[translations] updated
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index fad7fec..c2e7ec1 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -6,12 +6,12 @@
 DocType: Purchase Order,"If you have created a standard template in Purchase Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de las tasas de compra y gastos de plantilla, seleccione uno y haga clic en el botón de abajo."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,Cancelar Visita {0} antes de cancelar este Reclamo de Garantía
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +18,Consumer Products,Productos de Consumo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +72,Please select Party Type first,"Por favor, seleccione Partido Tipo primero"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +68,Please select Party Type first,"Por favor, seleccione Partido Tipo primero"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +89,Annealing,Recocido
 DocType: Item,Customer Items,Artículos de clientes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +41,Account {0}: Parent account {1} can not be a ledger,Cuenta {0}: Cuenta Padre {1} no puede ser una cuenta Mayor
 DocType: Item,Publish Item to hub.erpnext.com,Publicar artículo a hub.erpnext.com
-apps/erpnext/erpnext/config/setup.py +63,Email Notifications,Notificaciones por correo electrónico
+apps/erpnext/erpnext/config/setup.py +93,Email Notifications,Notificaciones por correo electrónico
 DocType: Item,Default Unit of Measure,Unidad de Medida Predeterminada
 DocType: SMS Center,All Sales Partner Contact,Todo Punto de Contacto de Venta
 DocType: Employee,Leave Approvers,Supervisores de Vacaciones
@@ -20,72 +20,76 @@
 DocType: Stock Entry,Get Stock and Rate,Verificar Inventario y Tasa
 DocType: About Us Settings,Website,Sitio Web
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +22,Compaction plus sintering,Compactación más sinterización
-DocType: Sales BOM,"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""","El artículo que representa el paquete . Este artículo debe estar como "" Es Stock Item"" como "" No"" y ""¿ Punto de venta"" como "" Sí"""
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +99,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
+DocType: Product Bundle,"The Item that represents the Package. This Item must have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes""","El artículo que representa el paquete . Este artículo debe estar como "" Es Stock Item"" como "" No"" y ""¿ Punto de venta"" como "" Sí"""
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +95,Currency is required for Price List {0},Se requiere de divisas para Lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculado en la transacción.
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales parson,Por favor introduzca Empleado Id de este párroco ventas
 apps/erpnext/erpnext/setup/doctype/backup_manager/backup_googledrive.py +120,Please set Google Drive access keys in {0},"Por favor, establece las claves de acceso de Google Drive en {0}"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +542,From Material Request,Desde Solicitud de material
-apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +39,{0} Tree,{0} Árbol
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +536,From Material Request,Desde Solicitud de material
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +37,{0} Tree,{0} Árbol
 DocType: Job Applicant,Job Applicant,solicitante de empleo
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Legal,Legal
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,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},La tarifa actual no puede ser incluida en el precio del artículo en la fila {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Requerido por
+DocType: Delivery Note,Return Against Delivery Note,Regreso Contra entrega Nota
 DocType: Department,Department,Departamento
 DocType: Purchase Order,% Billed,% Facturado
-DocType: Selling Settings,Customer Name,Nombre del Cliente
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +44,Exchange Rate must be same as {0} {1} ({2}),Tipo de cambio debe ser el mismo que {0} {1} ({2})
+DocType: Sales Invoice,Customer Name,Nombre del Cliente
 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.","Todos los campos relacionados tales como divisa, tasa de conversión, el total de exportaciones, total general de las exportaciones, etc están disponibles en la nota de entrega, Punto de venta, cotización, factura de venta, órdenes de venta, etc."
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +143,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +154,Outstanding for {0} cannot be less than zero ({1}),Sobresaliente para {0} no puede ser menor que cero ({1} )
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre de Tipo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +143,Series Updated Successfully,Serie actualizado correctamente
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +146,Series Updated Successfully,Serie actualizado correctamente
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +149,Stitching,Puntadas
 DocType: Pricing Rule,Apply On,Aplique En
 DocType: Item Price,Multiple Item prices.,Precios de Artículos Múltiples
 ,Purchase Order Items To Be Received,Productos de la Orden de Compra a ser Recibidos
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Quality Inspection Reading,Parameter,Parámetro
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +52,Please specify a Price List which is valid for Territory,"Por favor, especifique una lista de precios que es válido para el territorio"
-apps/erpnext/erpnext/projects/doctype/project/project.py +35,Expected End Date can not be less than Expected Start Date,Esperado Fecha de finalización no puede ser inferior a Fecha prevista de inicio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +235,Do really want to unstop production order:,No realmente quiere destapar orden de producción:
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +48,Please specify a Price List which is valid for Territory,"Por favor, especifique una lista de precios que es válido para el territorio"
+apps/erpnext/erpnext/projects/doctype/project/project.py +43,Expected End Date can not be less than Expected Start Date,Esperado Fecha de finalización no puede ser inferior a Fecha prevista de inicio
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +236,Do really want to unstop production order:,No realmente quiere destapar orden de producción:
+apps/erpnext/erpnext/utilities/transaction_base.py +104,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,New Leave Application,Nueva Aplicación de Permiso
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +129,Bank Draft,Cheque de Gerencia
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Bank Draft,Cheque de Gerencia
 DocType: Features Setup,1. To maintain the customer wise item code and to make them searchable based on their code use this option,1 . Para mantener el código de artículo del cliente y para efectuar búsquedas en ellos en función de ese código use esta opción
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de Cuenta de Pago
-apps/erpnext/erpnext/stock/doctype/item/item.js +60,Show Variants,Mostrar variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +30,Show Variants,Mostrar variantes
 DocType: Sales Invoice Item,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +174,Loans (Liabilities),Préstamos (pasivos )
 DocType: Employee Education,Year of Passing,Año de Fallecimiento
 DocType: Designation,Designation,Puesto
 DocType: Production Plan Item,Production Plan Item,Plan de Producción de artículos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +137,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +141,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
+apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Profile,Haz tu nuevo perfil de POS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +30,Health Care,Cuidado de la Salud
 DocType: Purchase Invoice,Monthly,Mensual
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Invoice,Factura
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidad
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +355,Email Address,Dirección De Correo Electrónico
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +357,Email Address,Dirección De Correo Electrónico
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +20,Defense,Defensa
 DocType: Company,Abbr,Abrev
 DocType: Appraisal Goal,Score (0-5),Puntuación ( 0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +205,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +62,Row # {0}:,Fila # {0}:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +204,Row {0}: {1} {2} does not match with {3},Fila {0}: {1} {2} no coincide con {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +67,Row # {0}:,Fila # {0}:
 DocType: Delivery Note,Vehicle No,Vehículo No
-sites/assets/js/erpnext.min.js +50,Please select Price List,"Por favor, seleccione Lista de precios"
+sites/assets/js/erpnext.min.js +53,Please select Price List,"Por favor, seleccione Lista de precios"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +161,Woodworking,Tratamiento de la madera
 DocType: Production Order Operation,Work In Progress,Trabajos en Curso
 DocType: Company,If Monthly Budget Exceeded,Si Presupuesto mensual excedido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +152,3D printing,Impresión 3D
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Time Log,Time Log,Hora de registro
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +80,Accountant,Contador
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +530,Accountant,Contador
+DocType: Cost Center,Stock User,Foto del usuario
 DocType: Company,Phone No,Teléfono No
 DocType: Time Log,"Log of Activities performed by users against Tasks that can be used for tracking time, billing.","Bitácora de actividades realizadas por los usuarios frente a las tareas que se pueden utilizar para el tiempo de seguimiento, facturación."
-apps/erpnext/erpnext/controllers/recurring_document.py +125,New {0}: #{1},Nuevo {0}: # {1}
+apps/erpnext/erpnext/controllers/recurring_document.py +127,New {0}: #{1},Nuevo {0}: # {1}
 ,Sales Partners Commission,Comisión del Socio de Ventas
-apps/erpnext/erpnext/setup/doctype/company/company.py +31,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
+apps/erpnext/erpnext/setup/doctype/company/company.py +32,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 DocType: Backup Manager,Allow Google Drive Access,Permitir Acceso a Google Drive
 DocType: Email Digest,Projects & System,Proyectos y Sistema
 DocType: Print Settings,Classic,Clásico
@@ -96,28 +100,29 @@
 DocType: Bin,Quantity Requested for Purchase,Cantidad solicitada para la compra
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y otro para el nuevo nombre"
 DocType: Packed Item,Parent Detail docname,Detalle Principal docname
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Kg,Kilogramo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Kg,Kilogramo
 apps/erpnext/erpnext/config/hr.py +48,Opening for a Job.,Apertura de un Trabajo .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +5,Advertising,Publicidad
 DocType: Employee,Married,Casado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +29,Grocery,tienda de comestibles
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +93,Make Bank Entry,Hacer Entrada del Banco
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +97,Make Bank Entry,Hacer Entrada del Banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +39,Pension Funds,Fondos de Pensiones
 apps/erpnext/erpnext/accounts/doctype/account/account.py +116,Warehouse is mandatory if account type is Warehouse,Almacén o Bodega es obligatorio si el tipo de cuenta es Almacén
 DocType: SMS Center,All Sales Person,Todos Ventas de Ventas
+DocType: Lead,Person Name,Nombre de la Persona
 DocType: Backup Manager,Credentials,Credenciales
 DocType: Purchase Order,"Check if recurring order, uncheck to stop recurring or put proper End Date","Compruebe si el orden recurrente, desmarque para detener recurrentes o poner  Fecha Final"
 DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
 DocType: Account,Credit,Crédito
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +25,Please setup Employee Naming System in Human Resource > HR Settings,"Por favor, instalación del sistema de nombres de los empleados en Recursos Humanos > Configuración de recursos humanos"
-DocType: POS Setting,Write Off Cost Center,Solicitar Centro de Costo
+DocType: POS Profile,Write Off Cost Center,Solicitar Centro de Costo
 DocType: Warehouse,Warehouse Detail,Detalle de almacenes
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +159,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +114,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
-apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.py +27,Parent Item {0} must be not Stock Item and must be a Sales Item,El Artículo Principal {0} no debe ser un elemento en Stock y debe ser un Artículo para Venta
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +162,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +124,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +25,Parent Item {0} must be not Stock Item and must be a Sales Item,El Artículo Principal {0} no debe ser un elemento en Stock y debe ser un Artículo para Venta
 DocType: Item,Item Image (if not slideshow),"Imagen del Artículo (si no, presentación de diapositivas)"
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por Hora / 60) * Tiempo real de la Operación
@@ -127,11 +132,11 @@
 DocType: Quality Inspection,Get Specification Details,Obtenga Especificación Detalles
 DocType: Lead,Interested,Interesado
 apps/erpnext/erpnext/config/manufacturing.py +14,Bill of Material,Lista de Materiales
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +32,From {0} to {1},Desde {0} a {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +112,Opening,Apertura
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},Desde {0} a {1}
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 DocType: Journal Entry,Opening Entry,Entrada de Apertura
 apps/erpnext/erpnext/controllers/trends.py +33,{0} is mandatory,{0} es obligatorio
-apps/erpnext/erpnext/config/setup.py +111,Contact master.,Contacto (principal).
 apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
 DocType: Lead,Product Enquiry,Consulta de producto
 DocType: Standard Reply,Owner,Propietario
@@ -142,8 +147,8 @@
 DocType: BOM,Total Cost,Coste total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +98,Reaming,Escariado
 DocType: Email Digest,Stub,talón
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +8,Activity Log:,Registro de Actividad:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +202,Item {0} does not exist in the system or has expired,Elemento {0} no existe en el sistema o ha expirado
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +9,Activity Log:,Registro de Actividad:
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +199,Item {0} does not exist in the system or has expired,Elemento {0} no existe en el sistema o ha expirado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +43,Real Estate,Bienes Raíces
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +4,Statement of Account,Estado de cuenta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +40,Pharmaceuticals,Productos farmacéuticos
@@ -152,54 +157,57 @@
 DocType: Custom Script,Client,Cliente
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
 DocType: Naming Series,Prefix,Prefijo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Consumable,Consumible
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Consumable,Consumible
 DocType: Upload Attendance,Import Log,Importar Registro
 apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.js +19,Send,Enviar
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +159,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +164,Annual Salary,Salario Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el Año Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Stock Expenses,Inventario de Gastos
 DocType: Newsletter,Email Sent?,Enviar Email ?
 DocType: Journal Entry,Contra Entry,Entrada Contra
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +89,Show Time Logs,Mostrar Registros Tiempo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +91,Show Time Logs,Mostrar Registros Tiempo
 DocType: Email Digest,Bank/Cash Balance,Banco / Balance de Caja
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +97,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +100,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Item,Supply Raw Materials for Purchase,Materiales Suministro primas para la Compra
-apps/erpnext/erpnext/stock/get_item_details.py +134,Item {0} must be a Purchase Item,Artículo {0} debe ser una compra de artículos
+apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Purchase Item,Artículo {0} debe ser una compra de artículos
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, rellenar los datos adecuados y adjuntar el archivo modificado.
  Todas las fechas y empleado combinación en el período seleccionado vendrá en la plantilla, con los registros de asistencia existentes"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +496,Item {0} is not active or end of life has been reached,Elemento {0} no está activo o ha llegado al final de la vida
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +428,Item {0} is not active or end of life has been reached,Elemento {0} no está activo o ha llegado al final de la vida
 DocType: Time Log Batch,Will be updated after Sales Invoice is Submitted.,Se actualizará después de la factura de venta se considera enviada .
-apps/erpnext/erpnext/controllers/accounts_controller.py +385,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir el impuesto de la fila {0} en la tasa de artículo , los impuestos en filas {1} también deben ser incluidos"
+apps/erpnext/erpnext/controllers/accounts_controller.py +418,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included","Para incluir el impuesto de la fila {0} en la tasa de artículo , los impuestos en filas {1} también deben ser incluidos"
 apps/erpnext/erpnext/config/hr.py +90,Settings for HR Module,Ajustes para el Módulo de Recursos Humanos
 DocType: SMS Center,SMS Center,Centro SMS
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +77,Straightening,Enderezar
 DocType: BOM Replace Tool,New BOM,Nueva Solicitud de Materiales
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +132,There were no updates in the items selected for this digest.,No hubo cambios en los elementos seleccionados para este resumen.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +14,Countergravity casting,Colada por contra
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +28,Newsletter has already been sent,Boletín de noticias ya ha sido enviado
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +30,Newsletter has already been sent,Boletín de noticias ya ha sido enviado
 DocType: Lead,Request Type,Tipo de solicitud
 DocType: Leave Application,Reason,Razón
 DocType: Purchase Invoice,The rate at which Bill Currency is converted into company's base currency,La velocidad a la que la moneda de la Factura se convierte en la moneda base de la compañía
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +13,Broadcasting,Difusión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +135,Execution,Ejecución
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,The first user will become the System Manager (you can change this later).,El primer usuario se convertirá en el Administrador del Sistema (puede cambiar esto más adelante).
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Execution,Ejecución
+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 usuario se convertirá en el Administrador del Sistema (puede cambiar esto más adelante).
 apps/erpnext/erpnext/config/manufacturing.py +39,Details of the operations carried out.,Los detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del Mantenimiento
+apps/erpnext/erpnext/config/stock.py +268,Items and Pricing,Artículos y precios
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +37,From Date should be within the Fiscal Year. Assuming From Date = {0},De fecha debe estar dentro del año fiscal. Suponiendo Desde Fecha = {0}
 DocType: Appraisal,Select the Employee for whom you are creating the Appraisal.,Seleccione el empleado para el que está creando la Evaluación .
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +90,Cost Center {0} does not belong to Company {1},Centro de Costos {0} no pertenece a la empresa {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +93,Cost Center {0} does not belong to Company {1},Centro de Costos {0} no pertenece a la empresa {1}
 DocType: Customer,Individual,Individual
 apps/erpnext/erpnext/config/support.py +23,Plan for maintenance visits.,Plan para las visitas de mantenimiento .
 DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro url para el mensaje
-apps/erpnext/erpnext/config/selling.py +143,Rules for applying pricing and discount.,Reglas para la aplicación de precios y descuentos .
+apps/erpnext/erpnext/config/selling.py +148,Rules for applying pricing and discount.,Reglas para la aplicación de precios y descuentos .
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +77,This Time Log conflicts with {0} for {1} {2},Conflictos Conectarse esta vez con {0} de {1} {2}
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de precios debe ser aplicable para comprar o vender
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +90,Installation date cannot be before delivery date for Item {0},Fecha de instalación no puede ser antes de la fecha de entrega para el elemento {0}
-sites/assets/js/form.min.js +261,Start,Iniciar
+DocType: Pricing Rule,Discount on Price List Rate (%),Descuento Precio de lista Tasa (%)
+sites/assets/js/form.min.js +265,Start,Iniciar
 DocType: User,First Name,Nombre
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +602,Your setup is complete. Refreshing.,Su configuración se ha completado. Actualizando.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +661,Your setup is complete. Refreshing.,Su configuración se ha completado. Actualizando.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +11,Full-mold casting,Fundición de molde completo
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
 DocType: Email Digest,Payments made during the digest period,Los pagos efectuados durante el período de digestión
@@ -209,6 +217,7 @@
 ,Purchase Order Trends,Tendencias de Ordenes de Compra
 apps/erpnext/erpnext/config/hr.py +78,Allocate leaves for the year.,Asignar las hojas para el año.
 DocType: Earning Type,Earning Type,Tipo de Ganancia
+DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,Planificación de la capacidad Desactivar y seguimiento de tiempo
 DocType: Email Digest,New Sales Orders,Nueva Órden de Venta
 DocType: Bank Reconciliation,Bank Account,Cuenta Bancaria
 DocType: Leave Type,Allow Negative Balance,Permitir Saldo Negativo
@@ -217,43 +226,39 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +52,Television,Televisión
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +137,Gashing,Gashing
 DocType: Production Order Operation,Updated via 'Time Log',Actualizado a través de 'Hora de Registro'
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +79,Account {0} does not belong to Company {1},Cuenta {0} no pertenece a la Compañía {1}
 DocType: Naming Series,Series List for this Transaction,Lista de series para esta transacción
-apps/erpnext/erpnext/controllers/selling_controller.py +176,Reserved Warehouse required for stock Item {0} in row {1},Almacén Reservado requerido para la acción del artículo {0} en la fila {1}
 DocType: Sales Invoice,Is Opening Entry,Es la entrada de apertura
 DocType: Supplier,Mention if non-standard receivable account applicable,Mencione si cuenta por cobrar no estándar es  aplicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +145,For Warehouse is required before Submit,Para se requiere antes de Almacén Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +150,For Warehouse is required before Submit,Para se requiere antes de Almacén Enviar
 DocType: Sales Partner,Reseller,Reseller
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +49,Please enter Company,Por favor introduzca Company
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +41,Please enter Company,Por favor introduzca Company
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
 ,Production Orders in Progress,Órdenes de producción en Construcción
-DocType: Item,Auto-raise Material Request if quantity goes below re-order level in default warehouse,Auto Generar Solicitud de Material si la cantidad está por debajo de nivel de re-orden en el almacén por defecto
 DocType: Journal Entry,Write Off Amount <=,Escribe Off Importe < =
 DocType: Lead,Address & Contact,Dirección y Contacto
-apps/erpnext/erpnext/controllers/recurring_document.py +205,Next Recurring {0} will be created on {1},Siguiente Recurrente {0} se creará en {1}
-DocType: POS Setting,Create Stock Ledger Entries when you submit a Sales Invoice,Crear Diario de Entradas de Inventario al momento de enviar una Factura de Venta
+apps/erpnext/erpnext/controllers/recurring_document.py +207,Next Recurring {0} will be created on {1},Siguiente Recurrente {0} se creará en {1}
+DocType: POS Profile,Create Stock Ledger Entries when you submit a Sales Invoice,Crear Diario de Entradas de Inventario al momento de enviar una Factura de Venta
 DocType: Newsletter List,Total Subscribers,Los suscriptores totales
-DocType: Lead,Contact Name,Nombre del Contacto
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Contact Name,Nombre del Contacto
 DocType: Production Plan Item,SO Pending Qty,SO Pendiente Cantidad
-DocType: Salary Manager,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
-apps/erpnext/erpnext/templates/generators/item.html +21,No description given,Sin descripción
+DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
+apps/erpnext/erpnext/templates/generators/item.html +24,No description given,Sin descripción
 apps/erpnext/erpnext/config/buying.py +18,Request for purchase.,Solicitud de compra.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +106,Double housing,Vivienda Doble
-DocType: Item,"Unit of measurement of this item (e.g. Kg, Unit, No, Pair).","Unidad de Medida de este material ( por ejemplo, Kg , Unidad , No, Par) ."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +157,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Relieving Date must be greater than Date of Joining,Aliviar fecha debe ser mayor que Fecha de acceso
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +167,Leaves per Year,Deja por año
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,Aliviar fecha debe ser mayor que Fecha de acceso
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +172,Leaves per Year,Deja por año
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +184,Please set Naming Series for {0} via Setup > Settings > Naming Series,"Por favor, establece Naming Series para {0} a través de Configuración&gt; Configuración&gt; Serie Naming"
 DocType: Time Log,Will be updated when batched.,Se actualizará al agruparse.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +123,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
 apps/erpnext/erpnext/stock/utils.py +174,Warehouse {0} does not belong to company {1},Almacén {0} no pertenece a la empresa {1}
-DocType: Brand,Material Master Manager,Maestro de Gerente de Materiales
 DocType: Bulk Email,Message,Mensaje
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +663,Pending Items {0} updated,Elementos Pendientes {0} actualizado
 DocType: Item Website Specification,Item Website Specification,Artículo Website Especificación
 DocType: Backup Manager,Dropbox Access Key,Clave de Acceso de Dropbox 
 DocType: Payment Tool,Reference No,Referencia
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +342,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +465,Item {0} has reached its end of life on {1},Artículo {0} ha llegado al término de la vida en {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +349,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +349,Item {0} has reached its end of life on {1},Artículo {0} ha llegado al término de la vida en {1}
 apps/erpnext/erpnext/accounts/utils.py +306,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Articulo de Reconciliación de Inventario
 DocType: Purchase Invoice,In Words will be visible once you save the Purchase Invoice.,En palabras serán visibles una vez que guarde la factura de compra .
@@ -261,14 +266,16 @@
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido (MOQ)
 DocType: Lead,Do Not Contact,No entre en contacto
 DocType: Sales Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El identificador único para el seguimiento de todas las facturas recurrentes. Se genera al enviar .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Software Developer,Desarrollador de Software
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software
 DocType: Item,Minimum Order Qty,Mínimo Online con su nombre
 DocType: Pricing Rule,Supplier Type,Tipo de Proveedor
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +482,Item {0} is cancelled,Artículo {0} se cancela
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +620,Material Request,Solicitud de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +366,Item {0} is cancelled,Artículo {0} se cancela
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +612,Material Request,Solicitud de Material
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar Fecha de Liquidación
+DocType: Item,Purchase Details,Detalles de Compra
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +330,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Artículo {0} no se encuentra en &#39;materias primas suministradas&#39; mesa en la Orden de Compra {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +128,Wire brushing,Cepillo de alambre
 DocType: Employee,Relation,Relación
 apps/erpnext/erpnext/config/selling.py +23,Confirmed orders from Customers.,Pedidos en firme de los clientes.
@@ -287,23 +294,26 @@
 DocType: Purchase Invoice Item,Expense Head,Cuenta de Gastos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +86,Please select Charge Type first,"Por favor, seleccione Tipo de Cargo primero"
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más Reciente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,Max 5 characters,Máximo 5 caracteres
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,Max 5 characters,Máximo 5 caracteres
 DocType: Email Digest,New Quotations,Nuevas Citas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +194,Select Your Language,Seleccione su idioma
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +195,Select Your Language,Seleccione su idioma
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer Administrador de Vacaciones in la lista sera definido como el Administrador de Vacaciones predeterminado.
+DocType: Manufacturing Settings,"Disables creation of time logs against Production Orders.
+Operations shall not be tracked against Production Order",Desactiva la creación de registros de tiempo en contra de las órdenes de fabricación. Las operaciones no serán objeto de seguimiento contra la Orden de Producción
 DocType: Accounts Settings,Settings for Accounts,Ajustes de Contabilidad
-apps/erpnext/erpnext/config/crm.py +80,Manage Sales Person Tree.,Administrar Árbol de Personal de Ventas.
+apps/erpnext/erpnext/config/crm.py +85,Manage Sales Person Tree.,Administrar Árbol de Personal de Ventas.
 DocType: Item,Synced With Hub,Sincronizado con Hub
+apps/erpnext/erpnext/setup/doctype/company/company.js +41,Wrong Password,Contraseña Incorrecta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +35,Item {0} must be Service Item,Artículo {0} debe ser de servicio Artículo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +297,Completed Qty can not be greater than 'Qty to Manufacture',Completado Cantidad no puede ser mayor que 'Cantidad de Fabricación'
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +32,Item {0} must be Service Item,Artículo {0} debe ser de servicio Artículo
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Completed Qty can not be greater than 'Qty to Manufacture',Completado Cantidad no puede ser mayor que 'Cantidad de Fabricación'
 DocType: DocType,Administrator,Administrador
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +135,Laser drilling,Perforación por láser
 DocType: Stock UOM Replace Utility,New Stock UOM,Unidad de Medida de Nuevo Inventario
 DocType: Period Closing Voucher,Closing Account Head,Cierre Cuenta Principal
 DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Customer Group"">Add / Edit</a>","<a href=""#Sales Browser/Customer grupo""> Añadir / Editar < / a>"
 DocType: Employee,External Work History,Historial de trabajo externo
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error Referencia Circular
+apps/erpnext/erpnext/projects/doctype/task/task.py +89,Circular Reference Error,Error Referencia Circular
 DocType: ToDo,Closed,Cerrado
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,En palabras (Export ) será visible una vez que guarde la nota de entrega .
 DocType: Lead,Industry,Industria
@@ -313,32 +323,31 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +48,Necking,Besuqueo
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificación por correo electrónico en la creación de la Solicitud de material automático
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +29,Item is updated,El Artículo está Actualizado
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +26,Global POS Setting {0} already created for company {1},POS Global Ajuste {0} ya creado para la compañía de {1}
 DocType: Comment,System Manager,Administrador del Sistema
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Factura
 DocType: Sales Invoice Item,Delivery Note,Nota de entrega
 DocType: Backup Manager,Allow Dropbox Access,Permitir Acceso a Dropbox
+apps/erpnext/erpnext/config/learn.py +72,Setting up Taxes,Configuración de Impuestos
 DocType: Communication,Support Manager,Gerente de Soporte
-DocType: Sales Order Item,Reserved Warehouse,Almacén Reservado
 apps/erpnext/erpnext/accounts/utils.py +182,Payment Entry has been modified after you pulled it. Please pull it again.,"Entrada de pago ha sido modificado después se tiró de él. Por favor, tire de ella de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +337,{0} entered twice in Item Tax,{0} entrado dos veces en el Impuesto
+apps/erpnext/erpnext/stock/doctype/item/item.py +195,{0} entered twice in Item Tax,{0} entrado dos veces en el Impuesto
 DocType: Workstation,Rent Cost,Renta Costo
+DocType: Manage Variants Item,Variant Attributes,Atributos Variant
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,Por favor seleccione el mes y el año
 DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date","Introduzca ID de correo electrónico separados por comas, la factura será enviada automáticamente en una fecha determinada"
 DocType: Employee,Company Email,Correo de la Empresa
 DocType: Workflow State,Refresh,Actualizar
 DocType: Features Setup,"All import related fields like currency, conversion rate, import total, import grand total etc are available in Purchase Receipt, Supplier Quotation, Purchase Invoice, Purchase Order etc.","Todos los campos tales como la divisa, tasa de conversión, el total de las importaciones, la importación total general etc están disponibles en recibo de compra, cotización de proveedor, factura de compra, orden de compra, etc"
-apps/erpnext/erpnext/stock/doctype/item/item.js +59,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +59,Total Order Considered,Total del Pedido Considerado
-DocType: Sales Invoice Item,Discount (%),Descuento (% )
+apps/erpnext/erpnext/stock/doctype/item/item.js +29,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +110,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
-apps/erpnext/erpnext/controllers/recurring_document.py +198,Please enter 'Repeat on Day of Month' field value,Por favor introduce 'Repeat en el Día del Mes ' valor del campo
+apps/erpnext/erpnext/controllers/recurring_document.py +200,Please enter 'Repeat on Day of Month' field value,Por favor introduce 'Repeat en el Día del Mes ' valor del campo
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base del cliente
 DocType: Features Setup,"Available in BOM, Delivery Note, Purchase Invoice, Production Order, Purchase Order, Purchase Receipt, Sales Invoice, Sales Order, Stock Entry, Timesheet","Disponible en la Solicitud de Materiales , Albarán, Factura de Compra , Orden de Produccuón , Orden de Compra , Fecibo de Compra , Factura de Venta Pedidos de Venta , Inventario de Entrada, Control de Horas"
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +510,Select Item,Seleccione Producto
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +504,Select Item,Seleccione Producto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +208,{0} {1} status is Stopped,{0} {1} estado es Detenido
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Item: {0} managed batch-wise, can not be reconciled using \
+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","Artículo: {0} gestionado por lotes, no se puede conciliar el uso \
  Stock Reconciliación, en lugar de utilizar la entrada Stock"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +242,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
@@ -347,14 +356,12 @@
 DocType: Stock UOM Replace Utility,Current Stock UOM,Unidad de Medida de Inventario Actual
 apps/erpnext/erpnext/config/stock.py +53,Batch (lot) of an Item.,Lote de un elemento .
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de la factura
-apps/erpnext/erpnext/stock/doctype/item/item.py +358,"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'","Como hay transacciones de inventario existentes por este elemento, no puede cambiar los valores de ""No tiene No de Serie"", ""Tiene lote No"", ""Es Elemento del Inventario"" y ""Método de Valoración"""
-apps/erpnext/erpnext/templates/includes/footer_extension.html +6,Your email address,Su dirección de correo electrónico
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Your email address,Su dirección de correo electrónico
 DocType: Email Digest,Income booked for the digest period,Ingresos reservado para el período de digestión
-apps/erpnext/erpnext/config/setup.py +106,Supplier master.,Maestro de Proveedores.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +191,Please see attachment,"Por favor, véase el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +108,Water jet cutting,Corte por chorro de agua
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +22,Setup Already Complete!!,Configuración completa !
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +23,Setup Already Complete!!,Configuración completa !
 ,Finished Goods,productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
@@ -365,7 +372,7 @@
 ,Schedule Date,Horario Fecha
 DocType: Packed Item,Packed Item,Artículo Empacado
 apps/erpnext/erpnext/config/buying.py +54,Default settings for buying transactions.,Ajustes por defecto para de las transacciones de compra.
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +23,Activity Cost exists for Employee {0} against Activity Type - {1},Existe Costo Actividad de Empleado {0} contra el Tipo de Actividad - {1}
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe Costo Actividad de Empleado {0} contra el Tipo de Actividad - {1}
 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.,"Por favor, NO crear cuentas de clientes y proveedores. Se crean directamente de los maestros de clientes/proveedores."
 DocType: Currency Exchange,Currency Exchange,Cambio de Divisas
 DocType: Purchase Invoice Item,Item Name,Nombre del Articulo
@@ -375,10 +382,7 @@
 DocType: Workstation,Working Hours,Horas de Trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Cambie el número de secuencia de inicio / actual de una serie existente .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +57,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si hay varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
-DocType: Stock Entry,Purchase Return,Devolucion de Compra
 ,Purchase Register,Registrar Compra
-DocType: Item,"Selecting ""Yes"" will allow this item to figure in Sales Order, Delivery Note","Al seleccionar "" Sí "" permitirá este artículo para averiguar en órdenes de venta , nota de entrega"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +212,Please enter Purchase Receipt No to proceed,Por favor introduzca recibo de compra en No para continuar
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de Consumibles
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +153,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener la función 'Supervisor de Vacaciones'
@@ -386,32 +390,36 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +124,Reason for losing,Razón de Pérdida
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +35,Tube beading,Abalorios Tubo
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},Estación de Trabajo está cerrada en las siguientes fechas según Lista de Vacaciones: {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +638,Make Maint. Schedule,Hacer Horaria Principal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +627,Make Maint. Schedule,Hacer Horaria Principal
 DocType: Employee,Single,solo
+DocType: Issue,Attachment,Accesorio
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +29,Budget cannot be set for Group Cost Center,Presupuesto no se puede establecer de centros de coste Grupo
 DocType: Account,Cost of Goods Sold,Costo de las Ventas
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +217,Please enter Cost Center,Por favor introduzca Centro de Costos
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +223,Please enter Cost Center,Por favor introduzca Centro de Costos
 DocType: Sales Invoice Item,Sales Order,Ordenes de Venta
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +63,Avg. Selling Rate,Tarifa Promedio de Venta
 DocType: Purchase Order,Start date of current order's period,Fecha del periodo del actual orden de inicio
-apps/erpnext/erpnext/utilities/transaction_base.py +113,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la fila {0}
+apps/erpnext/erpnext/utilities/transaction_base.py +128,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la fila {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Cambio
 DocType: Delivery Note,% Installed,"
 % Instalado"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +60,Please enter company name first,"Por favor, introduzca nombre de la empresa primero"
 DocType: BOM,Item Desription,Descripción del Artículo
-DocType: Buying Settings,Supplier Name,Nombre del Proveedor
+DocType: Purchase Invoice,Supplier Name,Nombre del Proveedor
 DocType: Account,Is Group,Es el Grupo
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +61,Enter atleast one Attribute & its Value in Attribute table.,Introduzca al menos un atributo y su valor en la tabla de atributos.
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar Proveedor Número de factura Singularidad
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +30,Thermoforming,Termoformado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +65,Slitting,De corte longitudinal
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta el caso No ' no puede ser inferior a 'Desde el Caso No'
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +99,Non Profit,Sin Fines de Lucro
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +104,Non Profit,Sin Fines de Lucro
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_list.js +7,Not Started,Sin comenzar
 DocType: Lead,Channel Partner,Canal de Socio
 DocType: Account,Old Parent,Antiguo Padre
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizar el texto de introducción que va como una parte de este correo electrónico. Cada transacción tiene un texto introductorio separado.
 DocType: Sales Taxes and Charges Template,Sales Master Manager,Gerente de Ventas
-apps/erpnext/erpnext/config/manufacturing.py +66,Global settings for all manufacturing processes.,La configuración global para todos los procesos de fabricación.
+apps/erpnext/erpnext/config/manufacturing.py +74,Global settings for all manufacturing processes.,La configuración global para todos los procesos de fabricación.
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas Congeladas Hasta
 DocType: SMS Log,Sent On,Enviado Por
 DocType: Sales Order,Not Applicable,No aplicable
@@ -419,12 +427,12 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +18,Shell molding,Moldeo Shell
 DocType: Material Request Item,Required Date,Fecha Requerida
 DocType: Delivery Note,Billing Address,Dirección de Facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +611,Please enter Item Code.,"Por favor, introduzca el código del artículo ."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +625,Please enter Item Code.,"Por favor, introduzca el código del artículo ."
 DocType: BOM,Costing,Costeo
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si se selecciona, el importe del impuesto se considerará como ya incluido en el Monto  a Imprimir"
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
 DocType: Employee,Health Concerns,Preocupaciones de salud
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Unpaid,No Pagado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,No Pagado
 DocType: Packing Slip,From Package No.,Del Paquete N º 
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y Depósitos
 DocType: Features Setup,Imports,Importaciones
@@ -441,31 +449,31 @@
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por Pagar
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +24,Add Subscribers,Añadir Suscriptores
-sites/assets/js/erpnext.min.js +2,""" does not exists",No existe
+sites/assets/js/erpnext.min.js +4,""" does not exists",No existe
 DocType: Pricing Rule,Valid Upto,Válido hasta
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +514,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +564,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 DocType: Email Digest,Open Tickets,Entradas abiertas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Direct Income,Ingreso Directo
 DocType: Email Digest,Total amount of invoices received from suppliers during the digest period,Importe Total de las facturas recibidas de los proveedores durante el período de asimilación
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,"Can not filter based on Account, if grouped by Account","No se puede filtrar en función de la cuenta , si se agrupan por cuenta"
-DocType: Item,Lead Time days is number of days by which this item is expected in your warehouse. This days is fetched in Material Request when you select this item.,Tiempo de Entrega en Días de la Iniciativa es el número de días en que se espera que este el artículo en su almacén. Este día es usado en la Solicitud de Materiales cuando se selecciona este elemento.
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Administrative Officer,Oficial Administrativo
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +88,Administrative Officer,Oficial Administrativo
 DocType: Payment Tool,Received Or Paid,Recibido o Pagado
-DocType: Item,"Select ""Yes"" if this item is used for some internal purpose in your company.","Seleccione "" Sí"" si este artículo se utiliza para algún propósito interno de su empresa."
+sites/assets/js/erpnext.min.js +54,Please select Company,"Por favor, seleccione de la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +307,Please enter Warehouse for which Material Request will be raised,"Por favor introduzca Almacén, bodega en la que se planteará Solicitud de material"
+apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar tarea como no se cierra su tarea depende {0}.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +298,Please enter Warehouse for which Material Request will be raised,"Por favor introduzca Almacén, bodega en la que se planteará Solicitud de material"
 DocType: Production Order,Additional Operating Cost,Costo adicional de funcionamiento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +19,Cosmetics,Productos Cosméticos
 DocType: DocField,Type,Tipo
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +272,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
 DocType: Backup Manager,Email ids separated by commas.,ID de correos electrónicos separados por comas.
 DocType: Communication,Subject,Sujeto
-DocType: Item,"Select ""Yes"" if this item represents some work like training, designing, consulting etc.","Seleccione "" Sí"" si este artículo representa un poco de trabajo al igual que la formación, el diseño, consultoría , etc"
 DocType: Shipping Rule,Net Weight,Peso Neto
 DocType: Employee,Emergency Phone,Teléfono de Emergencia
 DocType: Backup Manager,Google Drive Access Allowed,Google Drive Acceso Permitido
 ,Serial No Warranty Expiry,Número de orden de caducidad Garantía
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +634,Do you really want to STOP this Material Request?,¿De verdad quiere dejar de esta demanda de materiales?
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +635,Do you really want to STOP this Material Request?,¿De verdad quiere dejar de esta demanda de materiales?
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_list.js +22,To Deliver,Para Entregar
 DocType: Purchase Invoice Item,Item,artículo
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia ( Db - Cr)
 DocType: Account,Profit and Loss,Pérdidas y Ganancias
@@ -473,28 +481,30 @@
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +101,New UOM must NOT be of type Whole Number,Nueva Unidad de Medida NO debe ser de tipo Numero Entero
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furniture and Fixture,Muebles y Fixture
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
-apps/erpnext/erpnext/setup/doctype/company/company.py +48,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +52,Account {0} does not belong to company: {1},Cuenta {0} no pertenece a la compañía: {1}
 DocType: Selling Settings,Default Customer Group,Grupo predeterminado Cliente
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","Si desactiva, el campo 'Total redondeado' no será visible en ninguna transacción"
 DocType: BOM,Operating Cost,Costo de Funcionamiento
 ,Gross Profit,Utilidad Bruta
 DocType: Production Planning Tool,Material Requirement,Solicitud de Material
+DocType: Variant Attribute,Variant Attribute,Variante Atributo
 DocType: Company,Delete Company Transactions,Eliminar Transacciones Empresa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Item {0} is not Purchase Item,Artículo {0} no se compra del artículo
-apps/erpnext/erpnext/controllers/recurring_document.py +187,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +84,Item {0} is not Purchase Item,Artículo {0} no se compra del artículo
+apps/erpnext/erpnext/controllers/recurring_document.py +189,"{0} is an invalid email address in 'Notification \
 					Email Address'","{0} es una dirección de correo electrónico inválida en '\
  Notificación/ Dirección de Correo Electrónico'"
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +44,Total Billing This Year:,Facturación Total este año:
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
 DocType: Territory,For reference,Para referencia
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +198,Closing (Cr),Cierre (Cr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +227,Closing (Cr),Cierre (Cr)
 DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de artículos
 DocType: Job Applicant,Thread HTML,Tema HTML
 DocType: Company,Ignore,Pasar por Alto
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviado a los teléfonos: {0}
 DocType: Backup Manager,Enter Verification Code,Instroduzca el Código de Verificación
-apps/erpnext/erpnext/controllers/buying_controller.py +136,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas 
+apps/erpnext/erpnext/controllers/buying_controller.py +135,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Almacén de Proveedor es necesario para recibos de compras sub contratadas 
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Total Comisión
 DocType: Pricing Rule,Sales Partner,Socio de Ventas
@@ -504,10 +514,10 @@
 To distribute a budget using this distribution, set this **Monthly Distribution** in the **Cost Center**","** Distribución Mensual ** le ayuda a distribuir su presupuesto a través de meses si tiene periodos en su negocio.  Para distribuir un presupuesto utilizando esta distribución, establecer **Distribución Mensual ** en el **Centro de Costos**"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +172,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +20,Please select Company and Party Type first,"Por favor, seleccione de la empresa y el Partido Tipo primero"
-apps/erpnext/erpnext/config/accounts.py +79,Financial / accounting year.,Ejercicio / contabilidad.
+apps/erpnext/erpnext/config/accounts.py +84,Financial / accounting year.,Ejercicio / contabilidad.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +172,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
 DocType: Email Digest,New Supplier Quotations,Nueva Cotización de Proveedores
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +616,Make Sales Order,Hacer Orden de Venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +608,Make Sales Order,Hacer Orden de Venta
 DocType: Project Task,Project Task,Tarea del proyecto
 ,Lead Id,Iniciativa ID
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
@@ -515,12 +525,12 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Fiscal Year Start Date should not be greater than Fiscal Year End Date,Año fiscal Fecha de inicio no debe ser mayor de Fin de ejercicio Fecha
 DocType: Warranty Claim,Resolution,Resolución
 DocType: Sales Order,Display all the individual items delivered with the main items,Ver todas las partidas individuales se suministran con los elementos principales
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +67,Payable Account,Cuenta por Pagar
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Payable Account,Cuenta por Pagar
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Backup Manager,Sync with Google Drive,Sincronización con Google Drive
 DocType: Leave Control Panel,Allocate,Asignar
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard_page.html +16,Previous,Anterior
-DocType: Stock Entry,Sales Return,Volver Ventas
+DocType: Item,Manage Variants,Administrar Variantes
 DocType: Production Planning Tool,Select Sales Orders from which you want to create Production Orders.,Seleccione órdenes de venta a partir del cual desea crear órdenes de producción.
 apps/erpnext/erpnext/config/hr.py +120,Salary components.,Componentes salariales.
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
@@ -532,14 +542,14 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +122,Tumbling,Tumbling
 DocType: Purchase Order Item,Billed Amt,Monto Facturado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Almacén lógico contra el cual se hacen las entradas en existencias.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +110,Reference No & Reference Date is required for {0},Se requiere de No de Referencia y Fecha de Referencia para {0}
 DocType: Event,Wednesday,Miércoles
 DocType: Sales Invoice,Customer's Vendor,Vendedor del Cliente
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +197,Production Order is Mandatory,Orden de Producción es obligatorio
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +40,{0} {1} has a common territory {2},{0} {1} tiene un territorio común {2}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +134,Proposal Writing,Redacción de Propuestas
-apps/erpnext/erpnext/config/setup.py +85,Masters,Maestros
-apps/erpnext/erpnext/stock/stock_ledger.py +316,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Stock Error ( {6} ) para el punto {0} en Almacén {1} en {2} {3} en {4} {5}
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +200,Production Order is Mandatory,Orden de Producción es obligatorio
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,{0} {1} has a common territory {2},{0} {1} tiene un territorio común {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Proposal Writing,Redacción de Propuestas
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otra Sales Person {0} con el mismo ID de empleado
+apps/erpnext/erpnext/stock/stock_ledger.py +337,Negative Stock Error ({6}) for Item {0} in Warehouse {1} on {2} {3} in {4} {5},Negativo Stock Error ( {6} ) para el punto {0} en Almacén {1} en {2} {3} en {4} {5}
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal Compañía
 DocType: Packing Slip Item,DN Detail,Detalle DN
 DocType: Time Log,Billed,Facturado
@@ -558,69 +568,72 @@
 DocType: Buying Settings,Supplier Naming By,Nombre del Proveedor por:
 DocType: Maintenance Schedule,Maintenance Schedule,Calendario de Mantenimiento
 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.","Luego las Reglas de Precio son filtradas en base a Cliente, Grupo de Clientes, Territorio, Proveedor, Tipo de Proveedor, Campaña, Socio de Ventas, etc"
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +126,Please install dropbox python module,"Por favor, instale el módulo python dropbox"
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +127,Please install dropbox python module,"Por favor, instale el módulo python dropbox"
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Manager,Gerente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +512,From Purchase Receipt,Desde recibo de compra
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +222,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +506,From Purchase Receipt,Desde recibo de compra
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +219,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de Receptores
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Basado en "" y "" Agrupar por "" no puede ser el mismo"
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
-sites/assets/js/form.min.js +253,To,a
-apps/erpnext/erpnext/templates/includes/footer_extension.html +39,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
+sites/assets/js/form.min.js +257,To,a
+apps/frappe/frappe/templates/base.html +141,Please enter email address,"Por favor, introduzca la dirección de correo electrónico"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +34,End tube forming,Fin tubo formando
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de Resolución
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +596,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, ajuste de cuenta bancaria Efectivo por defecto o en el modo de pago {0}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, ajuste de cuenta bancaria Efectivo por defecto o en el modo de pago {0}"
 DocType: Selling Settings,Customer Naming By,Naming Cliente Por
 apps/erpnext/erpnext/accounts/doctype/account/account.js +67,Convert to Group,Convertir al Grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Cantidad Entregada
+DocType: Customer,Fixed Days,Días Fijos
 DocType: Sales Invoice,Packing List,Lista de Envío
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de Compra asignadas a Proveedores .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +42,Publishing,Publicación
 DocType: Activity Cost,Projects User,Proyectos usuario
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,Consumido
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +187,{0}: {1} not found in Invoice Details table,{0}: {1} no se encuentra en el detalle de la Factura
+DocType: Company,Round Off Cost Center,Completan centros de coste
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +189,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,Visita de Mantenimiento {0} debe ser cancelado antes de cancelar la Orden de Ventas
 DocType: Material Request,Material Transfer,Transferencia de Material
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +56,Opening (Dr),Apertura ( Dr)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +406,Posting timestamp must be after {0},Fecha y hora de publicación deberá ser posterior a {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +40,Posting timestamp must be after {0},Fecha y hora de publicación deberá ser posterior a {0}
 apps/frappe/frappe/config/setup.py +59,Settings,Configuración
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,Impuestos y Cargos Landed Cost
 DocType: Production Order Operation,Actual Start Time,Tiempo Real de Inicio
 DocType: BOM Operation,Operation Time,Tiempo de funcionamiento
 sites/assets/js/list.min.js +5,More,Más
 DocType: Communication,Sales Manager,Gerente De Ventas
-sites/assets/js/desk.min.js +555,Rename,Renombrar
+sites/assets/js/desk.min.js +641,Rename,Renombrar
 DocType: Purchase Invoice,Write Off Amount,Solicitar Monto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +51,Bending,Doblado
-DocType: Leave Block List Allow,Allow User,Permitir al usuario
+apps/frappe/frappe/core/page/user_permissions/user_permissions.js +246,Allow User,Permitir al usuario
 DocType: Journal Entry,Bill No,Factura No
 DocType: Purchase Invoice,Quarterly,Trimestral
 DocType: Selling Settings,Delivery Note Required,Nota de entrega requerida
 DocType: Sales Order Item,Basic Rate (Company Currency),Tarifa Base (Moneda Local)
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +66,Please enter item details,Por favor ingrese los detalles del artículo
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Por favor ingrese los detalles del artículo
 DocType: Purchase Receipt,Other Details,Otros Datos
 DocType: Account,Accounts,Contabilidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Marketing,Marketing
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Marketing,Marketing
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +64,Straight shearing,Esquila Heterosexual
 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.,Para rastrear artículo en ventas y documentos de compra en base a sus nn serie. Esto se puede también utilizar para rastrear información sobre la garantía del producto.
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario Actual
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +84,Rejected Warehouse is mandatory against regected item,Almacén Rechazado es obligatorio contra Ítem rechazado
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
 DocType: Employee,Provide email id registered in company,Proporcionar correo electrónico de identificación registrado en la compañía
 DocType: Hub Settings,Seller City,Ciudad del vendedor
 DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Presente Carta Plazo
-apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +23,Item {0} not found,Elemento {0} no encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item has variants.,El artículo tiene variantes.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +63,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventario
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +88,Tree Type,Tipo de Árbol
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad Consumida por Unidad
 DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la Garantía
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y Almacén
 DocType: Sales Invoice,Commission Rate (%),Comisión de Cambio (% )
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +141,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Pedidos de Venta, Factura de Venta o Entrada de Diario"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +142,"Against Voucher Type must be one of Sales Order, Sales Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Pedidos de Venta, Factura de Venta o Entrada de Diario"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +138,Biomachining,Biomachining
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +6,Aerospace,Aeroespacial
 apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +19,Welcome,Bienvenido
@@ -629,15 +642,14 @@
 apps/erpnext/erpnext/config/stock.py +28,Goods received from Suppliers.,Productos recibidos de proveedores .
 DocType: Communication,Open,Abierto
 DocType: Lead,Campaign Name,Nombre de la campaña
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +197,Please enter Delivery Note No or Sales Invoice No to proceed,"Por favor, ingrese la nota de entrega o No Factura No para continuar"
 ,Reserved,Reservado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +650,Do you really want to UNSTOP,¿Realmente quieres unstop
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +644,Do you really want to UNSTOP,¿Realmente quieres unstop
 DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La Fecha en que se la próxima factura sera generada. Se genera al enviar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +108,{0} is not a stock Item,{0} no es un elemento del Inventario
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} no es un elemento del Inventario
 DocType: Mode of Payment Account,Default Account,Cuenta Predeterminada
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +155,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
 DocType: Contact Us Settings,Address Title,Dirección Título
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +32,Please select weekly off day,Por favor seleccione el día libre semanal
 DocType: Production Order Operation,Planned End Time,Planificación de Tiempo Final
@@ -647,25 +659,22 @@
 DocType: Delivery Note,Customer's Purchase Order No,Nº de Pedido de Compra del Cliente
 DocType: Employee,Cell Number,Número de la célula
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +139,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +24,Energy,Energía
 DocType: Opportunity,Opportunity From,Oportunidad De
 apps/erpnext/erpnext/config/hr.py +33,Monthly salary statement.,Nómina Mensual.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +434,"Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. \
-						Pending Amount is {2}",Fila No {0}: El importe no puede ser mayor que la cantidad pendiente contra Reclamación de Gastos {1}. \  Monto Pendiente es {2}
 DocType: Item Group,Website Specifications,Especificaciones del Sitio Web
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +198,New Account,Nueva Cuenta
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +202,New Account,Nueva Cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +21,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
-apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
-apps/erpnext/erpnext/templates/pages/ticket.py +27,Please write something,"Por favor, escribir algo"
+apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
 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.,Entradas de Contabilidad se pueden hacer en contra de nodos hoja. No se permiten los comentarios en contra de los grupos.
 DocType: ToDo,High,Alto
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +364,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar Solicitud de Materiales ya que está vinculado con otras Solicitudes de Materiales
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +361,Cannot deactivate or cancel BOM as it is linked with other BOMs,No se puede desactivar o cancelar Solicitud de Materiales ya que está vinculado con otras Solicitudes de Materiales
 DocType: Opportunity,Maintenance,Mantenimiento
 DocType: User,Male,Masculino
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +181,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +174,Purchase Receipt number required for Item {0},Número de Recibo de Compra Requerido para el punto {0}
 DocType: Item Attribute Value,Item Attribute Value,Elemento Atributo Valor
-apps/erpnext/erpnext/config/crm.py +54,Sales campaigns.,Campañas de Ventas.
+apps/erpnext/erpnext/config/crm.py +59,Sales campaigns.,Campañas de Ventas.
 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.
 
 #### Note
@@ -713,25 +722,29 @@
 DocType: Address,Personal,Personal
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de Gastos
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
-apps/erpnext/erpnext/controllers/accounts_controller.py +255,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Asiento {0} está enlazado con la Orden {1}, compruebe si debe tirar como adelanto en esta factura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +269,"Journal Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Asiento {0} está enlazado con la Orden {1}, compruebe si debe tirar como adelanto en esta factura."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +12,Biotechnology,Biotecnología
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Maintenance Expenses,Gastos de Mantenimiento de Oficinas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +52,Hemming,Hemming
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +64,Please enter Item first,Por favor introduzca Artículo primero
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +66,Please enter Item first,Por favor introduzca Artículo primero
 DocType: Account,Liability,Obligaciones
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que la reclamación Cantidad en la fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Costo por defecto de la cuenta mercancías vendidas
-apps/erpnext/erpnext/stock/get_item_details.py +238,Price List not selected,Lista de precios no seleccionado
+apps/erpnext/erpnext/stock/get_item_details.py +237,Price List not selected,Lista de precios no seleccionado
 DocType: Employee,Family Background,antecedentes familiares
-DocType: Salary Manager,Send Email,Enviar Correo Electronico
+DocType: Process Payroll,Send Email,Enviar Correo Electronico
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.py +85,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta Bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +43,"To filter based on Party, select Party Type first","Para filtrar en base a la fiesta, seleccione Partido Escriba primero"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Nos,Números
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +49,'Update Stock' can not be checked because items are not delivered via {0},&quot;Actualización de la &#39;no se puede comprobar porque los artículos no se entregan a través de {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Nos,Números
+DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor coeficiente de ponderación se le aparecen más alta
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,Detalle de Conciliación Bancaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +588,My Invoices,Mis Facturas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +580,My Invoices,Mis Facturas
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +39,No employee found,Empleado no encontrado
 DocType: Purchase Order,Stopped,Detenido
+DocType: Item,If subcontracted to a vendor,Si subcontratado a un proveedor
+apps/erpnext/erpnext/manufacturing/page/bom_browser/bom_browser.js +17,Select BOM to start,Seleccione la lista de materiales para comenzar
 DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes
 apps/erpnext/erpnext/config/stock.py +64,Upload stock balance via csv.,Sube saldo de existencias a través csv .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +32,Send Now,Enviar ahora
@@ -739,44 +752,49 @@
 DocType: Item,Website Warehouse,Almacén del Sitio Web
 DocType: Sales Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El día del mes en el que se generará factura automática por ejemplo 05, 28, etc."
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Puntuación debe ser menor o igual a 5
-apps/erpnext/erpnext/config/accounts.py +159,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/accounts.py +164,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/selling.py +294,Customer and Supplier,Clientes y Proveedores
 DocType: Email Digest,Email Digest Settings,Configuración del Boletin de Correo Electrónico
 apps/erpnext/erpnext/config/support.py +13,Support queries from customers.,Consultas de soporte de clientes .
 DocType: Bin,Moving Average Rate,Porcentaje de Promedio Movil
 DocType: Production Planning Tool,Select Items,Seleccione Artículos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +294,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
-DocType: Communication,Reference Name,Referencia Nombre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,{0} against Bill {1} dated {2},{0} contra Factura {1} de fecha ​​{2}
+DocType: Comment,Reference Name,Referencia Nombre
 DocType: Maintenance Visit,Completion Status,Estado de Finalización
-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, Sales BOM, Sales Order, Serial No","Para realizar el seguimiento de marca en el siguiente documento Nota de entrega , Oportunidad , solicitud de material , artículo , Orden de Compra, Comprar Bono , el recibo de compra , cotización , factura de venta , lista de materiales de ventas , órdenes de venta , Número de Serie"
 DocType: Production Order,Target Warehouse,Inventario Objetivo
+DocType: Item,Allow over delivery or receipt upto this percent,Permitir sobre la entrega o recepción hasta este porcentaje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +23,Expected Delivery Date cannot be before Sales Order Date,Fecha prevista de entrega no puede ser anterior Fecha de órdenes de venta
 DocType: Upload Attendance,Import Attendance,Asistente de Importación
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +17,All Item Groups,Todos los Grupos de Artículos
-DocType: Salary Manager,Activity Log,Registro de Actividad
+DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +30,Net Profit / Loss,Neta / Pérdida Utilidad
-apps/erpnext/erpnext/config/setup.py +64,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
+apps/erpnext/erpnext/config/setup.py +94,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
 DocType: Production Order,Item To Manufacture,Artículo Para Fabricación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +15,Permanent mold casting,Fundición de molde permanente
 DocType: Sales Order Item,Projected Qty,Cantidad Projectada
 DocType: Sales Invoice,Payment Due Date,Fecha de Vencimiento del Pago
 DocType: Newsletter,Newsletter Manager,Boletín Administrador
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Apertura&#39;
 DocType: Notification Control,Delivery Note Message,Mensaje de la Nota de Entrega
 DocType: Expense Claim,Expenses,gastos
 ,Purchase Receipt Trends,Tendencias de Recibos de Compra
 DocType: Appraisal,Select template from which you want to get the Goals,Seleccione la plantilla de la que usted desea conseguir los Objetivos de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Research & Development,Investigación y Desarrollo
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y Desarrollo
 ,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de Registro
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +74,Staking,Replanteo
-DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
+DocType: Item,Re-Order Qty,Reordenar Cantidad
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +23,Scheduled to send to {0},Programado para enviar a {0}
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +25,Scheduled to send to {0},Programado para enviar a {0}
 DocType: Pricing Rule,Price or Discount,Precio o Descuento
 DocType: Sales Team,Incentives,Incentivos
+DocType: SMS Log,Requested Numbers,Números solicitados
 apps/erpnext/erpnext/config/hr.py +38,Performance appraisal.,Evaluación del Desempeño .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del Proyecto
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +636,Make Maint. Visit,Hacer Visita Principal
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +68,Cannot carry forward {0},No se puede llevar adelante {0}
+apps/erpnext/erpnext/config/learn.py +107,Point-of-Sale,Punto de venta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +626,Make Maint. Visit,Hacer Visita Principal
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +65,Cannot carry forward {0},No se puede llevar adelante {0}
+DocType: Backup Manager,Current Backups,Las copias de seguridad actuales
 apps/erpnext/erpnext/accounts/doctype/account/account.py +73,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 DocType: Account,Balance must be,Balance debe ser
 DocType: Hub Settings,Publish Pricing,Publicar precios
@@ -788,7 +806,7 @@
 DocType: Salary Slip,Working Days,Días de Trabajo
 DocType: Serial No,Incoming Rate,Incoming Cambio
 DocType: Packing Slip,Gross Weight,Peso Bruto
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +409,The name of your company for which you are setting up this system.,El nombre de su empresa para la que va a configurar el sistema.
+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 nombre de su empresa para la que va a configurar el sistema.
 DocType: HR Settings,Include holidays in Total no. of Working Days,Incluya vacaciones en total no. de días laborables
 DocType: Job Applicant,Hold,Mantener
 DocType: Employee,Date of Joining,Fecha de ingreso
@@ -800,38 +818,38 @@
 ,Received Items To Be Billed,Elementos Recibidos a Facturar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +113,Abrasive blasting,Chorreado abrasivo
 DocType: Employee,Ms,Sra.
-apps/erpnext/erpnext/config/accounts.py +138,Currency exchange rate master.,Maestro del tipo de cambio de divisas .
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +242,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
+apps/erpnext/erpnext/config/accounts.py +143,Currency exchange rate master.,Maestro del tipo de cambio de divisas .
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +248,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Plan de subconjuntos
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +423,BOM {0} must be active,Solicitud de Materiales {0} debe estar activa
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +427,BOM {0} must be active,Solicitud de Materiales {0} debe estar activa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.js +22,Set Status as Available,Estado Establecer como disponible
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +26,Please select the document type first,Por favor seleccione el tipo de documento primero
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +68,Cancel Material Visits {0} before cancelling this Maintenance Visit,Cancelar Visitas {0} antes de cancelar la Visita de Mantenimiento
 DocType: Salary Slip,Leave Encashment Amount,Monto de Vacaciones Descansadas
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to Item {1},Número de orden {0} no pertenece al elemento {1}
-apps/erpnext/erpnext/accounts/page/pos/pos_page.html +13,Make new POS Setting,Hacer nueva Configuración de POS
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
 DocType: Bank Reconciliation,Total Amount,Importe Total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +31,Internet Publishing,Internet Publishing
 DocType: Production Planning Tool,Production Orders,Órdenes de Producción
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +30,Balance Value,Valor de Balance
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +35,Balance Value,Valor de Balance
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +38,Sales Price List,Lista de Precios de Venta
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Publicar sincronizar artículos
+apps/erpnext/erpnext/accounts/general_ledger.py +117,Please mention Round Off Account in Company,"¡Por favor, Cuenta Off redonda en la empresa"
 DocType: Purchase Receipt,Range,Rango
 DocType: Supplier,Default Payable Accounts,Cuentas por Pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +40,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
 DocType: Features Setup,Item Barcode,Código de barras del artículo
-apps/erpnext/erpnext/stock/doctype/item/item.py +193,Item Variants {0} updated,{0} variantes actualizadas del artículo
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +161,Item Variants {0} updated,{0} variantes actualizadas del artículo
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Compra Factura Anticipada
 DocType: Address,Shop,Tienda
 DocType: Hub Settings,Sync Now,Sincronizar ahora
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +191,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Cuenta de Banco / Efectivo por Defecto defecto se actualizará automáticamente en el punto de venta de facturas cuando se selecciona este modo .
 DocType: Employee,Permanent Address Is,Dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +471,The Brand,La Marca
-apps/erpnext/erpnext/controllers/status_updater.py +123,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,The Brand,La Marca
+apps/erpnext/erpnext/controllers/status_updater.py +137,Allowance for over-{0} crossed for Item {1}.,Previsión por exceso de {0} cruzado para el punto {1}.
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es Compra de artículos
 DocType: Payment Reconciliation Payment,Purchase Invoice,Factura de Compra
@@ -841,45 +859,47 @@
 DocType: Payment Tool,Paid,Pagado
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Fecha y Hora de la Iniciativa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +127,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +112,Row #{0}: Please specify Serial No for Item {1},"Fila # {0}: Por favor, especifique No de Serie de artículos {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +565,"For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para los artículos &#39;Producto Bundle&#39;, Almacén, Serial No y lotes No será considerado en el cuadro &#39;Packing List&#39;. Si Warehouse y lotes No son las mismas para todos los elementos de embalaje para cualquier elemento &#39;Producto Bundle&#39;, esos valores se pueden introducir en la mesa principal del artículo, los valores se copiarán a la mesa &quot;Packing List &#39;."
 apps/erpnext/erpnext/config/stock.py +23,Shipments to customers.,Los envíos a los clientes .
 DocType: Purchase Invoice Item,Purchase Order Item,Articulos de la Orden de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Indirect Income,Ingresos Indirectos
 DocType: Contact Us Settings,Address Line 1,Dirección Línea 1
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Variance,Variación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +390,Company Name,Nombre de Compañía
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Name,Nombre de Compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +508,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +502,Select Item for Transfer,Seleccionar elemento de Transferencia
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta la cabeza del banco donde cheque fue depositado .
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad Máxima
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago contra Ventas / Orden de Compra siempre debe estar marcado como anticipo
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +124,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Fila {0}: El pago contra Ventas / Orden de Compra siempre debe estar marcado como anticipo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +15,Chemical,Químico
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +660,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
-DocType: Salary Manager,Select Payroll Year and Month,Seleccione nómina Año y Mes
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +605,All items have already been transferred for this Production Order.,Todos los artículos ya han sido transferidos para esta Orden de Producción.
+DocType: Process Payroll,Select Payroll Year and Month,Seleccione nómina Año y 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""","Ir al grupo apropiado (generalmente Aplicación de Fondos> Activo Circulante> Cuentas Bancarias y crear una nueva cuenta (haciendo clic en Añadir hijo) de tipo ""Banco"""
 DocType: Workstation,Electricity Cost,Coste de electricidad
 DocType: HR Settings,Don't send Employee Birthday Reminders,No envíe Empleado Birthday Reminders
 DocType: Comment,Unsubscribed,No Suscrito
 DocType: Opportunity,Walk In,Entrar
 DocType: Item,Inspection Criteria,Criterios de Inspección
-apps/erpnext/erpnext/config/accounts.py +96,Tree of finanial Cost Centers.,Árbol de Centros de Costos Financieros.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +472,Upload your letter head and logo. (you can edit them later).,Sube tu tipo de fuente para cabecera y logotipo. (Puedes editarlas más tarde).
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,White,Blanco
+apps/erpnext/erpnext/config/accounts.py +101,Tree of finanial Cost Centers.,Árbol de Centros de Costos Financieros.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,Upload your letter head and logo. (you can edit them later).,Sube tu tipo de fuente para cabecera y logotipo. (Puedes editarlas más tarde).
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +156,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 DocType: Purchase Invoice,Get Advances Paid,Cómo anticipos pagados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +360,Attach Your Picture,Adjunte su Fotografía 
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +362,Attach Your Picture,Adjunte su Fotografía 
 DocType: Journal Entry,Total Amount in Words,Importe Total con Letras
 DocType: Workflow State,Stop,Deténgase
 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.,"Ha ocurrido un error . Una razón probable podría ser que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 DocType: Purchase Order,% of materials billed against this Purchase Order.,% De materiales facturados contra esta Orden de Compra .
-apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},Tipo de orden debe ser uno de {0}
 DocType: Lead,Next Contact Date,Siguiente fecha de contacto
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +34,Opening Qty,Cant. de Apertura
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de Apertura
 DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +163,Stock Options,Opciones sobre Acciones
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Stock Options,Opciones sobre Acciones
 DocType: Expense Claim,Expense Claim,Reclamación de Gastos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +164,Qty for {0},Cantidad de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +166,Qty for {0},Cantidad de {0}
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
 apps/erpnext/erpnext/config/hr.py +77,Leave Allocation Tool,Herramienta de Asignación de Vacaciones
 DocType: Leave Block List,Leave Block List Dates,Fechas de Lista de Bloqueo de Vacaciones
@@ -887,17 +907,18 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +55,Trimming,Guarnición
 DocType: Workstation,Net Hour Rate,Tasa neta por hora
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost recibo de compra
+DocType: Company,Default Terms,Términos predeterminados
 DocType: Packing Slip Item,Packing Slip Item,Packing Slip artículo
-DocType: POS Setting,Cash/Bank Account,Cuenta de Caja / Banco
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +58,Removed items with no change in quantity or value.,Elementos retirados sin cambio en la cantidad o el valor.
+DocType: POS Profile,Cash/Bank Account,Cuenta de Caja / Banco
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +63,Removed items with no change in quantity or value.,Elementos retirados sin cambio en la cantidad o el valor.
 DocType: Delivery Note,Delivery To,Entregar a
 DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +64,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,"Row {0}: Party / Account does not match with \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +197,"Row {0}: Party / Account does not match with \
 							Customer / Debit To in {1}","Fila {0}: Fiesta / Cuenta no coincide con \
  / débito para los clientes en {1}"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +102,Filing,Presentación
-apps/erpnext/erpnext/templates/form_grid/item_grid.html +67,Discount,Descuento
+apps/erpnext/erpnext/templates/form_grid/item_grid.html +71,Discount,Descuento
 DocType: Features Setup,Purchase Discounts,Descuentos sobre Compra
 DocType: Stock Entry,This will override Difference Account in Item,Esto anulará la cuenta Diferencia en el punto
 DocType: Workstation,Wages,Salario
@@ -905,85 +926,66 @@
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +97,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la fila {0} en la tabla {1}"
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +76,This Time Log conflicts with {0} for {1},Este conflictos Tiempo Login con {0} de {1}
-DocType: Sales BOM,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
-
-The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
-
-For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.
-
-Note: BOM = Bill of Materials","Agregar Grupo de **Artículos** en otro **Artículo**. Esto es útil si usted está empaquetando  determinados **Artículos** en un paquete y mantener un inventario de los **Artículos** envasados y no el **Artículo** agregado . 
-
- El paquete **Artículo** tendrá ""Es Elemento del Inventario"" como ""No"" y ""Es artículo para la venta"" como ""Sí"".
-
- Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será una nueva lista de materiales de ventas de artículos.
-
- Nota: BOM = Solicitud de Materiales"
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Recibo de Compra del Artículo
 DocType: Sales Order,PO Date,PO Fecha
 DocType: Serial No,Sales Returned,Devoluciones sobre Ventas
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Almacén reservado en ventas por pedido / Finalizado Productos Almacén
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +65,Selling Amount,Cantidad de Venta
-apps/erpnext/erpnext/projects/doctype/project/project.js +37,Time Logs,Registros de Tiempo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
+apps/erpnext/erpnext/projects/doctype/project/project.js +40,Time Logs,Registros de Tiempo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +109,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
-apps/erpnext/erpnext/config/stock.py +136,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
+apps/erpnext/erpnext/config/stock.py +141,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +30,WIP Warehouse,WIP Almacén
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +204,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
 DocType: BOM Operation,Operation,Operación
 DocType: Lead,Organization Name,Nombre de la Organización
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +385,POS Setting required to make POS Entry,POS de ajuste necesario para hacer la entrada POS
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item must be added using 'Get Items from Purchase Receipts' button,El artículo debe ser añadido usando 'Obtener elementos de recibos de compra' botón
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Sales Expenses,Gastos de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Buying,Compra estándar
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +166,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
 DocType: Sales Partner,Implementation Partner,Socio de Implementación
-DocType: Purchase Invoice,Contact Info,Información de Contacto
+DocType: Supplier Quotation,Contact Info,Información de Contacto
 DocType: Packing Slip,Net Weight UOM,Unidad de Medida Peso Neto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +477,Make Purchase Receipt,Hacer recibo de compra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +473,Make Purchase Receipt,Hacer recibo de compra
 DocType: Item,Default Supplier,Proveedor Predeterminado
+DocType: Manufacturing Settings,Over Production Allowance Percentage,Sobre Producción Asignación Porcentaje
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regla Condición inicial
 DocType: Features Setup,Miscelleneous,Varios
 DocType: Holiday List,Get Weekly Off Dates,Obtenga Semanal Off Fechas
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,Fecha Final no puede ser inferior a Fecha de Inicio
 DocType: Sales Person,Select company name first.,Seleccionar nombre de la empresa en primer lugar.
-DocType: Sales BOM Item,Sales BOM Item,Elemoto de Solicitud de Materiales para Venta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Dr,Dr
-apps/erpnext/erpnext/stock/doctype/item/item.py +317,"Item must be a purchase item, as it is present in one or many Active BOMs","El artículo debe ser un artículo de la compra , ya que está presente en una o varias Solicitudes de Materiales activas"
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores .
 DocType: Journal Entry Account,Against Purchase Invoice,Contra la Factura de Compra
 apps/erpnext/erpnext/controllers/selling_controller.py +21,To {0} | {1} {2},Para {0} | {1} {2}
 DocType: Time Log Batch,updated via Time Logs,actualizada a través de los registros de tiempo
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
-apps/erpnext/erpnext/templates/includes/cart.js +59,Go ahead and add something to your cart.,Seguir adelante y añadir algo a su carrito.
+apps/erpnext/erpnext/templates/includes/cart.js +60,Go ahead and add something to your cart.,Seguir adelante y añadir algo a su carrito.
 DocType: Opportunity,Your sales person who will contact the customer in future,Su persona de ventas que va a ponerse en contacto con el cliente en el futuro
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +537,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +588,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 DocType: Supplier,Default Currency,Moneda Predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca designación de este contacto
 DocType: Contact Us Settings,Address,Dirección
 DocType: Expense Claim,From Employee,De Empleado
-apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any Fiscal Year. For more details check {2}.,"{0} {1} no en cualquier año fiscal. Para más detalles, consulta {2}."
-apps/erpnext/erpnext/controllers/accounts_controller.py +269,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
+apps/erpnext/erpnext/controllers/accounts_controller.py +283,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia : El sistema no comprobará sobrefacturación desde monto para el punto {0} en {1} es cero
 DocType: Journal Entry,Make Difference Entry,Hacer Entrada de Diferencia
 DocType: Upload Attendance,Attendance From Date,Asistencia De Fecha
 DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +53,Transportation,Transporte
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +393,{0} {1} must be submitted,{0} {1} debe ser presentado
 DocType: SMS Center,Total Characters,Total Caracteres 
-apps/erpnext/erpnext/controllers/buying_controller.py +140,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
+apps/erpnext/erpnext/controllers/buying_controller.py +139,Please select BOM in BOM field for Item {0},"Por favor, seleccione la Solicitud de Materiales en el campo de Solicitud de Materiales para el punto {0}"
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,Detalle C -Form Factura
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,Factura Reconciliación Pago
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +32,Contribution %,Contribución %
 DocType: Item,website page link,el vínculo web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +191,Let's prepare the system for first use.,Vamos a preparar el sistema para el primer uso.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +192,Let's prepare the system for first use.,Vamos a preparar el sistema para el primer uso.
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Los números de registro de la empresa para su referencia . Números fiscales, etc"
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +195,Production Order {0} must be cancelled before cancelling this Sales Order,Orden de producción {0} debe ser cancelado antes de cancelar esta orden Ventas
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +53,Budget cannot be set for Group Cost Centers,El presupuesto no se puede establecer para Grupos de Centros de Costos
 ,Ordered Items To Be Billed,Artículos Pedidos a Facturar
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +21,Select Time Logs and Submit to create a new Sales Invoice.,Seleccionar registros de tiempo e Presentar después de crear una nueva factura de venta .
 DocType: Global Defaults,Global Defaults,predeterminados globales
@@ -993,42 +995,48 @@
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Create Opportunity,Crear Oportunidad
 DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
 DocType: Supplier,Communications,Comunicaciones
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +275,Capacity Planning Error,Error en la Planificación de la Capacidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +281,Capacity Planning Error,Error en la Planificación de la Capacidad
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +364,Finished Item {0} must be entered for Manufacture type entry,Artículo Terminado {0} debe ser introducido para la entrada Tipo de Fabricación
+apps/erpnext/erpnext/config/learn.py +77,Opening Accounting Balance,Apertura de Balance de Contabilidad
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura Anticipadas
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +404,Nothing to request,Nada que solicitar
-apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Actual Start Date' can not be greater than 'Actual End Date',"""Fecha Actual de Inicio"" no puede ser mayor que "" Actual Fecha de Finalización"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +70,Management,Gerencia
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +391,Nothing to request,Nada que solicitar
+apps/erpnext/erpnext/projects/doctype/task/task.py +38,'Actual Start Date' can not be greater than 'Actual End Date',"""Fecha Actual de Inicio"" no puede ser mayor que "" Actual Fecha de Finalización"""
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +75,Management,Gerencia
 apps/erpnext/erpnext/config/projects.py +33,Types of activities for Time Sheets,Tipos de actividades para las Fichas de Tiempo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +13,Investment casting,Fundición de precisión
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +45,Either debit or credit amount is required for {0},Se requiere débito o crédito para la cantidad {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Either debit or credit amount is required for {0},Se requiere débito o crédito para la cantidad {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""","Esto se añade al Código del Artículo de la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina .
 apps/frappe/frappe/core/doctype/user/user_list.js +12,Active,Activo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +149,Blue,Azul
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +154,Blue,Azul
+DocType: Purchase Invoice,Is Return,Es el retorno
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +120,Further nodes can be only created under 'Group' type nodes,Sólo se pueden crear más nodos bajo nodos de tipo  ' Grupo '
 DocType: Item,UOMs,Unidades de Medida
 apps/erpnext/erpnext/stock/utils.py +167,{0} valid serial nos for Item {1},{0} No Serie válidos para el elemento {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +58,Item Code cannot be changed for Serial No.,Código del Artículo no se puede cambiar de Número de Serie
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},POS Perfil {0} ya creado para el usuario: {1} y compañía {2}
 DocType: Purchase Order Item,UOM Conversion Factor,Factor de Conversión de Unidad de Medida
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +155,Laminated object manufacturing,Fabricación de objetos laminado
 apps/erpnext/erpnext/config/buying.py +13,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +596,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +588,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +44,Stretch forming,Formando Stretch
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Su persona de ventas recibirá un aviso con esta fecha para ponerse en contacto con el cliente
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +203,"Further accounts can be made under Groups, but entries can be made against non-Groups","Otras cuentas se pueden organizar dentro de Grupos, pero las entradas solò se pueden hacer contra los que no son de Grupo"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +207,"Further accounts can be made under Groups, but entries can be made against non-Groups","Otras cuentas se pueden organizar dentro de Grupos, pero las entradas solò se pueden hacer contra los que no son de Grupo"
 apps/erpnext/erpnext/config/hr.py +125,Tax and other salary deductions.,Impuestos y otras deducciones salariales.
 DocType: Lead,Lead,Iniciativa
 DocType: Email Digest,Payables,Cuentas por Pagar
 DocType: Account,Warehouse,Almacén
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +75,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 ,Purchase Order Items To Be Billed,Artículos de Orden de Compra a Facturar
 DocType: Purchase Invoice Item,Net Rate,Tasa Neta
 DocType: Backup Manager,Database Folder ID,Base de Datos de Identificación de carpetas
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de Compra del artículo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +50,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Artículo 1
 DocType: Holiday,Holiday,Feriado
 DocType: Event,Saturday,Sábado
 DocType: Leave Control Panel,Leave blank if considered for all branches,Dejar en blanco si se considera para todas las ramas
@@ -1038,23 +1046,24 @@
 DocType: Global Defaults,Current Fiscal Year,Año Fiscal Actual
 DocType: Global Defaults,Disable Rounded Total,Desactivar Total Redondeado
 DocType: Lead,Call,Llamada
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,'Entries' cannot be empty,' Comentarios ' no puede estar vacío
-apps/erpnext/erpnext/utilities/transaction_base.py +72,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +353,'Entries' cannot be empty,' Comentarios ' no puede estar vacío
+apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 ,Trial Balance,Balanza de Comprobación
-sites/assets/js/erpnext.min.js +2,"Grid ""","Grid """
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +145,Please select prefix first,"Por favor, selecciona primero el prefijo"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Research,Investigación
+apps/erpnext/erpnext/config/learn.py +169,Setting up Employees,Configuración de Empleados
+sites/assets/js/erpnext.min.js +4,"Grid ""","Grid """
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +148,Please select prefix first,"Por favor, selecciona primero el prefijo"
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo Realizado
 DocType: Employee,User ID,ID de usuario
 DocType: Communication,Sent,Enviado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +57,View Ledger,Ver Libro Mayor
 DocType: Cost Center,Lft,lft
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +387,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +246,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 DocType: Sales Order,Delivery Status,Estado del Envío
 DocType: Production Order,Manufacture against Sales Order,Fabricación contra Pedido de Ventas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +443,Rest Of The World,Resto del mundo
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +72,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +496,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,The Item {0} cannot have Batch,El artículo {0} no puede tener lotes
 ,Budget Variance Report,Informe de  Varianza en el Presupuesto 
 DocType: Salary Slip,Gross Pay,Pago bruto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +186,Dividends Paid,Dividendos pagados
@@ -1072,55 +1081,58 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +61,Temporary Opening,Apertura Temporal
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +40,Cryorolling,Cryorolling
 ,Employee Leave Balance,Balance de Vacaciones del Empleado
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +101,Balance for Account {0} must always be {1},Balance de Cuenta {0} debe ser siempre {1}
-DocType: Sales Invoice,More Info,Más información
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,Balance for Account {0} must always be {1},Balance de Cuenta {0} debe ser siempre {1}
+DocType: Supplier,More Info,Más información
 DocType: Address,Address Type,Tipo de dirección
 DocType: Purchase Receipt,Rejected Warehouse,Almacén Rechazado
 DocType: GL Entry,Against Voucher,Contra Comprobante
 DocType: Item,Default Buying Cost Center,Centro de Costos Por Defecto
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +42,Item {0} must be Sales Item,Artículo {0} debe ser artículo de Ventas
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +36,Item {0} must be Sales Item,Artículo {0} debe ser artículo de Ventas
+DocType: Item,Lead Time in days,Plazo de ejecución en días
 ,Accounts Payable Summary,Resumen de Cuentas por Pagar
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +159,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +170,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Verifique Facturas Pendientes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +55,Sales Order {0} is not valid,Orden de Venta {0} no es válida
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +59,Sales Order {0} is not valid,Orden de Venta {0} no es válida
 DocType: Email Digest,New Stock Entries,Comentarios Nuevo archivo
-apps/erpnext/erpnext/setup/doctype/company/company.py +161,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +140,Small,Pequeño
+apps/erpnext/erpnext/setup/doctype/company/company.py +169,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +145,Small,Pequeño
 DocType: Employee,Employee Number,Número del Empleado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de Caso ya en uso. Intente Nº de  Caso {0}
 DocType: Material Request,% Completed,% Completado
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Artículo 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +59,Account head {0} created,Cabeza de cuenta {0} creado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Green,Verde
-DocType: Sales Order Item,Discount(%),Descuento (% )
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +153,Green,Verde
+DocType: Item,Auto re-order,Auto reordenar
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +57,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +54,Contract,Contrato
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +59,Contract,Contrato
 DocType: Report,Disabled,Deshabilitado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +523,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +472,UOM coversion factor required for UOM: {0} in Item: {1},Factor de conversion de la Unidad de Medida requerido para la Unidad de Medida {0} en el artículo: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +83,Indirect Expenses,Egresos Indirectos
-apps/erpnext/erpnext/controllers/selling_controller.py +171,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
+apps/erpnext/erpnext/controllers/selling_controller.py +170,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +7,Agriculture,Agricultura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +559,Your Products or Services,Sus Productos o Servicios
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +611,Your Products or Services,Sus Productos o Servicios
 DocType: Mode of Payment,Mode of Payment,Modo de Pago
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 DocType: Purchase Invoice Item,Purchase Order,Orden de Compra
 DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén 
-sites/assets/js/form.min.js +180,Name is required,El nombre es necesario
+sites/assets/js/form.min.js +182,Name is required,El nombre es necesario
 DocType: Purchase Invoice,Recurring Type,Tipo Recurrente
 DocType: Address,City/Town,Ciudad/Provincia
 DocType: Serial No,Serial No Details,Serial No Detalles
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de Impuesto del Artículo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con otro asiento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +428,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
-apps/erpnext/erpnext/stock/get_item_details.py +137,Item {0} must be a Sub-contracted Item,Artículo {0} debe ser un artículo subcontratada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +131,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con otro asiento de débito"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +416,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/stock/get_item_details.py +136,Item {0} must be a Sub-contracted Item,Artículo {0} debe ser un artículo subcontratada
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Equipos de Capitales
 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 precios se selecciona por primera vez basado en 'Aplicar On' de campo, que puede ser elemento, elemento de grupo o Marca."
 DocType: Hub Settings,Seller Website,Sitio Web Vendedor 
-apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Production Order status is {0},Estado de la orden de producción es de {0}
+apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +108,Production Order status is {0},Estado de la orden de producción es de {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +572,For Supplier,Para Proveedor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +318,Expected Delivery Date is lesser than Planned Start Date.,Fecha prevista de entrega es menor que la Fecha de inicio prevista.
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +566,For Supplier,Para Proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ajuste del tipo de cuenta le ayuda en la selección de esta cuenta en las transacciones.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total General (Moneda Local)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Total Outgoing,Total Saliente
@@ -1130,46 +1142,48 @@
 apps/erpnext/erpnext/config/projects.py +43,Tools,Herramientas
 DocType: Sales Taxes and Charges Template,Valid For Territories,Válido para Territorios
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +190,Production order number is mandatory for stock entry purpose manufacture,Número de orden de producción es obligatoria para la fabricación propósito de la entrada Stock
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +175,Production order number is mandatory for stock entry purpose manufacture,Número de orden de producción es obligatoria para la fabricación propósito de la entrada Stock
 DocType: Purchase Invoice,Total (Company Currency),Total (Compañía moneda)
 DocType: Applicable Territory,Applicable Territory,Territorio Aplicable
 apps/erpnext/erpnext/stock/utils.py +162,Serial number {0} entered more than once,Número de serie {0} entraron más de una vez
 DocType: Journal Entry,Journal Entry,Comprobante de Diario
 DocType: Workstation,Workstation Name,Nombre de la Estación de Trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +19,Email Digest:,Enviar Boletin:
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +429,BOM {0} does not belong to Item {1},Solicitud de Materiales {0} no pertenece a Punto {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +433,BOM {0} does not belong to Item {1},Solicitud de Materiales {0} no pertenece a Punto {1}
 DocType: Sales Partner,Target Distribution,Distribución Objetivo
-sites/assets/js/desk.min.js +536,Comments,Comentarios
+sites/assets/js/desk.min.js +622,Comments,Comentarios
 DocType: Salary Slip,Bank Account No.,Número de Cuenta Bancaria
 DocType: Naming Series,This is the number of the last created transaction with this prefix,Este es el número de la última transacción creado con este prefijo
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +167,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +172,Valuation Rate required for Item {0},Tasa de Valoración requerido para el punto {0}
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
 DocType: Sales Partner,Agent,Agente
 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 de {0} para todos los elementos es cero, puede que usted debe cambiar &#39;Distribuir los cargos basados ​​en&#39;"
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impuestos y Cargos
 DocType: BOM Operation,Workstation,Puesto de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +107,Hardware,Hardware
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +112,Hardware,Hardware
 DocType: Attendance,HR Manager,Gerente de Recursos Humanos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +47,Privilege Leave,Permiso con Privilegio
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +50,Privilege Leave,Permiso con Privilegio
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor 
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +169,You need to enable Shopping Cart,Necesita habilitar Carito de Compras
-sites/assets/js/form.min.js +197,No Data,No hay datos
+sites/assets/js/form.min.js +200,No Data,No hay datos
 DocType: Appraisal Template Goal,Appraisal Template Goal,Objetivo Plantilla de Evaluación
 DocType: Salary Slip,Earning,Ganancia
+,BOM Browser,BOM Browser
 DocType: Purchase Taxes and Charges,Add or Deduct,Agregar o Deducir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +75,Overlapping conditions found between:,Condiciones coincidentes encontradas entre :
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +134,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +145,Against Journal Entry {0} is already adjusted against some other voucher,Contra la Entrada de Diario entrada {0} ya se ajusta contra algún otro comprobante
 DocType: Backup Manager,Files Folder ID,ID de la Carpeta de archivos
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +58,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/stock/doctype/item/item.py +196,Item Variants {0} deleted,{0} variantes borradas del artículo
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +68,Total Order Value,Valor Total del Pedido
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +167,Item Variants {0} deleted,{0} variantes borradas del artículo
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +38,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango Envejecimiento 3
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +127,You can make a time log only against a submitted production order,Usted puede hacer un registro de tiempo sólo contra una orden de producción presentada
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +84,{0} {1} is entered more than once in Attributes table,{0} {1} se introduce más de una vez en la tabla Atributos
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +130,You can make a time log only against a submitted production order,Usted puede hacer un registro de tiempo sólo contra una orden de producción presentada
 DocType: Maintenance Schedule Item,No of Visits,No. de visitas
 DocType: Cost Center,old_parent,old_parent
 apps/erpnext/erpnext/config/support.py +33,"Newsletters to contacts, leads.","Boletines para contactos, clientes potenciales ."
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puntos para todas las metas debe ser 100. Es {0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +368,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +365,Operations cannot be left blank.,Las operaciones no se pueden dejar en blanco.
 ,Delivered Items To Be Billed,Material que se adjunta a facturar
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +61,Warehouse cannot be changed for Serial No.,Almacén no se puede cambiar para el N º de serie
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +99,Status updated to {0},Estado actualizado a {0}
@@ -1181,7 +1195,6 @@
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Features Setup,Features Setup,Características del programa de instalación
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,View Offer Letter,Ver oferta Carta
-DocType: Sales BOM,Sales BOM,Solicitud de Materiales Ventas
 DocType: Communication,Communication,Comunicación
 DocType: Item,Is Service Item,Es servicio de Artículo
 DocType: Activity Cost,Projects,Proyectos
@@ -1194,16 +1207,16 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Promedio diario saliente
 DocType: Pricing Rule,Campaign,Campaña
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
-DocType: Sales Invoice,Sales BOM Help,Ayuda para Solicitud de Materiales para Ventas
 DocType: Purchase Invoice,Contact Person,Persona de Contacto
-apps/erpnext/erpnext/projects/doctype/task/task.py +34,'Expected Start Date' can not be greater than 'Expected End Date',"'Fecha de Inicio Esperaba' no puede ser mayor que 'Fecha Esperada de Finalización """
+apps/erpnext/erpnext/projects/doctype/task/task.py +35,'Expected Start Date' can not be greater than 'Expected End Date',"'Fecha de Inicio Esperaba' no puede ser mayor que 'Fecha Esperada de Finalización """
 DocType: Holiday List,Holidays,Vacaciones
 DocType: Sales Order Item,Planned Quantity,Cantidad Planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Total de impuestos de los artículos
+DocType: Item,Maintain Stock,Mantener Stock
 DocType: Supplier Quotation,Get Terms and Conditions,Verificar Términos y Condiciones
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si se considera para todas las designaciones
-apps/erpnext/erpnext/controllers/accounts_controller.py +391,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cargo del tipo ' Real ' en la fila {0} no puede ser incluido en el Punto de Cambio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +165,Max: {0},Max: {0}
+apps/erpnext/erpnext/controllers/accounts_controller.py +424,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cargo del tipo ' Real ' en la fila {0} no puede ser incluido en el Punto de Cambio
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +167,Max: {0},Max: {0}
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +16,From Datetime,A partir de fecha y hora
 DocType: Email Digest,For Company,Para la empresa
 apps/erpnext/erpnext/config/support.py +38,Communication log.,Registro de Comunicación.
@@ -1211,11 +1224,11 @@
 DocType: Sales Invoice,Shipping Address Name,Dirección de envío Nombre
 apps/erpnext/erpnext/accounts/doctype/account/account.js +50,Chart of Accounts,Plan General de Contabilidad
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +506,cannot be greater than 100,No puede ser mayor que 100
-DocType: Purchase Receipt Item,Discount  %,Descuento%
-apps/erpnext/erpnext/stock/doctype/item/item.py +473,Item {0} is not a stock Item,Elemento {0} no es un producto imprescindible
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +498,cannot be greater than 100,No puede ser mayor que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +357,Item {0} is not a stock Item,Elemento {0} no es un producto imprescindible
 DocType: Maintenance Visit,Unscheduled,No Programada
 DocType: Employee,Owned,Propiedad
+DocType: Salary Slip Deduction,Depends on Leave Without Pay,Depende de la licencia sin sueldo
 DocType: Pricing Rule,"Higher the number, higher the priority","Mayor es el número, mayor es la prioridad"
 ,Purchase Invoice Trends,Tendencias de Facturas de Compra
 DocType: Employee,Better Prospects,Mejores Perspectivas
@@ -1226,72 +1239,74 @@
 DocType: HR Settings,Employee Settings,Configuración del Empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
 DocType: Email Digest,To Do List,Lista para hacer
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Apprentice,Aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Negative Quantity is not allowed,No se permiten cantidades negativas
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Quantity is not allowed,No se permiten cantidades negativas
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro de artículos como una cadena y almacenada en este campo.
  Se utiliza para las tasas y cargos"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +60,Lancing,Lancing
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +147,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +151,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelada , las entradas se les permite a los usuarios restringidos."
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral , las cualificaciones necesarias , etc"
 DocType: Journal Entry Account,Account Balance,Balance de la Cuenta
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +578,We buy this Item,Compramos este artículo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +630,We buy this Item,Compramos este artículo
 DocType: Address,Billing,Facturación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +76,Flanging,Flanger
 DocType: Bulk Email,Not Sent,No enviado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +72,Explosive forming,Explosivo formación
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Impuestos y Cargos (Moneda Local)
 DocType: Shipping Rule,Shipping Account,cuenta Envíos
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +41,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +43,Scheduled to send to {0} recipients,Programado para enviar a {0} destinatarios
 DocType: Quality Inspection,Readings,Lecturas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Sub Assemblies,Sub emsanblajes
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Sub Assemblies,Sub emsanblajes
 DocType: Shipping Rule Condition,To Value,Para el valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +159,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
+DocType: Supplier,Stock Manager,Gerente
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +144,Source warehouse is mandatory for row {0},Almacén de origen es obligatoria para la fila {0}
 DocType: Packing Slip,Packing Slip,El resbalón de embalaje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +111,Office Rent,Alquiler de Oficina
-apps/erpnext/erpnext/config/setup.py +80,Setup SMS gateway settings,Configuración de puerta de enlace de configuración de SMS
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +59,Import Failed!,¡Importación  Fallida!
-sites/assets/js/erpnext.min.js +19,No address added yet.,No se ha añadido ninguna dirección todavía.
+apps/erpnext/erpnext/config/setup.py +110,Setup SMS gateway settings,Configuración de puerta de enlace de configuración de SMS
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación  Fallida!
+sites/assets/js/erpnext.min.js +22,No address added yet.,No se ha añadido ninguna dirección todavía.
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la Estación de Trabajo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +78,Analyst,Analista
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +83,Analyst,Analista
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +191,Row {0}: Allocated amount {1} must be less than or equals to JV amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual al importe en Comprobante de Diario {2}
 DocType: Item,Inventory,inventario
 DocType: Item,Sales Details,Detalles de Ventas
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +148,Pinning,Fijación
 DocType: Opportunity,With Items,Con artículos
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,In Qty,En Cantidad
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,En Cantidad
 DocType: Notification Control,Expense Claim Rejected,Reclamación de Gastos Rechazados
 DocType: Sales Invoice,"The date on which next invoice will be generated. It is generated on submit.
 ",La fecha en que se generará próxima factura. Se genera en enviar.
 DocType: Item Attribute,Item Attribute,Elemento Atributo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +100,Government,Gobierno
-DocType: Item,Re-order,Reordenar
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +105,Government,Gobierno
+DocType: Manage Variants,Item Variants,Variantes del artículo
 DocType: Company,Services,Servicios
-apps/erpnext/erpnext/accounts/report/financial_statements.py +149,Total ({0}),Total ({0})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +147,Total ({0}),Total ({0})
 DocType: Cost Center,Parent Cost Center,Centro de Costo Principal
 DocType: Sales Invoice,Source,Fuente
 DocType: Leave Type,Is Leave Without Pay,Se licencia sin sueldo
 DocType: Purchase Order Item,"If Supplier Part Number exists for given Item, it gets stored here","Si existe Número de pieza del proveedor para determinado artículo , que se almacena aquí"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +175,No records found in the Payment table,No se encontraron registros en la tabla de pagos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +403,Financial Year Start Date,Ejercicio Fecha de Inicio
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year Start Date,Ejercicio Fecha de Inicio
 DocType: Employee External Work History,Total Experience,Experiencia Total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +99,Countersinking,Avellanado
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +255,Packing Slip(s) cancelled,Slip ( s ) de Embalaje cancelado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +243,Packing Slip(s) cancelled,Slip ( s ) de Embalaje cancelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Freight and Forwarding Charges,Freight Forwarding y Cargos
 DocType: Material Request Item,Sales Order No,Orden de Venta No
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +47,Taken,Tomado
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +63,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +52,Taken,Tomado
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +65,Transfer Materials for Manufacture,Transferenca de Materiales para Fabricación
 DocType: Pricing Rule,For Price List,Por paquete Precio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +26,Executive Search,Búsqueda de Ejecutivos
-apps/erpnext/erpnext/stock/stock_ledger.py +385,"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 para el artículo: {0} no se encuentra, lo que se requiere para reservar la entrada contable (gastos). Por favor, mencionar el precio del artículo contra una lista de precios de compra."
+apps/erpnext/erpnext/stock/stock_ledger.py +406,"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 para el artículo: {0} no se encuentra, lo que se requiere para reservar la entrada contable (gastos). Por favor, mencionar el precio del artículo contra una lista de precios de compra."
 DocType: Maintenance Schedule,Schedules,Horarios
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Número de Detalle en la Solicitud de Materiales
+DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Importe adicional de descuento (moneda Company)
 DocType: Period Closing Voucher,CoA Help,CoA Ayuda
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +533,Error: {0} > {1},Error: {0} > {1}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +540,Error: {0} > {1},Error: {0} > {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.js +8,Please create new account from Chart of Accounts.,"Por favor, cree una nueva cuenta en el Plan General de Contabilidad ."
 DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer > Customer Group > Territory,Cliente> Grupo de Clientes> Territorio
@@ -1302,42 +1317,45 @@
 DocType: Event,Tuesday,Martes
 DocType: Leave Block List,Block Holidays on important days.,Bloqueo de Vacaciones en días importantes.
 ,Accounts Receivable Summary,Resumen de Cuentas por Cobrar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +178,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +182,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
 DocType: UOM,UOM Name,Nombre Unidad de Medida
 DocType: Top Bar Item,Target,Objetivo
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +33,Contribution Amount,Contribución Monto
 DocType: Sales Invoice,Shipping Address,Dirección de envío
 DocType: Stock Reconciliation,This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.,Esta herramienta le ayuda a actualizar o corregir la cantidad y la valoración de los valores en el sistema. Normalmente se utiliza para sincronizar los valores del sistema y lo que realmente existe en sus almacenes.
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En palabras serán visibles una vez que se guarda la nota de entrega .
-apps/erpnext/erpnext/config/stock.py +120,Brand master.,Marca Maestra
+apps/erpnext/erpnext/config/stock.py +125,Brand master.,Marca Maestra
 DocType: ToDo,Due Date,Fecha de vencimiento
 DocType: Sales Invoice Item,Brand Name,Marca
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Box,Caja
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +387,The Organization,La Organización
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Box,Caja
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +389,The Organization,La Organización
 DocType: Monthly Distribution,Monthly Distribution,Distribución Mensual
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +66,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista de receptores está vacía. Por favor, cree Lista de receptores"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Plan de Producción Ventas Orden
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
 DocType: Pricing Rule,Pricing Rule,Regla de Precios
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +57,Notching,Muescas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +44,Reserved warehouse required for stock item {0},Almacén Reservado requerido para la acción del artículo {0}
+apps/erpnext/erpnext/config/learn.py +137,Material Request to Purchase Order,Solicitud de materiales de Orden de Compra
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +69,Row # {0}: Returned Item {1} does not exists in {2} {3},Fila # {0}: El artículo vuelto {1} no existe en {2} {3}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Cuentas Bancarias
 ,Bank Reconciliation Statement,Declaración de Conciliación Bancaria
 DocType: Address,Lead Name,Nombre de la Iniciativa
 ,POS,POS
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +14,{0} must appear only once,{0} debe aparecer sólo una vez
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +371,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite tranfer más {0} de {1} contra la Orden de Compra {2}
+apps/erpnext/erpnext/config/stock.py +273,Opening Stock Balance,Apertura de la balanza
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +20,{0} must appear only once,{0} debe aparecer sólo una vez
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +341,Not allowed to tranfer more {0} than {1} against Purchase Order {2},No se permite tranfer más {0} de {1} contra la Orden de Compra {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +58,Leaves Allocated Successfully for {0},Vacaciones Distribuidas Satisfactoriamente para {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,No hay artículos para empacar
 DocType: Shipping Rule Condition,From Value,De Valor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +579,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +525,Manufacturing Quantity is mandatory,Cantidad de Fabricación es obligatoria
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +41,Amounts not reflected in bank,Las cantidades no se reflejan en el banco
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
 apps/erpnext/erpnext/config/hr.py +23,Claims for company expense.,Peticiones para gastos de empresa.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +7,Centrifugal casting,La fundición centrífuga
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +118,Magnetic field-assisted finishing,Acabado asistida por campo magnético
 DocType: Company,Default Holiday List,Lista de vacaciones Por Defecto 
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +227,Task is Mandatory if Time Log is against a project,Tarea es obligatoria si Hora de registro está en contra de un proyecto
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +229,Task is Mandatory if Time Log is against a project,Tarea es obligatoria si Hora de registro está en contra de un proyecto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +165,Stock Liabilities,Inventario de Pasivos
 DocType: Purchase Receipt,Supplier Warehouse,Almacén Proveedor
 DocType: Opportunity,Contact Mobile No,No Móvil del Contacto
@@ -1346,60 +1364,63 @@
 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.,Para realizar un seguimiento de elementos mediante código de barras. Usted será capaz de entrar en los elementos de la nota de entrega y la factura de venta mediante el escaneo de código de barras del artículo.
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +34,Make Quotation,Hacer Proforma
 DocType: Dependent Task,Dependent Task,Tarea Dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +291,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversión de unidad de medida predeterminada debe ser de 1 en la fila {0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +193,You can not enter both Delivery Note No and Sales Invoice No. Please enter any one.,"No se puede introducir tanto ""No de Nota de Entrega""  y ""No de Factura"". Por favor ingrese cualquiera ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +158,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversión de unidad de medida predeterminada debe ser de 1 en la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +142,Leave of type {0} cannot be longer than {1},Permiso de tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Trate de operaciones para la planificación de X días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños
 DocType: SMS Center,Receiver List,Lista de receptores
 DocType: Payment Tool Detail,Payment Amount,Monto Pagado
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
+sites/assets/js/erpnext.min.js +49,{0} View,{0} Ver
 DocType: Salary Structure Deduction,Salary Structure Deduction,Estructura Salarial Deducción
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +157,Selective laser sintering,Sinterización selectiva por láser
-apps/erpnext/erpnext/stock/doctype/item/item.py +286,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión 
-apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +74,Import Successful!,¡Importación Exitosa!
+apps/erpnext/erpnext/stock/doctype/item/item.py +153,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión 
+apps/frappe/frappe/core/page/data_import_tool/data_import_tool.js +83,Import Successful!,¡Importación Exitosa!
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de Artículos Emitidas
 DocType: Email Digest,Expenses Booked,gastos Reservados
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +168,Quantity must not be more than {0},La cantidad no debe ser más de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +170,Quantity must not be more than {0},La cantidad no debe ser más de {0}
 DocType: Quotation Item,Quotation Item,Cotización del artículo
 DocType: Account,Account Name,Nombre de la Cuenta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +34,From Date cannot be greater than To Date,Desde La fecha no puede ser mayor que la fecha
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} quantity {1} cannot be a fraction,Número de orden {0} {1} cantidad no puede ser una fracción
 apps/erpnext/erpnext/config/buying.py +59,Supplier Type master.,Maestro de Tipo de Proveedor.
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +372,Add,Añadir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +87,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +379,Add,Añadir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +91,Conversion rate cannot be 0 or 1,La tasa de conversión no puede ser 0 o 1
 DocType: Accounts Settings,Credit Controller,Credit Controller
 DocType: Delivery Note,Vehicle Dispatch Date,Fecha de despacho de vehículo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Task is mandatory if Expense Claim is against a Project,Tarea es obligatorio si Reclamación de gastos está en contra de un proyecto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +196,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +189,Purchase Receipt {0} is not submitted,Recibo de Compra {0} no se presenta
 DocType: Company,Default Payable Account,Cuenta por Pagar por defecto
-DocType: Party Type,Contacts,Contactos
 apps/erpnext/erpnext/config/website.py +13,"Settings for online shopping cart such as shipping rules, price list etc.","Ajustes para la compra online, como las normas de envío, lista de precios, etc."
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +601,Setup Complete,Configuración completa
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +660,Setup Complete,Configuración completa
+DocType: Manage Variants,Item Variant Attributes,Atributos Variant artículo
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +48,{0}% Billed,{0}% Facturado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +33,Reserved Qty,Cant. Reservada
 DocType: Party Account,Party Account,Cuenta de la Partida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +69,Human Resources,Recursos Humanos
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +74,Human Resources,Recursos Humanos
 DocType: Lead,Upper Income,Ingresos Superior
-apps/erpnext/erpnext/support/doctype/issue/issue.py +52,My Issues,Mis Cuestiones
+apps/erpnext/erpnext/support/doctype/issue/issue.py +58,My Issues,Mis Cuestiones
 DocType: BOM Item,BOM Item,Artículo de Solicitud de Materiales
 DocType: Appraisal,For Employee,Para Empleados
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +188,Row {0}: Payment amount can not be negative,Fila {0}: Cantidad de pago no puede ser negativo
+DocType: Company,Default Values,Valores Predeterminados
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +189,Row {0}: Payment amount can not be negative,Fila {0}: Cantidad de pago no puede ser negativo
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +151,Press fitting,Press apropiado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +60,Against Supplier Invoice {0} dated {1},Contra Factura de Proveedor {0} con fecha{1}
-DocType: Party Type,Default Price List,Lista de precios Por defecto 
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +63,Against Supplier Invoice {0} dated {1},Contra Factura de Proveedor {0} con fecha{1}
+DocType: Selling Settings,Default Price List,Lista de precios Por defecto 
 DocType: Journal Entry,User Remark will be added to Auto Remark,Observación usuario se añadirá a Observación Auto
 DocType: Payment Reconciliation,Payments,Pagos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +23,Hot isostatic pressing,Prensado isostático en caliente
 DocType: ToDo,Medium,Medio
 DocType: Budget Detail,Budget Allocated,Presupuesto asignado
 ,Customer Credit Balance,Saldo de Crédito al Cliente
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +136,Please verify your email id,Verifique por favor su correo electrónico de identificación
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
 apps/erpnext/erpnext/config/accounts.py +53,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 DocType: Quotation,Term Details,Detalles de los Terminos
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de la Capacidad para (Días)
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +56,None of the items have any change in quantity or value.,Ninguno de los artículos tienen cualquier cambio en la cantidad o el valor.
 DocType: Warranty Claim,Warranty Claim,Reclamación de la Garantía
 ,Lead Details,Detalle de la Iniciativa
 DocType: Authorization Rule,Approving User,Aprobar Usuario
@@ -1407,33 +1428,35 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +125,Plating,Enchapado
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
 DocType: Pricing Rule,Applicable For,Aplicable para
+apps/erpnext/erpnext/stock/doctype/item/item.py +342,Item Template cannot have stock or Open Sales/Purchase/Production Orders.,Plantilla de artículo no puede tener acciones o abierto de compra / venta / Producción Órdenes.
 DocType: Bank Reconciliation,From Date,Desde la Fecha
 DocType: Backup Manager,Validate,Validar
 DocType: Maintenance Visit,Partially Completed,Parcialmente Completado
+DocType: Leave Type,Include holidays within leaves as leaves,Incluya las vacaciones dentro de las hojas como las hojas
 DocType: Sales Invoice,Packed Items,Artículos Empacados
 apps/erpnext/erpnext/config/support.py +18,Warranty Claim against Serial No.,Reclamación de Garantía ante el No. de serie
 DocType: BOM Replace Tool,"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate ""BOM Explosion Item"" table as per new BOM","Reemplazar una Solicitud de Materiales en particular en todas las demás Solicitudes de Materiales donde se utiliza. Sustituirá el antiguo enlace a la Solicitud de Materiales, actualizara el costo y regenerar una tabla para la nueva Solicitud de Materiales"
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar Carrito de Compras
 DocType: Employee,Permanent Address,Dirección Permanente
-apps/erpnext/erpnext/stock/get_item_details.py +123,Item {0} must be a Service Item.,Artículo {0} debe ser un elemento de servicio .
+apps/erpnext/erpnext/stock/get_item_details.py +122,Item {0} must be a Service Item.,Artículo {0} debe ser un elemento de servicio .
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +158,Please select item code,"Por favor, seleccione el código del artículo"
 DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir Deducción por Licencia sin Sueldo ( LWP )
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Selling Settings,Selling Settings,Configuración de Ventas 
-apps/erpnext/erpnext/stock/doctype/item/item.py +155,Item cannot be a variant of a variant,El Artículo no puede ser una variante de una variante
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +68,Item cannot be a variant of a variant,El Artículo no puede ser una variante de una variante
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +38,Online Auctions,Subastas en Línea
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Please specify either Quantity or Valuation Rate or both,Por favor especificar Cantidad o valoración de tipo o ambos
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +36,"Company, Month and Fiscal Year is mandatory","Empresa, Mes y Año Fiscal es obligatorio"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +94,Please specify either Quantity or Valuation Rate or both,Por favor especificar Cantidad o valoración de tipo o ambos
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Empresa, Mes y Año Fiscal es obligatorio"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +102,Marketing Expenses,Gastos de Comercialización
 ,Item Shortage Report,Reportar Escasez del Artículo
-apps/erpnext/erpnext/stock/doctype/item/item.js +208,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +188,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
 DocType: Journal Entry,View Details,Ver detalles
 apps/erpnext/erpnext/config/support.py +43,Single unit of an Item.,Una sola unidad de un elemento .
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +160,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +164,Time Log Batch {0} must be 'Submitted',El Registro de Horas {0} tiene que ser ' Enviado '
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Hacer Asiento Contable para cada movimiento de acciones
 DocType: Leave Allocation,Total Leaves Allocated,Total Vacaciones Asignadas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +334,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Employee,Date Of Retirement,Fecha de la jubilación
 DocType: Upload Attendance,Get Template,Verificar Plantilla
 DocType: Address,Postal,Postal
@@ -1445,77 +1468,79 @@
 DocType: Territory,Parent Territory,Territorio Principal
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
 DocType: Stock Entry,Material Receipt,Recepción de Materiales
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +570,Products,Productos
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +41,Party Type and Party is required for Receivable / Payable account {0},Partido Tipo y Partido se requiere para la cuenta por cobrar / pagar {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +622,Products,Productos
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +44,Party Type and Party is required for Receivable / Payable account {0},Partido Tipo y Partido se requiere para la cuenta por cobrar / pagar {0}
+DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Si este artículo tiene variantes, entonces no puede ser seleccionada en los pedidos de venta, etc."
 DocType: Lead,Next Contact By,Siguiente Contacto por
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +218,Quantity required for Item {0} in row {1},Cantidad requerida para el punto {0} en la fila {1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +215,Quantity required for Item {0} in row {1},Cantidad requerida para el punto {0} en la fila {1}
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +85,Warehouse {0} can not be deleted as quantity exists for Item {1},Almacén {0} no se puede eliminar mientras exista cantidad de artículo {1}
 DocType: Quotation,Order Type,Tipo de Orden
 DocType: Purchase Invoice,Notification Email Address,Correo Electronico de Notificación
 DocType: Payment Tool,Find Invoices to Match,Encuentra facturas para que coincida
 ,Item-wise Sales Register,- Artículo sabio ventas Registrarse
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +399,"e.g. ""XYZ National Bank""","por ejemplo ""XYZ Banco Nacional """
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este Impuesto 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,Totales del Objetivo
 DocType: Job Applicant,Applicant for a Job,Solicitante de Empleo
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +178,No Production Orders created,No hay órdenes de producción creadas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +169,No Production Orders created,No hay órdenes de producción creadas
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +131,Salary Slip of employee {0} already created for this month,Planilla de empleado {0} ya creado para este mes
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Sales Invoice Item,Batch No,Lote Nro
-apps/erpnext/erpnext/setup/doctype/company/company.py +142,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +149,Main,Principal
 DocType: DocPerm,Delete,Eliminar
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +11,Variant,Variante
-sites/assets/js/desk.min.js +836,New {0},Nuevo {0}
+sites/assets/js/desk.min.js +931,New {0},Nuevo {0}
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establecer prefijo de numeración de serie en sus transacciones
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +154,Stopped order cannot be cancelled. Unstop to cancel.,Orden detenida no puede ser cancelada . Continuar antes de Cancelar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +308,Default BOM ({0}) must be active for this item or its template,Por defecto la lista de materiales ({0}) debe estar activo para este material o su plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +175,Default BOM ({0}) must be active for this item or its template,Por defecto la lista de materiales ({0}) debe estar activo para este material o su plantilla
 DocType: Employee,Leave Encashed?,Vacaciones Descansadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +31,Opportunity From field is mandatory,El campo Oportunidad De es obligatorio
 DocType: Sales Invoice,Considered as an Opening Balance,Considerado como Saldo Inicial
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +468,Make Purchase Order,Hacer Orden de Compra
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +469,Make Purchase Order,Hacer Orden 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},No hay suficiente saldo para Tipo de Vacaciones {0}
 DocType: Sales Team,Contribution to Net Total,Contribución Neta Total
 DocType: Sales Invoice Item,Customer's Item Code,Código de artículo del Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de Inventario
 DocType: Territory,Territory Name,Nombre Territorio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +143,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +148,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
 apps/erpnext/erpnext/config/hr.py +43,Applicant for a Job.,Solicitante de empleo .
 DocType: Sales Invoice Item,Warehouse and Reference,Almacén y Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
 DocType: Country,Country,País
-apps/erpnext/erpnext/shopping_cart/utils.py +48,Addresses,Direcciones
+apps/erpnext/erpnext/shopping_cart/utils.py +47,Addresses,Direcciones
 DocType: Communication,Received,Recibido
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +156,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +155,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +216,Duplicate Serial No entered for Item {0},Duplicar Serie No existe para la partida {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +201,"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Nombre de la Nueva Cuenta . Nota : Por favor no crear cuentas para Clientes y Proveedores , se crean automáticamente desde el maestro de Clientes y Proveedores."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +326,Item is not allowed to have Production Order.,El artículo no se le permite tener orden de producción.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +205,"Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master","Nombre de la Nueva Cuenta . Nota : Por favor no crear cuentas para Clientes y Proveedores , se crean automáticamente desde el maestro de Clientes y Proveedores."
 DocType: DocField,Attach Image,Adjuntar Imagen
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete . ( calculados automáticamente como la suma del peso neto del material)
 DocType: Stock Reconciliation Item,Leave blank if no change,Dejar en blanco si no hay cambio
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_list.js +17,To Deliver and Bill,Para Entregar y Bill
 apps/erpnext/erpnext/config/manufacturing.py +24,Time Logs for manufacturing.,Registros de tiempo para su fabricación.
 DocType: Item,Apply Warehouse-wise Reorder Level,Aplicar Inventario para  Nivel de Reordemaniento
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +426,BOM {0} must be submitted,Solicitud de Materiales {0} debe ser enviada
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +430,BOM {0} must be submitted,Solicitud de Materiales {0} debe ser enviada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/config/projects.py +23,Time Log for tasks.,Registro de Tiempo para las Tareas.
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y Costo Real
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +52,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Solicitud de Materiales de máxima {0} se puede hacer para el punto {1} en contra de órdenes de venta {2}
 DocType: Employee,Salutation,Saludo
-DocType: Offer Letter,Rejected,Rechazado
+DocType: Quality Inspection Reading,Rejected,Rechazado
 DocType: Pricing Rule,Brand,Marca
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +609,% Delivered,% Entregado
-apps/erpnext/erpnext/config/selling.py +148,Bundle items at time of sale.,Agrupe elementos en el momento de la venta.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +601,% Delivered,% Entregado
+apps/erpnext/erpnext/config/selling.py +153,Bundle items at time of sale.,Agrupe elementos en el momento de la venta.
 DocType: Sales Order Item,Actual Qty,Cantidad Real
 DocType: Quality Inspection Reading,Reading 10,Lectura 10
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +560,"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 tus productos o servicios que usted compra o vende .
+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 tus productos o servicios que usted compra o vende .
 DocType: Hub Settings,Hub Node,Nodo del centro de actividad
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +82,Associate,Asociado
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Associate,Asociado
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +46,Item {0} is not a serialized Item,Elemento {0} no es un artículo serializado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +573,"For 'Sales BOM' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Sales BOM' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table.","Para los artículos 'Solicitud de Materiales para Ventas', Almacén, Número de Serie y de Lote No se tendrán en cuenta en el cuadro ""Lista de Empacado'. Si Almacenes y Lotes No son las mismas para todos los elementos de embalaje para cualquier artículo 'Solicitud de Materiales para Venta', esos valores se pueden introducir en la tabla principal de artículos, los valores se copiarán a la tabla ""Lista de Empacado""."
 DocType: SMS Center,Create Receiver List,Crear Lista de Receptores
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +5,Expired,Expirado
 DocType: Packing Slip,To Package No.,Al paquete No.
@@ -1531,7 +1556,8 @@
 ,Sales Invoice Trends,Tendencias de Facturas de Venta
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +90,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la fila sólo si el tipo de cargo es 'Sobre el importe de la fila anterior""o"" Total de la Fila Anterior"""
-DocType: Item,Allowance Percent,Porcentaje de Asignación
+DocType: Sales Order Item,Delivery Warehouse,Almacén Entrega
+DocType: Stock Settings,Allowance Percent,Porcentaje de Asignación
 DocType: SMS Settings,Message Parameter,Parámetro Mensaje
 DocType: Serial No,Delivery Document No,Entrega del documento No
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener los elementos desde Recibos de Compra
@@ -1543,81 +1569,82 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +53,Shearing,Cizallamiento
 DocType: Item,Has Variants,Tiene Variantes
 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.,"Haga clic en el botón ""Hacer la factura de venta"" para crear una nueva factura de venta ."
-apps/erpnext/erpnext/controllers/recurring_document.py +164,Period From and Period To dates mandatory for recurring %s,Periodo Desde y Período Para las fechas obligatorias para recurrente% s
+apps/erpnext/erpnext/controllers/recurring_document.py +166,Period From and Period To dates mandatory for recurring %s,Periodo Desde y Período Para las fechas obligatorias para recurrente% s
 DocType: Journal Entry Account,Against Expense Claim,Contra la Aseveración de Gastos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +165,Packaging and labeling,Envasado y etiquetado
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nombre de la Distribución Mensual
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 apps/erpnext/erpnext/setup/utils.py +14,Please specify Default Currency in Company Master and Global Defaults,"Por favor, especifique Moneda Predeterminada en la Empresa Principal y los Valores Predeterminados Globales"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +221,"Payment against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,"Payment against {0} {1} cannot be greater \
 					than Outstanding Amount {2}","Pago contra {0} {1} no puede ser mayor que \
  Monto Remanente {2}"
 DocType: Backup Manager,Dropbox Access Secret,Acceso Secreto de Dropbox
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrente
-DocType: Item,Net Weight of each Item,Peso Neto de cada Artículo
+apps/erpnext/erpnext/config/learn.py +189,Managing Projects,Gestión de Proyectos
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 DocType: Budget Detail,Fiscal Year,Año Fiscal
 DocType: Cost Center,Budget,Presupuesto
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +50,Achieved,Conseguido
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,e.g. 5,por ejemplo 5
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +195,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,e.g. 5,por ejemplo 5
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +196,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,En palabras serán visibles una vez que guarde la factura de venta .
 DocType: Item,Is Sales Item,Es artículo de Ventas
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Artículo Grupo Árbol
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +70,Item {0} is not setup for Serial Nos. Check Item master,Elemento {0} no está configurado para el amo números de serie del cheque Artículo
 DocType: Maintenance Visit,Maintenance Time,Tiempo de Mantenimiento
 ,Amount to Deliver,La cantidad a Deliver
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +568,A Product or Service,Un Producto o Servicio
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +620,A Product or Service,Un Producto o Servicio
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +139,There were errors.,Hubo errores .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +100,Tapping,Tapping
 DocType: Naming Series,Current Value,Valor actual
-apps/erpnext/erpnext/stock/doctype/item/item.py +145,Item Template cannot have stock and varaiants. Please remove stock from warehouses {0},"Plantilla de artículo no puede tener valores y varaiants. Por favor, elimine de stock de los almacenes de {0}"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +176,{0} created,{0} creado
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +167,{0} created,{0} creado
 DocType: Journal Entry Account,Against Sales Order,Contra la Orden de Venta
 ,Serial No Status,Número de orden Estado
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +502,Item table can not be blank,Tabla de artículos no puede estar en blanco
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +351,Item table can not be blank,Tabla de artículos no puede estar en blanco
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +148,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer {1} periodicidad, diferencia entre desde y hasta la fecha \
  debe ser mayor que o igual a {2}"
 DocType: Pricing Rule,Selling,Ventas
 DocType: Employee,Salary Information,Información salarial
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
-apps/erpnext/erpnext/accounts/party.py +186,Due Date cannot be before Posting Date,Fecha de vencimiento no puede ser anterior Fecha de publicación
+apps/erpnext/erpnext/accounts/party.py +211,Due Date cannot be before Posting Date,Fecha de vencimiento no puede ser anterior Fecha de publicación
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Duties and Taxes,Derechos e Impuestos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +275,Please enter Reference date,Por favor introduzca la fecha de referencia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +274,Please enter Reference date,Por favor introduzca la fecha de referencia
+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} entradas de pago no se pueden filtrar por {1}
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,Tabla de Artículo que se muestra en el Sitio Web
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
 DocType: Material Request Item,Material Request Item,Elemento de la Solicitud de Material
-apps/erpnext/erpnext/config/stock.py +103,Tree of Item Groups.,Árbol de los Grupos de Articulos
+apps/erpnext/erpnext/config/stock.py +108,Tree of Item Groups.,Árbol de los Grupos de Articulos
 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 se puede hacer referencia número de la fila superior o igual al número de fila actual de este tipo de carga
 ,Item-wise Purchase History,- Artículo sabio Historial de compras
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Red,Rojo
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +152,Red,Rojo
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +237,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en "" Generar Schedule ' en busca del cuento por entregas añadido para el elemento {0}"
 DocType: Account,Frozen,congelado
 ,Open Production Orders,Abrir Ordenes de Producción
 DocType: Installation Note,Installation Time,Tiempo de instalación
-apps/erpnext/erpnext/setup/doctype/company/company.js +36,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +204,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ón {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
+apps/erpnext/erpnext/setup/doctype/company/company.js +44,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +192,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ón {1} no se ha completado para {2} cantidad de productos terminados en orden de producción # {3}. Por favor, actualice el estado de funcionamiento a través de los registros de tiempo"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +57,Investments,Inversiones
 DocType: Issue,Resolution Details,Detalles de la resolución
 apps/erpnext/erpnext/config/stock.py +84,Change UOM for an Item.,Cambie Unidad de Medida para un artículo .
 DocType: Quality Inspection Reading,Acceptance Criteria,Criterios de Aceptación
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
-apps/erpnext/erpnext/controllers/selling_controller.py +256,Item {0} must be Sales or Service Item in {1},Artículo {0} debe ser ventas o servicio al artículo en {1}
+apps/erpnext/erpnext/controllers/selling_controller.py +263,Item {0} must be Sales or Service Item in {1},Artículo {0} debe ser ventas o servicio al artículo en {1}
 DocType: Item Group,Show In Website,Mostrar En Sitio Web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +569,Group,Grupo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +621,Group,Grupo
 DocType: Task,Expected Time (in hours),Tiempo esperado (en horas)
 ,Qty to Order,Cantidad a Solicitar
+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","Para realizar el seguimiento de marca en el siguiente documentación Nota de entrega, Oportunidad, solicitud de materiales, de artículos, de órdenes de compra, compra vale, Recibo Comprador, la cita, la factura de venta, producto Bundle, órdenes de venta, de serie"
 DocType: Sales Order,PO No,PO No
 apps/erpnext/erpnext/config/projects.py +51,Gantt chart of all tasks.,Diagrama de Gantt de todas las tareas .
 DocType: Appraisal,For Employee Name,En Nombre del Empleado
 DocType: Holiday List,Clear Table,Borrar la tabla
 DocType: Features Setup,Brands,Marcas
 DocType: C-Form Invoice Detail,Invoice No,Factura No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +497,From Purchase Order,De la Orden de Compra
-apps/erpnext/erpnext/accounts/party.py +139,Please select company first.,Por favor seleccione la empresa en primer lugar.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +492,From Purchase Order,De la Orden de Compra
+apps/erpnext/erpnext/accounts/party.py +152,Please select company first.,Por favor seleccione la empresa en primer lugar.
 DocType: Activity Cost,Costing Rate,Costeo Rate
 DocType: Journal Entry Account,Against Journal Entry,Contra la Entrada de Diario
 DocType: Employee,Resignation Letter Date,Fecha de Carta de Renuncia 
@@ -1625,9 +1652,9 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +137,Not Set,No Especificado
 DocType: Communication,Date,Fecha
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +592,Sit tight while your system is being setup. This may take a few moments.,Estar tranquilos mientras el sistema está siendo configuración. Esto puede tomar un momento .
+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.,Estar tranquilos mientras el sistema está siendo configuración. Esto puede tomar un momento .
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +46,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener la función de 'Supervisor de Gastos'
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Pair,Par
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Pair,Par
 DocType: Bank Reconciliation Detail,Against Account,Contra Cuenta
 DocType: Maintenance Schedule Detail,Actual Date,Fecha Real
 DocType: Item,Has Batch No,Tiene lote No
@@ -1637,8 +1664,8 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +43,Embossing,Repujado
 ,Quotation Trends,Tendencias de Cotización
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +135,Item Group not mentioned in item master for item {0},Grupo El artículo no se menciona en maestro de artículos para el elemento {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +243,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
-apps/erpnext/erpnext/stock/doctype/item/item.py +295,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +247,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +162,"As Production Order can be made for this item, it must be a stock item.","Puede haber una Orden de Producción por este concepto , debe ser un elemento del Inventario."
 DocType: Shipping Rule Condition,Shipping Amount,Importe del envío
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +139,Joining,Unión
 DocType: Authorization Rule,Above Value,Valor Superior
@@ -1657,104 +1684,104 @@
 apps/erpnext/erpnext/config/accounts.py +41,Tree of finanial accounts.,Árbol de las cuentas financieras
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si se considera para todos los tipos de empleados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados ​​en
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +253,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +255,Account {0} must be of type 'Fixed Asset' as Item {1} is an Asset Item,Cuenta {0} debe ser de tipo 'Activos Fijos' porque Artículo {1} es un Elemento de Activo Fijo
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
 apps/frappe/frappe/config/setup.py +130,Printing,Impresión
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +107,Expense Claim is pending approval. Only the Expense Approver can update status.,Cuenta de gastos está pendiente de aprobación . Sólo el Supervisor de Gastos se puede actualizar el estado .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Expense Claim is pending approval. Only the Expense Approver can update status.,Cuenta de gastos está pendiente de aprobación . Sólo el Supervisor de Gastos se puede actualizar el estado .
+DocType: Purchase Invoice,Additional Discount Amount,Importe adicional de descuento
 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 día (s) sobre el cual está solicitando la licencia son vacaciones. Usted no tiene que solicitar la licencia .
-sites/assets/js/desk.min.js +684,and,y
+sites/assets/js/desk.min.js +771,and,y
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
+apps/erpnext/erpnext/setup/doctype/company/company.py +35,Abbr can not be blank or space,Abbr no puede estar en blanco o el espacio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +49,Sports,deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +61,Total Actual,Total Actual
 DocType: Stock Entry,"Get valuation rate and available stock at source/target warehouse on mentioned posting date-time. If serialized item, please press this button after entering serial nos.","Obtenga tasa de valorización y el stock disponible en la fuente del almacén / destino en la fecha mencionada publicación a tiempo . Si serializado tema, por favor, pulse este botón después de entrar nos serie."
-apps/erpnext/erpnext/templates/includes/cart.js +288,Something went wrong.,Algo salió mal.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +574,Unit,Unidad
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +129,Please set Dropbox access keys in your site config,"Por favor, establece las claves de acceso de Dropbox en tu config sitio"
-apps/erpnext/erpnext/stock/get_item_details.py +114,Please specify Company,"Por favor, especifique la empresa"
+apps/erpnext/erpnext/templates/includes/cart.js +289,Something went wrong.,Algo salió mal.
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +626,Unit,Unidad
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_dropbox.py +130,Please set Dropbox access keys in your site config,"Por favor, establece las claves de acceso de Dropbox en tu config sitio"
+apps/erpnext/erpnext/stock/get_item_details.py +113,Please specify Company,"Por favor, especifique la empresa"
 ,Customer Acquisition and Loyalty,Adquisición de clientes y fidelización
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +103,From Time cannot be greater than To Time,De tiempo no puede ser mayor que A Tiempo
 DocType: Purchase Receipt,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year ends on,Su año Financiero termina en
-DocType: POS Setting,Price List,Lista de Precios
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +408,Your financial year ends on,Su año Financiero termina en
+DocType: POS Profile,Price List,Lista de Precios
 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} es ahora la Año Fiscal predeterminado . Por favor, actualice su navegador para que el cambio surta efecto."
-apps/erpnext/erpnext/projects/doctype/project/project.js +41,Expense Claims,Las reclamaciones de gastos
+apps/erpnext/erpnext/projects/doctype/project/project.js +47,Expense Claims,Las reclamaciones de gastos
 DocType: Email Digest,Support,Soporte
 DocType: Authorization Rule,Approving Role,Aprobar Rol
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +89,Please specify currency in Company,"Por favor, especifique la moneda en la Empresa"
+,BOM Search,BOM Buscar
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +126,Closing (Opening + Totals),Cierre (Apertura + Totales)
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +85,Please specify currency in Company,"Por favor, especifique la moneda en la Empresa"
 DocType: Workstation,Wages per hour,Salarios por Hora
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +43,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
-apps/erpnext/erpnext/config/setup.py +53,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Disimular las características como de serie n , POS , etc"
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +45,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},Balance de Inventario en Lote {0} se convertirá en negativa {1} para la partida {2} en Almacén {3}
+apps/erpnext/erpnext/config/setup.py +83,"Show / Hide features like Serial Nos, POS etc.","Mostrar / Disimular las características como de serie n , POS , etc"
 DocType: Purchase Receipt,LR No,LR No
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},Se requiere el factor de conversión de la Unidad de Medida en la fila {0}
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +51,Clearance date cannot be before check date in row {0},Fecha de Liquidación no puede ser antes de la fecha de verificación de la fila {0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +52,Clearance date cannot be before check date in row {0},Fecha de Liquidación no puede ser antes de la fecha de verificación de la fila {0}
 DocType: Salary Slip,Deduction,Deducción
 DocType: Address Template,Address Template,Plantilla de Direcciones
+apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +125,Please enter Employee Id of this sales person,Introduzca Empleado Id de este vendedor
 DocType: Territory,Classification of Customers by region,Clasificación de los clientes por región
 DocType: Project,% Tasks Completed,% Tareas Completadas
 DocType: Project,Gross Margin,Margen Bruto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +137,Please enter Production Item first,Por favor introduzca Artículo Producción primera
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Please enter Production Item first,Por favor introduzca Artículo Producción primera
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +76,disabled user,usuario deshabilitado
 DocType: Opportunity,Quotation,Cotización
 DocType: Salary Slip,Total Deduction,Deducción Total
-apps/erpnext/erpnext/templates/includes/cart.js +99,Hey! Go ahead and add an address,Hey! Seguir adelante y añadir una dirección
+apps/erpnext/erpnext/templates/includes/cart.js +100,Hey! Go ahead and add an address,Hey! Seguir adelante y añadir una dirección
 DocType: Quotation,Maintenance User,Mantenimiento por el Usuario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +144,Cost Updated,Costo Actualizado
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +764,Are you sure you want to UNSTOP,Esta seguro que desea CONTINUAR
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +751,Are you sure you want to UNSTOP,Esta seguro que desea CONTINUAR
 DocType: Employee,Date of Birth,Fecha de nacimiento
-DocType: Salary Manager,Salary Manager,Administrador de Salario
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +425,Item {0} has already been returned,Artículo {0} ya se ha devuelto
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +77,Item {0} has already been returned,Artículo {0} ya se ha devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Año Fiscal ** representa un Ejercicio Financiero. Los asientos contables y otras transacciones importantes se registran contra ** Año Fiscal **.
 DocType: Opportunity,Customer / Lead Address,Cliente / Dirección de Oportunidad
 DocType: Production Order Operation,Actual Operation Time,Tiempo Real de Funcionamiento
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Job Description,Descripción Del Trabajo
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +170,Job Description,Descripción Del Trabajo
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario
 apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +34,Please select a valid csv file with data,"Por favor, seleccione un archivo csv válidos con datos"
 DocType: Features Setup,To track items in sales and purchase documents with batch nos<br><b>Preferred Industry: Chemicals etc</b>,Para realizar un seguimiento de los elementos de las ventas y la compra de los documentos con lotes nos <br> <b> Industria preferido: Productos químicos etc < / b >
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +91,Coating,Revestimiento
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +121,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +124,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Caracteres especiales excepto ""-"" ""."", ""#"", y ""/"" no permitido en el nombramiento de serie"
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.","Lleve un registro de las campañas de venta. Lleve un registro de conductores, Citas, pedidos de venta, etc de Campañas para medir retorno de la inversión. "
 DocType: Expense Claim,Approver,Supervisor
 ,SO Qty,SO Cantidad
 apps/erpnext/erpnext/accounts/doctype/account/account.py +127,"Stock entries exist against warehouse {0}, hence you cannot re-assign or modify Warehouse","Existen entradas de inventario para el almacén de {0}, por lo tanto, no se puede volver a asignar o modificar Almacén"
 DocType: Appraisal,Calculate Total Score,Calcular Puntaje Total
-DocType: Salary Slip Deduction,Depends on LWP,Depende LWP
 DocType: Supplier Quotation,Manufacturing Manager,Gerente de Manufactura
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +201,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +69,Split Delivery Note into packages.,Dividir nota de entrega en paquetes .
-apps/erpnext/erpnext/shopping_cart/utils.py +46,Shipments,Los envíos
+apps/erpnext/erpnext/shopping_cart/utils.py +45,Shipments,Los envíos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +28,Dip molding,Moldeo por inmersión
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +25,Time Log Status must be Submitted.,El Estado del Registro de Horas tiene que ser 'Enviado'.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +591,Setting Up,Configuración
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +90,Make Debit Note,Haga Nota de Débito
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +650,Setting Up,Configuración
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +488,Make Debit Note,Haga Nota de Débito
 DocType: Purchase Invoice,In Words (Company Currency),En Palabras (Moneda Local)
 DocType: Pricing Rule,Supplier,Proveedor
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +105,Miscellaneous Expenses,Gastos Varios
 DocType: Global Defaults,Default Company,Compañía Predeterminada
-apps/erpnext/erpnext/controllers/stock_controller.py +165,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de gastos o Diferencia es obligatorio para el elemento {0} , ya que los impactos valor de las acciones en general"
-apps/erpnext/erpnext/controllers/accounts_controller.py +285,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede cobrar demasiado a la partida {0} en la fila {1} más {2}. Para permitir la sobrefacturación, configure en la configuración de inventario"
+apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de gastos o Diferencia es obligatorio para el elemento {0} , ya que los impactos valor de las acciones en general"
+apps/erpnext/erpnext/controllers/accounts_controller.py +299,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede cobrar demasiado a la partida {0} en la fila {1} más {2}. Para permitir la sobrefacturación, configure en la configuración de inventario"
 DocType: Employee,Bank Name,Nombre del Banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +38,-Above,-Sobre
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +131,User {0} is disabled,El usuario {0} está deshabilitado
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +135,User {0} is disabled,El usuario {0} está deshabilitado
 DocType: Leave Application,Total Leave Days,Total Vacaciones
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correo electrónico no se enviará a los usuarios deshabilitados
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +36,Select Company...,Seleccione la empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
 apps/erpnext/erpnext/config/hr.py +95,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +305,{0} is mandatory for Item {1},{0} es obligatorio para el elemento {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +300,{0} is mandatory for Item {1},{0} es obligatorio para el elemento {1}
 DocType: Currency Exchange,From Currency,De Moneda
 DocType: DocField,Name,Nombre
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +199,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, seleccione monto asignado, Tipo factura y número de factura en al menos una fila"
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +61,Last Sales Order Date,Last Order Sales Fecha
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +90,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +200,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, seleccione monto asignado, Tipo factura y número de factura en al menos una fila"
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +89,Sales Order required for Item {0},Orden de Venta requerida para el punto {0}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Amounts not reflected in system,Las cantidades no se reflejan en el sistema
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarifa (Moneda Local)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +40,Others,Otros
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +313,Production might not be able to finish by the Expected Delivery Date.,La producción podría no ser capaz de terminar por la fecha del alumbramiento.
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +19,Set as Stopped,Establecer como Stopped
-DocType: POS Setting,Taxes and Charges,Impuestos y Cargos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +24,Set as Stopped,Establecer como Stopped
+DocType: POS Profile,Taxes and Charges,Impuestos y Cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un Producto o un Servicio que se compra, se vende o se mantiene en stock."
 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 se puede seleccionar el tipo de cargo como 'Importe en Fila Anterior' o ' Total en Fila Anterior' dentro de la primera fila
 apps/frappe/frappe/core/doctype/doctype/boilerplate/controller_list.html +31,Completed,Completado
@@ -1762,20 +1789,21 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +103,Broaching,Brochado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +11,Banking,Banca
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +48,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en ' Generar la Lista de conseguir horario"
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +276,New Cost Center,Nuevo Centro de Costo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +280,New Cost Center,Nuevo Centro de Costo
 DocType: Bin,Ordered Quantity,Cantidad Pedida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +397,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Itemwise Descuento
 DocType: Purchase Receipt,Detailed Breakup of the totals,Corte detallado de los totales
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +286,{0} against Sales Order {1},{0} en contra de Orden de Venta {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +284,{0} against Sales Order {1},{0} en contra de Orden de Venta {1}
 DocType: Account,Fixed Asset,Activos Fijos
 DocType: Time Log Batch,Total Billing Amount,Monto total de facturación
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +47,Receivable Account,Cuenta por Cobrar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +140,No Updates For,No hay actualizaciones para
 ,Stock Balance,Balance de Inventarios
+apps/erpnext/erpnext/config/learn.py +102,Sales Order to Payment,Órdenes de venta al Pago
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de Gastos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +259,Time Logs created:,Registros de Tiempo de creados:
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +265,Time Logs created:,Registros de Tiempo de creados:
 DocType: Company,If Yearly Budget Exceeded,Si el presupuesto anual fue superado
 DocType: Item,Weight UOM,Peso Unidad de Medida
 DocType: Employee,Blood Group,Grupos Sanguíneos
@@ -1790,8 +1818,7 @@
 DocType: Shipping Rule,"Specify a list of Territories, for which, this Shipping Rule is valid","Especifica una lista de territorios , para lo cual, esta Regla envío es válida"
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Levante Solicitud de material cuando la acción alcanza el nivel de re- orden
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +18,From Maintenance Schedule,Desde Programa de mantenimiento
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +51,Full-time,Jornada Completa
-DocType: Company,Country Settings,Ajustes País
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Full-time,Jornada Completa
 DocType: Employee,Contact Details,Datos del Contacto
 DocType: C-Form,Received Date,Fecha de Recepción
 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 creado una plantilla estándar de las tasas y cargos de venta de plantilla, seleccione uno y haga clic en el botón de abajo."
@@ -1805,23 +1832,23 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +164,Please select Incharge Person's name,"Por favor, seleccione el nombre de InCharge persona"
 DocType: Delivery Note,Date on which lorry started from your warehouse,Fecha en la que ingreso a su almacén
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +50,Technology,Tecnología
-DocType: Purchase Order,Supplier (vendor) name as entered in supplier master,Proveedor (vendedor ) nombre que ingresó en el maestro de proveedores
 DocType: Offer Letter,Offer Letter,Carta De Oferta
 apps/erpnext/erpnext/config/manufacturing.py +51,Generate Material Requests (MRP) and Production Orders.,Generar Solicitudes de Material ( MRP ) y Órdenes de Producción .
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Total Monto Facturado
 DocType: Time Log,To Time,Para Tiempo
 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.","Para agregar registros secundarios , explorar el árbol y haga clic en el registro en el que desea agregar más registros."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +94,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +236,BOM recursion: {0} cannot be parent or child of {2},Recursividad de Solicitud de Materiales: {0} no puede ser padre o hijo de {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +96,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +233,BOM recursion: {0} cannot be parent or child of {2},Recursividad de Solicitud de Materiales: {0} no puede ser padre o hijo de {2}
 DocType: Production Order Operation,Completed Qty,"Cantidad Completada
 "
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +135,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden ser enlazados con otra entrada de crédito"
-apps/erpnext/erpnext/stock/get_item_details.py +236,Price List {0} is disabled,Lista de precios {0} está deshabilitado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +134,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden ser enlazados con otra entrada de crédito"
+apps/erpnext/erpnext/stock/get_item_details.py +235,Price List {0} is disabled,Lista de precios {0} está deshabilitado
 DocType: Manufacturing Settings,Allow Overtime,Permitir Overtime
-apps/erpnext/erpnext/controllers/selling_controller.py +247,Sales Order {0} is stopped,Orden de Venta {0} esta detenida
+apps/erpnext/erpnext/controllers/selling_controller.py +254,Sales Order {0} is stopped,Orden de Venta {0} esta detenida
 DocType: Email Digest,New Leads,Nuevas Oportunidades
 DocType: Stock Reconciliation Item,Current Valuation Rate,Valoración actual Tasa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +239,"Advance paid against {0} {1} cannot be greater \
+DocType: Item,Customer Item Codes,Códigos de los Clientes
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +238,"Advance paid against {0} {1} cannot be greater \
 					than Grand Total {2}","Anticipo pagado contra {0} {1} no puede ser mayor \
  de Gran Total {2}"
 DocType: Opportunity,Lost Reason,Razón de la pérdida
@@ -1829,12 +1856,11 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +140,Welding,Soldadura
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +18,New Stock UOM is required,Se requiere Unidad de Medida para Nuevo Inventario
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +418,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +419,All items have already been invoiced,Todos los artículos que ya se han facturado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Especifique un válido ' De Caso No. '
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +280,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centros de costos adicionales se pueden hacer en Grupos, pero las entradas se pueden hacer contra los no Grupos"
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +284,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centros de costos adicionales se pueden hacer en Grupos, pero las entradas se pueden hacer contra los no Grupos"
 DocType: Project,External,externo
 DocType: Features Setup,Item Serial Nos,N º de serie de los Artículo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +8,Not Received,No recibido
 DocType: Branch,Branch,Rama
 DocType: Sales Invoice,Customer (Receivable) Account,Cliente ( por cobrar ) Cuenta
 DocType: Bin,Actual Quantity,Cantidad Real
@@ -1842,27 +1868,29 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +198,Serial No {0} not found,Serial No {0} no encontrado
 DocType: Shopping Cart Settings,Price Lists,Listas de precios
 DocType: Purchase Invoice,Considered as Opening Balance,Considerado como Balance de Apertura
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +513,Your Customers,Sus Clientes
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +563,Your Customers,Sus Clientes
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +26,Compression molding,El moldeo por compresión
 DocType: Leave Block List Date,Block Date,Bloquear Fecha
 DocType: Sales Order,Not Delivered,No Entregado
 ,Bank Clearance Summary,Resumen de Liquidación del Banco
-apps/erpnext/erpnext/config/setup.py +75,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
+apps/erpnext/erpnext/config/setup.py +105,"Create and manage daily, weekly and monthly email digests.","Creación y gestión de resúmenes de correo electrónico diarias , semanales y mensuales."
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code > Item Group > Brand,Código del artículo> Grupo Elemento> Marca
 DocType: Appraisal Goal,Appraisal Goal,Evaluación Meta
 DocType: Event,Friday,Viernes
 DocType: Time Log,Costing Amount,Costeo Monto
-DocType: Salary Manager,Submit Salary Slip,Presentar nómina
+DocType: Process Payroll,Submit Salary Slip,Presentar nómina
 DocType: Salary Structure,Monthly Earning & Deduction,Ingresos Mensuales y Deducción
-apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}%
+apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,Descuento máximo para el elemento {0} es {1}%
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Importación a granel
 DocType: Supplier,Address & Contacts,Dirección y Contactos
 DocType: SMS Log,Sender Name,Nombre del Remitente
 DocType: Page,Title,Título
-sites/assets/js/list.min.js +92,Customize,Personalizar
-DocType: POS Setting,[Select],[Seleccionar]
+sites/assets/js/list.min.js +94,Customize,Personalizar
+DocType: POS Profile,[Select],[Seleccionar]
+DocType: SMS Log,Sent To,Enviado A
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +28,Make Sales Invoice,Hacer Factura de Venta
 DocType: Company,For Reference Only.,Sólo para referencia.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +45,Invalid {0}: {1},No válida {0}: {1}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +30,Invalid {0}: {1},No válida {0}: {1}
 DocType: Sales Invoice Advance,Advance Amount,Cantidad Anticipada
 DocType: Manufacturing Settings,Capacity Planning,Planificación de la capacidad
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,'From Date' is required,"' A partir de la fecha "" se requiere"
@@ -1870,62 +1898,62 @@
 DocType: Employee,Employment Details,Detalles de Empleo
 DocType: Employee,New Workplace,Nuevo lugar de trabajo
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Establecer como Cerrada
-apps/erpnext/erpnext/stock/get_item_details.py +104,No Item with Barcode {0},Ningún artículo con Barcode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +103,No Item with Barcode {0},Ningún artículo con Barcode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Nº de Caso no puede 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 usted tiene Eqipo de Ventas y Socios de Ventas ( Socios de canal ) ellos pueden ser etiquetados y mantener su contribución en la actividad de ventas
 DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página
-apps/erpnext/erpnext/setup/doctype/company/company.py +71,Stores,Tiendas
+DocType: Item,"Allow in Sales Order of type ""Service""",Deje de órdenes de venta de &quot;Servicio&quot; Tipo
+apps/erpnext/erpnext/setup/doctype/company/company.py +77,Stores,Tiendas
 DocType: Time Log,Projects Manager,Gerente de Proyectos
 DocType: Serial No,Delivery Time,Tiempo de Entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envejecimiento Basado En
 DocType: Item,End of Life,Final de la Vida
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +41,Travel,Viajes
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +199,Operation is Mandatory,El funcionamiento es obligatorio
 DocType: Purchase Order,Recurring,Periódico
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
 DocType: Rename Tool,Rename Tool,Cambiar el nombre de la herramienta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +11,Update Cost,Actualización de Costos
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +15,Update Cost,Actualización de Costos
 DocType: Item Reorder,Item Reorder,Reordenar artículo
-DocType: Address,Check to make primary address,Marque para hacer ésta la dirección principal
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +507,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +508,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especifique la operación , el costo de operación y dar una operación única que no a sus operaciones."
 DocType: Purchase Invoice,Price List Currency,Lista de Precios de Divisas
 DocType: Naming Series,User must always select,Usuario elegirá siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
 DocType: Installation Note,Installation Note,Nota de Instalación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +491,Add Taxes,Añadir Impuestos
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +541,Add Taxes,Añadir Impuestos
 ,Financial Analytics,Financial Analytics
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Filial
-apps/erpnext/erpnext/setup/doctype/company/company.py +37,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la empresa, porque existen operaciones existentes. Las transacciones deben ser canceladas para cambiar la moneda por defecto."
+apps/erpnext/erpnext/setup/doctype/company/company.py +41,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la empresa, porque existen operaciones existentes. Las transacciones deben ser canceladas para cambiar la moneda por defecto."
 DocType: Quality Inspection,Purchase Receipt No,Recibo de Compra No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinero Ganado
-DocType: Salary Manager,Create Salary Slip,Crear Nómina
+DocType: System Settings,In Hours,En Horas
+DocType: Process Payroll,Create Salary Slip,Crear Nómina
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +44,Expected balance as per bank,Importe pendiente de recibir por banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +114,Buffing,Pulido
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +158,Source of Funds (Liabilities),Fuente de los fondos ( Pasivo )
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +383,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Cantidad en la fila {0} ({1} ) debe ser la misma que la cantidad fabricada {2}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +354,Quantity in row {0} ({1}) must be same as manufactured quantity {2},Cantidad en la fila {0} ({1} ) debe ser la misma que la cantidad fabricada {2}
 DocType: Appraisal,Employee,Empleado
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +10,Import Email From,Importar Correo Electrónico de:
 DocType: Features Setup,After Sale Installations,Instalaciones Post Venta
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,{0} {1} is fully billed,{0} {1} está totalmente facturado
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +232,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de Finalización
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Condiciones contractuales estándar para Ventas o Compra.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +79,Group by Voucher,Grupo por Bono
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Grupo por Bono
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Requerido Por
 DocType: Sales Invoice,Mass Mailing,Correo Masivo
 DocType: Page,Standard,estándar
 DocType: Rename Tool,File to Rename,Archivo para cambiar el nombre de
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +175,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
-apps/erpnext/erpnext/controllers/buying_controller.py +246,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +168,Purchse Order number required for Item {0},Número de Orden de Compra se requiere para el elemento {0}
+apps/erpnext/erpnext/controllers/buying_controller.py +245,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +183,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 DocType: Email Digest,Payments Received,Pagos recibidos
 DocType: Cost Center,"Define Budget for this Cost Center. To set budget action, see <a href=""#!List/Company"">Company Master</a>","Definir Presupuesto para este centro de coste . Para configurar la acción presupuestaria, ver <a href=""#!List/Company""> Company Maestro < / a>"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +138,Size,Tamaño
+apps/erpnext/erpnext/setup/doctype/backup_manager/backup_files_list.html +11,Size,Tamaño
 DocType: Notification Control,Expense Claim Approved,Reclamación de Gastos Aprobado
 DocType: Email Digest,Calendar Events,Calendario de Eventos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +108,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,El costo de artículos comprados
 DocType: Selling Settings,Sales Order Required,Orden de Ventas Requerida
 apps/erpnext/erpnext/crm/doctype/lead/lead.js +30,Create Customer,Crear cliente
@@ -1934,32 +1962,34 @@
 DocType: Backup Manager,"Note: Backups and files are not deleted from Dropbox, you will have to delete them manually.","Nota: Las copias de seguridad y archivos no se eliminan de Dropbox, tendrá que hacerlo manualmente."
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,Detalle de Calendario de Mantenimiento
 DocType: Quality Inspection Reading,Reading 9,Lectura 9
+DocType: Supplier,Is Frozen,Está Congelado
 DocType: Buying Settings,Buying Settings,Ajustes de Compras
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +121,Mass finishing,Acabado en masa
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Solicitud de Materiales Nº de Producto Terminado
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
-apps/erpnext/erpnext/config/selling.py +153,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante de correo electrónico de identificación de las ventas. (por ejemplo sales@example.com )
+apps/erpnext/erpnext/config/selling.py +158,Setup incoming server for sales email id. (e.g. sales@example.com),Configuración del servidor de correo entrante de correo electrónico de identificación de las ventas. (por ejemplo sales@example.com )
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Tool,Payment Account,Cuenta de Pago
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +725,Please specify Company to proceed,"Por favor, especifique la empresa para proceder"
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +14,Google Drive,Google Drive
-sites/assets/js/list.min.js +22,Draft,Borrador
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +45,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +712,Please specify Company to proceed,"Por favor, especifique la empresa para proceder"
+sites/assets/js/list.min.js +23,Draft,Borrador
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 DocType: User,Female,Femenino
-apps/erpnext/erpnext/setup/doctype/company/company.js +19,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegúrese de que realmente desea borrar todas las transacciones de esta empresa. Sus datos maestros permanecerán tal como es. Esta acción no se puede deshacer."
+apps/erpnext/erpnext/setup/doctype/company/company.js +24,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegúrese de que realmente desea borrar todas las transacciones de esta empresa. Sus datos maestros permanecerán tal como es. Esta acción no se puede deshacer."
 DocType: Print Settings,Modern,Moderno
 DocType: Communication,Replied,Respondio
 DocType: Payment Tool,Total Payment Amount,Monto Total de Pago
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +136,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +141,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +209,Raw Materials cannot be blank.,Materias primas no pueden estar en blanco.
 DocType: Newsletter,Test,Prueba
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +84,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
+apps/erpnext/erpnext/stock/doctype/item/item.py +216,"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'","Como hay transacciones de acciones existentes por este concepto, \ no puede cambiar los valores de &#39;no tiene de serie&#39;, &#39;Tiene lote n&#39;, &#39;¿Es de la Elemento &quot;y&quot; Método de valoración&#39;"
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +92,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
 DocType: Stock Entry,For Quantity,Por Cantidad
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +162,Please enter Planned Qty for Item {0} at row {1},Por favor introduzca Planificada Cantidad de elemento {0} en la fila {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +218,{0} {1} is not submitted,{0} {1} no esta presentado
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +153,Please enter Planned Qty for Item {0} at row {1},Por favor introduzca Planificada Cantidad de elemento {0} en la fila {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is not submitted,{0} {1} no esta presentado
 apps/erpnext/erpnext/config/stock.py +13,Requests for items.,Las solicitudes de artículos.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Para la producción por separado se crea para cada buen artículo terminado.
 DocType: Email Digest,New Communications,Nuevas Comunicaciones
@@ -1969,12 +1999,12 @@
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +124,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del Proyecto
 DocType: UOM,Check this to disallow fractions. (for Nos),Active esta opción para no permitir fracciones. ( para refs )
-apps/erpnext/erpnext/config/crm.py +86,Newsletter Mailing List,Boletín de la lista de correo
+apps/erpnext/erpnext/config/crm.py +91,Newsletter Mailing List,Boletín de la lista de correo
 DocType: Delivery Note,Transporter Name,Nombre del Transportista
 DocType: Contact,Enter department to which this Contact belongs,Introduzca departamento al que pertenece este Contacto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Absent,Total Ausente
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +716,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
-apps/erpnext/erpnext/config/stock.py +109,Unit of Measure,Unidad de Medida
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +658,Item or Warehouse for row {0} does not match Material Request,Artículo o Bodega para la fila {0} no coincide Solicitud de material
+apps/erpnext/erpnext/config/stock.py +114,Unit of Measure,Unidad de Medida
 DocType: Fiscal Year,Year End Date,Año de Finalización
 DocType: Task Depends On,Task Depends On,Tarea Depende de
 DocType: Lead,Opportunity,Oportunidad
@@ -1985,7 +2015,8 @@
 DocType: Notification Control,Expense Claim Approved Message,Mensaje de Gastos Aprobado
 DocType: Email Digest,How frequently?,¿Con qué frecuencia ?
 DocType: Purchase Receipt,Get Current Stock,Verificar Inventario Actual
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Installation Note,Hacer Nota de Instalación
+apps/erpnext/erpnext/config/manufacturing.py +63,Tree of Bill of Materials,Árbol de la lista de materiales
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +612,Make Installation Note,Hacer Nota de Instalación
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +208,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
 DocType: Production Order,Actual End Date,Fecha Real de Finalización
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
@@ -1995,14 +2026,15 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,El usuario que aprueba no puede ser igual que el usuario para el que la regla es aplicable
 DocType: SMS Log,No of Requested SMS,No. de SMS solicitados
 DocType: Campaign,Campaign-.####,Campaña-.#### 
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +485,Make Invoice,Hacer Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Make Invoice,Hacer Factura
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +54,Piercing,Perforación
 DocType: Customer,Your Customer's TAX registration numbers (if applicable) or any general information,Los números de registro de impuestos de su cliente ( si es aplicable) o cualquier información de carácter general
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuidor de terceros / distribuidor / comisionista / afiliado / distribuidor que vende los productos de las empresas por una comisión.
 DocType: Customer Group,Has Child Node,Tiene Nodo Niño
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +296,{0} against Purchase Order {1},{0} contra la Orden de Compra {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","Introduzca los parámetros de URL estáticas aquí (Ej. sender = ERPNext , nombre de usuario = ERPNext , contraseña = 1234 etc )"
+apps/erpnext/erpnext/accounts/utils.py +39,{0} {1} not in any active Fiscal Year. For more details check {2}.,{0} {1} no en cualquier año fiscal activa. Para más detalles de verificación {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/default_website.py +26,This is an example website auto-generated from ERPNext,Este es un sitio web ejemplo generado por automáticamente por ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Rango Envejecimiento 1
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +109,Photochemical machining,Mecanizado fotoquímico
@@ -2051,25 +2083,26 @@
 DocType: Email Digest,New Material Requests,Nueva Solicitud de Material
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantidad
 DocType: Email Account,Email Ids,IDs de Correo Electrónico
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +95,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir más artículo {0} que en la cantidad de pedidos de cliente {1}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +23,Set as Unstopped,Establecer como destapados
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +440,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +100,Cannot produce more Item {0} than Sales Order quantity {1},No se puede producir más artículo {0} que en la cantidad de pedidos de cliente {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +28,Set as Unstopped,Establecer como destapados
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +436,Stock Entry {0} is not submitted,Entrada de la {0} no se presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de Banco / Efectivo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +43,This Leave Application is pending approval. Only the Leave Approver can update status.,Esta solicitud de autorización está pendiente de aprobación. Sólo el Supervisor de Vacaciones   puede actualizar el estado.
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el Símbolo de Moneda
-apps/erpnext/erpnext/config/accounts.py +154,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
+apps/erpnext/erpnext/config/accounts.py +159,"e.g. Bank, Cash, Credit Card","por ejemplo Banco, Efectivo , Tarjeta de crédito"
 DocType: Journal Entry,Credit Note,Nota de Crédito
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +206,Completed Qty cannot be more than {0} for operation {1},Completado Cantidad no puede contener más de {0} para la operación {1}
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +207,Completed Qty cannot be more than {0} for operation {1},Completado Cantidad no puede contener más de {0} para la operación {1}
 DocType: Features Setup,Quality,Calidad
 DocType: Contact Us Settings,Introduction,Introducción
 DocType: Warranty Claim,Service Address,Dirección del Servicio
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Max 100 rows for Stock Reconciliation.,Número máximo de 100 filas de Conciliación de Inventario.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Max 100 rows for Stock Reconciliation.,Número máximo de 100 filas de Conciliación de Inventario.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +104,Note: Reference Date exceeds invoice due date by {0} days for {1} {2},Nota: Fecha de referencia supera fecha de vencimiento de la factura por {0} días para {1} {2}
 DocType: Stock Entry,Manufacture,Manufactura
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,"Por favor, nota de entrega primero"
 DocType: Shopping Cart Taxes and Charges Master,Tax Master,Maestro de Impuestos
 DocType: Opportunity,Customer / Lead Name,Cliente / Nombre de Oportunidad
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +61,Clearance Date not mentioned,Fecha de Liquidación no mencionada
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +66,Production,Producción
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +62,Clearance Date not mentioned,Fecha de Liquidación no mencionada
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Production,Producción
 DocType: Item,Allow Production Order,Permitir Orden de Producción
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +60,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
@@ -2079,21 +2112,24 @@
 sites/assets/js/list.min.js +26,Submitted,Enviado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Momento en que se recibieron los materiales
+apps/erpnext/erpnext/utilities/doctype/address/address.py +110,My Addresses,Mis Direcciones
+DocType: Stock Ledger Entry,Outgoing Rate,Saliente Rate
 apps/erpnext/erpnext/config/hr.py +100,Organization branch master.,Rama Principal de la Organización.
 DocType: Purchase Invoice,Will be calculated automatically when you enter the details,Se calcularán automáticamente cuando entre en los detalles
 DocType: Delivery Note,Transporter lorry number,Número de camiones Transportador
 DocType: Sales Order,Billing Status,Estado de Facturación
 DocType: Backup Manager,Backup Right Now,Respaldar Ya
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Utility Expenses,Los gastos de servicios públicos
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +45,90-Above,90-Arriba
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +54,90-Above,90-Arriba
 DocType: Buying Settings,Default Buying Price List,Lista de Precios de Compra Por Defecto
+DocType: Backup Manager,Download Backups,Descarga Backups
 DocType: Notification Control,Sales Order Message,Mensaje de la Orden de Venta
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Establecer Valores Predeterminados , como Empresa , Moneda, Año Fiscal Actual, etc"
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +20,Payment Type,Tipo de Pago
-DocType: Salary Manager,Select Employees,Seleccione Empleados
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js +28,Payment Type,Tipo de Pago
+DocType: Process Payroll,Select Employees,Seleccione Empleados
 DocType: Bank Reconciliation,To Date,Hasta la fecha
 DocType: Opportunity,Potential Sales Deal,Trato de ventas potenciales
-sites/assets/js/form.min.js +286,Details,Detalles
+sites/assets/js/form.min.js +294,Details,Detalles
 DocType: Purchase Invoice,Total Taxes and Charges,Total Impuestos y Cargos
 DocType: Email Digest,Payments Made,Pagos Realizados
 DocType: Employee,Emergency Contact,Contacto de Emergencia
@@ -2102,11 +2138,12 @@
 DocType: Shopping Cart Settings,Shopping Cart Settings,Compras Ajustes
 DocType: Journal Entry,Accounting Entries,Asientos Contables
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +24,Duplicate Entry. Please check Authorization Rule {0},Entrada Duplicada. Por favor consulte la Regla de Autorización {0}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +26,Global POS Profile {0} already created for company {1},POS Perfil Global {0} ya creado para la compañía de {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +56,Replace Item / BOM in all BOMs,Reemplazar elemento / Solicitud de Materiales en todas las Solicitudes de Materiales
 DocType: Purchase Order Item,Received Qty,Cantidad Recibida
 DocType: Stock Entry Detail,Serial No / Batch,N º de serie / lote
-DocType: Sales BOM,Parent Item,Artículo Principal
+DocType: Product Bundle,Parent Item,Artículo Principal
 DocType: Account,Account Type,Tipo de Cuenta
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +222,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
 ,To Produce,Producir
@@ -2114,10 +2151,9 @@
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 DocType: Landed Cost Voucher,Purchase Receipt Items,Artículos de Recibo de Compra
-DocType: Party Type,Parent Party Type,Tipo de Partida Principal
+apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Formas Personalización
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +61,Cutting,Corte
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +68,Flattening,Aplastamiento
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +27,Backups will be uploaded to,Respaldos serán subidos a
 DocType: Account,Income Account,Cuenta de Ingresos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +21,Molding,Moldura
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
@@ -2130,60 +2166,59 @@
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.js +48,Voucher #,Comprobante #
 DocType: Notification Control,Purchase Order Message,Mensaje de la Orden de Compra
 DocType: Upload Attendance,Upload HTML,Subir HTML
-apps/erpnext/erpnext/controllers/accounts_controller.py +323,"Total advance ({0}) against Order {1} cannot be greater \
+apps/erpnext/erpnext/controllers/accounts_controller.py +337,"Total advance ({0}) against Order {1} cannot be greater \
 				than the Grand Total ({2})","Avance total ({0}) en contra de la orden {1} no puede ser mayor \
  que el Gran Total ({2})"
 DocType: Employee,Relieving Date,Aliviar Fecha
 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 precios está sobrescribir Precio de lista / definir porcentaje de descuento, sobre la base de algunos criterios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +87,Head of Marketing and Sales,Director de Marketing y Ventas
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de Marketing y Ventas
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la Renta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +156,Laser engineered net shaping,Láser diseñado conformación neta
 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 precios seleccionada está hecho para 'Precio', sobrescribirá Lista de Precios. Regla precio El precio es el precio final, así que no hay descuento adicional debe aplicarse. Por lo tanto, en las transacciones como pedidos de venta, órdenes de compra, etc, se fue a buscar en el campo ""Rate"", en lugar de campo 'Precio de lista Rate'."
-apps/erpnext/erpnext/config/selling.py +158,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
+apps/erpnext/erpnext/config/selling.py +163,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del Artículo
 apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +331,Please enter Item Code to get batch no,"Por favor, introduzca el código del artículo para obtener lotes no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +679,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
-DocType: Global Defaults,For automatic exchange rates go to jsonrates.com and signup for an API key,Para los tipos de cambio automáticas ir a jsonrates.com y registrarse para una clave de API
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +670,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
 apps/erpnext/erpnext/config/selling.py +33,All Addresses.,Todas las Direcciones .
 DocType: Company,Stock Settings,Ajustes de Inventarios
 DocType: User,Bio,Bio
 apps/erpnext/erpnext/accounts/doctype/account/account.py +166,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es el Grupo, Tipo Raíz, Company"
-apps/erpnext/erpnext/config/crm.py +62,Manage Customer Group Tree.,Administrar Árbol de Grupos de Clientes.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +278,New Cost Center Name,Nombre de Nuevo Centro de Coste
+apps/erpnext/erpnext/config/crm.py +67,Manage Customer Group Tree.,Administrar Árbol de Grupos de Clientes.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +282,New Cost Center Name,Nombre de Nuevo Centro de Coste
 DocType: Leave Control Panel,Leave Control Panel,Salir del Panel de Control
-apps/erpnext/erpnext/utilities/doctype/address/address.py +67,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No se encontró la plantilla por defecto Dirección. Por favor, cree una nueva desde Configuración> Prensa y Branding> Plantilla de Dirección."
+apps/erpnext/erpnext/utilities/doctype/address/address.py +87,No default Address Template found. Please create a new one from Setup > Printing and Branding > Address Template.,"No se encontró la plantilla por defecto Dirección. Por favor, cree una nueva desde Configuración> Prensa y Branding> Plantilla de Dirección."
 DocType: Appraisal,HR User,Usuario Recursos Humanos
 DocType: Purchase Invoice,Taxes and Charges Deducted,Impuestos y Gastos Deducidos
-apps/erpnext/erpnext/shopping_cart/utils.py +47,Issues,Cuestiones
-apps/erpnext/erpnext/utilities/__init__.py +24,Status must be one of {0},Estado debe ser uno de {0}
+apps/erpnext/erpnext/shopping_cart/utils.py +46,Issues,Cuestiones
+apps/erpnext/erpnext/controllers/status_updater.py +12,Status must be one of {0},Estado debe ser uno de {0}
 DocType: Sales Invoice,Debit To,Débitar a
 DocType: Delivery Note,Required only for sample item.,Sólo es necesario para el artículo de muestra .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad Real Después de la Transacción
 ,Pending SO Items For Purchase Request,A la espera de SO Artículos A la solicitud de compra
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +143,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +148,Extra Large,Extra grande
+DocType: Manage Variants,Generate Combinations,Generar Combinaciones
 ,Profit and Loss Statement,Estado de Pérdidas y Ganancias
 DocType: Bank Reconciliation Detail,Cheque Number,Número de Cheque
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +42,Pressing,Prensado
 DocType: Payment Tool Detail,Payment Tool Detail,Detalle Herramienta Pago
 ,Sales Browser,Navegador de Ventas
 DocType: Journal Entry,Total Credit,Crédito Total
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +443,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +390,Local,Local
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +439,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +438,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),Préstamos y anticipos (Activos )
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,Deudores
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +142,Large,Grande
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +18,No employee found!,Ningún empleado encontrado!
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +147,Large,Grande
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +23,No employee found!,Ningún empleado encontrado!
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +162,Please mention no of visits required,"¡Por favor, no de visitas requeridas"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de Valoración
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +126,Polishing,Pulido
 DocType: Production Order Operation,Planned Start Time,Planificación de la hora de inicio
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +46,Allocated,Numerado
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +51,Allocated,Numerado
 apps/erpnext/erpnext/config/accounts.py +63,Close Balance Sheet and book Profit or Loss.,Cerrar Balance General y el libro de Pérdidas y Ganancias .
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar Tipo de Cambio para convertir una moneda en otra
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +81,Row{0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partido Tipo y Partido sólo es aplicable contra la cuenta de cobro / pago
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +135,Quotation {0} is cancelled,Cotización {0} se cancela
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Total Monto Pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,Empleado {0} estaba de permiso en {1} . No se puede marcar la asistencia.
@@ -2192,13 +2227,14 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar contra múltiples **vendedores ** para que pueda establecer y monitorear metas.
 ,S.O. No.,S.O. No.
 DocType: Production Order Operation,Make Time Log,Hacer Registro de Tiempo
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +162,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +156,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Computers,Computadoras
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +111,Electro-chemical grinding,Electro-química de molienda
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +14,This is a root customer group and cannot be edited.,Se trata de un grupo de clientes raíz y no se puede editar .
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +39,Please setup your chart of accounts before you start Accounting Entries,"Por favor, configure su plan de cuentas antes de empezar los Registros de Contabilidad"
 DocType: Purchase Invoice,Ignore Pricing Rule,Ignorar la Regla Precios
-sites/assets/js/list.min.js +23,Cancelled,Cancelado
+sites/assets/js/list.min.js +24,Cancelled,Cancelado
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +91,From Date in Salary Structure cannot be lesser than Employee Joining Date.,A partir de la fecha en la estructura salarial no puede ser menor que el empleado Fecha Unirse.
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear Días
 DocType: Journal Entry,Excise Entry,Entrada Impuestos Especiales
@@ -2228,7 +2264,7 @@
  1. Formas de disputas que abordan, indemnización, responsabilidad, etc. 
  1. Dirección y contacto de su empresa."
 DocType: Attendance,Leave Type,Tipo de Vacaciones
-apps/erpnext/erpnext/controllers/stock_controller.py +171,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Cuenta de gastos / Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida """
+apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"Cuenta de gastos / Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida """
 DocType: Account,Accounts User,Cuentas de Usuario
 DocType: Purchase Invoice,"Check if recurring invoice, uncheck to stop recurring or put proper End Date","Marque si es factura periódica, desmarque para detener periodicidad o poner una Fecha de Fin apropiada"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
@@ -2241,64 +2277,65 @@
 DocType: Project Task,Working,Trabajando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Cola de Inventario (FIFO)
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +13,Please select Time Logs.,Por favor seleccione registros de tiempo.
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +43,{0} does not belong to Company {1},{0} no pertenece a la Empresa {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +43,{0} does not belong to Company {1},{0} no pertenece a la Empresa {1}
+DocType: Account,Round Off,Redondear
 ,Requested Qty,Cant. Solicitada
 DocType: BOM Item,Scrap %,Chatarra %
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +38,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Los cargos se distribuirán proporcionalmente basan en Cantidad o importe del artículo, como por su selección"
 DocType: Maintenance Visit,Purposes,Propósitos
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +89,Atleast one item should be entered with negative quantity in return document,Al menos un elemento debe introducirse con cantidad negativa en el documento de devolución
 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ón {0} ya que cualquier tiempo de trabajo disponibles en la estación de trabajo {1}, romper la operación en múltiples operaciones"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +133,Electrochemical machining,Mecanizado electroquímico
 ,Requested,Requerido
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +62,No Remarks,No hay observaciones
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +11,Overdue,Atrasado
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +65,No Remarks,No hay observaciones
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,Atrasado
 DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
 DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,Importe Bruto + Pay arrear Monto + Cobro - Deducción total
 DocType: Monthly Distribution,Distribution Name,Nombre del Distribución
 DocType: Features Setup,Sales and Purchase,Ventas y Compras
 DocType: Pricing Rule,Price / Discount,Precio / Descuento
 DocType: Purchase Order Item,Material Request No,Nº de Solicitud de Material
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +201,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +202,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa a la cual la Moneda del Cliente se convierte a la moneda base de la compañía
-DocType: Purchase Invoice,Discount Amount (Company Currency),Importe del Descuento (Moneda Local)
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +105,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +106,{0} has been successfully unsubscribed from this list.,{0} se ha dado de baja correctamente de esta lista.
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa Neta (Moneda Local)
-apps/erpnext/erpnext/config/crm.py +71,Manage Territory Tree.,Administrar Árbol de Territorio.
+apps/frappe/frappe/templates/base.html +130,Added,Añadido
+apps/erpnext/erpnext/config/crm.py +76,Manage Territory Tree.,Administrar Árbol de Territorio.
 DocType: Payment Reconciliation Payment,Sales Invoice,Factura de Venta
 DocType: Journal Entry Account,Party Balance,Equilibrio Partido
 DocType: Sales Invoice Item,Time Log Batch,Grupo de Horas Registradas
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +344,Please select Apply Discount On,"Por favor, seleccione Aplicar descuento en las"
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +332,Please select Apply Discount On,"Por favor, seleccione Aplicar descuento en las"
 DocType: Company,Default Receivable Account,Cuenta por Cobrar Por defecto
-DocType: Salary Manager,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banco para el sueldo total pagado por los criterios anteriormente seleccionados
-DocType: Item,Item will be saved by this name in the data base.,El artículo será salvado por este nombre en la base de datos.
+DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banco para el sueldo total pagado por los criterios anteriormente seleccionados
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Porcentaje de descuento puede ser aplicado ya sea en contra de una lista de precios o para toda la lista de precios.
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,Año fiscal {0} no se encuentra.
 DocType: Bank Reconciliation,Get Relevant Entries,Obtenga Asientos Correspondientes
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +299,Accounting Entry for Stock,Asiento Contable de Inventario
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +300,Accounting Entry for Stock,Asiento Contable de Inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +63,Coining,Acuñando
 DocType: Sales Invoice,Sales Team1,Team1 Ventas
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,Item {0} does not exist,Elemento {0} no existe
-DocType: Item,"Selecting ""Yes"" will allow you to make a Production Order for this item.","Al seleccionar "" Sí "" permitirá que usted haga una orden de producción por este concepto."
+apps/erpnext/erpnext/stock/doctype/item/item.py +267,Item {0} does not exist,Elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del Cliente
-DocType: Purchase Invoice,Total,Total
+apps/frappe/frappe/desk/query_report.py +136,Total,Total
 DocType: Backup Manager,System for managing Backups,Sistema para la gestión de copias de seguridad
+DocType: Purchase Invoice,Apply Additional Discount On,Aplicar adicional de descuento en las
 DocType: Account,Root Type,Tipo Root
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +79,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +52,Plot,parcela
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta presentación de diapositivas en la parte superior de la página
 DocType: BOM,Item UOM,Unidad de Medida del Artículo
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +165,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +150,Target warehouse is mandatory for row {0},Almacenes de destino es obligatorio para la fila {0}
 DocType: Quality Inspection,Quality Inspection,Inspección de Calidad
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +139,Extra Small,Extra Pequeño
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +144,Extra Small,Extra Pequeño
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +19,Spray forming,Rocíe la formación
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +468,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +157,Account {0} is frozen,Cuenta {0} está congelada
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +469,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: Cantidad de Material Solicitado es menor que Cantidad Mínima Establecida
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +168,Account {0} is frozen,Cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
-apps/erpnext/erpnext/config/setup.py +116,Address master.,Dirección Principal.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +28,"Food, Beverage & Tobacco","Alimentos, Bebidas y Tabaco"
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +20,PL or BS,PL o BS
-apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Porcentaje de comisión no puede ser superior a 100
+apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,Porcentaje de comisión no puede ser superior a 100
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Minimum Inventory Level,Nivel de inventario mínimo
 DocType: Stock Entry,Subcontract,Subcontrato
 DocType: Production Planning Tool,Get Items From Sales Orders,Obtener Elementos de Órdenes de Venta
@@ -2312,12 +2349,13 @@
 DocType: Account,Company,Compañia
 DocType: Account,Expense Account,cuenta de Gastos
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +48,Software,Software
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +146,Colour,Color
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +151,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programado
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde &quot;Es de la Elemento&quot; es &quot;No&quot; y &quot;¿Es de artículos de venta&quot; es &quot;Sí&quot;, y no hay otro paquete de producto"
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Seleccione Distribución Mensual de distribuir de manera desigual a través de objetivos meses.
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
-DocType: Address,Check to make Shipping Address,Seleccione para hacer ésta la de dirección de envío
-apps/erpnext/erpnext/stock/get_item_details.py +253,Price List Currency not selected,Lista de Precios de Divisas no Seleccionado
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.js +38,Create Variants,Crear Variantes
+apps/erpnext/erpnext/stock/get_item_details.py +252,Price List Currency not selected,Lista de Precios de Divisas no Seleccionado
 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,Elemento Fila {0}: Compra de Recibo {1} no existe en la tabla de arriba 'recibos de compra'
 DocType: Pricing Rule,Applicability,Aplicable
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +135,Employee {0} has already applied for {1} between {2} and {3},Empleado {0} ya se ha aplicado para {1} entre {2} y {3}
@@ -2325,35 +2363,37 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,Hasta
 DocType: Rename Tool,Rename Log,Cambiar el Nombre de Sesión
 DocType: Installation Note Item,Against Document No,Contra el Documento No
-apps/erpnext/erpnext/config/selling.py +93,Manage Sales Partners.,Administrar Puntos de venta.
+apps/erpnext/erpnext/config/selling.py +98,Manage Sales Partners.,Administrar Puntos de venta.
 DocType: Quality Inspection,Inspection Type,Tipo de Inspección
-apps/erpnext/erpnext/controllers/recurring_document.py +160,Please select {0},"Por favor, seleccione {0}"
+apps/erpnext/erpnext/controllers/recurring_document.py +162,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +90,Researcher,Investigador
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +95,Researcher,Investigador
 apps/frappe/frappe/custom/doctype/customize_form/customize_form.js +87,Update,Actualización
-apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +75,Please save the Newsletter before sending,"Por favor, guarde el boletín antes de enviar"
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +77,Please save the Newsletter before sending,"Por favor, guarde el boletín antes de enviar"
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +23,Name or Email is mandatory,Nombre o Email es obligatorio
 apps/erpnext/erpnext/config/stock.py +74,Incoming quality inspection.,Inspección de calidad de entrada .
 DocType: Employee,Exit,Salir
 apps/erpnext/erpnext/accounts/doctype/account/account.py +108,Root Type is mandatory,Tipo Root es obligatorio
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +292,Serial No {0} created,Número de orden {0} creado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +124,Vibratory finishing,Acabado vibratorio
-DocType: Item,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
+DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Para comodidad de los clientes , estos códigos se pueden utilizar en formatos impresos como facturas y notas de entrega"
 DocType: Journal Entry Account,Against Purchase Order,Contra la Orden de Compra
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Sales Invoice,Advertisement,Anuncio
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +160,Probationary Period,Período De Prueba
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +165,Probationary Period,Período De Prueba
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las Cuentas de Detalle se permiten en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de Gastos
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Recibo de Compra del Artículo Adquirido
-sites/assets/js/erpnext.min.js +43,Pay,Pagar
+sites/assets/js/erpnext.min.js +46,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_time_log_summary/daily_time_log_summary.py +17,To Datetime,Para Fecha y Hora
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
+apps/erpnext/erpnext/config/crm.py +48,Logs for maintaining sms delivery status,Registros para mantener el estado de entrega de sms
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +136,Grinding,Molienda
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +33,Shrink wrapping,Retractilado
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +167,Confirmed,Confirmado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier > Supplier Type,Proveedor> Tipo de Proveedor
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +123,Please enter relieving date.,Por favor introduzca la fecha aliviar .
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,Por favor introduzca la fecha aliviar .
 apps/erpnext/erpnext/controllers/trends.py +137,Amt,Monto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +237,Serial No {0} status must be 'Available' to Deliver,"Número de orden {0} Estado debe ser "" disponible "" para entregar"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' can be submitted,"Sólo Solicitudes de Vacaciones con estado ""Aprobado"" puede ser enviadas"
@@ -2371,10 +2411,10 @@
 DocType: Purchase Receipt Item,Accepted Warehouse,Almacén Aceptado
 DocType: Bank Reconciliation Detail,Posting Date,Fecha de publicación
 DocType: Item,Valuation Method,Método de Valoración
-DocType: Sales Invoice,Sales Team,Equipo de Ventas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +76,Duplicate entry,Entrada Duplicada
+DocType: Sales Order,Sales Team,Equipo de Ventas
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +81,Duplicate entry,Entrada Duplicada
 DocType: Serial No,Under Warranty,Bajo Garantía
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +425,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +417,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas .
 ,Employee Birthday,Cumpleaños del Empleado
 DocType: GL Entry,Debit Amt,Monto Débito
@@ -2384,7 +2424,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +51,Serial No {0} does not exist,Número de orden {0} no existe
 DocType: Pricing Rule,Discount Percentage,Porcentaje de Descuento
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de Factura
-apps/erpnext/erpnext/shopping_cart/utils.py +44,Orders,Órdenes
+apps/erpnext/erpnext/shopping_cart/utils.py +43,Orders,Órdenes
 DocType: Leave Control Panel,Employee Type,Tipo de Empleado
 DocType: Employee Leave Approver,Leave Approver,Supervisor de Vacaciones
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +69,Swaging,Recalcado
@@ -2395,21 +2435,22 @@
 DocType: Target Detail,Target Detail,Objetivo Detalle
 DocType: Sales Order,% of materials billed against this Sales Order,% De materiales facturados contra esta Orden de Venta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +50,Period Closing Entry,Entrada Período de Cierre
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +36,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +62,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Depreciation,Depreciación
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
 DocType: Email Digest,Payments received during the digest period,Los pagos recibidos durante el período de digestión
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +82,Row # {0}: Rate must be same as {1} {2},Fila # {0}: Tasa debe ser el mismo que {1} {2}
 DocType: Customer,Credit Limit,Límite de Crédito
 DocType: Features Setup,To enable <b>Point of Sale</b> features,Para activar <b> punto de venta </ b> características
 DocType: Purchase Receipt,LR Date,LR Fecha
 apps/erpnext/erpnext/accounts/page/pos/pos_page.html +4,Select type of transaction,Seleccione el tipo de transacción
 DocType: GL Entry,Voucher No,Comprobante No
 DocType: Leave Allocation,Leave Allocation,Asignación de Vacaciones
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +398,'Update Stock' for Sales Invoice {0} must be set,"""Actualizar Inventario"" por la Factura de Venta {0} debe establecerse"
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +402,Material Requests {0} created,Solicitud de Material {0} creada
-apps/erpnext/erpnext/config/selling.py +117,Template of terms or contract.,Plantilla de términos o contrato.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +389,Material Requests {0} created,Solicitud de Material {0} creada
+apps/erpnext/erpnext/config/selling.py +122,Template of terms or contract.,Plantilla de términos o contrato.
+DocType: Customer,Last Day of the Next Month,Último día del siguiente mes
 DocType: Employee,Feedback,Feedback
-apps/erpnext/erpnext/accounts/party.py +192,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Debido / Fecha de referencia supera permitidos días de crédito de clientes por {0} día (s)
+apps/erpnext/erpnext/accounts/party.py +217,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Debido / Fecha de referencia supera permitidos días de crédito de clientes por {0} día (s)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +107,Abrasive jet machining,Mecanizado por chorro abrasivo
 DocType: Stock Settings,Freeze Stock Entries,Helada Stock comentarios
 DocType: Website Settings,Website Settings,Configuración del Sitio Web
@@ -2424,24 +2465,22 @@
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Root account can not be deleted,Cuenta root no se puede borrar
 DocType: GL Entry,Credit Amt,Monto Crédito
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +72,Show Stock Entries,Mostrar Imagenes de entradas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +74,Show Stock Entries,Mostrar Imagenes de entradas
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de Trabajos en Proceso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +273,Reference #{0} dated {1},Referencia # {0} de fecha {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,Reference #{0} dated {1},Referencia # {0} de fecha {1}
 DocType: Pricing Rule,Item Code,Código del artículo
-DocType: Supplier,Material Manager,Gerente de Materiales
 DocType: Production Planning Tool,Create Production Orders,Crear Órdenes de Producción
 DocType: Time Log,Costing Rate (per hour),Costeo Tasa (por hora)
 DocType: Serial No,Warranty / AMC Details,Garantía / AMC Detalles
 DocType: Journal Entry,User Remark,Observación del Usuario
-apps/erpnext/erpnext/config/accounts.py +117,Point-of-Sale Setting,Point -of -Sale Marco
 DocType: Lead,Market Segment,Sector de Mercado
 DocType: Communication,Phone,Teléfono
 DocType: Purchase Invoice,Supplier (Payable) Account,Proveedor (A pagar ) Cuenta
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabajo Interno del Empleado
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +192,Closing (Dr),Cierre (Dr)
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +221,Closing (Dr),Cierre (Dr)
 DocType: Contact,Passive,Pasivo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +242,Serial No {0} not in stock,Número de orden {0} no está en stock
-apps/erpnext/erpnext/config/selling.py +122,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
+apps/erpnext/erpnext/config/selling.py +127,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
 DocType: Sales Invoice,Write Off Outstanding Amount,Solicitar Monto Pendiente
 DocType: Features Setup,"Check if you need automatic recurring invoices. After submitting any sales invoice, Recurring section will be visible.","Marque si necesita facturas periódicas automáticas. Después del envio de cualquier factura de venta , la sección de periodicidad será visible."
 DocType: Account,Accounts Manager,Gerente de Cuentas
@@ -2452,41 +2491,47 @@
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén
 ,Billed Amount,Importe Facturado
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación Bancaria
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +9,Get Updates,Obtener actualizaciones
 DocType: Purchase Invoice,Total Amount To Pay,Monto Total a Pagar
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +174,Material Request {0} is cancelled or stopped,Solicitud de Material {0} cancelada o detenida
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +641,Add a few sample records,Añadir unos registros de ejemplo
+apps/erpnext/erpnext/config/learn.py +174,Leave Management,Deja Gestión
 DocType: Event,Groups,Grupos
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +85,Group by Account,Grupos por Cuenta
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,Grupos por Cuenta
 DocType: Sales Order,Fully Delivered,Totalmente Entregado
 DocType: Lead,Lower Income,Ingreso Bajo
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","El cuenta de Patrimonio , en el que será calculada la  Ganancia / Pérdida"
 DocType: Payment Tool,Against Vouchers,Contra Comprobantes
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +23,Quick Help,Ayuda Rápida
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +184,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +169,Source and target warehouse cannot be same for row {0},Fuente y el almacén de destino no pueden ser la misma para la fila {0}
 DocType: Features Setup,Sales Extras,Extras Ventas
 apps/erpnext/erpnext/accounts/utils.py +311,{0} budget for Account {1} against Cost Center {2} will exceed by {3},{0} presupuesto para la Cuenta {1} en contra de Centros de Costos {2} es mayor por {3}
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +127,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
+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","Cuenta diferencia debe ser un tipo de cuenta de Activos / Pasivos, ya que este archivo reconciliación es una entrada de Apertura"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +123,Purchase Order number required for Item {0},Número de la Orden de Compra se requiere para el elemento {0}
 DocType: Leave Allocation,Carry Forwarded Leaves,Llevar Vacaciones Reenviadas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' A partir de la fecha "" debe ser después de ' A Fecha '"
 ,Stock Projected Qty,Cantidad de Inventario Proyectada
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +143,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +132,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Warranty Claim,From Company,De Compañía
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,Valor o Cant.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Minute,Minuto
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos de Compra y Cargos
 DocType: Backup Manager,Upload Backups to Dropbox,Cargar Copias de Seguridad en Dropbox
 ,Qty to Receive,Cantidad a Recibir
 DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +104,Conversion factor cannot be in fractions,Factor de conversión no puede estar en fracciones
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +356,You will use it to Login,Lo utilizará para iniciar sesión
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +358,You will use it to Login,Lo utilizará para iniciar sesión
 DocType: Sales Partner,Retailer,detallista
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,Todos los Tipos de proveedores
-apps/erpnext/erpnext/stock/doctype/item/item.py +35,Item Code is mandatory because Item is not automatically numbered,Código del Artículo es obligatorio porque el Artículo no se enumera automáticamente
+apps/erpnext/erpnext/stock/doctype/item/item.py +34,Item Code is mandatory because Item is not automatically numbered,Código del Artículo es obligatorio porque el Artículo no se enumera automáticamente
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Quotation {0} not of type {1},Cotización {0} no es de tipo {1}
 DocType: Maintenance Schedule Item,Maintenance Schedule Item,Programa de mantenimiento de artículos
 DocType: Sales Order,%  Delivered,% Entregado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +177,Bank Overdraft Account,Cuenta Crédito en Cuenta Corriente
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +164,Item Variants {0} renamed,Artículo Variantes {0} rebautizado
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +15,Make Salary Slip,Hacer Nómina
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +83,Unstop,Continuar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +85,Unstop,Continuar
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +18,Browse BOM,Navegar por lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +175,Secured Loans,Préstamos Garantizados
 apps/erpnext/erpnext/utilities/doctype/rename_tool/rename_tool.py +49,Ignored:,Ignorado:
 apps/erpnext/erpnext/shopping_cart/__init__.py +68,{0} cannot be purchased using Shopping Cart,{0} no se puede comprar con el carrito
@@ -2501,16 +2546,18 @@
 DocType: Hub Settings,Seller Email,Correo Electrónico del Vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +183,Select Quantity,Seleccione Cantidad
+DocType: Item Price,Bulk Import Help,A granel de importación Ayuda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +185,Select Quantity,Seleccione Cantidad
 DocType: Sales Taxes and Charges Template,"Specify a list of Territories, for which, this Taxes Master is valid","Especifica una lista de territorios , para lo cual, esta Impuestos Master es válida"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,El rol que aprueba no puede ser igual que el rol al que se aplica la regla
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +41,Message Sent,Mensaje enviado
 DocType: Production Plan Sales Order,SO Date,SO Fecha
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +77,Attribute value {0} does not exist in Item Attribute Master.,Atributo valor {0} no existe en el Punto de atributo Maestro.
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base del cliente
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Importe neto (Compañía moneda)
 DocType: BOM Operation,Hour Rate,Hora de Cambio
 DocType: Stock Settings,Item Naming By,Nombres de Artículos por
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +650,From Quotation,desde la cotización
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +637,From Quotation,desde la cotización
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +35,Another Period Closing Entry {0} has been made after {1},Otra entrada de Cierre de Período {0} se ha hecho después de {1}
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para la Fabricación
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +25,Account {0} does not exists,Cuenta {0} no existe
@@ -2519,7 +2566,7 @@
 DocType: Project,Project Type,Tipo de Proyecto
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Cualquiera Cantidad de destino o importe objetivo es obligatoria.
 apps/erpnext/erpnext/config/projects.py +38,Cost of various activities,Costo de diversas actividades
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +93,Not allowed to update stock transactions older than {0},Sin permisos para actualizar las transacciones de valores mayores a {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +100,Not allowed to update stock transactions older than {0},Sin permisos para actualizar las transacciones de valores mayores a {0}
 DocType: Item,Inspection Required,Inspección Requerida
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
 DocType: Sales Order,Fully Billed,Totalmente Facturado
@@ -2527,7 +2574,7 @@
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),El peso bruto del paquete. Peso + embalaje Normalmente material neto . (para impresión)
 DocType: Accounts Settings,Users with this role are allowed to set frozen accounts and create / modify accounting entries against frozen accounts,Los usuarios con esta función pueden establecer cuentas congeladas y crear / modificar los asientos contables contra las cuentas congeladas
 DocType: Serial No,Is Cancelled,CANCELADO
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +291,My Shipments,Mis envíos
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +267,My Shipments,Mis envíos
 DocType: Journal Entry,Bill Date,Fecha de 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:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
 DocType: Supplier,Supplier Details,Detalles del Proveedor
@@ -2537,7 +2584,7 @@
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +38,From value must be less than to value in row {0},De valor debe ser inferior al valor de la fila {0}
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +128,Wire Transfer,Transferencia Bancaria
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +133,Wire Transfer,Transferencia Bancaria
 apps/erpnext/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py +25,Please select Bank Account,Por favor seleccione la cuenta bancaria
 DocType: Newsletter,Create and Send Newsletters,Crear y enviar boletines de noticias
 sites/assets/js/report.min.js +107,From Date must be before To Date,Desde la fecha debe ser antes de la fecha
@@ -2545,39 +2592,40 @@
 DocType: Company,Default Income Account,Cuenta de Ingresos por defecto
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupo de Clientes / Clientes
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea que aparezca en el sitio web
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +189,Welcome to ERPNext,Bienvenido a ERPNext
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +190,Welcome to ERPNext,Bienvenido a ERPNext
 DocType: Payment Reconciliation Payment,Voucher Detail Number,Número de Detalle de Comprobante
+apps/erpnext/erpnext/config/crm.py +141,Lead to Quotation,El plomo a la Petición
 DocType: Lead,From Customer,De cliente
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +37,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Monto total del cálculo del coste (a través de los registros de tiempo)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de Media del Inventario
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +192,Purchase Order {0} is not submitted,Orden de Compra {0} no existe
-apps/erpnext/erpnext/stock/doctype/item/item.py +161,{0} {1} is entered more than once in Item Variants table,{0} {1} se introduce más de una vez en el punto tabla Variantes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Purchase Order {0} is not submitted,Orden de Compra {0} no existe
 ,Projected,Proyectado
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +232,Serial No {0} does not belong to Warehouse {1},Número de orden {0} no pertenece al Almacén {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Note: Reference Date exceeds allowed credit days by {0} days for {1} {2},Nota: Fecha de referencia supera días de crédito permitidas por {0} días para {1} {2}
-apps/erpnext/erpnext/controllers/status_updater.py +96,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará la entrega excesiva y el exceso de reservas para el elemento {0} como la cantidad o la cantidad es 0
+apps/erpnext/erpnext/controllers/status_updater.py +110,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,Nota : El sistema no verificará la entrega excesiva y el exceso de reservas para el elemento {0} como la cantidad o la cantidad es 0
 DocType: Notification Control,Quotation Message,Cotización Mensaje
 DocType: Issue,Opening Date,Fecha de Apertura
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +23,POS Setting {0} already created for user: {1} and company {2},POS Ajuste {0} ya creado para el usuario: {1} y {2} empresa
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y Cantidad
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +41,"Budget cannot be assigned against {0}, as it's not an Expense account","Presupuesto no se puede asignar en contra {0}, ya que no es una cuenta de gastos"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +94,Boring,Aburrido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +680,From Sales Order,De órdenes de venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +667,From Sales Order,De órdenes de venta
 DocType: Blog Category,Parent Website Route,Ruta del Website Principal
 DocType: Sales Order,Not Billed,No Facturado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +107,Both Warehouse must belong to same Company,Ambos Almacenes deben pertenecer a una misma empresa
-sites/assets/js/erpnext.min.js +20,No contacts added yet.,No se han añadido contactos todavía
+sites/assets/js/erpnext.min.js +23,No contacts added yet.,No se han añadido contactos todavía
 apps/frappe/frappe/workflow/doctype/workflow/workflow_list.js +7,Not active,No activo
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +43,Against Invoice Posting Date,Fecha de Contabilización de Factura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +52,Against Invoice Posting Date,Fecha de Contabilización de Factura
 DocType: Purchase Receipt Item,Landed Cost Voucher Amount,Landed Cost Monto Voucher
 DocType: Time Log,Batched for Billing,Lotes para facturar
 apps/erpnext/erpnext/config/accounts.py +23,Bills raised by Suppliers.,Facturas presentadas por los Proveedores.
-DocType: POS Setting,Write Off Account,Solicitar Cuenta
-DocType: Purchase Invoice,Discount Amount,Cantidad de Descuento
+DocType: POS Profile,Write Off Account,Solicitar Cuenta
+sites/assets/js/erpnext.min.js +24,Discount Amount,Cantidad de Descuento
+DocType: Purchase Invoice,Return Against Purchase Invoice,Regreso Contra Compra Factura
 DocType: Item,Warranty Period (in days),Período de garantía ( en días)
 DocType: Email Digest,Expenses booked for the digest period,Gastos reservado para el período de digestión
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,e.g. VAT,por ejemplo IVA
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +550,e.g. VAT,por ejemplo IVA
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Artículo 4
 DocType: Journal Entry Account,Journal Entry Account,Cuenta de Comprobante de  Diario
 DocType: Shopping Cart Settings,Quotation Series,Serie Cotización
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +51,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
@@ -2585,11 +2633,10 @@
 DocType: Sales Order Item,Sales Order Date,Fecha de las Órdenes de Venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad Entregada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +63,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
-DocType: Item,Percentage variation in quantity to be allowed while receiving or delivering this item.,La variación porcentual de la cantidad que se le permita al recibir o entregar este artículo.
 DocType: Shopping Cart Taxes and Charges Master,Shopping Cart Taxes and Charges Master,Compras tasas y cargos Maestro
 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.",Ir al grupo apropiado (por lo general Fuente de los fondos&gt; Pasivos Corrientes&gt; Impuestos y derechos y crear una nueva cuenta (haciendo clic en Añadir niño) de tipo &quot;Impuestos&quot; y hacer hablar de la tasa de impuestos.
 ,Payment Period Based On Invoice Date,Período de pago basado en Fecha de la factura
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +113,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +109,Missing Currency Exchange Rates for {0},Falta de Tipo de Cambio de moneda para {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +134,Laser cutting,Corte por láser
 DocType: Event,Monday,Lunes
 DocType: Journal Entry,Stock Entry,Entrada de Inventario
@@ -2600,11 +2647,10 @@
 DocType: Appraisal Goal,Weightage (%),Coeficiente de ponderación (% )
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de Liquidación
 DocType: Newsletter,Newsletter List,Lista Newsletter
-DocType: Salary Manager,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Marque si usted desea enviar nómina por correo a cada empleado , mientras se sube el detalle de salario"
+DocType: Process Payroll,Check if you want to send salary slip in mail to each employee while submitting salary slip,"Marque si usted desea enviar nómina por correo a cada empleado , mientras se sube el detalle de salario"
 DocType: Lead,Address Desc,Dirección descripción
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +33,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +230,"Difference Account must be a 'Liability' type account, since this Stock Reconciliation is an Opening Entry","Cuenta de Diferencia debe ser una cuenta de tipo 'Patrimonio' , ya que esta Conciliación de Inventario es una Entrada de Apertura"
-apps/erpnext/erpnext/stock/doctype/item/item.js +215,"Variants can not be created manually, add item attributes in the template item","Las variantes no se pueden crear manualmente, agregar atributos de elementos en el elemento de la plantilla"
+apps/erpnext/erpnext/stock/doctype/item/item.js +195,"Variants can not be created manually, add item attributes in the template item","Las variantes no se pueden crear manualmente, agregar atributos de elementos en el elemento de la plantilla"
 apps/erpnext/erpnext/config/manufacturing.py +34,Where manufacturing operations are carried.,¿Dónde se realizan las operaciones de fabricación.
 DocType: Page,All,Todos
 DocType: Stock Entry Detail,Source Warehouse,fuente de depósito
@@ -2613,15 +2659,15 @@
 DocType: C-Form,Total Invoiced Amount,Total Facturado
 DocType: Communication,Sales User,Usuario de Ventas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +46,Min Qty can not be greater than Max Qty,Qty del minuto no puede ser mayor que Max Und
-apps/frappe/frappe/core/page/permission_manager/permission_manager.js +421,Set,conjunto
+apps/frappe/frappe/core/page/permission_manager/permission_manager.js +428,Set,conjunto
 DocType: Item,Warehouse-wise Reorder Levels,Re ordenar Niveles de Almacén
 DocType: Lead,Lead Owner,Propietario de la Iniciativa
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +241,Warehouse is required,Se requiere Almacén
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +245,Warehouse is required,Se requiere Almacén
 DocType: Employee,Marital Status,Estado Civil
 DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
 DocType: Time Log,Will be updated when billed.,Se actualizará cuando se facture.
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Solicitud de Materiales actual y Nueva Solicitud de Materiales no pueden ser iguales
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +111,Date Of Retirement must be greater than Date of Joining,Fecha de la jubilación debe ser mayor que Fecha de acceso
 DocType: Sales Invoice,Against Income Account,Contra la Cuenta de Utilidad
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +52,{0}% Delivered,{0}% Entregado
 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).,Artículo {0}: Cantidad ordenada {1} no puede ser menor que el qty pedido mínimo {2} (definido en el artículo).
@@ -2632,15 +2678,16 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +140,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
-DocType: POS Setting,Update Stock,Actualización de Inventario
+DocType: POS Profile,Update Stock,Actualización de Inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +127,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.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Tasa de Solicitud e Materiales
 DocType: Shopping Cart Settings,"<a href=""#Sales Browser/Territory"">Add / Edit</a>","<a href=""#Sales Browser/Territory""> Añadir / Editar < / a>"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +94,Please pull items from Delivery Note,"Por favor, tire de los artículos en la nota de entrega"
 apps/erpnext/erpnext/accounts/utils.py +235,Journal Entries {0} are un-linked,Comprantes de Diario {0} son no enlazados
+apps/erpnext/erpnext/accounts/general_ledger.py +120,Please mention Round Off Cost Center in Company,"¡Por favor, Ronda Off de centros de coste en la empresa"
 DocType: Purchase Invoice,Terms,Términos
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +235,Create New,Crear Nuevo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +239,Create New,Crear Nuevo
 DocType: Buying Settings,Purchase Order Required,Orden de Compra Requerida
 ,Item-wise Sales History,- Artículo sabio Historia Ventas
 DocType: Expense Claim,Total Sanctioned Amount,Total Sancionada
@@ -2649,16 +2696,16 @@
 DocType: Expense Claim,Task,Tarea
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +56,Shaving,Afeitado
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +67,Batch number is mandatory for Item {0},Número de lote es obligatorio para Punto {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +74,Batch number is mandatory for Item {0},Número de lote es obligatorio para Punto {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +14,This is a root sales person and cannot be edited.,Se trata de una persona de las ventas raíz y no se puede editar .
 ,Stock Ledger,Libro Mayor de Inventarios
 DocType: Salary Slip Deduction,Salary Slip Deduction,Deducción En Planilla
-apps/erpnext/erpnext/stock/doctype/item/item.py +368,"To set reorder level, item must be a Purchase Item","Para definir el nivel de pedido, el artículo debe estar incluido en una Compra de Artículos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +227,"To set reorder level, item must be a Purchase Item","Para definir el nivel de pedido, el artículo debe estar incluido en una Compra de Artículos"
 apps/frappe/frappe/desk/doctype/note/note_list.js +3,Notes,Notas
 DocType: Opportunity,From,Desde
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +192,Select a group node first.,Seleccione un nodo de grupo primero.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +88,Purpose must be one of {0},Propósito debe ser uno de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Fill the form and save it,Llene el formulario y guárdelo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +196,Select a group node first.,Seleccione un nodo de grupo primero.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +76,Purpose must be one of {0},Propósito debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +105,Fill the form and save it,Llene el formulario y guárdelo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas con su estado actual inventario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +93,Facing,Frente a
 DocType: Leave Application,Leave Balance Before Application,Vacaciones disponibles antes de la solicitud
@@ -2669,7 +2716,7 @@
 DocType: Account,Rate at which this tax is applied,Velocidad a la que se aplica este impuesto
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +34,Reorder Qty,Reordenar Cantidad
 DocType: Company,Stock Adjustment Account,Cuenta de Ajuste de existencias
-DocType: Sales Invoice,Write Off,Cancelar
+sites/assets/js/erpnext.min.js +48,Write Off,Cancelar
 DocType: Time Log,Operation ID,ID de Operación
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
@@ -2677,100 +2724,102 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +81,Opportunity Lost,Oportunidad Perdida
 DocType: Features Setup,"Discount Fields will be available in Purchase Order, Purchase Receipt, Purchase Invoice","Los campos descuento estará disponible en orden de compra, recibo de compra , factura de compra"
 DocType: Report,Report Type,Tipo de informe
-apps/frappe/frappe/core/doctype/user/user.js +136,Loading,Cargando
+apps/frappe/frappe/core/doctype/user/user.js +134,Loading,Cargando
 DocType: BOM Replace Tool,BOM Replace Tool,Herramiento de reemplazo de Solicitud de Materiales
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Plantillas por País dirección predeterminada
-apps/erpnext/erpnext/accounts/party.py +196,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+apps/erpnext/erpnext/accounts/party.py +220,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Los datos de importación y exportación
 DocType: Features Setup,If you involve in manufacturing activity. Enables Item 'Is Manufactured',Si usted involucra en la actividad manufacturera . Permite artículo ' está fabricado '
 DocType: Sales Invoice,Rounded Total,Total Redondeado
-DocType: Sales BOM,List items that form the package.,Lista de tareas que forman el paquete .
+DocType: Product Bundle,List items that form the package.,Lista de tareas que forman el paquete .
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Porcentaje de asignación debe ser igual al 100 %
 DocType: Serial No,Out of AMC,Fuera de AMC
 DocType: Purchase Order Item,Material Request Detail No,Detalle de Solicitud de Materiales No
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +96,Hard turning,Torneado duro
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.js +33,Make Maintenance Visit,Hacer Visita de Mantenimiento
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +165,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +168,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de Tesorería por Defecto
-apps/erpnext/erpnext/config/setup.py +91,Company (not Customer or Supplier) master.,Company (no cliente o proveedor ) maestro.
+apps/erpnext/erpnext/config/accounts.py +79,Company (not Customer or Supplier) master.,Company (no cliente o proveedor ) maestro.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +68,Please enter 'Expected Delivery Date',"Por favor, introduzca "" la fecha del alumbramiento '"
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +492,"List your tax heads (e.g. VAT, Excise; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later.","Enumere sus cabezas fiscales ( por ejemplo, IVA , impuestos especiales , sino que deben tener nombres únicos ) y sus tasas estándar."
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +168,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota de Entrega {0} debe ser cancelado antes de cancelar esta Orden Ventas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +323,Paid amount + Write Off Amount can not be greater than Grand Total,Cantidad pagada + Escribir Off La cantidad no puede ser mayor que Gran Total
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +69,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válida para el elemento {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +318,Paid amount + Write Off Amount can not be greater than Grand Total,Cantidad pagada + Escribir Off La cantidad no puede ser mayor que Gran Total
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válida para el elemento {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +109,Note: There is not enough leave balance for Leave Type {0},Nota : No suficiente saldo de vacaciones para el Tipo de Vacaciones {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 pago no se hace en contra de cualquier referencia, hacer entrada de diario manualmente."
 DocType: Item,Supplier Items,Artículos del Proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +165,Please enter atleast one attribute row in Item Variants table,Introduzca al menos un atributo en la fila de artículos Variantes de mesa
 DocType: Opportunity,Opportunity Type,Tipo de Oportunidad
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +42,New Company,Nueva Empresa
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +50,Cost Center is required for 'Profit and Loss' account {0},"Se requiere de Centros de Costos para la cuenta "" Pérdidas y Ganancias "" {0}"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,Cost Center is required for 'Profit and Loss' account {0},"Se requiere de Centros de Costos para la cuenta "" Pérdidas y Ganancias "" {0}"
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +16,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borrados por el creador de la Compañía
-apps/erpnext/erpnext/accounts/general_ledger.py +21,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Número incorrecto de entradas del libro mayor encontrado. Es posible que haya seleccionado una cuenta equivocada en la transacción.
+apps/erpnext/erpnext/accounts/general_ledger.py +22,Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction.,Número incorrecto de entradas del libro mayor encontrado. Es posible que haya seleccionado una cuenta equivocada en la transacción.
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +31,To create a Bank Account,Para crear una Cuenta Bancaria
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +101,Date of Birth cannot be greater than today.,Fecha de nacimiento no puede ser posterior a la fecha de hoy.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,Fecha de nacimiento no puede ser posterior a la fecha de hoy.
 ,Stock Ageing,Envejecimiento de existencias
 DocType: Purchase Receipt,Automatically updated from BOM table,Actualizado automáticamente en el cuadro de lista de materiales
-apps/erpnext/erpnext/controllers/accounts_controller.py +170,{0} '{1}' is disabled,{0} '{1}' no esta activado
+apps/erpnext/erpnext/controllers/accounts_controller.py +184,{0} '{1}' is disabled,{0} '{1}' no esta activado
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a Contactos en transacciones SOMETER.
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +282,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +270,"Row {0}: Qty not avalable in warehouse {1} on {2} {3}.
 					Available Qty: {4}, Transfer Qty: {5}","Fila {0}: Cantidad no esta disponible en almacén {1} del {2} {3}.  Disponible Cantidad: {4}, Transferir Cantidad: {5}"
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Artículo 3
 DocType: Backup Manager,Sync with Dropbox,Sincronización con Dropbox
 DocType: Event,Sunday,Domingo
 DocType: Sales Team,Contribution (%),Contribución (%)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +412,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : La entrada de pago no se creará desde ' Dinero en efectivo o cuenta bancaria ' no se ha especificado
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +400,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : La entrada de pago no se creará desde ' Dinero en efectivo o cuenta bancaria ' no se ha especificado
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +171,Responsibilities,Responsabilidades
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +9,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre del Vendedor
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Por favor introduzca al menos 1 de facturas en la tabla
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +511,Add Users,Agregar usuarios
 DocType: Pricing Rule,Item Group,Grupo de artículos
 DocType: Task,Actual Start Date (via Time Logs),Fecha de inicio actual (via Registros Temporales)
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de la reconciliación
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
-apps/erpnext/erpnext/stock/doctype/item/item.py +334,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Artículo Impuesto Row {0} debe tener en cuenta el tipo de impuestos o ingresos o de gastos o Imponible
+apps/erpnext/erpnext/stock/doctype/item/item.py +192,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Artículo Impuesto Row {0} debe tener en cuenta el tipo de impuestos o ingresos o de gastos o Imponible
 DocType: Sales Order,Partly Billed,Parcialmente Facturado
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +78,Decambering,Decambering
-apps/erpnext/erpnext/setup/doctype/company/company.js +17,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
+apps/erpnext/erpnext/setup/doctype/company/company.js +22,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Monto Total Soprepasado
 DocType: Time Log Batch,Total Hours,Total de Horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +266,Total Debit must be equal to Total Credit. The difference is {0},El total de Débitos debe ser igual al total de Créditos. La diferencia es {0} 
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},El total de Débitos debe ser igual al total de Créditos. La diferencia es {0} 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +10,Automotive,Automotor
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +40,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vacaciones para el tipo {0} ya asignado para Empleado {1} para el Año Fiscal {0}
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +37,Leaves for type {0} already allocated for Employee {1} for Fiscal Year {0},Vacaciones para el tipo {0} ya asignado para Empleado {1} para el Año Fiscal {0}
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +15,Item is required,Articulo es requerido
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +24,Metal injection molding,Moldeo por inyección de metal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +697,From Delivery Note,De la nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +684,From Delivery Note,De la nota de entrega
 DocType: Time Log,From Time,From Time
 DocType: Notification Control,Custom Message,Mensaje personalizado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +32,Investment Banking,Banca de Inversión
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,"Select your Country, Time Zone and Currency","Seleccione su País, Zona Horaria y Moneda"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +319,Cash or Bank Account is mandatory for making payment entry,Cuenta de Efectivo o Cuenta Bancaria es obligatoria para hacer una entrada de pago
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +261,"Select your Country, Time Zone and Currency","Seleccione su País, Zona Horaria y Moneda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +314,Cash or Bank Account is mandatory for making payment entry,Cuenta de Efectivo o Cuenta Bancaria es obligatoria para hacer una entrada de pago
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +214,{0} {1} status is Unstopped,{0} {1} estado es Continuado
 DocType: Purchase Invoice,Price List Exchange Rate,Lista de precios Tipo de Cambio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +90,Pickling,Decapado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +17,Sand casting,Fundición de arena
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +116,Electroplating,Galvanoplastia
 DocType: Purchase Invoice Item,Rate,Tarifa
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Intern,Interno
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +62,Intern,Interno
+DocType: Manage Variants Item,Manage Variants Item,Administrar Variantes del artículo
 DocType: Newsletter,A Lead with this email id should exist,Una Iniciativa con este correo electrónico debería existir
 DocType: Stock Entry,From BOM,A partir de la lista de materiales
 DocType: Time Log,Billing Rate (per hour),Tasa de facturación (por hora)
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +34,Basic,Básico
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +86,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +93,Stock transactions before {0} are frozen,Operaciones de Inventario antes de {0} se congelan
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +226,Please click on 'Generate Schedule',"Por favor, haga clic en ' Generar la Lista de"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +78,To Date should be same as From Date for Half Day leave,Hasta la fecha debe ser igual a Partir de la fecha para la licencia de medio día
-apps/erpnext/erpnext/config/stock.py +110,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +115,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +104,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
+apps/erpnext/erpnext/config/stock.py +115,"e.g. Kg, Unit, Nos, m","por ejemplo Kg , Unidad , Nos, m"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +114,Reference No is mandatory if you entered Reference Date,Referencia No es obligatorio si introdujo Fecha de Referencia
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +108,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 DocType: Salary Structure,Salary Structure,Estructura Salarial
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +237,"Multiple Price Rule exists with same criteria, please resolve \
 			conflict by assigning priority. Price Rules: {0}","Existe Regla de Múltiple Precio con los mismos criterios, por favor resolver \
  conflicto mediante la asignación de prioridad. Reglas de Precio: {0}"
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +8,Airline,Línea Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +511,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +512,Issue Material,Material Issue
 DocType: Material Request Item,For Warehouse,para el almacén
 DocType: Employee,Offer Date,Fecha de Oferta
 DocType: Hub Settings,Access Token,Token de acceso
@@ -2780,14 +2829,14 @@
 DocType: Stock Entry,Including items for sub assemblies,Incluyendo artículos para subconjuntos
 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 usted tiene formatos de impresión largos , esta característica puede ser utilizada para dividir la página que se imprimirá en varias páginas con todos los encabezados y pies de página en cada página"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +130,Hobbing,Hobbing
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +93,All Territories,Todos los Territorios
-DocType: Party Type,Party Type Name,Nombre del Tipo de Partida
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Artículos
 DocType: Fiscal Year,Year Name,Nombre de Año
-DocType: Salary Manager,Process Payroll,Nómina de Procesos
+DocType: Process Payroll,Process Payroll,Nómina de Procesos
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +59,There are more holidays than working days this month.,Hay más vacaciones que días de trabajo este mes.
+DocType: Product Bundle Item,Product Bundle Item,Producto Bundle artículo
 DocType: Sales Partner,Sales Partner Name,Nombre de Socio de Ventas
-DocType: Purchase Order Item,Image View,Imagen Vista
+DocType: Purchase Invoice Item,Image View,Imagen Vista
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +112,Finishing & industrial finishing,Acabado y acabado industrial
 DocType: Issue,Opening Time,Tiempo de Apertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Desde y Hasta la fecha solicitada
@@ -2796,7 +2845,7 @@
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +97,Drilling,Perforación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +27,Blow molding,El moldeo por soplado
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y Total
-apps/erpnext/erpnext/stock/doctype/item/item.js +65,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado
+apps/erpnext/erpnext/stock/doctype/item/item.js +35,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado
 DocType: Account,Purchase User,Usuario de Compras
 DocType: Sales Order,Customer's Purchase Order Number,Número de Pedido de Compra del Cliente
 DocType: Notification Control,Customize the Notification,Personalice la Notificación
@@ -2808,46 +2857,49 @@
 DocType: Quotation,Maintenance Manager,Gerente de Mantenimiento
 DocType: Workflow State,Search,Búsqueda
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +14,'Days Since Last Order' must be greater than or equal to zero,' Días desde el Último Pedido ' debe ser mayor o igual a cero
+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,' Días desde el Último Pedido ' debe ser mayor o igual a cero
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +141,Brazing,Soldadura
 DocType: C-Form,Amended From,Modificado Desde
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +571,Raw Material,Materia Prima
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +623,Raw Material,Materia Prima
 DocType: Leave Application,Follow via Email,Siga a través de correo electrónico
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total de Impuestos Después Cantidad de Descuento
 apps/erpnext/erpnext/accounts/doctype/account/account.py +146,Child account exists for this account. You can not delete this account.,Cuenta secundaria existe para esta cuenta. No es posible eliminar esta cuenta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Cualquiera Cantidad Meta o Monto Meta es obligatoria
-apps/erpnext/erpnext/stock/get_item_details.py +421,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
+apps/erpnext/erpnext/stock/get_item_details.py +420,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
 DocType: Leave Allocation,Carry Forward,Llevar adelante
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +54,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
 DocType: Department,Days for which Holidays are blocked for this department.,Días para los que Días Feriados se bloquean para este departamento .
 ,Produced,Producido
+DocType: Item,Item Code for Suppliers,Código del artículo para Proveedores
 DocType: Issue,Raised By (Email),Raised By (Email )
 DocType: Email Digest,General,General
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +475,Attach Letterhead,Adjuntar Membrete
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +495,Attach Letterhead,Adjuntar Membrete
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +272,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y 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.","Enumere sus cabezas fiscales (por ejemplo, el IVA, aduanas, etc., sino que deben tener nombres únicos) y sus tarifas estándar. Esto creará una plantilla estándar, que puede editar y añadir más tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +244,Serial Nos Required for Serialized Item {0},Serie n Necesario para artículo serializado {0}
 DocType: Journal Entry,Bank Entry,Entrada de Banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Denominación )
 DocType: Blog Post,Blog Post,Entrada en el Blog
-apps/erpnext/erpnext/templates/generators/item.html +32,Add to Cart,Añadir a la Cesta
+apps/erpnext/erpnext/templates/generators/item.html +35,Add to Cart,Añadir a la Cesta
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Agrupar por
-apps/erpnext/erpnext/config/accounts.py +133,Enable / disable currencies.,Habilitar / deshabilitar las monedas .
+apps/erpnext/erpnext/config/accounts.py +138,Enable / disable currencies.,Habilitar / deshabilitar las monedas .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +114,Postal Expenses,Gastos Postales
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +25,Entertainment & Leisure,Entretenimiento y Ocio
 DocType: Purchase Order,The date on which recurring order will be stop,La fecha en que se detiene el pedido recurrente
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Attribute Value {0} cannot be removed from {1} as Item Variants exist with this Attribute.,Atributo Valor {0} no puede ser removido de {1} como existen variantes artículo con este atributo.
 DocType: Quality Inspection,Item Serial No,Nº de Serie del Artículo
-apps/erpnext/erpnext/controllers/status_updater.py +102,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
+apps/erpnext/erpnext/controllers/status_updater.py +116,{0} must be reduced by {1} or you should increase overflow tolerance,{0} debe reducirse en {1} o se debe aumentar la tolerancia de desbordamiento
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Presente
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +575,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +133,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +627,Hour,Hora
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +138,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation","Serializado artículo {0} no se puede actualizar utilizando \
  Stock Reconciliación"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +480,Transfer Material to Supplier,Transferencia de material a proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +476,Transfer Material to Supplier,Transferencia de material a proveedor
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +30,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nueva serie n no puede tener Warehouse. Depósito debe ser ajustado por Stock Entrada o recibo de compra
 DocType: Lead,Lead Type,Tipo de Iniciativa
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +77,Create Quotation,Crear Cotización
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +316,All these items have already been invoiced,Todos estos elementos ya fueron facturados
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +292,All these items have already been invoiced,Todos estos elementos ya fueron facturados
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +37,Can be approved by {0},Puede ser aprobado por {0}
 DocType: Shipping Rule,Shipping Rule Conditions,Regla envío Condiciones
 DocType: BOM Replace Tool,The new BOM after replacement,La nueva Solicitud de Materiales después de la sustitución
@@ -2863,13 +2915,12 @@
 DocType: Job Opening,Job Title,Título del trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +84,{0} Recipients,{0} Destinatarios
 DocType: Features Setup,Item Groups in Details,Grupos de componentes en detalles
-apps/erpnext/erpnext/accounts/doctype/pos_setting/pos_setting.py +32,Expense Account is mandatory,Cuenta de Gastos es obligatorio
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +32,Expense Account is mandatory,Cuenta de Gastos es obligatorio
 apps/erpnext/erpnext/accounts/page/pos/pos.js +4,Start Point-of-Sale (POS),Inicio de punto de venta (POS)
-DocType: Item,A new variant (Item) will be created for each attribute value combination,Una nueva variante (Elemento) será creado para cada combinación de valor de atributo
 apps/erpnext/erpnext/config/support.py +28,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Porcentaje que se les permite recibir o entregar más en contra de la cantidad pedida . Por ejemplo : Si se ha pedido 100 unidades. y el subsidio es de 10 %, entonces se le permite recibir 110 unidades."
 DocType: Pricing Rule,Customer Group,Grupo de Clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,Expense account is mandatory for item {0},Cuenta de gastos es obligatorio para el elemento {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +156,Expense account is mandatory for item {0},Cuenta de gastos es obligatorio para el elemento {0}
 DocType: Item,Website Description,Descripción del Sitio Web 
 DocType: Serial No,AMC Expiry Date,AMC Fecha de caducidad
 ,Sales Register,Resitro de Ventas
@@ -2879,18 +2930,20 @@
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +38,Cold rolling,Laminación en frío
 DocType: Customer Group,Customer Group Name,Nombre del grupo del Cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +358,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine este Factura {0} de C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +353,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine este 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,Por favor seleccione Carry Forward si también desea incluir el saldo del ejercicio anterior deja a este año fiscal
 DocType: GL Entry,Against Voucher Type,Contra Comprobante Tipo
-DocType: POS Setting,POS Setting,POS Ajuste
+DocType: Manage Variants Item,Attributes,Atributos
 DocType: Packing Slip,Get Items,Obtener Artículos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Please enter Write Off Account,Por favor introduce Escriba Off Cuenta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +178,Please enter Write Off Account,Por favor introduce Escriba Off Cuenta
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +71,Last Order Date,Última Fecha de pedido
 DocType: DocField,Image,Imagen
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +220,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +628,Make Packing Slip,Hacer Lista de Empaque
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +155,Make Excise Invoice,Hacer Impuestos Especiales de la Factura
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +619,Make Packing Slip,Hacer Lista de Empaque
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +39,Account {0} does not belongs to company {1},Cuenta {0} no pertenece a la compañía de {1}
 DocType: Communication,Other,Otro
 DocType: C-Form,C-Form,C - Forma
-apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +134,Operation ID not set,ID de Operación no definido
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +137,Operation ID not set,ID de Operación no definido
 DocType: Production Order,Planned Start Date,Fecha de inicio prevista
 DocType: Serial No,Creation Document Type,Tipo de creación de documentos
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
@@ -2900,7 +2953,7 @@
 apps/erpnext/erpnext/controllers/trends.py +257,Project-wise data is not available for Quotation,Datos del proyecto - sabio no está disponible para la cita
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +366,Commercial,Comercial
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +419,Commercial,Comercial
 DocType: Cost Center,Distribution Id,Id Distribución
 apps/erpnext/erpnext/setup/page/setup_wizard/data/sample_home_page.html +14,Awesome Services,Servicios Impresionantes 
 apps/erpnext/erpnext/config/manufacturing.py +29,All Products or Services.,Todos los Productos o Servicios .
@@ -2908,31 +2961,35 @@
 DocType: Contact Us Settings,Address Line 2,Dirección Línea 2
 DocType: ToDo,Reference,Referencia
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +58,Perforating,Perforado
-apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Out Qty,Salir Cant.
-apps/erpnext/erpnext/config/accounts.py +118,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío para una venta
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +65,Selected Item cannot have Variants.,Elemento seleccionado no puede tener variantes.
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Salir Cant.
+apps/erpnext/erpnext/config/accounts.py +123,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío para una venta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +31,Series is mandatory,Serie es obligatorio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +27,Financial Services,Servicios Financieros
 DocType: Opportunity,Sales,Venta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +166,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +155,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +87,Cr,Cr
 DocType: Customer,Default Receivable Accounts,Cuentas por Cobrar Por Defecto 
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +101,Sawing,Serrar
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +31,Laminating,Laminación
 DocType: Item Reorder,Transfer,Transferencia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +567,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +568,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
+apps/erpnext/erpnext/controllers/accounts_controller.py +88,Due Date is mandatory,Fecha de vencimiento es obligatorio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +142,Sintering,La sinterización
 DocType: Journal Entry,Pay To / Recd From,Pagar a / Recibido de
 DocType: Naming Series,Setup Series,Serie de configuración
 DocType: Supplier,Contact HTML,"HTML del Contacto
 "
+apps/erpnext/erpnext/stock/doctype/item/item.js +90,You have unsaved changes. Please save.,"Usted tiene cambios no guardados. Por favor, guarde."
 DocType: Landed Cost Voucher,Purchase Receipts,Recibo de Compra
 DocType: Payment Reconciliation,Maximum Amount,Importe máximo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la Regla Precios?
 DocType: Quality Inspection,Delivery Note No,No. de Nota de Entrega
 DocType: Company,Retail,venta al por menor
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +106,Customer {0} does not exist,{0} no existe Cliente
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +107,Customer {0} does not exist,{0} no existe Cliente
 DocType: Attendance,Absent,Ausente
+DocType: Product Bundle,Product Bundle,Bundle Producto
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +164,Crushing,Aplastante
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Compra las tasas y cargos Plantilla
 DocType: Upload Attendance,Download Template,Descargar Plantilla
@@ -2940,54 +2997,57 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
 DocType: Journal Entry,Write Off Based On,Solicitar Basado en
 DocType: Features Setup,POS View,POS Ver
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +655,Make Sales Return,Hacer Retorno Ventas
 apps/erpnext/erpnext/config/stock.py +33,Installation record for a Serial No.,Registro de la instalación para un número de serie
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +8,Continuous casting,La colada continua
-sites/assets/js/erpnext.min.js +6,Please specify a,"Por favor, especifique un"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +490,Make Purchase Invoice,Hacer factura de compra
+sites/assets/js/erpnext.min.js +9,Please specify a,"Por favor, especifique un"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +513,Make Purchase Invoice,Hacer factura de compra
 DocType: Offer Letter,Awaiting Response,Esperando la Respuesta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +79,Cold sizing,Dimensionamiento Fría
 DocType: Salary Slip,Earning & Deduction,Ganancia y Descuento
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +70,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +257,Region,Región
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +208,Optional. This setting will be used to filter in various transactions.,Opcional . Este ajuste se utiliza para filtrar en varias transacciones.
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +99,Negative Valuation Rate is not allowed,Negativo valoración de tipo no está permitida
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +259,Region,Región
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +212,Optional. This setting will be used to filter in various transactions.,Opcional . Este ajuste se utiliza para filtrar en varias transacciones.
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +104,Negative Valuation Rate is not allowed,Negativo valoración de tipo no está permitida
 DocType: Holiday List,Weekly Off,Semanal Desactivado
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Por ejemplo, 2012 , 2012-13"
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +13,Dropbox,Dropbox
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +32,Provisional Profit / Loss (Credit),Beneficio / Pérdida (Crédito) Provisional 
+DocType: Sales Invoice,Return Against Sales Invoice,Regreso Contra Ventas Factura
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Tema 5
 apps/erpnext/erpnext/accounts/utils.py +243,Please set default value {0} in Company {1},"Por favor, establece el valor por defecto {0} en la empresa {1}"
 DocType: Serial No,Creation Time,Momento de la creación
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ingresos Totales
+DocType: Sales Invoice,Product Bundle Help,Producto Bundle Ayuda
 ,Monthly Attendance Sheet,Hoja de Asistencia Mensual
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +17,No record found,No se encontraron registros
-apps/erpnext/erpnext/controllers/stock_controller.py +174,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costo es obligatorio para el punto {2}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +73,Account {0} is inactive,Cuenta {0} está inactiva
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No se encontraron registros
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costo es obligatorio para el punto {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +76,Account {0} is inactive,Cuenta {0} está inactiva
 DocType: GL Entry,Is Advance,Es Avance
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +20,Attendance From Date and Attendance To Date is mandatory,Asistencia Desde Fecha y Hasta Fecha de Asistencia es obligatoria
-apps/erpnext/erpnext/controllers/buying_controller.py +132,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca "" se subcontrata "" como Sí o No"
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia Desde Fecha y Hasta Fecha de Asistencia es obligatoria
+apps/erpnext/erpnext/controllers/buying_controller.py +131,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca "" se subcontrata "" como Sí o No"
 DocType: Sales Team,Contact No.,Contacto No.
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pérdidas y Ganancias "" tipo de cuenta {0} no se permite en la Entrada de Apertura"
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +64,'Profit and Loss' type account {0} not allowed in Opening Entry,"""Pérdidas y Ganancias "" tipo de cuenta {0} no se permite en la Entrada de Apertura"
 DocType: Workflow State,Time,Tiempo
 DocType: Features Setup,Sales Discounts,Descuentos sobre Ventas
 DocType: Hub Settings,Seller Country,País del Vendedor 
 DocType: Authorization Rule,Authorization Rule,Regla de Autorización
 DocType: Sales Invoice,Terms and Conditions Details,Detalle de Términos y Condiciones 
-apps/erpnext/erpnext/templates/generators/item.html +49,Specifications,Especificaciones
+apps/erpnext/erpnext/templates/generators/item.html +52,Specifications,Especificaciones
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Impuestos y cargos de venta de plantilla
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +9,Apparel & Accessories,Ropa y Accesorios
-DocType: Item,"Mandatory if Stock Item is ""Yes"". Also the default warehouse where reserved quantity is set from Sales Order.","Obligatorio si es Elemento del Inventario es ""Sí"" . También el almacén por defecto en que la cantidad reservada se establece a partir de Órdenes de Venta ."
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +57,Number of Order,Número de Orden
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +67,Number of Order,Número de Orden
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / Banner que aparecerá en la parte superior de la lista de productos.
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones de calcular el importe de envío
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +117,Add Child,Añadir Hijo
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +121,Add Child,Añadir Hijo
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Función Permitida para Establecer Cuentas Congeladas y Editar Entradas Congeladas
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +26,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de Centros de Costos a una cuenta del Libro de Mayor , ya que tiene nodos secundarios"
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +52,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de Centros de Costos a una cuenta del Libro de Mayor , ya que tiene nodos secundarios"
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +25,Conversion Factor is required,Se requiere el factor de conversión
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +32,Serial #,Serial #
+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,Comisión de Ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
 ,Customers Not Buying Since Long Time,Clientes que no han comprado desde hace mucho tiempo
 DocType: Production Order,Expected Delivery Date,Fecha Esperada de Envio
+apps/erpnext/erpnext/accounts/general_ledger.py +107,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +47,Bulging,Abultado
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +10,Evaporative-pattern casting,Evaporativo-modelo de fundición
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +93,Entertainment Expenses,Gastos de Entretenimiento
@@ -3005,43 +3065,45 @@
 DocType: Sales Partner,Logo,Logo
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +212,{0} Serial Numbers required for Item {0}. Only {0} provided.,{0} de números de serie de artículos requeridos para {0} . Sólo {0} prevista .
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,Seleccione esta opción si desea obligar al usuario a seleccionar una serie antes de guardar. No habrá ninguna por defecto si marca ésta .
-apps/erpnext/erpnext/stock/get_item_details.py +108,No Item with Serial No {0},Ningún artículo con Serial No {0}
+apps/erpnext/erpnext/stock/get_item_details.py +107,No Item with Serial No {0},Ningún artículo con Serial No {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +68,Direct Expenses,Gastos Directos
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +645,Do you really want to UNSTOP this Material Request?,¿De verdad quiere destapar esta demanda de materiales?
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +646,Do you really want to UNSTOP this Material Request?,¿De verdad quiere destapar esta demanda de materiales?
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ingresos por Nuevo Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +132,Travel Expenses,Gastos de Viaje
 DocType: Maintenance Visit,Breakdown,Desglose
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +43,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +33,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
+apps/erpnext/erpnext/setup/doctype/company/company.js +38,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +110,Honing,Afilando
 DocType: Serial No,"Only Serial Nos with status ""Available"" can be delivered.","Sólo los Números de Serie con estado ""Disponible"" pueden ser entregados."
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +53,Probation,libertad condicional
-apps/erpnext/erpnext/stock/doctype/item/item.py +94,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para elementos del almacén.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +58,Probation,libertad condicional
+apps/erpnext/erpnext/stock/doctype/item/item.py +91,Default Warehouse is mandatory for stock Item.,Almacén por defecto es obligatorio para elementos del almacén.
 DocType: Feed,Full Name,Nombre Completo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +147,Clinching,Remachado
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.py +188,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +191,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} y {1} años
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Monto Total de Pago
-apps/erpnext/erpnext/accounts/general_ledger.py +91,Debit and Credit not equal for this voucher. Difference is {0}.,Débito y Crédito no son iguales para este comprobante. La diferencia es {0} .
 ,Transferred Qty,Cantidad Transferida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Planning,Planificación
+apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +137,Planning,Planificación
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +9,Make Time Log Batch,Haga Registro de Tiempo de Lotes
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Monto total de facturación (a través de los registros de tiempo)
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +577,We sell this Item,Vendemos este artículo
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +66,Supplier Id,Proveedor Id
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +629,We sell this Item,Vendemos este artículo
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +65,Supplier Id,Proveedor Id
 DocType: Journal Entry,Cash Entry,Entrada de Efectivo
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
-apps/erpnext/erpnext/stock/doctype/item/item.py +190,Item Variants {0} created,{0} variantes creadas del artículo
+apps/erpnext/erpnext/stock/doctype/manage_variants/manage_variants.py +158,Item Variants {0} created,{0} variantes creadas del artículo
 apps/erpnext/erpnext/config/hr.py +135,"Type of leaves like casual, sick etc.","Tipo de vacaciones como, enfermo, casual, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periódicos resumidos por correo electrónico.
+DocType: Brand,Item Manager,Administración de elementos
 DocType: Cost Center,Add rows to set annual budgets on Accounts.,Añadir filas para establecer los presupuestos anuales de las Cuentas .
 DocType: Buying Settings,Default Supplier Type,Tipo Predeterminado de Proveedor
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +159,Quarrying,Extracción
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +153,Note: Item {0} entered multiple times,Nota : El artículo {0} entrado varias veces
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +142,Note: Item {0} entered multiple times,Nota : El artículo {0} entrado varias veces
 apps/erpnext/erpnext/config/crm.py +27,All Contacts.,Todos los Contactos .
 DocType: Newsletter,Test Email Id,Prueba de Identificación del email
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +392,Company Abbreviation,Abreviatura de la Empresa
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,Company Abbreviation,Abreviatura de la Empresa
 DocType: Features Setup,If you follow Quality Inspection. Enables Item QA Required and QA No in Purchase Receipt,Si usted sigue la Inspección de calidad . Permite Artículo QA Obligatorio y QA No en recibo de compra
 DocType: GL Entry,Party Type,Tipo de Partida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +68,Raw material cannot be same as main Item,La materia prima no puede ser la misma que el artículo principal
@@ -3053,26 +3115,25 @@
 DocType: Payment Tool,Set Matching Amounts,Establecer montos a juego
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y Cargos Adicionales
 ,Sales Funnel,Embudo de Ventas
-apps/erpnext/erpnext/shopping_cart/utils.py +34,Cart,Carro
+apps/erpnext/erpnext/shopping_cart/utils.py +33,Cart,Carro
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +135,Thank you for your interest in subscribing to our updates,Gracias por su interés en suscribirse a nuestras actualizaciones
 ,Qty to Transfer,Cantidad a Transferir
 apps/erpnext/erpnext/config/selling.py +18,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
 DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
 ,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo 
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +96,All Customer Groups,Todos los Grupos de Clientes
-apps/erpnext/erpnext/controllers/accounts_controller.py +366,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez no se ha creado registro para el Tipo de Cambio {1} a {2}.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +101,All Customer Groups,Todos los Grupos de Clientes
+apps/erpnext/erpnext/controllers/accounts_controller.py +399,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Tal vez no se ha creado registro para el Tipo de Cambio {1} a {2}.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +37,Account {0}: Parent account {1} does not exist,Cuenta {0}: Cuenta Padre {1} no existe
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Lista de Precios Tarifa (Moneda Local)
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +83,{0} {1} status is 'Stopped',{0} {1} estado es ' Detenido '
 DocType: Account,Temporary,Temporal
 DocType: Address,Preferred Billing Address,Preferida Dirección de Facturación
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación de
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +81,Secretary,Secretario
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Secretary,Secretario
 DocType: Serial No,Distinct unit of an Item,Unidad distinta de un artículo
-apps/erpnext/erpnext/config/setup.py +96,Item master.,Maestro de Artículos .
 DocType: Pricing Rule,Buying,Compra
 DocType: HR Settings,Employee Records to be created by,Registros de empleados a ser creados por
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.js +24,This Time Log Batch has been cancelled.,Este Grupo de Horas Registradas se ha facturado.
-DocType: Purchase Invoice,Apply Discount On,Aplicar de descuento en las
 DocType: Salary Slip Earning,Salary Slip Earning,Ingreso en Planilla
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Creditors,Acreedores
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artículo Wise detalle de impuestos
@@ -3080,13 +3141,16 @@
 DocType: Purchase Order Item,Supplier Quotation,Cotización Proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En palabras serán visibles una vez que guarde la cita .
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +67,Ironing,Planchado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +236,{0} {1} is stopped,{0} {1} esta detenido
-apps/erpnext/erpnext/stock/doctype/item/item.py +346,Barcode {0} already used in Item {1},Código de Barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +235,{0} {1} is stopped,{0} {1} esta detenido
+apps/erpnext/erpnext/stock/doctype/item/item.py +204,Barcode {0} already used in Item {1},Código de Barras {0} ya se utiliza en el elemento {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
-apps/erpnext/erpnext/config/selling.py +127,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
+apps/erpnext/erpnext/config/selling.py +132,Rules for adding shipping costs.,Reglas para la adición de los gastos de envío .
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere Cliente
 DocType: Letter Head,Letter Head,Membrete
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +21,{0} is mandatory for Return,{0} es obligatorio para el Retorno
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +12,To Receive,Recibir
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +32,Shrink fitting,Shrink apropiado
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +522,user@example.com,user@example.com
 DocType: Email Digest,Income / Expense,Ingresos / gastos
 DocType: Employee,Personal Email,Correo Electrónico Personal
 apps/erpnext/erpnext/selling/report/territory_target_variance_item_group_wise/territory_target_variance_item_group_wise.py +58,Total Variance,Total Variacion
@@ -3098,30 +3162,32 @@
 DocType: Customer,From Lead,De la iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +19,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/accounts/page/financial_analytics/financial_analytics.js +42,Select Fiscal Year...,Seleccione el año fiscal ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +387,POS Profile required to make POS Entry,POS perfil requerido para hacer la entrada POS
 DocType: Hub Settings,Name Token,Nombre Token
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +105,Planing,Cepillado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +159,Standard Selling,Venta estándar
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +153,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.py +166,Standard Selling,Venta estándar
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +138,Atleast one warehouse is mandatory,Al menos un almacén es obligatorio
 DocType: Serial No,Out of Warranty,Fuera de Garantía
 DocType: BOM Replace Tool,Replace,Reemplazar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +281,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +47,Please enter default Unit of Measure,Por favor ingrese unidad de medida predeterminada
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +280,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +46,Please enter default Unit of Measure,Por favor ingrese unidad de medida predeterminada
 DocType: Purchase Invoice Item,Project Name,Nombre del proyecto
 DocType: Workflow State,Edit,Editar
 DocType: Journal Entry Account,If Income or Expense,Si los ingresos o Egresos
 DocType: Email Digest,New Support Tickets,Nueva solicitud de soporte
 DocType: Features Setup,Item Batch Nos,Lotes de artículos núms
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia de Valor de Inventario
+apps/erpnext/erpnext/config/learn.py +165,Human Resource,Recursos Humanos
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,Reconciliación Pago Pago
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,Activos por Impuestos
 DocType: BOM Item,BOM No,Solicitud de Materiales No
 DocType: Contact Us Settings,Pincode,Código PIN
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +147,Journal Entry {0} does not have account {1} or already matched against other voucher,Asiento {0} no tiene cuenta {1} o ya esta enlazada con otro bono
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +146,Journal Entry {0} does not have account {1} or already matched against other voucher,Asiento {0} no tiene cuenta {1} o ya esta enlazada con otro bono
 DocType: Item,Moving Average,Promedio Movil
 DocType: BOM Replace Tool,The BOM which will be replaced,La Solicitud de Materiales que será sustituida
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +21,New Stock UOM must be different from current stock UOM,Nueva Unidad de Medida del Inventario debe ser diferente de la Unidad de Medida actual
 DocType: Account,Debit,Débito
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +32,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +29,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
 apps/erpnext/erpnext/config/hr.py +71,Upload attendance from a .csv file,Sube la asistencia de un archivo .csv
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
@@ -3129,7 +3195,7 @@
 DocType: Warranty Claim,"To assign this issue, use the ""Assign"" button in the sidebar.","Para asignar este problema, utilice el botón ""Asignar"" en la barra lateral."
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congele Acciones Older Than [ días ]
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +40,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados ​​en las condiciones anteriores, se aplica Prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +42,Against Invoice,Contra Factura
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +51,Against Invoice,Contra Factura
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Año fiscal: {0} no existe
 DocType: Currency Exchange,To Currency,Para la moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
@@ -3153,28 +3219,28 @@
 DocType: Employee,Held On,Retenida en
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +24,Production Item,Elemento Producción
 ,Employee Information,Información del Empleado
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +502,Rate (%),Tarifa (% )
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +405,Financial Year End Date,Ejercicio Fecha de finalización
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +552,Rate (%),Tarifa (% )
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +407,Financial Year End Date,Ejercicio Fecha de finalización
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función del número de comprobante, si esta agrupado por número de comprobante"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +502,Make Supplier Quotation,Hacer Cotización de Proveedor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +503,Make Supplier Quotation,Hacer Cotización de Proveedor
 DocType: Quality Inspection,Incoming,Entrante
-DocType: Item,Name and Description,Nombre y descripción
-apps/erpnext/erpnext/stock/doctype/item/item.py +134,"Default Unit of Measure can not 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.","Unidad de medida predeterminada no se puede cambiar directamente porque ya ha realizado alguna transacción con otra Unidad de Medida. Para cambiar UDM predeterminado, utilice 'La Herramienta para Cambiar Unidades de Medida' del módulo de Inventario ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +131,"Default Unit of Measure can not 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.","Unidad de medida predeterminada no se puede cambiar directamente porque ya ha realizado alguna transacción con otra Unidad de Medida. Para cambiar UDM predeterminado, utilice 'La Herramienta para Cambiar Unidades de Medida' del módulo de Inventario ."
 DocType: BOM,Materials Required (Exploded),Materiales necesarios ( despiece )
 DocType: Salary Structure Earning,Reduce Earning for Leave Without Pay (LWP),Reduzca la Ganancia por Licencia sin Sueldo ( LWP )
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +512,"Add users to your organization, other than yourself","Añadir usuarios a su organización, que no sea usted"
 apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso Temporal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +92,Credit To account must be a liability account,Crédito a la cuenta debe ser una cuenta de pasivo
 DocType: Batch,Batch ID,ID de lote
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +303,Note: {0},Nota: {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +300,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +72,{0} must be a Purchased or Sub-Contracted Item in row {1},{0} debe ser un Elemento de Compra o de Sub-contratación en la fila {1}
-apps/erpnext/erpnext/accounts/general_ledger.py +100,Account: {0} can only be updated via Stock Transactions,Cuenta: {0} sólo puede ser actualizado a través de transacciones de inventario
+apps/erpnext/erpnext/accounts/general_ledger.py +92,Account: {0} can only be updated via Stock Transactions,Cuenta: {0} sólo puede ser actualizado a través de transacciones de inventario
 DocType: GL Entry,Party,Parte
 DocType: Sales Order,Delivery Date,Fecha de Entrega
 DocType: DocField,Currency,Divisa
 DocType: Opportunity,Opportunity Date,Oportunidad Fecha
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +10,To Bill,A Facturar
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +56,Piecework,trabajo a destajo
+DocType: Purchase Receipt,Return Against Purchase Receipt,Regreso Contra Compra Recibo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +16,To Bill,A Facturar
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +61,Piecework,trabajo a destajo
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +64,Avg. Buying Rate,Promedio de Compra
 DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
 DocType: Employee,History In Company,Historia en la Compañia
@@ -3184,35 +3250,36 @@
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +203,Item {0} is not setup for Serial Nos. Column must be blank,Elemento {0} no está configurado para Serial Columna Nos. debe estar en blanco
 DocType: Accounts Settings,Accounts Settings,Configuración de Cuentas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plant and Machinery,Instalaciones técnicas y maquinaria
-DocType: Item,You can enter the minimum quantity of this item to be ordered.,Puede introducir la cantidad mínima que se puede pedir de este artículo.
 DocType: Sales Partner,Partner's Website,Sitio Web del Socio
 DocType: Opportunity,To Discuss,Para Discusión
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +60,Temporary Accounts,Cuentas Temporales
 DocType: Payment Tool,Column Break 1,Columna Pausa 1
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +150,Black,Negro
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +155,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,BOM Explosion Artículo
 DocType: Account,Auditor,Auditor
 DocType: Purchase Order,End date of current order's period,Fecha de finalización del período de orden actual
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +17,Make Offer Letter,Hacer una Carta de Oferta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,Retorno
 DocType: DocField,Fold,Plegar
 DocType: Production Order Operation,Production Order Operation,Orden de Producción Operación
 DocType: Pricing Rule,Disable,Inhabilitar
 DocType: Project Task,Pending Review,opinión pendiente
-sites/assets/js/desk.min.js +558,Please specify,"Por favor, especifique"
+sites/assets/js/desk.min.js +644,Please specify,"Por favor, especifique"
 DocType: Task,Total Expense Claim (via Expense Claim),Reclamación de gastos totales (a través de Gastos)
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +65,Customer Id,ID del cliente
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +66,Customer Id,ID del cliente
 DocType: Page,Page Name,Nombre de la Página
+apps/erpnext/erpnext/projects/doctype/time_log/time_log.py +106,To Time must be greater than From Time,Para Tiempo debe ser mayor que From Time
 DocType: Purchase Invoice,Exchange Rate,Tipo de Cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +422,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +410,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +74,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: Cuenta Padre{1} no pertenece a la empresa {2}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +123,Spindle finishing,Acabado husillo
 DocType: Material Request,% of materials ordered against this Material Request,% De materiales ordenados en contra de esta Solicitud de Materiales
 DocType: BOM,Last Purchase Rate,Tasa de Cambio de la Última Compra
 DocType: Account,Asset,Activo
 DocType: Project Task,Task ID,Tarea ID
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""MC""","por ejemplo ""MC """
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +75,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +395,"e.g. ""MC""","por ejemplo ""MC """
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +82,Stock cannot exist for Item {0} since has variants,Inventario no puede existir para el punto {0} ya tiene variantes
 ,Sales Person-wise Transaction Summary,Resumen de Transacción por Vendedor
 DocType: System Settings,Time Zone,Huso Horario
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +104,Warehouse {0} does not exist,Almacén {0} no existe
@@ -3228,23 +3295,23 @@
 DocType: Sales Invoice,Paid Amount,Cantidad pagada
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +25,Closing Account {0} must be of type 'Liability',Cuenta de Cierre{0} debe ser de tipo 'Patrimonio'
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +275,Reserved Warehouse is missing in Sales Order,Almacén Reservado falta de órdenes de venta
+apps/erpnext/erpnext/controllers/stock_controller.py +237,Reserved Warehouse is missing in Sales Order,Almacén Reservado falta de órdenes de venta
 DocType: Item Variant,Item Variant,Variante del artículo
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +15,Setting this Address Template as default as there is no other default,Al establecer esta plantilla de dirección por defecto ya que no hay otra manera predeterminada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +71,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +71,Quality Management,Gestión de la Calidad
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de la Calidad
 DocType: Production Planning Tool,Filter based on customer,Filtro basado en cliente
 DocType: Payment Tool Detail,Against Voucher No,Contra Comprobante No
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +46,Please enter quantity for Item {0},Por favor introduzca la cantidad para el elemento {0}
+apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +45,Please enter quantity for Item {0},Por favor introduzca la cantidad para el elemento {0}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +35,Warning: Sales Order {0} already exists against same Purchase Order number,Advertencia: Orden de Venta {0} ya existe contra el mismo número de Orden de Compra
 DocType: Employee External Work History,Employee External Work History,Historial de Trabajo Externo del Empleado
 DocType: Notification Control,Purchase,Compra
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +178,Status of {0} {1} is now {2},Situación de {0} {1} { 2 es ahora }
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +29,Balance Qty,Cantidad en Balance
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +34,Balance Qty,Cantidad en Balance
 DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
-apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +18,{0} for {1},{0} de {1}
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +92,Cost Centers,Centros de Costos
-apps/erpnext/erpnext/config/stock.py +115,Warehouses.,Almacenes.
+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,Centros de Costos
+apps/erpnext/erpnext/config/stock.py +120,Warehouses.,Almacenes.
 DocType: Purchase Order,Rate at which supplier's currency is converted to company's base currency,Grado a la que la moneda de proveedor se convierte en la moneda base de la compañía
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Fila # {0}: conflictos con fila {1}
 DocType: Employee,Employment Type,Tipo de Empleo
@@ -3252,37 +3319,43 @@
 DocType: Item Group,Default Expense Account,Cuenta de Gastos por defecto
 DocType: Employee,Notice (days),Aviso (días)
 DocType: Page,Yes,Sí
-DocType: Cost Center,Material User,Material del Usuario
 DocType: Employee,Encashment Date,Fecha de Cobro
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +73,Electroforming,Electroformado
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +147,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Orden de Compra, Factura de Compra o Comprobante de Diario"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +148,"Against Voucher Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Contra Tipo de Comprobante debe ser uno de Orden de Compra, Factura de Compra o Comprobante de Diario"
 DocType: Account,Stock Adjustment,Ajuste de existencias
+apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Costo por defecto para el tipo de actividad Actividad - {0}
 DocType: Production Order,Planned Operating Cost,Planeado Costo de funcionamiento
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +118,New {0} Name,Nuevo {0} Nombre
-apps/erpnext/erpnext/controllers/recurring_document.py +126,Please find attached {0} #{1},Encuentre {0} # adjunto {1}
-DocType: Global Defaults,jsonrates.com API Key,jsonrates.com Clave API
+apps/erpnext/erpnext/controllers/recurring_document.py +128,Please find attached {0} #{1},Encuentre {0} # adjunto {1}
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
 DocType: Authorization Rule,Customer / Item Name,Cliente / Nombre de Artículo
+DocType: Product Bundle,"Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. 
+
+The package **Item** will have ""Is Stock Item"" as ""No"" and ""Is Sales Item"" as ""Yes"".
+
+For Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Product Bundle Item.
+
+Note: BOM = Bill of Materials","Grupo Global de la ** ** Los productos que en otro artículo ** **. Esto es útil si usted está empaquetando unas determinadas Artículos ** ** en un paquete y mantener un balance de los ** Los productos envasados ​​** y no el agregado ** ** Artículo. El paquete ** ** Artículo tendrá &quot;Es el archivo de artículos&quot; como &quot;No&quot; y &quot;¿Es artículo de ventas&quot; como &quot;Sí&quot;. Por ejemplo: Si usted está vendiendo ordenadores portátiles y Mochilas por separado y tienen un precio especial si el cliente compra a la vez, entonces el ordenador portátil + Mochila será un nuevo paquete de productos de artículos. Nota: BOM = Lista de materiales"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Serial No is mandatory for Item {0},No de serie es obligatoria para el elemento {0}
-sites/assets/js/desk.min.js +536,Created By,Creado por
+DocType: Variant Attribute,Attribute,Atributo
+sites/assets/js/desk.min.js +622,Created By,Creado por
 DocType: Serial No,Under AMC,Bajo AMC
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +47,Item valuation rate is recalculated considering landed cost voucher amount,Tasa de valorización artículo se vuelve a calcular teniendo en cuenta la cantidad de vales costo descargado
-apps/erpnext/erpnext/config/selling.py +65,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
+apps/erpnext/erpnext/config/selling.py +70,Default settings for selling transactions.,Los ajustes por defecto para las transacciones de venta.
 DocType: BOM Replace Tool,Current BOM,Solicitud de Materiales actual
-sites/assets/js/erpnext.min.js +5,Add Serial No,Añadir Número de Serie
+sites/assets/js/erpnext.min.js +7,Add Serial No,Añadir Número de Serie
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Print and Stationary,Impresión y Papelería
 apps/erpnext/erpnext/selling/page/sales_browser/sales_browser.js +119,Group Node,Grupo de nodos
 DocType: Payment Reconciliation,Minimum Amount,Volumen mínimo de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +68,Update Finished Goods,Actualización de las Mercancías Terminadas
-DocType: Item,"Automatically set. If this item has variants, then it cannot be selected in sales orders etc.","Se ajusta automáticamente. Si este artículo tiene variantes, entonces no puede ser seleccionado en los pedidos de venta, etc."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +70,Update Finished Goods,Actualización de las Mercancías Terminadas
 DocType: Workstation,per hour,por horas
-apps/frappe/frappe/core/doctype/doctype/doctype.py +97,Series {0} already used in {1},Serie {0} ya se utiliza en {1}
+apps/frappe/frappe/core/doctype/doctype/doctype.py +96,Series {0} already used in {1},Serie {0} ya se utiliza en {1}
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,Cuenta para el almacén ( Inventario Permanente ) se creará en esta Cuenta.
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +95,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,Almacén no se puede suprimir porque hay una entrada en registro de inventario para este almacén.
 DocType: Company,Distribution,Distribución
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +86,Project Manager,Gerente de Proyectos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +67,Dispatch,Despacho
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de Proyectos
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para cada elemento: {0} es {1}%
 DocType: Account,Receivable,Cuenta por Cobrar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Función que esta autorizada a presentar las transacciones que excedan los límites de crédito establecidos .
@@ -3290,14 +3363,12 @@
 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.","Si se selecciona, la Solicitud de Materiales para los elementos de sub-ensamble será considerado para conseguir materias primas. De lo contrario , todos los elementos de sub-ensamble serán tratados como materia prima ."
 DocType: Material Request,Material Issue,Incidencia de Material
 DocType: Hub Settings,Seller Description, Descripción del Vendedor
-DocType: Item,Is Stock Item,Es Stock Artículo
 DocType: Shopping Cart Price List,Shopping Cart Price List,Cesta de la compra Precio de lista
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precio del Artículo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +47,Soap & Detergent,Jabón y Detergente
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +35,Motion Picture & Video,Imagén en Movimiento y Vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado
-DocType: Company,Default Settings,Configuración Predeterminada
 DocType: Warehouse,Warehouse Name,Nombre del Almacén
 DocType: Naming Series,Select Transaction,Seleccione Transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Por favor introduzca Aprobar Función o Aprobar Usuario
@@ -3307,26 +3378,25 @@
 DocType: Journal Entry,eg. Cheque Number,por ejemplo . Número de Cheque
 apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +25,Company is missing in warehouses {0},Compañía no se encuentra en los almacenes {0}
 DocType: Stock UOM Replace Utility,Stock UOM Replace Utility,Herramienta para cambiar Unidad de Medida
-DocType: POS Setting,Terms and Conditions,Términos y Condiciones
+DocType: POS Profile,Terms and Conditions,Términos y Condiciones
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,To Date should be within the Fiscal Year. Assuming To Date = {0},La fecha debe estar dentro del año fiscal. Asumiendo a la fecha = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
 DocType: Leave Block List,Applies to Company,Se aplica a la empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +156,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que la entrada de almacen {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que la entrada de almacen {0} existe
 DocType: Purchase Invoice,In Words,En palabras
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +204,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +208,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
 DocType: Production Planning Tool,Material Request For Warehouse,Solicitud de material para el almacén
 DocType: Sales Order Item,For Production,Para Producción
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +107,Please enter sales order in the above table,Por favor ingrese para ventas en la tabla anterior
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +99,Please enter sales order in the above table,Por favor ingrese para ventas en la tabla anterior
 DocType: Project Task,View Task,Vista de tareas
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +404,Your financial year begins on,Su año Financiero inicia en
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +406,Your financial year begins on,Su año Financiero inicia en
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Purchase Receipts,Por favor ingrese recibos de compra
 DocType: Sales Invoice,Get Advances Received,Cómo anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Añadir / Quitar Destinatarios
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +471,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +402,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este Año Fiscal como Predeterminado , haga clic en "" Establecer como Predeterminado """
 apps/erpnext/erpnext/config/support.py +54,Setup incoming server for support email id. (e.g. support@example.com),Configuración del servidor de correo entrante para el apoyo de id de correo electrónico. (ej. support@example.com )
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +35,Shortage Qty,Escasez Cantidad
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row{0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partido Tipo y Partido se requiere para la cuenta por cobrar / pagar {1}
 DocType: Salary Slip,Salary Slip,Planilla
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +115,Burnishing,Bruñido
 DocType: Features Setup,To enable <b>Point of Sale</b> view,Para activar <b> punto de venta < / b > Vista
@@ -3335,11 +3405,10 @@
 DocType: Sales Invoice Item,Sales Order Item,Articulo de la Solicitud de Venta
 DocType: Salary Slip,Payment Days,Días de Pago
 DocType: BOM,Manage cost of operations,Administrar el costo de las operaciones
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +86,Make Credit Note,Hacer Nota de Crédito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +655,Make Credit Note,Hacer Nota de Crédito
 DocType: Features Setup,Item Advanced,artículo avanzada
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +39,Hot rolling,Laminación en caliente
 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.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
-apps/erpnext/erpnext/config/setup.py +101,Customer master.,Maestro de Clientes .
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
 DocType: Employee Education,Employee Education,Educación del Empleado
 DocType: Salary Slip,Net Pay,Pago Neto
@@ -3350,13 +3419,13 @@
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
 DocType: Expense Claim,Total Claimed Amount,Total Reclamado
 apps/erpnext/erpnext/config/crm.py +22,Potential opportunities for selling.,Posibles oportunidades para vender .
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +46,Sick Leave,Permiso por Enfermedad
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por Enfermedad
 DocType: Email Digest,Email Digest,Boletín por Correo Electrónico
 DocType: Delivery Note,Billing Address Name,Nombre de la Dirección de Facturación
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +21,Department Stores,Tiendas por Departamento
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +39,System Balance,Balance del Sistema
 DocType: Workflow,Is Active,Está Activo
-apps/erpnext/erpnext/controllers/stock_controller.py +70,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
+apps/erpnext/erpnext/controllers/stock_controller.py +72,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +22,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Cobrable
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +120,Linishing,Desbarbado
@@ -3364,21 +3433,22 @@
 DocType: Workflow State,Primary,Primario
 DocType: Expense Claim Detail,Expense Date,Fecha de Gasto
 DocType: Item,Max Discount (%),Descuento Máximo (%)
-apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +60,Last Order Amount,Última Cantidad de la orden
+apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.py +70,Last Order Amount,Última Cantidad de la orden
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +160,Blasting,Voladura
 DocType: Company,Warn,Advertir
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +82,Item valuation updated,Valoración Artículo actualizado
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, esfuerzo notable que debe ir en los registros."
 DocType: BOM,Manufacturing User,Usuario de Manufactura
 DocType: Purchase Order,Raw Materials Supplied,Materias primas suministradas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +239,Total valuation ({0}) for manufactured or repacked item(s) can not be less than total valuation of raw materials ({1}),Valoración total ({0}) para fabricar o embalados de nuevo artículo (s) no puede ser inferior a la valoración total de las materias primas ({1})
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +227,Total valuation ({0}) for manufactured or repacked item(s) can not be less than total valuation of raw materials ({1}),Valoración total ({0}) para fabricar o embalados de nuevo artículo (s) no puede ser inferior a la valoración total de las materias primas ({1})
+DocType: Purchase Invoice,Recurring Print Format,Recurrente Formato de impresión
 DocType: Email Digest,New Projects,Nuevos Proyectos
 DocType: Communication,Series,Serie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +28,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
 DocType: Appraisal,Appraisal Template,Plantilla de Evaluación
 DocType: Communication,Email,Correo Electronico
 DocType: Item Group,Item Classification,Clasificación de Artículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Business Development Manager,Gerente de Desarrollo de Negocios
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de Desarrollo de Negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +15,Period,Período
 ,General Ledger,Contabilidad General
@@ -3386,12 +3456,12 @@
 DocType: Item Attribute Value,Attribute Value,Valor del Atributo
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +65,"Email id must be unique, already exists for {0}","Identificación del E-mail debe ser único , ya existe para {0}"
 ,Itemwise Recommended Reorder Level,Itemwise Recomendado por reorden Nivel
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +216,Please select {0} first,"Por favor, seleccione {0} primero"
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +217,Please select {0} first,"Por favor, seleccione {0} primero"
 DocType: Features Setup,To get Item Group in details table,Para obtener Grupo de Artículo en la tabla detalles
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +66,Redrawing,Redibujar
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +111,Batch {0} of Item {1} has expired.,Lote {0} de {1} artículo ha expirado.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +119,Etching,Aguafuerte
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +55,Commission,Comisión
-apps/erpnext/erpnext/templates/pages/ticket.py +31,You are not allowed to reply to this ticket.,No se le permite responder a este ticket.
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +60,Commission,Comisión
 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>
 <pre><code>{{ address_line1 }}&lt;br&gt;
@@ -3416,7 +3486,7 @@
  {% if email_ID%} Email: {{email_ID}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Slip Deduction,Default Amount,Importe por Defecto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Warehouse not found in the system,Almacén no se encuentra en el sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +89,Warehouse not found in the system,Almacén no se encuentra en el sistema
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lectura de Inspección de Calidad
 DocType: Party Account,col_break1,col_break1
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +26,`Freeze Stocks Older Than` should be smaller than %d days.,`Congelar Inventarios Anteriores a` debe ser menor que %d días .
@@ -3428,21 +3498,24 @@
 DocType: HR Settings,Payroll Settings,Configuración de Nómina
 apps/erpnext/erpnext/config/accounts.py +58,Match non-linked Invoices and Payments.,Coincidir con las facturas y pagos no vinculados.
 DocType: Email Digest,New Purchase Orders,Nueva Órdén de compra
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +25,Root cannot have a parent cost center,Raíz no puede tener un centro de costes de los padres
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalle de Conversión de Unidad de Medida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +476,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +496,Keep it web friendly 900px (w) by 100px (h),Manténgalo  adecuado para la web 900px ( w ) por 100px ( h )
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +329,Production Order cannot be raised against a Item Template,Orden de fabricación no se puede levantar en contra de una plantilla de artículo
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +44,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en recibo de compra en contra de cada artículo
 DocType: Payment Tool,Get Outstanding Vouchers,Verificar Comprobantes Pendientes
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Appraisal,Start Date,Fecha de inicio
-sites/assets/js/desk.min.js +512,Value,Valor
+sites/assets/js/desk.min.js +598,Value,Valor
 apps/erpnext/erpnext/config/hr.py +130,Allocate leaves for a period.,Asignar las vacaciones para un período .
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +138,Click here to verify,Haz clic aquí para verificar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +39,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
 DocType: Purchase Invoice Item,Price List Rate,Lista de Precios Tarifa
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +166,Delivered Serial No {0} cannot be deleted,Serie No Entregado {0} no se puede eliminar
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""en la acción "" o "" No disponible "", basada en stock disponible en este almacén."
 apps/erpnext/erpnext/config/manufacturing.py +13,Bill of Materials (BOM),Solicitud de Materiales (BOM: Bill of Materials)
+DocType: Item,Average time taken by the supplier to deliver,Tiempo medio por el proveedor para entregar
 DocType: Time Log,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +37,Rolling,Rodando
@@ -3453,36 +3526,36 @@
 DocType: Backup Manager,Weekly,Semanal
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg . smsgateway.com / api / send_sms.cgi
 DocType: Maintenance Visit,Fully Completed,totalmente Terminado
-DocType: Item,"Products will be sorted by weight-age in default searches. More the weight-age, higher the product will appear in the list.","Los productos se clasifican por peso-edad en las búsquedas por defecto. Más del peso-edad , más alto es el producto aparecerá en la lista."
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}% Completo
 DocType: Employee,Educational Qualification,Capacitación Académica
 DocType: Workstation,Operating Costs,Costos Operativos
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de Vacaciones del Empleado
-apps/erpnext/erpnext/templates/includes/footer_extension.html +9,Stay Updated,Manténgase actualizado
-apps/erpnext/erpnext/stock/doctype/item/item.py +376,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +167,{0} has been successfully added to our Newsletter list.,{0} ha sido agregado con éxito a nuestra lista de Newsletter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +66,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la Cotización ha sido hecha."
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +132,Electron beam machining,Mecanizado por haz de electrones
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Maestro Compras
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +468,Production Order {0} must be submitted,Orden de producción {0} debe ser presentado
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +399,Production Order {0} must be submitted,Orden de producción {0} debe ser presentado
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +160,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el punto {0}"
-apps/erpnext/erpnext/config/stock.py +141,Main Reports,Informes Principales
+apps/erpnext/erpnext/config/stock.py +146,Main Reports,Informes Principales
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +73,Stock Ledger entries balances updated,Saldo de Apertura de Libro Mayor de Inventarios han sido actualizados
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Purchase Receipt Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +201,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +181,Add / Edit Prices,Añadir / Editar Precios
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +54,Chart of Cost Centers,Gráfico de Centros de Costos
 ,Requested Items To Be Ordered,Artículos solicitados a ser ordenados
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +238,My Orders,Mis pedidos
 DocType: Price List,Price List Name,Lista de Precios Nombre
 DocType: Time Log,For Manufacturing,Para Manufactura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +124,Totals,Totales
 DocType: BOM,Manufacturing,Fabricación
 ,Ordered Items To Be Delivered,Artículos pedidos para ser entregados
 DocType: Account,Income,Ingresos
 ,Setup Wizard,Asistente de configuración
 DocType: Industry Type,Industry Type,Tipo de Industria
-apps/erpnext/erpnext/templates/includes/cart.js +264,Something went wrong!,Algo salió mal!
+apps/erpnext/erpnext/templates/includes/cart.js +265,Something went wrong!,Algo salió mal!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +68,Warning: Leave application contains following block dates,Advertencia: Solicitud de Renuncia contiene las siguientes fechas bloquedas
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +235,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +223,Sales Invoice {0} has already been submitted,Factura {0} ya se ha presentado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de Terminación
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +9,Die casting,Fundición a presión
@@ -3491,31 +3564,32 @@
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,Por favor introduzca nos móviles válidos
 DocType: Email Digest,User Specific,Específicas de Usuario
 DocType: Budget Detail,Budget Detail,Detalle del Presupuesto
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +73,Please enter message before sending,Por favor introduce el mensaje antes de enviarlo
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,Por favor introduce el mensaje antes de enviarlo
 DocType: Communication,Status,estado
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +36,Stock UOM updated for Item {0},Unidad de Medida Actualizado para el punto {0}
 DocType: Company History,Year,Año
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +69,Please Update SMS Settings,Por favor actualizar la configuración de SMS
+apps/erpnext/erpnext/config/accounts.py +122,Point-of-Sale Profile,Punto de Venta Perfil
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,Por favor actualizar la configuración de SMS
 apps/erpnext/erpnext/projects/doctype/time_log_batch/time_log_batch.py +34,Time Log {0} already billed,Hora de registro {0} ya facturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +176,Unsecured Loans,Préstamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre Centro de Costo
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Item {0} with Serial No {1} is already installed,Artículo {0} con N º de serie {1} ya está instalada
-apps/erpnext/erpnext/setup/doctype/backup_manager/backup_manager.js +10,You can start by selecting backup frequency and granting access for sync,Puede empezar por seleccionar la frecuencia de copia de seguridad y conceder acceso para sincronizar
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Pagado Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes de más de 160 caracteres se dividirá en varios mensajes
 DocType: Purchase Receipt Item,Received and Accepted,Recibidos y Aceptados
 DocType: Item Attribute,"Lower the number, higher the priority in the Item Code suffix that will be created for this Item Attribute for the Item Variant","Baja el número, mayor es la prioridad en el Código sufijo artículo que se creará para este atributo del artículo para el artículo Variant"
 ,Serial No Service Contract Expiry,Número de orden de servicio Contrato de caducidad
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +79,Employee can not be changed,Empleado no se puede cambiar
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +257,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
+DocType: Item,Unit of Measure Conversion,Unidad de Conversión de la medida
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +86,Employee can not be changed,Empleado no se puede cambiar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +256,You cannot credit and debit same account at the same time,No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo
 DocType: Naming Series,Help HTML,Ayuda HTML
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +50,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
-apps/erpnext/erpnext/controllers/status_updater.py +100,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
+apps/erpnext/erpnext/controllers/status_updater.py +114,Allowance for over-{0} crossed for Item {1},Previsión por exceso de {0} cruzados por artículo {1}
 DocType: Address,Name of person or organization that this address belongs to.,Nombre de la persona u organización a la que esta dirección pertenece.
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +536,Your Suppliers,Sus Proveedores
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Cannot set as Lost as Sales Order is made.,No se puede definir como Perdido cuando está hecha la Orden de Venta .
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +58,Another Salary Structure {0} is active for employee {1}. Please make its status 'Inactive' to proceed.,"Otra estructura salarial {0} está activo para empleado {1}. Por favor, haga su estado 'Inactivo' para proceder."
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +587,Your Suppliers,Sus Proveedores
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,No se puede definir como Perdido cuando está hecha la Orden de Venta .
+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.,"Otra estructura salarial {0} está activo para empleado {1}. Por favor, haga su estado 'Inactivo' para proceder."
 DocType: Purchase Invoice,Contact,Contacto
 DocType: Features Setup,Exports,Exportaciones
 DocType: Lead,Converted,Convertido
@@ -3532,33 +3606,31 @@
 DocType: Cost Center,Budgets,Presupuestos
 apps/frappe/frappe/core/page/modules_setup/modules_setup.py +11,Updated,Actualizado
 DocType: Employee,Emergency Contact Details,Detalles de Contacto de Emergencia
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +394,What does it do?,¿Qué hace?
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +396,What does it do?,¿Qué hace?
 DocType: Delivery Note,To Warehouse,Para Almacén
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +56,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +45,Account {0} has been entered more than once for fiscal year {1},Cuenta {0} se ha introducido más de una vez para el año fiscal {1}
 ,Average Commission Rate,Tasa de Comisión Promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +298,'Has Serial No' can not be 'Yes' for non-stock item,"""Tiene Número de Serie"" no puede ser ""Sí"" para elementos que son de inventarios"
+apps/erpnext/erpnext/stock/doctype/item/item.py +165,'Has Serial No' can not be 'Yes' for non-stock item,"""Tiene Número de Serie"" no puede ser ""Sí"" para elementos que son de inventarios"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +34,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de Regla de Precios
 DocType: Purchase Taxes and Charges,Account Head,cuenta Head
 DocType: Price List,"Specify a list of Territories, for which, this Price List is valid","Especifica una lista de territorios , para lo cual, la lista de precios es válida"
 apps/erpnext/erpnext/config/stock.py +79,Update additional costs to calculate landed cost of items,Actualización de los costes adicionales para el cálculo del precio al desembarque de artículos
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +106,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Diferencia Total (Salida - Entrada)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +94,Difference Account mandatory for purpose '{0}',Cuenta Diferencia obligatoria para el propósito &#39;{0}&#39;
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de usuario no establecido para el empleado {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +71,Peening,Peening
 apps/erpnext/erpnext/support/doctype/maintenance_visit/maintenance_visit.js +30,From Warranty Claim,De reclamo de garantía
 DocType: Stock Entry,Default Source Warehouse,Origen predeterminado Almacén
 DocType: Item,Customer Code,Código de Cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +203,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
-DocType: Item,Default Purchase Account in which cost of the item will be debited.,Cuenta de Compra por defecto en la que se cargará el costo del artículo.
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +207,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +162,Lapping,Pulido
 apps/erpnext/erpnext/selling/report/customers_not_buying_since_long_time/customers_not_buying_since_long_time.js +8,Days Since Last Order,Días desde el último pedido
 DocType: Buying Settings,Naming Series,Nombrar Series
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 DocType: User,Enabled,Habilitado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Activos de Inventario
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.js +22,Do you really want to Submit all Salary Slip for month {0} and year {1},¿De verdad quieres a que me envíen toda la nómina para el mes {0} y {1} años
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +28,Do you really want to Submit all Salary Slip for month {0} and year {1},¿De verdad quieres a que me envíen toda la nómina para el mes {0} y {1} años
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +8,Import Subscribers,Importar Suscriptores
 DocType: Target Detail,Target Qty,Cantidad Objetivo
 DocType: Attendance,Present,Presente
@@ -3570,13 +3642,13 @@
 DocType: Stock Settings,Stock Frozen Upto,Inventario Congelado hasta
 apps/erpnext/erpnext/config/projects.py +13,Project activity / task.,Actividad del Proyecto / Tarea.
 apps/erpnext/erpnext/config/hr.py +65,Generate Salary Slips,Generar Salario Slips
-apps/frappe/frappe/utils/__init__.py +85,{0} is not a valid email id,{0} no es un Correo Electrónico de identificación válida
+apps/frappe/frappe/utils/__init__.py +87,{0} is not a valid email id,{0} no es un Correo Electrónico de identificación válida
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","Compra debe comprobarse, si se selecciona Aplicable Para como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
 DocType: ToDo,Low,Bajo
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +70,Spinning,Hilado
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vale Landed Cost
-apps/erpnext/erpnext/hr/doctype/salary_manager/salary_manager.py +55,Please set {0},"Por favor, configure {0}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +55,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repita el Día del mes
 DocType: Employee,Health Details,Detalles de la Salud
 DocType: Offer Letter,Offer Letter Terms,Ofrecer Términos de letras
@@ -3585,7 +3657,7 @@
 DocType: Purchase Invoice Advance,Journal Entry Detail No,Detalle Comprobante No.
 DocType: Employee External Work History,Salary,Salario
 DocType: Serial No,Delivery Document Type,Tipo de documento de entrega
-DocType: Salary Manager,Submit all salary slips for the above selected criteria,Presentar todas las nóminas para los criterios seleccionados anteriormente
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas para los criterios seleccionados anteriormente
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0} Artículos actualizados
 DocType: Sales Order,Partly Delivered,Parcialmente Entregado
 DocType: Sales Invoice,Existing Customer,Cliente Existente
@@ -3593,75 +3665,78 @@
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
 DocType: Purchase Order,"Enter email id separated by commas, order will be mailed automatically on particular date","Ingrese correo electrónico de identificación separadas por comas, la orden será enviada automáticamente en una fecha particular"
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +37,Campaign Name is required,Es necesario ingresar el nombre  de la Campaña 
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Rounded Off,Redondeado
 DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 DocType: Purchase Receipt Item,Rejected Serial No,Rechazado Serie No
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +50,Deep drawing,Embutición profunda
-apps/erpnext/erpnext/selling/doctype/sales_bom/sales_bom.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Sales BOM","Por favor, seleccione el elemento donde ""Es Elemento del Inventario"" es "" No"" y ""Es Árticulo para la Venta"" es "" Sí "", y no hay otra Solicitud de Materiales de Ventas"
 apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.js +40,New Newsletter,Nuevo Boletín
 apps/erpnext/erpnext/support/doctype/maintenance_schedule/maintenance_schedule.py +167,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.js +46,Show Balance,Mostrar Equilibrio
+apps/erpnext/erpnext/stock/doctype/item/item.js +13,Show Balance,Mostrar Equilibrio
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Ejemplo:. ABCD ##### 
  Si la serie se establece y Número de Serie no se menciona en las transacciones, entonces se creara un número de serie automático sobre la base de esta serie. Si siempre quiere mencionar explícitamente los números de serie para este artículo, déjelo en blanco."
 DocType: Upload Attendance,Upload Attendance,Subir Asistencia
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +143,BOM and Manufacturing Quantity are required,Lista de materiales y de fabricación se requieren Cantidad
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +107,BOM and Manufacturing Quantity are required,Lista de materiales y de fabricación se requieren Cantidad
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Rango Envejecimiento 2
 DocType: Journal Entry Account,Amount,Monto Total
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +146,Riveting,Remachado
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Solcitud de Materiales reemplazada
 ,Sales Analytics,Análisis de Ventas
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,Please enter default currency in Company Master,Por favor introduce la moneda por defecto en la Empresa Principal
+apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configuración de Correo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +89,Please enter default currency in Company Master,Por favor introduce la moneda por defecto en la Empresa Principal
 DocType: Stock Entry Detail,Stock Entry Detail,Detalle de la Entrada de Inventario
-apps/erpnext/erpnext/templates/includes/cart.js +286,You need to be logged in to view your cart.,Tienes que estar registrado para ver su carrito.
-apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +200,New Account Name,Nueva Cuenta Nombre
+apps/erpnext/erpnext/templates/includes/cart.js +287,You need to be logged in to view your cart.,Tienes que estar registrado para ver su carrito.
+apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +204,New Account Name,Nueva Cuenta Nombre
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Coste materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +68,Customer Service,Servicio al Cliente
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al Cliente
 DocType: Item Customer Detail,Item Customer Detail,Elemento Detalle Cliente
+apps/erpnext/erpnext/crm/doctype/newsletter/newsletter.py +148,Confirm Your Email,Confirma Tu Email
 apps/erpnext/erpnext/config/hr.py +53,Offer candidate a Job.,Oferta candidato a Job.
 DocType: Notification Control,Prompt for Email on Submission of,Preguntar por el correo electrónico en la presentación de
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +61,Item {0} must be a stock Item,Artículo {0} debe ser un producto imprescindible
-apps/erpnext/erpnext/config/accounts.py +102,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} must be a stock Item,Artículo {0} debe ser un producto imprescindible
+apps/erpnext/erpnext/config/accounts.py +107,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 apps/frappe/frappe/model/naming.py +40,{0} is required,{0} es necesario
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +20,Vacuum molding,Moldeo por vacío
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +57,Expected Date cannot be before Material Request Date,Lanzamiento no puede ser anterior material Fecha de Solicitud
 DocType: Contact Us Settings,City,Ciudad
+apps/erpnext/erpnext/config/stock.py +89,Manage Item Variants.,Administrar artículo variantes.
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +131,Ultrasonic machining,Mecanizado por ultrasonidos
-apps/erpnext/erpnext/stock/get_item_details.py +126,Item {0} must be a Sales Item,Artículo {0} debe ser un elemento de Ventas
+apps/frappe/frappe/templates/base.html +133,Error: Not a valid id?,Error: No es un documento de identidad válido?
+apps/erpnext/erpnext/stock/get_item_details.py +125,Item {0} must be a Sales Item,Artículo {0} debe ser un elemento de Ventas
 DocType: Naming Series,Update Series Number,Actualización de los Números de Serie
 DocType: Account,Equity,Patrimonio
 DocType: Task,Closing Date,Fecha de Cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +79,Engineer,Ingeniero
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +329,Item Code required at Row No {0},Código del Artículo requerido en la Fila No {0}
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Asambleas Buscar Sub
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Item Code required at Row No {0},Código del Artículo requerido en la Fila No {0}
 DocType: Sales Partner,Partner Type,Tipo de Socio
 DocType: Purchase Taxes and Charges,Actual,Real
 DocType: Purchase Order,% of materials received against this Purchase Order,% Del material recibido en contra de esta Orden de Compra
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
 DocType: Production Order,Production Order,Orden de Producción
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +242,Installation Note {0} has already been submitted,Nota de instalación {0} ya se ha presentado
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +230,Installation Note {0} has already been submitted,Nota de instalación {0} ya se ha presentado
 DocType: Quotation Item,Against Docname,Contra Docname
 DocType: SMS Center,All Employee (Active),Todos los Empleados (Activos)
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,Ver Ahora
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,Seleccione el período en que la factura se generará de forma automática
 DocType: BOM,Raw Material Cost,Costo de la Materia Prima
-DocType: Item Reorder,Re-Order Level,Reordenar Nivel
+DocType: Item,Re-Order Level,Reordenar Nivel
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,Escriba artículos y Cantidad planificada para los que desea elevar las órdenes de producción o descargar la materia prima para su análisis.
-sites/assets/js/list.min.js +160,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +52,Part-time,Tiempo Parcial
+sites/assets/js/list.min.js +163,Gantt Chart,Diagrama de Gantt
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +57,Part-time,Tiempo Parcial
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
 DocType: Employee,Cheque,Cheque
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +52,Series Updated,Series Actualizado
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +55,Series Updated,Series Actualizado
 apps/erpnext/erpnext/accounts/doctype/account/account.py +105,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Item,Serial Number Series,Número de Serie Serie
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +67,Warehouse is mandatory for stock Item {0} in row {1},Almacén es obligatorio para la acción del artículo {0} en la fila {1}
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +44,Retail & Wholesale,Venta al por menor y al por mayor
 DocType: Issue,First Responded On,Primero respondió el
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cruz Ficha de artículo en varios grupos
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +349,The First User: You,El Primer Usuario: Usted
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +351,The First User: You,El Primer Usuario: Usted
 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},Año fiscal Fecha de Inicio y Fin de ejercicio Fecha ya están establecidas en el Año Fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Successfully Reconciled,Reconciliado con éxito
 DocType: Production Order,Planned End Date,Planeado Fecha de finalización
@@ -3671,30 +3746,32 @@
 DocType: Page,No,Ningún
 DocType: BOM,Materials,Materiales
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Si no está marcada , la lista tendrá que ser añadido a cada Departamento donde ha de aplicarse ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +663,Make Delivery,Hacer Entrega
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +261,Posting date and posting time is mandatory,Fecha de publicación y el envío tiempo es obligatorio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +647,Make Delivery,Hacer Entrega
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +249,Posting date and posting time is mandatory,Fecha de publicación y el envío tiempo es obligatorio
 apps/erpnext/erpnext/config/buying.py +79,Tax template for buying transactions.,Plantilla de impuestos para las transacciones de compra.
 ,Item Prices,Precios de los Artículos
 DocType: Purchase Order,In Words will be visible once you save the Purchase Order.,En palabras serán visibles una vez que guarde la Orden de Compra .
 DocType: Period Closing Voucher,Period Closing Voucher,Vale Período de Cierre
-apps/erpnext/erpnext/config/stock.py +125,Price List master.,Master Lista de precios .
+apps/erpnext/erpnext/config/stock.py +130,Price List master.,Master Lista de precios .
 DocType: Task,Review Date,Fecha de Revisión
 DocType: DocPerm,Level,Nivel
 DocType: Purchase Taxes and Charges,On Net Total,En Total Neto
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la fila {0} debe ser la misma que la producción del pedido
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +161,Target warehouse in row {0} must be same as Production Order,Almacenes de destino de la fila {0} debe ser la misma que la producción del pedido
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +61,No permission to use Payment Tool,No tiene permiso para utilizar la herramienta de pagos
-apps/erpnext/erpnext/controllers/recurring_document.py +191,'Notification Email Addresses' not specified for recurring %s,"""Correo Electrónico de Notificación"" no especificados para %s recurrentes"
+apps/erpnext/erpnext/controllers/recurring_document.py +193,'Notification Email Addresses' not specified for recurring %s,"""Correo Electrónico de Notificación"" no especificados para %s recurrentes"
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +85,Milling,Molienda
+DocType: Company,Round Off Account,Para redondear la cuenta
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +59,Nibbling,Mordisqueando
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +84,Administrative Expenses,Gastos de Administración
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/industry_type.py +17,Consulting,Consuloría
 DocType: Customer Group,Parent Customer Group,Grupo de Clientes Principal
-sites/assets/js/erpnext.min.js +45,Change,Cambio
+sites/assets/js/erpnext.min.js +48,Change,Cambio
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +103,Purchase Order {0} is 'Stopped',Orden de Compra {0} ' Detenido '
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Purchase Order {0} is 'Stopped',Orden de Compra {0} ' Detenido '
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +391,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +168,Notice Period,Período de Notificación
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +393,"e.g. ""My Company LLC""","por ejemplo ""Mi Company LLC """
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +173,Notice Period,Período de Notificación
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +516,Make Purchase Return,Haga Compra Volver
 DocType: Bank Reconciliation Detail,Voucher ID,Comprobante ID
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +14,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
 DocType: Packing Slip,Gross Weight UOM,Peso Bruto de la Unidad de Medida
@@ -3708,9 +3785,10 @@
 DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
 DocType: Item,Default Warehouse,Almacén por Defecto
 DocType: Task,Actual End Date (via Time Logs),Fecha actual de finalización (via Registros Temporales)
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +20,Please enter parent cost center,"Por favor, introduzca el centro de coste de los padres"
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +37,Budget cannot be assigned against Group Account {0},Presupuesto no se puede asignar contra cuentas de grupo {0}
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +23,Please enter parent cost center,"Por favor, introduzca el centro de coste de los padres"
 DocType: Delivery Note,Print Without Amount,Imprimir sin Importe
-apps/erpnext/erpnext/controllers/buying_controller.py +70,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
+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,"Categoría de impuesto no puede ser 'Valoración ' o ""Valoración y Total"" como todos los artículos no elementos del inventario"
 DocType: User,Last Name,Apellido
 DocType: Web Page,Left,Izquierda
 DocType: Event,All Day,Todo el Día
@@ -3718,7 +3796,7 @@
 DocType: Appraisal,Total Score (Out of 5),Puntaje total (de 5 )
 DocType: Contact Us Settings,State,Estado
 DocType: Batch,Batch,Lote
-apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +48,Balance,Balance
+apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +53,Balance,Balance
 DocType: Project,Total Expense Claim (via Expense Claims),Reclamación de Gastos Totales (a través de reclamaciones de gastos)
 DocType: User,Gender,Género
 DocType: Journal Entry,Debit Note,Nota de Débito
@@ -3726,22 +3804,22 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirado
 DocType: Journal Entry,Total Debit,Débito Total
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Sales Person,Vendedor
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +496,Unstop Purchase Order,Continuar Orden de Compra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +490,Unstop Purchase Order,Continuar Orden de Compra
 DocType: Sales Invoice,Cold Calling,Llamadas en frío
 DocType: SMS Parameter,SMS Parameter,Parámetro SMS
 DocType: Maintenance Schedule Item,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
 DocType: Email Digest,Income Year to Date,Ingresos Año a la Fecha
-apps/erpnext/erpnext/config/setup.py +58,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
+apps/erpnext/erpnext/config/setup.py +88,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
 DocType: Purchase Invoice,Total Advance,Avance total
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +543,Unstop Material Request,Continuar Solicitud de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +544,Unstop Material Request,Continuar Solicitud de Material
 DocType: Workflow State,User,Usuario
 DocType: Opportunity Item,Basic Rate,Tasa Básica
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +122,Set as Lost,Establecer como Perdidos
+DocType: Customer,Credit Days Based On,Días crédito basado en
 apps/erpnext/erpnext/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.py +57,Stock balances updated,Balance de Inventario Actualizado
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Mantener misma tasa durante todo el ciclo de ventas
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +427,Cannot return more than {0} for Item {1},No se puede devolver más de {0} para el artículo {1}
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planee registros de tiempo fuera de las horas de trabajo Estación de trabajo.
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +91,{0} {1} has already been submitted,{0} {1} ya ha sido presentado
 ,Items To Be Requested,Los artículos que se solicitarán
@@ -3753,24 +3831,24 @@
 DocType: Production Planning Tool,Filter based on item,Filtro basado en artículo
 DocType: Fiscal Year,Year Start Date,Año de Inicio
 DocType: Attendance,Employee Name,Nombre del Empleado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +241,Debit To account must be a liability account,La Cuenta para Débito debe ser una cuenta de pasivo
 DocType: Sales Invoice,Rounded Total (Company Currency),Total Redondeado (Moneda Local)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +89,Cannot covert to Group because Account Type is selected.,No se puede convertir a Grupo porque se seleccionó Tipo de Cuenta.
 DocType: Purchase Common,Purchase Common,Compra Común
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +93,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor regenere .
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +626,From Opportunity,De Oportunidades
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +618,From Opportunity,De Oportunidades
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +45,Blanking,Supresión
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +161,Employee Benefits,Beneficios a los Empleados
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +166,Employee Benefits,Beneficios a los Empleados
 DocType: Sales Invoice,Is POS,Es POS
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +224,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elmento {0} en la fila {1}
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +212,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elmento {0} en la fila {1}
 DocType: Production Order,Manufactured Qty,Cantidad Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
+apps/erpnext/erpnext/accounts/party.py +22,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +18,Bills raised to Customers.,Facturas presentadas a los Clientes.
 DocType: DocField,Default,Defecto
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Identificación del proyecto
-DocType: Item,"Selecting ""Yes"" will allow this item to appear in Purchase Order , Purchase Receipt.","Al seleccionar "" Sí"" permitirá que este tema aparezca en la Orden de Compra , recibo de compra ."
-apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +41,{0} subscribers added,{0} abonados añadidos
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +431,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Monto no puede ser mayor que la espera Monto contra la Cuenta de gastos de {1}. A la espera de Monto es {2}
+apps/erpnext/erpnext/crm/doctype/newsletter_list/newsletter_list.py +42,{0} subscribers added,{0} abonados añadidos
 DocType: Maintenance Schedule,Schedule,Horario
 DocType: Account,Parent Account,Cuenta Primaria
 DocType: Serial No,Available,Disponible
@@ -3790,26 +3868,28 @@
 apps/erpnext/erpnext/config/accounts.py +13,Accounting journal entries.,Entradas de diario de contabilidad.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +210,Please select Employee Record first.,"Por favor, seleccione Employee Record primero."
 apps/erpnext/erpnext/accounts/page/accounts_browser/accounts_browser.js +35,To create a Tax Account,Para crear una Cuenta de impuestos
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +227,Please enter Expense Account,"Por favor, ingrese Cuenta de Gastos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +233,Please enter Expense Account,"Por favor, ingrese Cuenta de Gastos"
 DocType: Account,Stock,Existencias
 DocType: Employee,Current Address,Dirección Actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces descripción, imágenes, precios, impuestos etc se establecerá a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
 DocType: Employee,Contract End Date,Fecha Fin de Contrato
 DocType: Sales Order,Track this Sales Order against any Project,Seguir este de órdenes de venta en contra de cualquier proyecto
-apps/erpnext/erpnext/templates/includes/cart.js +284,Price List not configured.,Lista de precios no configurado.
+apps/erpnext/erpnext/templates/includes/cart.js +285,Price List not configured.,Lista de precios no configurado.
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Tire de las órdenes de venta (pendiente de entregar ) sobre la base de los criterios anteriores
 DocType: DocShare,Document Type,Tipo de Documento
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +558,From Supplier Quotation,Desde la cotización del proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +552,From Supplier Quotation,Desde la cotización del proveedor
 DocType: Deduction Type,Deduction Type,Tipo de Deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Serial No,Not Available,No disponible
 DocType: Pricing Rule,Min Qty,Cantidad Mínima
 DocType: GL Entry,Transaction Date,Fecha de Transacción
 DocType: Production Plan Item,Planned Qty,Cantidad Planificada
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +92,Total Tax,Impuesto Total
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +91,Total Tax,Impuesto Total
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +179,For Quantity (Manufactured Qty) is mandatory,Por Cantidad (Fabricado Cantidad) es obligatorio
 DocType: Stock Entry,Default Target Warehouse,Almacén de Destino Predeterminado
 DocType: Purchase Invoice,Net Total (Company Currency),Total Neto (Moneda Local)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +81,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,Fila {0}: Partido Tipo y Partido es aplicable únicamente contra la cuenta de cobro / pago
 DocType: Notification Control,Purchase Receipt Message,Mensaje de Recibo de Compra
 DocType: Production Order,Actual Start Date,Fecha de Comienzo Real
 DocType: Sales Order,% of materials delivered against this Sales Order,% De los materiales entregados en contra de esta Orden de Venta
@@ -3828,13 +3908,14 @@
 DocType: Purchase Taxes and Charges,On Previous Row Amount,En la Fila Anterior de Cantidad
 DocType: Email Digest,New Delivery Notes,Nuevas Notas de Entrega
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +30,Please enter Payment Amount in atleast one row,"Por favor, ingrese el monto del pago en al menos una fila"
-apps/erpnext/erpnext/templates/pages/tickets.py +34,Please write something in subject and message!,"Por favor, escriba algo en asunto y el mensaje!"
-apps/erpnext/erpnext/config/accounts.py +143,"Seasonality for setting budgets, targets etc.","La estacionalidad de establecer presupuestos, objetivos, etc."
-apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +190,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Fila {0}: Cantidad de pago no puede ser superior a Monto Pendiente
+DocType: POS Profile,POS Profile,POS Perfil
+apps/erpnext/erpnext/config/accounts.py +148,"Seasonality for setting budgets, targets etc.","La estacionalidad de establecer presupuestos, objetivos, etc."
+apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.js +191,Row {0}: Payment Amount cannot be greater than Outstanding Amount,Fila {0}: Cantidad de pago no puede ser superior a Monto Pendiente
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +46,Total Unpaid,Total no pagado
 apps/erpnext/erpnext/projects/doctype/time_log/time_log_list.js +21,Time Log is not billable,Registro de Horas no es Facturable
-apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants","Artículo {0} es una plantilla, por favor seleccione una de sus variantes"
-DocType: System Settings,Localization,Localización
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +74,Net pay cannot be negative,Salario neto no puede ser negativo
+apps/erpnext/erpnext/stock/get_item_details.py +128,"Item {0} is a template, please select one of its variants","Artículo {0} es una plantilla, por favor seleccione una de sus variantes"
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +528,Purchaser,Comprador
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +81,Net pay cannot be negative,Salario neto no puede ser negativo
 apps/erpnext/erpnext/accounts/doctype/payment_tool/payment_tool.py +70,Please enter the Against Vouchers manually,"Por favor, introduzca la Contra Vales manualmente"
 DocType: SMS Settings,Static Parameters,Parámetros estáticos
 DocType: Purchase Order,Advance Paid,Pago Anticipado
@@ -3843,13 +3924,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +159,Current Liabilities,Pasivo Corriente
 apps/erpnext/erpnext/config/crm.py +43,Send mass SMS to your contacts,Enviar Mensaje de Texto masivo a sus contactos
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Considere Impuesto o Cargo por
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +53,Actual Qty is mandatory,Cantidad Real es obligatoria
-DocType: Item,"Select ""Yes"" if you are maintaining stock of this item in your Inventory.","Seleccione "" Sí"" si usted está manteniendo un balance de este artículo en su inventario."
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +415,Item {0} does not exist in {1} {2},Elemento {0} no existe en {1} {2}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +55,Actual Qty is mandatory,Cantidad Real es obligatoria
 apps/erpnext/erpnext/setup/page/setup_wizard/fixtures/operations.py +41,Cross-rolling,Cross-balanceo
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +127,Credit Card,Tarjeta de Crédito
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +132,Credit Card,Tarjeta de Crédito
 DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
-apps/erpnext/erpnext/config/stock.py +95,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
+apps/erpnext/erpnext/config/stock.py +100,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
 DocType: Employee Education,Major/Optional Subjects,Principales / Asignaturas Optativas
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +49,Please enter Taxes and Charges,"Por favor, introduzca las tasas y cargos"
@@ -3861,7 +3940,7 @@
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,Desde Moneda y A Moneda no puede ser el mismo
 DocType: Stock Entry,Repack,Vuelva a embalar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder
-apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +480,Attach Logo,Adjunte Logo
+apps/erpnext/erpnext/setup/page/setup_wizard/setup_wizard.js +500,Attach Logo,Adjunte Logo
 DocType: Customer,Commission Rate,Comisión de Tarifas
 apps/erpnext/erpnext/config/hr.py +145,Block leave applications by department.,Bloquee solicitudes de vacaciones por departamento.
 DocType: Production Order,Actual Operating Cost,Costo de Funcionamiento Real
@@ -3872,12 +3951,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +183,Capital Stock,Capital Social
 DocType: Packing Slip,Package Weight Details,Peso Detallado del Paquete
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +105,Please select a csv file,"Por favor, seleccione un archivo csv"
-apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +89,Designer,Diseñador
-apps/erpnext/erpnext/config/selling.py +116,Terms and Conditions Template,Plantilla de Términos y Condiciones
+DocType: Backup Manager,Send Backups to Dropbox,Enviar copias de seguridad de Dropbox
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_list.js +9,To Receive and Bill,Para Recibir y Bill
+apps/erpnext/erpnext/setup/page/setup_wizard/install_fixtures.py +94,Designer,Diseñador
+apps/erpnext/erpnext/config/selling.py +121,Terms and Conditions Template,Plantilla de Términos y Condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
-DocType: Party Type,Allow Children,Permitir hijos
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +362,Cost Center is required in row {0} in Taxes table for type {1},Se requiere de Centros de Costo en la fila {0} en la tabla Impuestos para el tipo {1}
-DocType: Purchase Invoice Item,Discount %,Descuento%
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +363,Cost Center is required in row {0} in Taxes table for type {1},Se requiere de Centros de Costo en la fila {0} en la tabla Impuestos para el tipo {1}
+DocType: Item,Automatically create Material Request if quantity falls below this level,Creación automática de solicitud de materiales si la cantidad es inferior a este nivel
 ,Item-wise Purchase Register,- Artículo sabio Compra Registrarse
 DocType: Batch,Expiry Date,Fecha de caducidad
 ,Supplier Addresses and Contacts,Contactos y Direcciones del Proveedor
@@ -3886,14 +3966,16 @@
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ etc junto a monedas.
 DocType: Supplier,Credit Days,Días de Crédito
 DocType: Leave Type,Is Carry Forward,Es llevar adelante
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +496,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
-DocType: Item,Lead Time Days,Tiempo de Entrega en Días
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +497,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Tiempo de Entrega en Días
+apps/erpnext/erpnext/config/manufacturing.py +120,Bill of Materials,Lista de materiales
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +79,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Fila {0}: Partido Tipo y Partido se requiere para la cuenta por cobrar / pagar {1}
 DocType: Backup Manager,Send Notifications To,Enviar notificaciones a
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html +26,Ref Date,Fecha Ref
 DocType: Employee,Reason for Leaving,Razones de Renuncia 
 DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
 DocType: GL Entry,Is Opening,está abriendo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +188,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +187,Row {0}: Debit entry can not be linked with a {1},Fila {0}: Débito no puede vincularse con {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Account {0} does not exist,Cuenta {0} no existe
 DocType: Account,Cash,Efectivo
 DocType: Employee,Short biography for website and other publications.,Breve biografía de la página web y otras publicaciones.