diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index a49bc2b..0d18483 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -18,20 +18,21 @@
 DocType: Sales Partner,Dealer,Distribuidor
 DocType: Employee,Rented,Arrendado
 DocType: Purchase Order,PO-,CORREOS-
+apps/erpnext/erpnext/accounts/report/financial_statements.py +19,Start Year {0} not found.,Año de inicio {0} no encontrado.
 DocType: POS Profile,Applicable for User,Aplicable para el usuario
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +187,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +449,Error: {0} &gt; {1},Error: {0}&gt; {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +191,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +197,Do you really want to scrap this asset?,¿Realmente desea desechar este activo?
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +17,Select Default Supplier,Elija un proveedor predeterminado
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +36,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Será calculado en la transacción.
 DocType: Address,County,Condado
 DocType: Purchase Order,Customer Contact,Contacto del cliente
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +15,Mandatory feild - Program,Obligatoria feild - Programa
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory feild - Program,Obligatoria feild - Programa
 DocType: Job Applicant,Job Applicant,Solicitante de empleo
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +5,This is based on transactions against this Supplier. See timeline below for details,Esto se basa en transacciones con este proveedor. Ver cronología abajo para más detalles
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,No hay más resultados.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Legal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +130,Actual type tax cannot be included in Item rate in row {0},El tipo de impuesto real no puede incluirse en la tarifa del artículo en la fila {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},El tipo de impuesto real no puede incluirse en la tarifa del artículo en la fila {0}
 DocType: C-Form,Customer,Cliente
 DocType: Purchase Receipt Item,Required By,Solicitado por
 DocType: Delivery Note,Return Against Delivery Note,Devolución contra nota de entrega
@@ -39,7 +40,7 @@
 DocType: Purchase Order,% Billed,% Facturado
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),El tipo de cambio debe ser el mismo que {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Nombre del cliente
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +124,Bank account cannot be named as {0},La cuenta bancaria no puede nombrarse como {0}
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},La cuenta bancaria no puede nombrarse como {0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) para el cual los asientos contables se crean y se mantienen los saldos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
@@ -52,16 +53,16 @@
 ,Purchase Order Items To Be Received,Productos por recibir desde orden de compra
 DocType: SMS Center,All Supplier Contact,Todos Contactos de Proveedores
 DocType: Quality Inspection Reading,Parameter,Parámetro
-apps/erpnext/erpnext/projects/doctype/project/project.py +52,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
+apps/erpnext/erpnext/projects/doctype/project/project.py +54,Expected End Date can not be less than Expected Start Date,La fecha prevista de finalización no puede ser inferior a la fecha prevista de inicio
 apps/erpnext/erpnext/utilities/transaction_base.py +107,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Línea # {0}: El valor debe ser el mismo que {1}: {2} ({3} / {4})
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +229,New Leave Application,Nueva solicitud de ausencia
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,Nueva solicitud de ausencia
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +20,Attendance Record {0} exists against Student {1} for Course Schedule {2},Registro de asistencia {0} existe en contra de estudiantes {1} para el Programa del curso {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Bank Draft,Giro bancario
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,Giro bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
 apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,Mostrar variantes
 DocType: Academic Term,Academic Term,Término académico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +13,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +584,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +511,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),Préstamos (pasivos)
 DocType: Employee Education,Year of Passing,Año de graduación
@@ -73,14 +74,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Asistencia médica
 DocType: Purchase Invoice,Monthly,Mensual
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retraso en el pago (días)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +718,Invoice,Factura
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año fiscal {0} es necesario
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
-DocType: Company,Abbr,Abreviatura
+DocType: Salary Component,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,Row {0}: {1} {2} does not match with {3},Línea {0}: {1} {2} no coincide con {3}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +74,Row # {0}:,Línea # {0}:
+DocType: Timesheet,Total Costing Amount,Monto cálculo del coste total
 DocType: Delivery Note,Vehicle No,Vehículo No.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,"Por favor, seleccione la lista de precios"
 DocType: Production Order Operation,Work In Progress,Trabajo en proceso
@@ -91,9 +93,9 @@
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py +47,Course Schedules created:,Calendario de cursos creados:
 apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},Nuevo/a {0}: #{1}
 ,Sales Partners Commission,Comisiones de socios de ventas
-apps/erpnext/erpnext/setup/doctype/company/company.py +38,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,Abreviatura no puede tener más de 5 caracteres
 DocType: Payment Request,Payment Request,Solicitud de pago
-DocType: Asset,Value After Depreciation,Valor después de la depreciación
+DocType: Asset,Value After Depreciation,Valor después de Depreciación
 DocType: Employee,O+,O +
 apps/erpnext/erpnext/selling/doctype/quotation/quotation_dashboard.py +7,Related,Relacionado
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Esta es una cuenta raíz y no se puede editar.
@@ -102,6 +104,7 @@
 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 la otra para el nombre nuevo."
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,Kilogramo
+DocType: Student Log,Log,Iniciar sesión
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
 DocType: Item Attribute,Increment,Incremento
 apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Seleccione Almacén ...
@@ -109,9 +112,9 @@
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Igual Company se introduce más de una vez
 DocType: Employee,Married,Casado
 apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},No está permitido para {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +536,Get items from,Obtener artículos de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +377,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
-apps/erpnext/erpnext/templates/pages/home.py +23,Product {0},Producto {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,Obtener artículos de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producto {0}
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
@@ -119,7 +122,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondo de pensiones
 DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribución mensual ayuda a distribuir el presupuesto / Target a través de meses si tiene la estacionalidad de su negocio.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +92,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +156,Salary Structure Missing,Falta Estructura salarial
 DocType: Lead,Person Name,Nombre de persona
 DocType: Sales Invoice Item,Sales Invoice Item,Producto de factura de venta
 DocType: Account,Credit,Haber
@@ -128,7 +131,7 @@
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Informes de archivo
 DocType: Warehouse,Warehouse Detail,Detalles del Almacén
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
 DocType: Tax Rule,Tax Type,Tipo de impuestos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: Item,Item Image (if not slideshow),Imagen del producto (si no son diapositivas)
@@ -137,12 +140,14 @@
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El día de fiesta en {0} no es entre De la fecha y Hasta la fecha
+DocType: Student Log,Student Log,Iniciar estudiante
 DocType: Quality Inspection,Get Specification Details,Obtener especificaciones
 DocType: Lead,Interested,Interesado
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +162,Opening,Apertura
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,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 desde grupo
 DocType: Journal Entry,Opening Entry,Asiento de apertura
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Territorio
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Sólo cuenta de pago
 DocType: Stock Entry,Additional Costs,Costes adicionales
 apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,Cuenta con transacción existente no se puede convertir al grupo.
@@ -170,10 +175,11 @@
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tire Solicitud de materiales de tipo Fabricación en base a los criterios anteriores
 DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Annual Salary,Salario Anual
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,Salario Anual
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
 apps/erpnext/erpnext/accounts/party.py +349,{0} {1} is frozen,{0} {1} está congelado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Gastos sobre existencias
+apps/erpnext/erpnext/accounts/report/financial_statements.py +22,End Year {0} not found.,Año de finalización {0} no encontrado.
 DocType: Journal Entry,Contra Entry,Entrada contra
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
 DocType: Delivery Note,Installation Status,Estado de la instalación
@@ -185,7 +191,7 @@
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descargue la plantilla, para rellenar los datos apropiados y adjuntar el archivo modificado.
  Todas las fechas y los empleados en el período seleccionado se adjuntara a la planilla, con los registros de asistencia existentes."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,El producto {0} no está activo o ha llegado al final de la vida útil
-apps/erpnext/erpnext/public/js/setup_wizard.js +339,Example: Basic Mathematics,Ejemplo: Matemáticas Básicas
+apps/erpnext/erpnext/public/js/setup_wizard.js +341,Example: Basic Mathematics,Ejemplo: Matemáticas Básicas
 apps/erpnext/erpnext/controllers/accounts_controller.py +614,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos
 apps/erpnext/erpnext/config/hr.py +166,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
@@ -198,7 +204,7 @@
 DocType: Leave Application,Reason,Razón
 apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Crear empleado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +149,Execution,Ejecución
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Execution,Ejecución
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalles de las operaciones realizadas.
 DocType: Serial No,Maintenance Status,Estado del mantenimiento
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Productos y precios
@@ -206,7 +212,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},La fecha 'Desde' tiene que pertenecer al rango del año fiscal = {0}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},El centro de Costos {0} no pertenece a la compañía {1}
 DocType: Customer,Individual,Individual
-DocType: Academic Term,Academics User,académicos usuario
+DocType: Interest,Academics User,académicos usuario
 DocType: Cheque Print Template,Amount In Figure,En la Figura cantidad
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas
 DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro url para el mensaje
@@ -221,7 +227,6 @@
 DocType: Purchase Taxes and Charges,Valuation,Valuación
 ,Purchase Order Trends,Tendencias de ordenes de compra
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,Asignar las ausencias para el año.
-DocType: Earning Type,Earning Type,Tipo de ingresos
 DocType: SG Creation Tool Course,SG Creation Tool Course,SG Curso herramienta de creación
 DocType: Student Group Creation Tool,Leave blank if you wish to fetch all courses for selected academic term,Dejar en blanco si desea obtener todos los cursos de su término académico elegido
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,Insufficient Stock,insuficiente Stock
@@ -237,14 +242,14 @@
 DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es  aplicable
 DocType: Course Schedule,Instructor Name,Nombre instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +170,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recibida el
 DocType: Sales Partner,Reseller,Re-vendedor
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, introduzca compañia"
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
 ,Production Orders in Progress,Órdenes de producción en progreso
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +37,Net Cash from Financing,Efectivo neto de financiación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1448,"LocalStorage is full , did not save","LocalStorage está lleno, no salvó"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,Efectivo neto de financiación
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1436,"LocalStorage is full , did not save","LocalStorage está lleno, no salvó"
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir las hojas no utilizados de las asignaciones anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
@@ -257,34 +262,35 @@
 apps/erpnext/erpnext/templates/generators/item.html +78,No description given,Ninguna descripción definida
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitudes de compra.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +5,This is based on the Time Sheets created against this project,Esto se basa en la tabla de tiempos creados en contra de este proyecto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +196,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +114,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +181,Leaves per Year,Ausencias por año
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Leaves per Year,Ausencias por año
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
 apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},El almacén {0} no pertenece a la compañía {1}
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Por favor configuración de sistema de nombres de los empleados en Recursos Humanos&gt; Configuración de recursos humanos
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Litre,Litro
 DocType: Task,Total Costing Amount (via Time Sheet),Cálculo del coste total Monto (a través de hoja de horas)
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +425,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,Vacaciones Bloqueadas
+apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,Asientos bancarios
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +82,Annual,Anual
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
 DocType: Stock Entry,Sales Invoice No,Factura de venta No.
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido
+DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso herramienta de creación de grupo de alumnos
 DocType: Lead,Do Not Contact,No contactar
-apps/erpnext/erpnext/public/js/setup_wizard.js +358,People who teach at your organisation,Las personas que enseñan en su organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +360,People who teach at your organisation,Las personas que enseñan en su organización
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El ID único para el seguimiento de todas las facturas recurrentes. Este es generado al validar.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Software Developer,Desarrollador de Software.
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,Desarrollador de Software.
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
 DocType: Pricing Rule,Supplier Type,Tipo de proveedor
 DocType: Scheduling Tool,Course Start Date,Curso Fecha de Inicio
 DocType: Item,Publish in Hub,Publicar en el Hub
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +686,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +791,Material Request,Solicitud de materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,Solicitud de materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +28,Abbreviation already used for another salary component,Abreviatura ya utilizado para otro componente de sueldos
 DocType: Item,Purchase Details,Detalles de compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},El elemento {0} no se encuentra en 'Materias Primas Suministradas' en la tabla de la órden de compra {1}
 DocType: Employee,Relation,Relación
@@ -301,7 +307,7 @@
 DocType: Lead,Mobile No.,Número móvil
 DocType: Maintenance Schedule,Generate Schedule,Generar planificación
 DocType: Purchase Invoice Item,Expense Head,Cuenta de gastos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +102,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,"Por favor, seleccione primero el tipo de cargo"
 DocType: Student Group Student,Student Group Student,Estudiante grupo de alumnos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más reciente
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
@@ -310,14 +316,14 @@
 DocType: Asset,Next Depreciation Date,Siguiente Depreciación Fecha
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coste de actividad por empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +614,Supplier Invoice No exists in Purchase Invoice {0},Proveedor de factura no existe en la factura de la compra {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +626,Supplier Invoice No exists in Purchase Invoice {0},Proveedor de factura no existe en la factura de la compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
 DocType: Job Applicant,Cover Letter,Carta de presentación
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques pendientes y Depósitos para despejar
 DocType: Item,Synced With Hub,Sincronizado con Hub.
 apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,Contraseña incorrecta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +344,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
 DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,Error de referencia circular
@@ -329,11 +335,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +763,Delivery Note,Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,Nota de entrega
 apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costo de activo vendido
 apps/erpnext/erpnext/accounts/utils.py +233,Payment Entry has been modified after you pulled it. Please pull it again.,"El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
+apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Student Applicant,Admitted,Aceptado
 DocType: Workstation,Rent Cost,Costo de arrendamiento
@@ -343,7 +349,7 @@
 DocType: Employee,Company Email,Email de la compañía
 DocType: GL Entry,Debit Amount in Account Currency,Importe debitado con la divisa
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Operaciones bancarias / efectivo contra la parte o al traslado
-DocType: Shipping Rule,Valid for Countries,Válido para los Países
+DocType: Shipping Rule,Valid for Countries,Válido para Países
 apps/erpnext/erpnext/stock/doctype/item/item.js +51,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 producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
@@ -352,18 +358,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no se puede hacer frente a un activo existente {1}
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +54,{0} already allocated for Employee {1} for period {2} to {3},{0} ya ha sido asignado para el empleado {1} para el periodo {2} hasta {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +759,Select Item,Seleccione producto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Item: {0} managed batch-wise, can not be reconciled using \
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +812,Select Item,Seleccione producto
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
 					Stock Reconciliation, instead use Stock Entry","El Producto: {0} gestionado por lotes, no se puede conciliar usando\ Reconciliación de Stock, se debe usar Entrada de Stock"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +47,Convert to non-Group,Convertir a 'Sin-Grupo'
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
 apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,Su dirección de correo electrónico
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +272,Please see attachment,"Por favor, revise el documento adjunto"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grupos de estudiantes
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,La configuración ya se ha completado!
@@ -389,15 +395,15 @@
 DocType: Salary Slip Timesheet,Working Hours,Horas de trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
 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 existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +683,Purchase Return,Devolucion de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,Devolucion de Compra
 ,Purchase Register,Registro de compras
 DocType: Scheduling Tool,Rechedule,Rechedule
 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 +192,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
 DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos
-apps/erpnext/erpnext/demo/setup_data.py +346,Medical,Médico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +142,Reason for losing,Razón de pérdida
+DocType: Student Log,Medical,Médico
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +143,Reason for losing,Razón de pérdida
 apps/erpnext/erpnext/accounts/utils.py +239,Allocated amount can not greater than unadjusted amount,importe asignado no puede superar el importe no ajustado
 DocType: Announcement,Receiver,Receptor
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +79,Workstation is closed on the following dates as per Holiday List: {0},La estación de trabajo estará cerrada en las siguientes fechas según la lista de festividades: {0}
@@ -405,15 +411,15 @@
 DocType: Employee,Single,Soltero
 DocType: Account,Cost of Goods Sold,Costo sobre ventas
 DocType: Purchase Invoice,Yearly,Anual
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +229,Please enter Cost Center,"Por favor, introduzca el centro de costos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,"Por favor, introduzca el centro de costos"
 DocType: Journal Entry Account,Sales Order,Orden de venta (OV)
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +67,Avg. Selling Rate,Precio de venta promedio
-DocType: Examination,Examiner Name,Nombre del examinador
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,Precio de venta promedio
+DocType: Assessment,Examiner Name,Nombre del examinador
 apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},La cantidad no puede ser una fracción en la línea {0}
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y precios
 DocType: Delivery Note,% Installed,% Instalado
-apps/erpnext/erpnext/public/js/setup_wizard.js +376,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las conferencias se pueden programar."
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +41,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
+apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las conferencias se pueden programar."
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: BOM,Item Desription,Descripción de producto
 DocType: Purchase Invoice,Supplier Name,Nombre de proveedor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lea el Manual ERPNext
@@ -421,7 +427,7 @@
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Ajusta automáticamente los números de serie basado en FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Comprobar número de factura único por proveedor
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta el caso nº' no puede ser menor que 'Desde el caso nº'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +104,Non Profit,Sin fines de lucro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,Sin fines de lucro
 DocType: Production Order,Not Started,No iniciado
 DocType: Lead,Channel Partner,Canal de socio
 DocType: Account,Old Parent,Antiguo Padre
@@ -431,13 +437,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +638,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master de vacaciones .
 DocType: Request for Quotation Item,Required Date,Fecha de solicitud
 DocType: Delivery Note,Billing Address,Dirección de facturación
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +809,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Presupuesto
 DocType: Tax Rule,Billing County,Condado de facturación
 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 valor del impuesto se considerará como ya incluido en el importe"
@@ -456,23 +462,24 @@
 DocType: Salary Structure,Salary Component for timesheet based payroll.,El componente salarial para la nómina de parte de horas basado.
 DocType: Sales Order Item,Used for Production Plan,Se utiliza para el plan de producción
 DocType: Manufacturing Settings,Time Between Operations (in mins),Tiempo entre operaciones (en minutos)
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +89,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Presupuesto para la cuenta {1} contra centros de coste {2} es {3}. Se superará por {4}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +92,{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4},{0} Presupuesto para la cuenta {1} contra centros de coste {2} es {3}. Se superará por {4}
 DocType: Customer,Buyer of Goods and Services.,Consumidor de productos y servicios.
 DocType: Journal Entry,Accounts Payable,Cuentas por pagar
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Las listas de materiales seleccionados no son para el mismo artículo
 DocType: Pricing Rule,Valid Upto,Válido hasta
 apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o personas.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Ingreso directo
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +33,"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"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Administrative Officer,Funcionario administrativo
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"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"
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Administrative Officer,Funcionario administrativo
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +23,Acutal Qty {0} / Waiting Qty {1},Acutal Cantidad {0} / en espera Cantidad {1}
+DocType: Timesheet Detail,Hrs,Horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +44,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +380,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +398,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productos cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +527,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items","Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 DocType: Shipping Rule,Net Weight,Peso neto
 DocType: Employee,Emergency Phone,Teléfono de emergencia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +28,Buy,Comprar
@@ -480,14 +487,14 @@
 DocType: Sales Invoice,Offline POS Name,Desconectado Nombre POS
 DocType: Sales Order,To Deliver,Para entregar
 DocType: Purchase Invoice Item,Item,Productos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1109,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1563,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
 apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,Gestión de sub-contrataciones
 DocType: Project,Project will be accessible on the website to these users,Proyecto será accesible en la página web a estos usuarios
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Tasa por la cual la lista de precios es convertida como base de la compañía
-apps/erpnext/erpnext/setup/doctype/company/company.py +53,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 +44,Abbreviation already used for another company,Abreviatura ya utilizada para otra empresa
+apps/erpnext/erpnext/setup/doctype/company/company.py +56,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 +47,Abbreviation already used for another company,Abreviatura ya utilizada para otra empresa
 DocType: Selling Settings,Default Customer Group,Categoría de cliente predeterminada
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","si es desactivado,  el campo 'Total redondeado' no será visible en ninguna transacción"
 DocType: BOM,Operating Cost,Costo de operacion
@@ -495,7 +502,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,Incremento no puede ser 0
 DocType: Production Planning Tool,Material Requirement,Solicitud de material
 DocType: Company,Delete Company Transactions,Eliminar las transacciones de la compañía
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +306,Reference No and Reference Date is mandatory for Bank transaction,No de referencia y fecha de referencia es obligatoria para las transacciones bancarias
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +313,Reference No and Reference Date is mandatory for Bank transaction,No de referencia y fecha de referencia es obligatoria para las transacciones bancarias
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
@@ -506,25 +513,26 @@
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Production Plan Item,Pending Qty,Cantidad pendiente
 DocType: Budget,Ignore,Pasar por alto
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo Elemento&gt; Marca
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/config/accounts.py +235,Setup cheque dimensions for printing,dimensiones de verificación de configuración para la impresión
+apps/erpnext/erpnext/config/accounts.py +241,Setup cheque dimensions for printing,dimensiones de verificación de configuración para la impresión
 DocType: Salary Slip,Salary Slip Timesheet,Parte de horas de salario de deslizamiento
 apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
 DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido
-apps/erpnext/erpnext/stock/doctype/item/item.py +125,Valuation Rate is mandatory if Opening Stock entered,Valoración de los tipos es obligatoria si la apertura Stock entró
+apps/erpnext/erpnext/stock/doctype/item/item.py +128,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,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 +28,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
-apps/erpnext/erpnext/config/accounts.py +251,Financial / accounting year.,Finanzas / Ejercicio contable.
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +9,Accumulated Values,Valores acumulados
+apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,Finanzas / Ejercicio contable.
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,Valores acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lamentablemente, los numeros de serie no se puede fusionar"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +664,Make Sales Order,Crear orden de venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,Crear orden de venta
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
-DocType: Course,Course,Curso
+DocType: Assessment,Course,Curso
 DocType: Timesheet,Payslip,recibo de sueldo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,La fecha de inicio no puede ser mayor que la fecha final del año fiscal
 DocType: Issue,Resolution,Resolución
@@ -536,7 +544,7 @@
 DocType: Job Applicant,Resume Attachment,Adjunto curriculum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +691,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,Devoluciones de ventas
 DocType: Announcement,Posted By,Publicado por
 DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (nave)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Base de datos de clientes potenciales.
@@ -545,18 +553,19 @@
 DocType: Quotation,Quotation To,Oferta de venta para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +792,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +795,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente.
 apps/erpnext/erpnext/accounts/utils.py +237,Allocated amount can not be negative,Monto asignado no puede ser negativo
 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 que se crean las entradas de inventario
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venta de partes de horas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
 DocType: Sales Invoice,Customer's Vendor,Agente de ventas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +148,Proposal Writing,Redacción de propuestas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,Redacción de propuestas
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pago Deducción de Entrada
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
-apps/erpnext/erpnext/config/accounts.py +74,Masters,Maestros
-apps/erpnext/erpnext/config/accounts.py +134,Update Bank Transaction Dates,Actualizar Fechas de Transacciones Bancarias
+DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Si está marcada, las materias primas para los artículos que son sub-contratados serán incluidos en las solicitudes de materiales"
+apps/erpnext/erpnext/config/accounts.py +80,Masters,Maestros
+apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Actualizar Fechas de Transacciones Bancarias
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tiempo de seguimiento
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
 DocType: Packing Slip Item,DN Detail,Detalle DN
@@ -566,7 +575,7 @@
 DocType: Delivery Note,Time at which items were delivered from warehouse,Hora en que los productos fueron entregados desde el almacén
 DocType: Sales Invoice,Sales Taxes and Charges,Impuestos y cargos sobre ventas
 DocType: Employee,Organization Profile,Perfil de la organización
-apps/erpnext/erpnext/accounts/page/pos/pos.js +725,View Offline Records,Ver Desconectado Registros
+apps/erpnext/erpnext/accounts/page/pos/pos.js +733,View Offline Records,Ver Desconectado Registros
 DocType: Employee,Reason for Resignation,Motivo de la renuncia
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,Plantilla para evaluaciones de desempeño.
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Detalles de diarios
@@ -578,9 +587,9 @@
 DocType: Activity Type,Default Costing Rate,Precio de costo predeterminado
 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 precios son filtradas por cliente, categoría de cliente, territorio, proveedor, tipo de proveedor, campaña, socio de ventas, etc."
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Inventory,Cambio neto en el inventario
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Inventory,Cambio neto en el inventario
 DocType: Employee,Passport Number,Número de pasaporte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Manager,Gerente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,Gerente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,Este artículo se ha introducido varias veces.
 DocType: SMS Settings,Receiver Parameter,Configuración de receptor(es)
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Basado en' y 'Agrupar por' no pueden ser iguales
@@ -589,12 +598,12 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,"Por favor, introduzca la dirección de correo electrónico (Email)"
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +295,Timesheet created:,Parte de horas de creación:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +693,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +299,Timesheet created:,Parte de horas de creación:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +17,Enroll,Inscribirse
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
 DocType: Depreciation Schedule,Depreciation Amount,importe de la amortización
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +51,Convert to Group,Convertir a grupo
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir a grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
 DocType: Request for Quotation,For individual supplier,Por proveedor individual
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Importe entregado
@@ -608,7 +617,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}: {1} no se encontró en la tabla de detalles de factura
 DocType: Company,Round Off Cost Center,Centro de costos por defecto (redondeo)
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,La visita de mantenimiento {0} debe ser cancelada antes de cancelar la orden de ventas
-DocType: Material Request,Material Transfer,Transferencia de material
+DocType: Item,Material Transfer,Transferencia de material
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),Apertura (Deb)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},Fecha y hora de contabilización deberá ser posterior a {0}
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
@@ -616,6 +625,7 @@
 DocType: BOM Operation,Operation Time,Tiempo de operación
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +141,Finish,Terminar
 DocType: Pricing Rule,Sales Manager,Gerente de ventas
+DocType: Salary Structure Employee,Base,Base
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta ganancia / pérdida en la disposición de activos
@@ -626,13 +636,15 @@
 DocType: Sales Invoice Timesheet,Time Sheet,Hoja de horario
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Adquisición retroactiva de materia prima basada en
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,"Por favor, ingrese los detalles del producto"
+DocType: Interest,Interest,Interesar
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +9,Pre Sales,Pre ventas
 DocType: Purchase Receipt,Other Details,Otros detalles
 DocType: Account,Accounts,Cuentas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Marketing,Marketing
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,Ya está creado Entrada Pago
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
 apps/erpnext/erpnext/controllers/accounts_controller.py +538,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Activos no vinculado al elemento {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +21,Preview Salary Slip,Salario previsualización de deslizamiento
 DocType: Company,Deafult Cost Center,Centro de coste deafult
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +48,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
@@ -641,7 +653,7 @@
 apps/erpnext/erpnext/schools/doctype/announcement/announcement.py +22,Please select a Student Group,"Por favor, seleccione un grupo de alumnos"
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +614,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +617,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,Elemento {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +25,Company {0} does not exist,Compañía {0} no existe
@@ -653,7 +665,7 @@
 DocType: Project,Estimated Cost,Costo estimado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Ingreso de tarjeta de crédito
-apps/erpnext/erpnext/config/accounts.py +45,Company and Accounts,Empresa y Contabilidad
+apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Empresa y Contabilidad
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Productos recibidos de proveedores.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,En valor
 DocType: Lead,Campaign Name,Nombre de la campaña
@@ -661,10 +673,10 @@
 DocType: Purchase Order,Supply Raw Materials,Suministro de materia prima
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,La fecha en que la próxima factura será generada. Es generada al validar.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo circulante
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} no es un artículo en existencias
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{0} is not a stock Item,{0} no es un artículo en existencia
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
 DocType: Payment Entry,Received Amount (Company Currency),Cantidad recibida (Compañía de divisas)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +167,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +169,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: Production Order Operation,Planned End Time,Tiempo de finalización planeado
 ,Sales Person Target Variance Item Group-Wise,"Variación del objetivo de ventas, por grupo de vendedores"
@@ -746,10 +758,10 @@
 apps/erpnext/erpnext/stock/get_item_details.py +275,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar correo electronico
-apps/erpnext/erpnext/stock/doctype/item/item.py +201,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +709,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +47,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar existencias' no puede marcarse porque los artículos no se han entregado mediante {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,Nos.
 DocType: Item,Items with higher weightage will be shown higher,Los productos con mayor ponderación se mostraran arriba
@@ -766,12 +778,12 @@
 DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volumen mínimo Factura
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +64,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {} idx: {} {DOCTYPE docname} no existe en el anterior &#39;{} tipo de documento&#39; mesa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +234,Timesheet {0} is already completed or cancelled,Parte de horas {0} ya se haya completado o cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +227,Timesheet {0} is already completed or cancelled,Parte de horas {0} ya se haya completado o cancelado
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Día del mes en el que se generará la factura automática por ejemplo 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,La apertura de la depreciación acumulada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,La puntuación debe ser menor o igual a 5
 DocType: Program Enrollment Tool,Program Enrollment Tool,Herramienta de Inscripción Programa
-apps/erpnext/erpnext/config/accounts.py +288,C-Form records,Registros C -Form
+apps/erpnext/erpnext/config/accounts.py +294,C-Form records,Registros C -Form
 apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,Clientes y proveedores
 DocType: Email Digest,Email Digest Settings,Configuración del boletín de correo electrónico
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Soporte técnico para los clientes
@@ -781,7 +793,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0} contra la factura {1} de fecha {2}
 apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Calendario de cursos
 DocType: Maintenance Visit,Completion Status,Estado de finalización
-apps/erpnext/erpnext/schools/doctype/course/course.js +24,Examination,Examen
 DocType: HR Settings,Enter retirement age in years,Introduzca la edad de jubilación en años
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,Inventario estimado
 DocType: Cheque Print Template,Starting location from left edge,Posición inicial desde el borde izquierdo
@@ -799,14 +810,13 @@
 apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,Orden de compra a pago
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo Elemento&gt; Marca
-apps/erpnext/erpnext/stock/doctype/item/item.js +270,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',&#39;Apertura&#39;
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
 DocType: Expense Claim,Expenses,Gastos
 DocType: Item Variant Attribute,Item Variant Attribute,Artículo Variant Atributo
 ,Purchase Receipt Trends,Tendencias de recibos de compra
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Research & Development,Investigación y desarrollo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,Investigación y desarrollo
 ,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de registro
 DocType: Item Reorder,Re-Order Qty,Cantidad mínima para ordenar
@@ -814,6 +824,7 @@
 DocType: Pricing Rule,Price or Discount,Precio o descuento
 DocType: Sales Team,Incentives,Incentivos
 DocType: SMS Log,Requested Numbers,Números solicitados
+DocType: Production Planning Tool,Only Obtain Raw Materials,Sólo obtención de materias primas
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Evaluación de desempeño.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +94,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitación de «uso de Compras &#39;, como cesta de la compra está activado y debe haber al menos una regla fiscal para Compras"
 apps/erpnext/erpnext/controllers/accounts_controller.py +340,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pago {0} está enlazado con la Orden {1}, comprobar si se debe tirar como avance en esta factura."
@@ -838,12 +849,12 @@
 DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado
 DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto
 DocType: Examination Result,Examination Result,Resultado del examen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +703,Purchase Receipt,Recibo de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
 DocType: Employee,Ms,Sra.
-apps/erpnext/erpnext/config/accounts.py +261,Currency exchange rate master.,Configuración principal para el cambio de divisas
+apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,Configuración principal para el cambio de divisas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +167,Reference Doctype must be one of {0},Referencia Doctype debe ser uno de {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +278,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/manufacturing/doctype/production_order/production_order.py +282,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,Plan de materiales para los subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Puntos de venta y Territorio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
@@ -866,24 +877,26 @@
 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,El empleado {0} no está activo o no existe
+DocType: Fee Structure,Components,componentes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +232,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el punto {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +609,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,{0} variantes actualizadas del producto
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +553,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +843,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Address,Shop,Tienda.
 DocType: Hub Settings,Sync Now,Sincronizar ahora.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +172,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
-apps/erpnext/erpnext/config/accounts.py +204,Define budget for a financial year.,Definir presupuesto para un ejercicio.
+apps/erpnext/erpnext/config/accounts.py +210,Define budget for a financial year.,Definir presupuesto para un ejercicio.
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,La cuenta de Banco / Efectivo por defecto se actualizará automáticamente en la factura del POS cuando seleccione este 'modelo'
 DocType: Lead,LEAD-,DIRIGIR-
 DocType: Employee,Permanent Address Is,La dirección permanente es
 DocType: Production Order Operation,Operation completed for how many finished goods?,Se completo la operación para la cantidad de productos terminados?
 apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,La marca
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
+DocType: Item,Is Purchase Item,Es un producto para compra
 DocType: Asset,Purchase Invoice,Factura de compra
 DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +720,New Sales Invoice,Nueva factura de venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +728,New Sales Invoice,Nueva factura de venta
 DocType: Stock Entry,Total Outgoing Value,Valor total de salidas
 apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Fecha y Fecha de Cierre de apertura debe ser dentro del mismo año fiscal
 DocType: Lead,Request for Information,Solicitud de información
@@ -891,26 +904,27 @@
 DocType: Program Fee,Program Fee,tarifa del programa
 DocType: Salary Slip,Total in words,Total en palabras
 DocType: Material Request Item,Lead Time Date,Hora de la Iniciativa
+DocType: Guardian,Guardian Name,Nombre tutor
 DocType: Cheque Print Template,Has Print Format,Formato de impresión tiene
 apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,es obligatorio. Posiblemente el registro de cambio de divisa no ha sido creado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},"Línea #{0}: Por favor, especifique el número de serie para el producto {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,"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 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"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 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
 DocType: Job Opening,Publish on website,Publicar en el sitio web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Envíos realizados a los clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +594,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveedor La fecha no puede ser mayor que la fecha de publicación
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +606,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveedor La fecha no puede ser mayor que la fecha de publicación
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Ingresos indirectos
 DocType: Cheque Print Template,Date Settings,Ajustes de fecha
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variación
 ,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 +757,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,Seleccione el producto a transferir
 DocType: Purchase Invoice,Additional Discount Percentage,Porcentaje de descuento adicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Ver una lista de todos los vídeos de ayuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Seleccione la cuenta principal de banco donde los cheques fueron depositados.
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar la lista de precios en las transacciones
 DocType: Pricing Rule,Max Qty,Cantidad máxima
-DocType: Student,Father's Name,Nombre del Padre
+DocType: Student Applicant,Father's Name,Nombre del Padre
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Fila {0}: {1} factura no es válida, podría ser cancelado / no existe. \ Por favor, introduzca una factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo
@@ -925,21 +939,23 @@
 DocType: Item,Inspection Criteria,Criterios de inspección
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,Transferido
 apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,White,Blanco
+DocType: Timesheet Detail,Bill,Cuenta
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +228,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} a publicar momento de la entrada ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +678,Make ,Crear
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,Crear
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 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 es que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mi carrito
 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 +35,Opening Qty,Cant. de apertura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +393,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
 DocType: Student Batch,Student Batch Name,Lote Nombre del estudiante
 DocType: Holiday List,Holiday List Name,Nombre de festividad
 apps/erpnext/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js +8,Schedule Course,Calendario de Cursos
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Stock Options,Opciones de stock
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,Opciones de stock
 DocType: Journal Entry Account,Expense Claim,Reembolso de gastos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +211,Do you really want to restore this scrapped asset?,¿Realmente desea restaurar este activo desechado?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},Cantidad de {0}
@@ -953,7 +969,7 @@
 DocType: Purchase Invoice,Cash/Bank Account,Cuenta de caja / banco
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +632,Attribute table is mandatory,Tabla de atributos es obligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,Tabla de atributos es obligatorio
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes 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/schools/doctype/announcement/announcement.py +18,Please select a Student,"Por favor, seleccione un Estudiante"
@@ -962,14 +978,14 @@
 DocType: Workstation,Wages,Salarios
 DocType: Project,Internal,Interno
 DocType: Task,Urgent,Urgente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +113,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,Please specify a valid Row ID for row {0} in table {1},"Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Vaya al escritorio y comenzar a usar ERPNext
 DocType: Item,Manufacturer,Fabricante
 DocType: Landed Cost Item,Purchase Receipt Item,Recibo de compra del producto
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
 DocType: POS Profile,Sales Invoice Payment,El pago de facturas de ventas
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Selling Amount,Cantidad de venta
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,Cantidad de venta
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
@@ -984,7 +1000,7 @@
 DocType: Lead,Organization Name,Nombre de la organización
 DocType: Tax Rule,Shipping State,Estado de envío
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,Item must be added using 'Get Items from Purchase Receipts' button,El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'
-DocType: Employee,A-,UN-
+DocType: Employee,A-,A-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Gastos de venta
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra estándar
 DocType: GL Entry,Against,Contra
@@ -1003,12 +1019,10 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,Deb
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertas de venta recibidas de los proveedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Para {0} | {1} {2}
-DocType: Timesheet,updated via Time Logs,actualizada a través de la gestión de tiempos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
 DocType: Opportunity,Your sales person who will contact the customer in future,Indique la persona de ventas que se pondrá en contacto posteriormente con el cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +261,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/templates/pages/home.html +32,View All Products,Ver todos los Productos
-apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No se encontró la plantilla de direcciones predeterminada. Por favor, crear una nueva desde Configuración&gt; Prensa y Branding&gt; plantilla de dirección."
 DocType: Company,Default Currency,Divisa / modena predeterminada
 DocType: Contact,Enter designation of this Contact,Introduzca el puesto de este contacto
 DocType: Expense Claim,From Employee,Desde Empleado
@@ -1035,25 +1049,26 @@
 ,Ordered Items To Be Billed,Ordenes por facturar
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama
 DocType: Global Defaults,Global Defaults,Predeterminados globales
-apps/erpnext/erpnext/projects/doctype/project/project.py +151,Project Collaboration Invitation,Invitación del Proyecto de Colaboración
+apps/erpnext/erpnext/projects/doctype/project/project.py +153,Project Collaboration Invitation,Invitación del Proyecto de Colaboración
 DocType: Salary Slip,Deductions,Deducciones
+apps/erpnext/erpnext/public/js/financial_statements.js +73,Start Year,Año de inicio
 DocType: Purchase Invoice,Start date of current invoice's period,Fecha inicial del período de facturación
 DocType: Salary Slip,Leave Without Pay,Permiso / licencia sin goce de salario (LSS)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +323,Capacity Planning Error,Error en la planificación de capacidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,Error en la planificación de capacidad
 ,Trial Balance for Party,Balance de terceros
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Ganancias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,El producto terminado {0} debe ser introducido para el tipo de producción
 apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,Apertura de saldos contables
 DocType: Sales Invoice Advance,Sales Invoice Advance,Factura de ventas anticipada
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +483,Nothing to request,Nada que solicitar
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,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 de Inicio' no puede ser mayor que 'Fecha Final'
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Management,Gerencia
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Management,Gerencia
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},Se requiere cuenta de débito o crédito para {0}
 DocType: Cheque Print Template,Payer Settings,Configuración del pagador
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces 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 salarial.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,Blue,Azul
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,Azul
 DocType: Purchase Invoice,Is Return,Es un retorno
 DocType: Price List Country,Price List Country,Lista de precios del país
 apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,Por favor ajuste ID de correo electrónico
@@ -1063,12 +1078,12 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +23,POS Profile {0} already created for user: {1} and company {2},Perfil de POS {0} ya esta creado para el usuario: {1} en la 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/accounts/page/pos/pos.js +1388,Do you really want to submit the invoice?,¿Realmente desea enviar la factura?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1374,Do you really want to submit the invoice?,¿Realmente desea enviar la factura?
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de datos de proveedores.
 DocType: Payment Reconciliation Payment,Reference_name,Nombre de referencia
 DocType: Account,Balance Sheet,Hoja de balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1537,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en puntos de venta perfil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +685,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1526,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en puntos de venta perfil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso en esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Lead,Lead,Iniciativa
@@ -1092,24 +1107,24 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,'Entradas' no pueden estar vacías
 apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},Línea {0} duplicada con igual {1}
 ,Trial Balance,Balanza de comprobación
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +205,Fiscal Year {0} not found,Año fiscal {0} no encontrado
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +214,Fiscal Year {0} not found,Año fiscal {0} no encontrado
 apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,Configuración de empleados
 DocType: Sales Order,SO-,ASI QUE-
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,"Por favor, seleccione primero el prefijo"
 DocType: Employee,O-,O-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Research,Investigación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,Investigación
 DocType: Maintenance Visit Purpose,Work Done,Trabajo realizado
 apps/erpnext/erpnext/controllers/item_variant.py +25,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla"
 DocType: Announcement,All Students,Todos los estudiantes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a non-stock item,Elemento {0} debe ser una posición no de almacén
 DocType: Contact,User ID,ID de usuario
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,"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/setup/setup_wizard/setup_wizard.py +433,Rest Of The World,Resto del mundo
+apps/erpnext/erpnext/stock/doctype/item/item.py +504,"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/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
 ,Budget Variance Report,Variación de Presupuesto
 DocType: Salary Slip,Gross Pay,Pago bruto
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +82,Row {0}: Activity Type is mandatory.,Fila {0}: Tipo de actividad es obligatoria.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +90,Row {0}: Activity Type is mandatory.,Fila {0}: Tipo de actividad es obligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +163,Dividends Paid,DIVIDENDOS PAGADOS
 apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,Libro de contabilidad
 DocType: Stock Reconciliation,Difference Amount,Diferencia
@@ -1124,9 +1139,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Apertura temporal
 ,Employee Leave Balance,Balance de ausencias de empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},El balance para la cuenta {0} siempre debe ser {1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +179,Valuation Rate required for Item in row {0},Valoración de los tipos requeridos para el artículo en la fila {0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},Rango de Valoración requeridos para el Item en la fila {0}
 DocType: Address,Address Type,Tipo de dirección
-apps/erpnext/erpnext/public/js/setup_wizard.js +321,Example: Masters in Computer Science,Ejemplo: Maestría en Ciencias de la Computación
+apps/erpnext/erpnext/public/js/setup_wizard.js +323,Example: Masters in Computer Science,Ejemplo: Maestría en Ciencias de la Computación
 DocType: Purchase Invoice,Rejected Warehouse,Almacén rechazado
 DocType: GL Entry,Against Voucher,Contra comprobante
 DocType: Item,Default Buying Cost Center,Centro de costos (compra) por defecto
@@ -1137,45 +1152,45 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},No autorizado para editar la cuenta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtener facturas pendientes de pago
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,Orden de venta {0} no es válida
-apps/erpnext/erpnext/setup/doctype/company/company.py +182,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La cantidad total de emisión / Transferencia {0} en la Solicitud de material {1} \ no puede ser mayor que la cantidad solicitada {2} para el artículo {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Small,Pequeño
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Small,Pequeño
 DocType: Employee,Employee Number,Número de empleado
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},El numero de caso ya se encuentra en uso. Intente {0}
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada (Impuesto excluido)
-DocType: Student,Mother's / Guardian 1 Email ID,de la madre / tutor 1 ID de correo electrónico
+DocType: Student Applicant,Mother's / Guardian 1 Email ID,de la madre / tutor 1 ID de correo electrónico
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Elemento 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +77,Account head {0} created,Encabezado de cuenta {0} creado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Green,Verde
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,Verde
 DocType: Supplier,SUPP-,SUPP-
 DocType: Item,Auto re-order,Ordenar automáticamente
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +59,Total Achieved,Total Conseguido
 DocType: Employee,Place of Issue,Lugar de emisión.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Contract,Contrato
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Contract,Contrato
 DocType: Email Digest,Add Quote,Añadir Cita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,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 +90,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +729,Sync Master Data,Sincronización de datos maestros
+apps/erpnext/erpnext/accounts/page/pos/pos.js +737,Sync Master Data,Sincronización de datos maestros
 apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,Los productos o servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
+apps/erpnext/erpnext/stock/doctype/item/item.py +178,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +31,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
 DocType: Journal Entry Account,Purchase Order,Orden de compra (OC)
 DocType: Warehouse,Warehouse Contact Info,Información del Contacto en el Almacén
 DocType: Payment Entry,Write Off Difference Amount,Amortizar importe de la diferencia
 DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +275,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +345,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
 DocType: Address,City/Town,Ciudad / Provincia
 DocType: Address,Is Your Company Address,Su dirección es la empresa
 DocType: Email Digest,Annual Income,Ingresos anuales
 DocType: Serial No,Serial No Details,Detalles del numero de serie
 DocType: Purchase Invoice Item,Item Tax Rate,Tasa de impuesto del producto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"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 un asiento de débito"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +464,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,El elemento: {0} debe ser un producto sub-contratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,BIENES DE CAPITAL
 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.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
@@ -1185,7 +1200,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar descripción
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +704,For Supplier,De proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,De proveedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Al configurar el tipo de cuenta facilitará la seleccion de la misma en las transacciones
 DocType: Purchase Invoice,Grand Total (Company Currency),Suma total (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Crear Formato de impresión
@@ -1204,7 +1219,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
 DocType: Sales Partner,Target Distribution,Distribución del objetivo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1658,Deafault warehouse is required for selected item,Se requiere depósito de Deafault elemento seleccionado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1667,Deafault warehouse is required for selected item,Se requiere depósito de Deafault elemento seleccionado
 DocType: Salary Slip,Bank Account No.,Cta. bancaria núm.
 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 creada con este prefijo
 DocType: Quality Inspection Reading,Reading 8,Lectura 8
@@ -1213,11 +1228,11 @@
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de impuestos y cargos
 DocType: BOM Operation,Workstation,Puesto de trabajo
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitud de oferta de venta de proveedor
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +112,Hardware,Hardware
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Hasta que se repite
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
 apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,"Por favor, seleccione la compañía"
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Privilege Leave,Vacaciones
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,Vacaciones
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +79,You need to enable Shopping Cart,Necesita habilitar el carito de compras
 DocType: Payment Entry,Writeoff,Pedir por escrito
@@ -1229,7 +1244,7 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +81,Overlapping conditions found between:,Condiciones traslapadas entre:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +171,Against Journal Entry {0} is already adjusted against some other voucher,El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,Valor Total del Pedido
-apps/erpnext/erpnext/demo/setup_data.py +345,Food,Comida
+apps/erpnext/erpnext/demo/setup_data.py +358,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 DocType: Maintenance Schedule Item,No of Visits,Número de visitas
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +103,Mark Attendence,Marcos Attendence
@@ -1244,7 +1259,7 @@
 DocType: Purchase Invoice Item,Accounting,Contabilidad
 DocType: Employee,EMP/,EMP /
 DocType: Asset,Depreciation Schedules,programas de depreciación
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +84,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
 DocType: Activity Cost,Projects,Proyectos
 DocType: Payment Request,Transaction Currency,moneda de la transacción
 apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},Desde {0} | {1} {2}
@@ -1253,7 +1268,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved.,No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado.
 DocType: Quotation,Shopping Cart,Carrito de compras
 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
+DocType: POS Profile,Campaign,Campaña
 DocType: Supplier,Name and Type,Nombre y Tipo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',"El estado de esta solicitud debe ser ""Aprobado"" o ""Rechazado"""
 DocType: Purchase Invoice,Contact Person,Persona de contacto
@@ -1264,7 +1279,7 @@
 DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto
 DocType: Item,Maintain Stock,Mantener stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,Las entradas de stock ya fueron creadas para el numero de producción
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Net Change in Fixed Asset,Cambio neto en activos fijos
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,Cambio neto en activos fijos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
 apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,Cambiar a tipo 'Actual' en la línea {0} no puede ser incluido en el precio
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},Máximo: {0}
@@ -1272,12 +1287,12 @@
 DocType: Email Digest,For Company,Para la empresa
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Registro de comunicaciones
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +153,"Request for Quotation is disabled to access from portal, for more check portal settings.","Solicitud de Cotización se desactiva con el acceso desde el portal, para más ajustes del portal de verificación."
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Buying Amount,Importe de compra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,Importe de compra
 DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plan de cuentas
 DocType: Material Request,Terms and Conditions Content,Contenido de los términos y condiciones
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +509,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +677,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,No puede ser mayor de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licencia sin goce de salario
@@ -1293,8 +1308,8 @@
 ,Batch-Wise Balance History,Historial de saldo por lotes
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +72,To Do List,Tareas por hacer
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Los ajustes de impresión actualizados en formato de impresión respectivo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Apprentice,Aprendiz
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +106,Negative Quantity is not allowed,No se permiten cantidades negativas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Apprentice,Aprendiz
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,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","la tabla de detalle de impuestos se obtiene del producto principal como una cadena y es guardado en este campo, este es usado para los impuestos y cargos."
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +152,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
@@ -1303,7 +1318,7 @@
 apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
-apps/erpnext/erpnext/config/accounts.py +174,Tax Rule for transactions.,Regla de impuestos para las transacciones.
+apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,Regla de impuestos para las transacciones.
 DocType: Rename Tool,Type of document to rename.,Indique el tipo de documento que desea cambiar de nombre.
 apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,Compramos este producto
 DocType: Address,Billing,Facturación
@@ -1316,14 +1331,14 @@
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Asset Movement,Stock Manager,Gerente de almacén
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},El almacén de origen es obligatorio para la línea {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +673,Packing Slip,Lista de embalaje
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,Lista de embalaje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ALQUILERES DE LOCAL
 apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,Configuración de pasarela SMS
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,Request for quotation can be access by clicking following link,Se puede acceder a la solicitud de presupuesto haciendo clic en siguiente enlace
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección
 DocType: Workstation Working Hour,Workstation Working Hour,Horario de la estación de trabajo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +83,Analyst,Analista
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Analyst,Analista
 DocType: Item,Inventory,inventario
 DocType: Item,Sales Details,Detalles de ventas
 DocType: Quality Inspection,QI-,qi
@@ -1331,7 +1346,7 @@
 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,Reembolso de gastos rechazado
 DocType: Item Attribute,Item Attribute,Atributos del producto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,Government,Gubernamental
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,Gubernamental
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,nombre del Instituto
 apps/erpnext/erpnext/config/stock.py +289,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
@@ -1340,7 +1355,7 @@
 DocType: Sales Invoice,Source,Referencia
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar cerrada
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/stock/doctype/item/item.py +233,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
+apps/erpnext/erpnext/stock/doctype/item/item.py +236,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No se encontraron registros en la tabla de pagos
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este {0} conflictos con {1} de {2} {3}
 DocType: Course Schedule,Students HTML,Los estudiantes HTML
@@ -1348,7 +1363,7 @@
 DocType: POS Profile,Apply Discount,aplicar descuento
 DocType: Employee External Work History,Total Experience,Experiencia total
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +265,Packing Slip(s) cancelled,Lista(s) de embalaje cancelada(s)
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Cash Flow from Investing,Flujo de efectivo de inversión
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Cash Flow from Investing,Flujo de efectivo de inversión
 DocType: Program Course,Program Course,Curso programa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,CARGOS DE TRANSITO Y TRANSPORTE
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio página web
@@ -1358,7 +1373,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Búsqueda de ejecutivos
 apps/erpnext/erpnext/stock/stock_ledger.py +426,"Purchase rate for item: {0} not found, which is required to book accounting entry (expense). Please mention item price against a buying price list.","La tarifa de compra para el producto: {0} no se encuentra, este se requiere para reservar la entrada contable (gastos). Por favor, indique el precio del artículo en una 'lista de precios' de compra."
 DocType: Maintenance Schedule,Schedules,Programas
-DocType: Timesheet Detail,To display value check Billable,Para mostrar el valor de verificación facturable
 DocType: Purchase Invoice Item,Net Amount,Importe Neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Detalles de Lista de materiales (LdM) No.
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
@@ -1370,7 +1384,7 @@
 DocType: Purchase Invoice,Select Shipping Address,Seleccione la dirección de envío
 DocType: Leave Block List,Block Holidays on important days.,Bloquear vacaciones en días importantes.
 ,Accounts Receivable Summary,Balance de cuentas por cobrar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +198,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,"Por favor, seleccione el ID y el nombre del empleado para establecer el rol."
 DocType: UOM,UOM Name,Nombre de la unidad de medida (UdM)
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Importe de contribución
 DocType: Purchase Invoice,Shipping Address,Dirección de envío.
@@ -1412,25 +1426,27 @@
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Peticiones para gastos de compañía
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +71,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: Fecha de Liquidación {1} no puede ser anterior Cheque Fecha {2}
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +162,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del tiempo y Tiempo de {1} se solapan con {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,Inventarios por pagar
 DocType: Purchase Invoice,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
 ,Material Requests for which Supplier Quotations are not created,Requisición de materiales sin documento de oferta de venta
 DocType: Student Group,Set 0 for no limit,Ajuste 0 indica sin límite
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +120,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Vuelva a enviar el pago por correo electrónico
 apps/erpnext/erpnext/config/selling.py +206,Other Reports,otros informes
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +408,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +180,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +24,Please setup Employee Naming System in Human Resource &gt; HR Settings,Por favor configuración de sistema de nombres de los empleados en Recursos Humanos&gt; Configuración de recursos humanos
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +190,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 DocType: SMS Center,Receiver List,Lista de receptores
+apps/erpnext/erpnext/accounts/page/pos/pos.js +921,Search Item,Busca artículo
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +96,Net Change in Cash,Cambio Neto en efectivo
-DocType: Salary Structure Deduction,Salary Structure Deduction,Deducciones de la estructura salarial
-apps/erpnext/erpnext/stock/doctype/item/item.py +403,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +542,Already completed,Ya completado
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +97,Net Change in Cash,Cambio Neto en efectivo
+apps/erpnext/erpnext/stock/doctype/item/item.py +406,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +546,Already completed,Ya completado
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},Solicitud de pago ya existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +241,Quantity must not be more than {0},La cantidad no debe ser más de {0}
@@ -1470,12 +1486,12 @@
 DocType: Payment Reconciliation,Payments,Pagos.
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de clientes
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Payable,Cambio neto en cuentas por pagar
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,Cambio neto en cuentas por pagar
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Se requiere un cliente para el descuento
-apps/erpnext/erpnext/config/accounts.py +136,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
+apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Actualización de las fechas de pago del banco con los registros.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +20,Pricing,la fijación de precios
 DocType: Quotation,Term Details,Detalles de términos y condiciones
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes de este grupo de estudiantes.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +36,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes de este grupo de estudiantes.
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} debe ser mayor que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +9,Procurement,Obtención
@@ -1492,25 +1508,24 @@
 DocType: Sales Invoice,Packed Items,Productos Empacados
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Reclamación de garantía por numero 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"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;Total&#39;
 DocType: Shopping Cart Settings,Enable Shopping Cart,Habilitar carrito de compras
 DocType: Employee,Permanent Address,Dirección permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",El anticipo pagado para {0} {1} no puede ser mayor que el total {2}
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione el código del producto"
-DocType: Salary Structure Deduction,Reduce Deduction for Leave Without Pay (LWP),Reducir deducción por licencia sin goce de salario (LSS)
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Packed Item,To Warehouse (Optional),Para almacenes (Opcional)
 DocType: Payment Entry,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
 DocType: Selling Settings,Selling Settings,Configuración de ventas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Subastas en línea
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +101,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +97,Please specify either Quantity or Valuation Rate or both,"Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +13,Fulfillment,Cumplimiento
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +50,"Company, Month and Fiscal Year is mandatory","Compañía, mes y año fiscal son obligatorios"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +224,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de materiales usados para crear esta entrada del inventario
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +66,Next Depreciation Date is mandatory for new asset,La depreciación próxima fecha es obligatorio para los nuevos activos
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Elemento de producto
@@ -1523,7 +1538,7 @@
 DocType: Employee,Date Of Retirement,Fecha de jubilación
 DocType: Upload Attendance,Get Template,Obtener plantilla
 DocType: Address,Postal,Postal
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +196,ERPNext Setup Complete!,Configuración ERPNext completa!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,Configuración ERPNext completa!
 DocType: Item,Weightage,Asignación
 DocType: Packing Slip,PS-,PD-
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Existe una categoría de cliente con el mismo nombre. Por favor cambie el nombre de cliente o renombre la categoría de cliente
@@ -1544,6 +1559,7 @@
 ,Item-wise Sales Register,Detalle de ventas
 DocType: Asset,Gross Purchase Amount,Compra importe bruto
 DocType: Asset,Depreciation Method,Método de depreciación
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Offline,Desconectado
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total meta / objetivo
 DocType: Program Course,Required,Necesario
@@ -1551,42 +1567,43 @@
 DocType: Production Plan Material Request,Production Plan Material Request,Producción Solicitud Plan de materiales
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,No existen órdenes de producción (OP)
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.html +1,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.
+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: Purchase Invoice Item,Batch No,Lote No.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Permitir varias órdenes de venta, para las ordenes de compra de los clientes"
-apps/erpnext/erpnext/setup/doctype/company/company.py +161,Main,Principal
+apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,Principal
 apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +422,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
+apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones pagadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +815,Make Purchase Order,Crear orden de compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +858,Make Purchase Order,Crear orden de compra
 DocType: SMS Center,Send To,Enviar a
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +131,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
 DocType: Sales Team,Contribution to Net Total,Contribución neta total
 DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de inventarios
 DocType: Territory,Territory Name,Nombre Territorio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +168,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +172,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Solicitante de empleo .
 DocType: Purchase Order Item,Warehouse and Reference,Almacén y Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal u otra información general acerca de su proveedor
 apps/erpnext/erpnext/hooks.py +88,Addresses,Direcciones
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,El asiento contable {0} no tiene ninguna entrada {1} que vincular
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Evaluaciones
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicar No. de serie para el producto {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Una condición para una regla de envío
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +149,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basada en el apartado o Almacén"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basada en el apartado o Almacén"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (calculado automáticamente por la suma del peso neto de los materiales)
 DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Almacén Rechazado es obligatorio en la partida rechazada {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +678,Payment,Pago
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,Pago
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo reales
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Máxima requisición de materiales {0} es posible para el producto {1} en las órdenes de venta {2}
 DocType: Employee,Salutation,Saludo.
@@ -1594,6 +1611,7 @@
 DocType: Course,Course Abbreviation,Abreviatura de golf
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +142,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya lo es {0}"
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +42,Total working hours should not be greater than max working hours {0},Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0}
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Quotation Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
@@ -1601,7 +1619,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.","Enumere algunos de los productos o servicios que usted compra y/o vende. Asegúrese de revisar el grupo del artículo, la unidad de medida (UdM) y demás propiedades."
 DocType: Hub Settings,Hub Node,Nodo del centro de actividades
 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/setup_wizard/install_fixtures.py +87,Associate,Asociado
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,Associate,Asociado
 DocType: Asset Movement,Asset Movement,Movimiento activo
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
@@ -1618,11 +1636,11 @@
 ,Sales Invoice Trends,Tendencias de ventas
 DocType: Leave Application,Apply / Approve Leaves,Aplicar/Aprobar vacaciones
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +23,For,por
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +106,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +134,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',"Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
 DocType: Sales Order Item,Delivery Warehouse,Almacén de entrega
 DocType: Stock Settings,Allowance Percent,Porcentaje de reserva
 DocType: SMS Settings,Message Parameter,Parámetro del mensaje
-apps/erpnext/erpnext/config/accounts.py +199,Tree of financial Cost Centers.,Árbol de Centros de costes financieros.
+apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,Árbol de Centros de costes financieros.
 DocType: Serial No,Delivery Document No,Documento de entrega No.
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +180,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},Ajuste &#39;Cuenta / Pérdida de beneficios por enajenaciones de activos&#39; en su empresa {0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Obtener productos desde recibo de compra
@@ -1641,13 +1659,15 @@
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de servicios y/o productos.
 DocType: Budget,Fiscal Year,Año fiscal
 DocType: Budget,Budget,Presupuesto
-apps/erpnext/erpnext/stock/doctype/item/item.py +230,Fixed Asset Item must be a non-stock item.,Activos Fijos El artículo debe ser una posición no de almacén.
+apps/erpnext/erpnext/stock/doctype/item/item.py +233,Fixed Asset Item must be a non-stock item.,Activos Fijos El artículo debe ser una posición no de almacén.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","El presupuesto no se puede asignar contra {0}, ya que no es una cuenta de ingresos o gastos"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
 apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,Localidad / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,por ejemplo 5
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {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.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +502,Error: {0} &gt; {1},Error: {0}&gt; {1}
+DocType: Item,Is Sales Item,Es un producto para venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,Árbol de productos
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
 DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento
@@ -1665,7 +1685,7 @@
 						must be greater than or equal to {2}","Fila {0}: Para establecer periodo {1}, la diferencia de tiempo debe ser mayor o igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +5,This is based on stock movement. See {0} for details,Esto se basa en el movimiento de valores. Ver {0} para obtener más detalles
 DocType: Pricing Rule,Selling,Ventas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +334,Amount {0} {1} deducted against {2},Monto {0} {1} presenta disminuyendo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +341,Amount {0} {1} deducted against {2},Monto {0} {1} presenta disminuyendo {2}
 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 +296,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
@@ -1677,10 +1697,10 @@
 DocType: Purchase Order Item Supplied,Supplied Qty,Cant. Suministrada
 DocType: Purchase Order Item,Material Request Item,Requisición de materiales del producto
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Árbol de las categorías de producto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +116,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
 DocType: Asset,Sold,Vendido
 ,Item-wise Purchase History,Historial de Compras
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Red,Rojo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Red,Rojo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado(a)
 ,Open Production Orders,Ordenes de producción abiertas
@@ -1709,12 +1729,12 @@
 DocType: Holiday List,Clear Table,Borrar tabla
 DocType: C-Form Invoice Detail,Invoice No,Factura No.
 DocType: Room,Room Name,Nombre de la habitación
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +95,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deja no puede aplicarse / cancelada antes de {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deja no puede aplicarse / cancelada antes de {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
 DocType: Activity Cost,Costing Rate,Costo calculado
 ,Customer Addresses And Contacts,Direcciones de clientes y contactos
 DocType: Discussion,Discussion,Discusión
 DocType: Payment Entry,Transaction ID,ID de transacción
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +17,Mandatory feild - Academic Year,Obligatoria feild - Año Académico
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory feild - Academic Year,Obligatoria feild - Año Académico
 DocType: Employee,Resignation Letter Date,Fecha de carta de renuncia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
 DocType: Task,Total Billing Amount (via Time Sheet),Facturación cantidad total (a través de hoja de horas)
@@ -1731,22 +1751,23 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +182,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
 ,Maintenance Schedules,Programas de mantenimiento
 DocType: Task,Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
 ,Quotation Trends,Tendencias de ofertas de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +296,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,La cuenta 'Debitar a' debe ser una cuenta por cobrar
 DocType: Shipping Rule Condition,Shipping Amount,Monto de envío
 ,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
 DocType: Purchase Order,Delivered,Enviado
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +137,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
-DocType: Purchase Receipt,Vehicle Number,Número de vehículos
+DocType: Purchase Receipt,Vehicle Number,Número de Vehículo
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Fecha en que la factura recurrente es detenida
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de hojas asignadas {0} no puede ser inferior a las hojas ya aprobados {1} para el período
 DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar
 ,Supplier-Wise Sales Analytics,Análisis de ventas (Proveedores)
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +22,Enter Paid Amount,Ingrese monto pagado
 DocType: Address Template,This format is used if country specific format is not found,Este formato será utilizado para todos los documentos si no se encuentra un formato específico para el país.
+DocType: Salary Structure,Select employees for current Salary Structure,Seleccione los empleados de estructura salarial actual
 DocType: Production Order,Use Multi-Level BOM,Utilizar Lista de Materiales (LdM)  Multi-Nivel
 DocType: Bank Reconciliation,Include Reconciled Entries,Incluir las entradas conciliadas
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
@@ -1757,7 +1778,7 @@
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
 apps/erpnext/erpnext/controllers/accounts_controller.py +524,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para el qty múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +246,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo de No-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
@@ -1771,7 +1792,7 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
 ,BOM Search,Buscar listas de materiales (LdM)
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +180,Closing (Opening + Totals),Cierre (Apertura + Totales)
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),Cierre (Apertura + Totales)
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 DocType: Workstation,Wages per hour,Salarios por hora
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
@@ -1779,9 +1800,9 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +272,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +659,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +956,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
 DocType: Salary Slip,Deduction,Deducción
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +79,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del tiempo y el tiempo es obligatorio.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +87,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del tiempo y el tiempo es obligatorio.
 apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},Artículo Precio agregó para {0} en Precio de lista {1}
 DocType: Address Template,Address Template,Plantillas de direcciones
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor"
@@ -1798,15 +1819,14 @@
 DocType: Maintenance Visit,Maintenance User,Mantenimiento por usuario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,Costo actualizado
 DocType: Employee,Date of Birth,Fecha de nacimiento
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configuración series de numeración para la asistencia a través de Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,El producto {0} ya ha sido 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. Todos los asientos contables y demás transacciones importantes son registradas contra el **año fiscal**.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +205,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 DocType: Production Order Operation,Actual Operation Time,Hora de operación real
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +179,Job Description,Descripción del trabajo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Job Description,Descripción del trabajo
 DocType: Student Applicant,Applied,Aplicado
 DocType: Purchase Order Item,Qty as per Stock UOM,Cantidad de acuerdo a la unidad de medida (UdM) de stock
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",Caracteres especiales excepto '-'  '.' '#' y '/' no permitido en las secuencias e identificadores
@@ -1822,14 +1842,14 @@
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total asignado (Compañía de divisas)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,El número de serie {0} no pertenece a ningún almacén
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +157,Row # ,Línea #
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +153,Row # ,Línea #
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Divisa por defecto)
 DocType: Asset,Supplier,Proveedor
 apps/erpnext/erpnext/public/js/utils.js +156,Get From,Obtener desde
 DocType: C-Form,Quarter,Trimestre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,GASTOS VARIOS
 DocType: Global Defaults,Default Company,Compañía predeterminada
-apps/erpnext/erpnext/controllers/stock_controller.py +166,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Una cuenta de gastos o de diiferencia es obligatoria para el producto: {0} , ya que impacta el valor del stock"
+apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Una cuenta de gastos o de diiferencia es obligatoria para el producto: {0} , ya que impacta el valor del stock"
 apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings","No se puede sobre-facturar el producto {0} más de {2} en la línea {1}. Para permitir la sobre-facturación, necesita configurarlo en las opciones de stock"
 DocType: Cheque Print Template,Bank Name,Nombre del banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Arriba
@@ -1839,18 +1859,18 @@
 apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,Seleccione la compañía...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deje en blanco si se utilizará para todos los departamentos
 apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +341,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
 DocType: Currency Exchange,From Currency,Desde moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Costo de Compra de Nueva
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
-apps/erpnext/erpnext/demo/setup_data.py +347,Others,Otros
+apps/erpnext/erpnext/demo/setup_data.py +360,Others,Otros
 DocType: Payment Entry,Unallocated Amount,Monto sin asignar
 apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,Si no encuentra un artículo a juego. Por favor seleccione otro valor para {0}.
 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 +110,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 de línea anterior' o ' Total de línea anterior' para la primera linea
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,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 de línea anterior' o ' Total de línea anterior' para la primera linea
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Niño Artículo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
@@ -1859,7 +1879,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Quality Inspection,In Process,En proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
-apps/erpnext/erpnext/config/accounts.py +63,Tree of financial accounts.,Árbol de las cuentas financieras.
+apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Árbol de las cuentas financieras.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0} contra la orden de ventas {1}
 DocType: Account,Fixed Asset,Activo Fijo
 apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,Inventario Serializado
@@ -1869,10 +1889,11 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +546,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} de activos ya es {2}
 DocType: Quotation Item,Stock Balance,Balance de Inventarios.
 apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,Órdenes de venta a pagar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,CEO,CEO
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +805,Please select correct account,"Por favor, seleccione la cuenta correcta"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,"Por favor, seleccione la cuenta correcta"
 DocType: Item,Weight UOM,Unidad de medida (UdM)
+DocType: Salary Structure Employee,Salary Structure Employee,Empleado Estructura salarial
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Purchase Invoice Item,Page Break,Salto de página
 DocType: Production Order Operation,Pending,Pendiente
@@ -1883,13 +1904,14 @@
 DocType: Fiscal Year,Companies,Compañías
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónicos
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Generar requisición de materiales cuando se alcance un nivel bajo el stock
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Full-time,Jornada completa
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Full-time,Jornada completa
+DocType: Salary Structure,Employees,Empleados
 DocType: Employee,Contact Details,Detalles de 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 los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +29,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique un país para esta regla de envió o verifique los precios para envíos mundiales"
 DocType: Stock Entry,Total Incoming Value,Valor total de entradas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +290,Debit To is required,Se requiere débito para
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,Se requiere débito para
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
 DocType: Offer Letter Term,Offer Term,Términos de la oferta
 DocType: Quality Inspection,Quality Manager,Gerente de calidad
@@ -1899,7 +1921,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción.
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Invoiced Amt,Monto total facturado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,Monto total facturado
 DocType: Timesheet Detail,To Time,Hasta hora
 DocType: Authorization Rule,Approving Role (above authorized value),Aprobar Rol (por encima del valor autorizado)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,La cuenta de crédito debe pertenecer al grupo de cuentas por pagar
@@ -1907,12 +1929,14 @@
 DocType: Production Order Operation,Completed Qty,Cantidad completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +121,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
 apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,La lista de precios {0} está deshabilitada
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +99,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Completo Cantidad no puede contener más de {1} para la operación {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,{0} números de serie son requeridos para el artículo {1}. Usted ha proporcionado {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Ganancia en Cambio / Pérdida
 DocType: Opportunity,Lost Reason,Razón de la pérdida
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +87,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Por favor configuración series de numeración para la asistencia a través de Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nueva direccion
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +46,Please enter Receipt Document,"Por favor, introduzca recepción de documentos"
@@ -1922,6 +1946,7 @@
 DocType: Project,External,Externo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
 DocType: Branch,Branch,Sucursal
+DocType: Guardian,Mobile Number,Número de teléfono móvil
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impresión y marcas
 apps/erpnext/erpnext/hr/report/monthly_salary_register/monthly_salary_register.py +66,No salary slip found for month:,No existe nómina salarial para el mes:
 DocType: Bin,Actual Quantity,Cantidad real
@@ -1929,14 +1954,16 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numero de serie {0} no encontrado
 DocType: Student Batch,Student Batch,lote estudiante
 apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,Sus clientes
-apps/erpnext/erpnext/projects/doctype/project/project.py +139,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
+apps/erpnext/erpnext/projects/doctype/project/project.py +141,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear fecha
 apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,Aplica ya
 DocType: Sales Order,Not Delivered,No entregado
+DocType: Assessment Group,Assessment Group Code,Código grupo de evaluación
 ,Bank Clearance Summary,Liquidez bancaria
 apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
 DocType: Appraisal Goal,Appraisal Goal,Meta de evaluación
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Edificios
+apps/erpnext/erpnext/utilities/doctype/address/address.py +164,No default Address Template found. Please create a new one from Setup &gt; Printing and Branding &gt; Address Template.,"No se encontró la plantilla de direcciones predeterminada. Por favor, crear una nueva desde Configuración&gt; Prensa y Branding&gt; plantilla de dirección."
 DocType: Fee Structure,Fee Structure,Estructura de tarifas
 DocType: Timesheet Detail,Costing Amount,Costo acumulado
 DocType: Process Payroll,Submit Salary Slip,Validar nómina salarial
@@ -1949,7 +1976,7 @@
 DocType: Payment Request,Make Sales Invoice,Crear factura de venta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
 DocType: Company,For Reference Only.,Sólo para referencia.
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +49,Invalid {0}: {1},No válido {0}: {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No válido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
 DocType: Manufacturing Settings,Capacity Planning,Planificación de capacidad
@@ -1961,12 +1988,12 @@
 apps/erpnext/erpnext/stock/get_item_details.py +113,No Item with Barcode {0},Ningún producto con código de barras {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: 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/stock/doctype/item/item.py +131,Stores,Sucursales
+apps/erpnext/erpnext/stock/doctype/item/item.py +134,Stores,Sucursales
 DocType: Serial No,Delivery Time,Tiempo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en
 DocType: Item,End of Life,Final de vida útil
-apps/erpnext/erpnext/demo/setup_data.py +348,Travel,Viajes
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura activa o salario por defecto encontrado de empleado {0} para las fechas indicadas
+apps/erpnext/erpnext/demo/setup_data.py +361,Travel,Viajes
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +155,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura activa o salario por defecto encontrado de empleado {0} para las fechas indicadas
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
 DocType: Sales Invoice,Recurring,Recurrente
@@ -1974,26 +2001,27 @@
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +23,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +695,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +36,Show Salary Slip,Slip Mostrar Salario
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,Transferencia de Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar las operaciones, el costo de operativo y definir un numero único de operación"
 apps/erpnext/erpnext/controllers/status_updater.py +166,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?
 apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,Por favor conjunto recurrente después de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +646,Select change amount account,Seleccione el cambio importe de la cuenta
 DocType: Purchase Invoice,Price List Currency,Divisa de la lista de precios
 DocType: Naming Series,User must always select,El usuario deberá elegir siempre
 DocType: Stock Settings,Allow Negative Stock,Permitir Inventario Negativo
 DocType: Installation Note,Installation Note,Nota de instalación
 apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,Agregar impuestos
 DocType: Topic,Topic,Tema
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Cash Flow from Financing,Flujo de caja de financiación
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,Flujo de caja de financiación
 DocType: Budget Account,Budget Account,cuenta presupuestaria
 DocType: Quality Inspection,Verified By,Verificado por
 DocType: Address,Subsidiary,Subsidiaria
-apps/erpnext/erpnext/setup/doctype/company/company.py +61,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla"
+apps/erpnext/erpnext/setup/doctype/company/company.py +64,"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 divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla"
 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,GANANCIAS PERCIBIDAS
 DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +33,Traceability,trazabilidad
-DocType: Quotation,Custome Name,atención al cliente al nombre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),Origen de fondos (Pasivo)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,Quantity in row {0} ({1}) must be same as manufactured quantity {2},La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}
 DocType: Appraisal,Employee,Empleado
@@ -2001,7 +2029,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Workstation Working Hour,End Time,Hora de finalización
 DocType: Payment Entry,Payment Deductions or Loss,Las deducciones de pago o pérdida
-apps/erpnext/erpnext/config/schools.py +92,LMS,LMS
+apps/erpnext/erpnext/config/schools.py +100,LMS,LMS
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Contrato estándar de términos y condiciones para ventas y compras.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,Agrupar por recibo
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Flujo de ventas
@@ -2013,8 +2041,8 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},La solicitud de la lista de materiales (LdM) especificada: {0} no existe para el producto {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +220,Salary Slip of employee {0} already created for this period,Nómina de los empleados {0} ya creado para este periodo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,Pharmaceutical,Farmacéutico
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +297,Salary Slip of employee {0} already created for this period,Nómina de los empleados {0} ya creado para este periodo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +111,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
 DocType: Purchase Invoice,Credit To,Acreditar en
@@ -2029,18 +2057,19 @@
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Gateway Account,Payment Account,Cuenta de pagos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +761,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +20,Net Change in Accounts Receivable,Cambio neto en las cuentas por cobrar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Compensatory Off,Compensatorio
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,Cambio neto en las cuentas por cobrar
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,Compensatorio
 DocType: Quality Inspection Reading,Accepted,Aceptado
 DocType: SG Creation Tool Course,Student Group Name,Nombre del grupo de estudiante
 apps/erpnext/erpnext/setup/doctype/company/company.js +46,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, asegurate de que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
 DocType: Room,Room Number,Número de habitación
 apps/erpnext/erpnext/utilities/transaction_base.py +93,Invalid reference {0} {1},Inválido referencia {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +157,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la orden de producción {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la orden de producción {3}
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
+apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +217,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +403,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.","No se pudo actualizar valores, factura contiene los artículos del envío de la gota."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,Asiento Rápida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,No se puede cambiar el precio si existe una Lista de materiales (LdM) en el producto
 DocType: Employee,Previous Work Experience,Experiencia laboral previa
@@ -2067,7 +2096,6 @@
 DocType: Fiscal Year,Year End Date,Fecha de Finalización de Año
 DocType: Task Depends On,Task Depends On,Tarea depende de
 DocType: Lead,Opportunity,Oportunidad
-DocType: Salary Structure Earning,Salary Structure Earning,Ingresos de la estructura salarial
 ,Completed Production Orders,Órdenes de producción (OP) completadas
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +42,Row {0}: For supplier {0} email id is required to send email,Fila {0}: Por proveedor se requiere {0} id de correo electrónico para enviar correo electrónico
 DocType: Operation,Default Workstation,Estación de Trabajo por defecto
@@ -2095,7 +2123,8 @@
 DocType: SMS Log,No of Requested SMS,Número de SMS solicitados
 DocType: Campaign,Campaign-.####,Campaña-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos pasos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +676,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +729,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
+apps/erpnext/erpnext/public/js/financial_statements.js +81,End Year,Año final
 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 ingreso
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuidor / proveedor / comisionista / afiliado / revendedor que vende productos de empresas a cambio de una comisión.
@@ -2154,16 +2183,16 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
 DocType: Tax Rule,Billing City,Ciudad de facturación
+DocType: Salary Component Account,Salary Component Account,Cuenta Nómina Componente
 DocType: Global Defaults,Hide Currency Symbol,Ocultar el símbolo de moneda
-apps/erpnext/erpnext/config/accounts.py +283,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
+apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card","Los métodos de pago normalmente utilizados por ejemplo: banco, efectivo, tarjeta de crédito, etc."
 DocType: Journal Entry,Credit Note,Nota de crédito
 DocType: Warranty Claim,Service Address,Dirección de servicio
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +83,Max 100 rows for Stock Reconciliation.,Máximo 100 lineas para la conciliación de inventario.
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +78,"Salary structure {0} already exist, more than one salary structure for same period is not allowed","Estructura de los sueldos {0} ya existe, más de una estructura de salario para igual periodo no se permite"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Muebles y Accesorios
-DocType: Material Request,Manufacture,Manufacturar
+DocType: Item,Manufacture,Manufacturar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Entregar primero la nota
 DocType: Student Applicant,Application Date,Fecha de aplicacion
+DocType: Salary Detail,Amount based on formula,Cantidad basada en la fórmula
 DocType: Purchase Invoice,Currency and Price List,Divisa y listas de precios
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,Fecha de liquidación no definida
@@ -2181,12 +2210,13 @@
 apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,Sucursal principal de la organización.
 apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,ó
 DocType: Sales Order,Billing Status,Estado de facturación
+apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informar un problema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 o más
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +203,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Asiento {1} no tiene en cuenta {2} o ya compara con otro bono
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
 DocType: Process Payroll,Salary Slip Based on Timesheet,Sobre la base de nómina de parte de horas
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +81,No employee for the above selected criteria OR salary slip already created,Ningún empleado para los criterios anteriormente seleccionado o nómina ya creado
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,No employee for the above selected criteria OR salary slip already created,Ningún empleado para los criterios anteriormente seleccionado o nómina ya creado
 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 los valores predeterminados como: empresa, moneda / divisa, año fiscal, etc."
 DocType: Payment Entry,Payment Type,Tipo de pago
@@ -2218,7 +2248,7 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
 ,To Produce,Producir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Nómina de sueldos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +135,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
 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,Productos del recibo de compra
@@ -2227,14 +2257,14 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +32,Disabled template must not be default template,plantilla personas con discapacidad no debe ser plantilla predeterminada
 DocType: Account,Income Account,Cuenta de ingresos
 DocType: Payment Request,Amount in customer's currency,Monto de la moneda del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Delivery,Entregar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,Entregar
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Consulte 'tasa de materiales en base de' en la sección de costos
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
 DocType: Payment Entry,Total Allocated Amount,Total asignado
 DocType: Item Reorder,Material Request Type,Tipo de requisición
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Ref,Referencia
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,Referencia
 DocType: Budget,Cost Center,Centro de costos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Comprobante #
 DocType: Notification Control,Purchase Order Message,Mensaje en la orden de compra
@@ -2244,13 +2274,13 @@
 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.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,El almacen sólo puede ser alterado a través de: Entradas de inventario / Nota de entrega / Recibo de compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Head of Marketing and Sales,Director de marketing y ventas
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Head of Marketing and Sales,Director de marketing y ventas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +31,Income Tax,Impuesto sobre la renta
 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 la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'"
 apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del producto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +360,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +727,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,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 +46,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +224,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La fusión sólo es posible si las propiedades son las mismas en ambos registros. Es Grupo, Tipo Raíz, Compañía"
@@ -2271,30 +2301,31 @@
 apps/erpnext/erpnext/accounts/party.py +345,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +157,Extra Large,Extra grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,Extra grande
 ,Profit and Loss Statement,Cuenta de pérdidas y ganancias
 DocType: Bank Reconciliation Detail,Cheque Number,Número de cheque
 ,Sales Browser,Explorar ventas
 DocType: Journal Entry,Total Credit,Crédito Total
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Local,Local
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,Local
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +26,Loans and Advances (Assets),INVERSIONES Y PRESTAMOS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +12,Debtors,DEUDORES VARIOS
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +156,Large,Grande
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +154,Large,Grande
 DocType: Homepage Featured Product,Homepage Featured Product,Página de inicio Producto destacado
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Almacén nuevo nombre
-apps/erpnext/erpnext/accounts/report/financial_statements.py +198,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +225,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorio
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
+DocType: Assessment,Assessment,Evaluación
 DocType: Payment Entry Reference,Allocated,Numerado
-apps/erpnext/erpnext/config/accounts.py +225,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
+apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,Cerrar balance general y el libro de pérdidas y ganancias.
 DocType: Student Applicant,Application Status,Estado de la aplicación
 DocType: Fees,Fees,Matrícula
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,Especificar el tipo de cambio para convertir una moneda a otra
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,Quotation {0} is cancelled,La oferta de venta {0} esta cancelada
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Outstanding Amount,Monto total pendiente
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +26,Total Outstanding Amount,Monto total pendiente
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} was on leave on {1}. Cannot mark attendance.,El empleado {0} estaba ausente el {1}. No se puede marcar la asistencia.
 DocType: Sales Partner,Targets,Objetivos
 DocType: Price List,Price List Master,Lista de precios principal
@@ -2307,7 +2338,7 @@
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz (principal) y no se puede editar.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorar la regla precios
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +92,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado.
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,From Date in Salary Structure cannot be lesser than Employee Joining Date.,La fecha de la estructura salarial no puede ser menor que la fecha de contratación del empleado.
 DocType: Employee Education,Graduate,Graduado
 DocType: Leave Block List,Block Days,Bloquear días
 DocType: Journal Entry,Excise Entry,Registro de impuestos especiales
@@ -2338,8 +2369,9 @@
  1. Formas de disputas que abordan, indemnización, responsabilidad, etc. 
  1. Dirección y contacto de su empresa."
 DocType: Attendance,Leave Type,Tipo de ausencia
-apps/erpnext/erpnext/controllers/stock_controller.py +172,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"La 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,"La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida """
 DocType: Account,Accounts User,Cuentas de Usuario
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +79,Name error: {0},Nombre de error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Escasez
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +178,{0} {1} does not associated with {2} {3},{0} {1} no asociada a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
@@ -2375,23 +2407,23 @@
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},Inspección de la calidad requerida para el producto {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,Tasa por la cual la divisa es convertida como moneda base de la compañía
 DocType: Purchase Invoice Item,Net Rate (Company Currency),Tasa neta (Divisa por defecto)
+DocType: Salary Detail,Condition and Formula Help,Condición y la Fórmula de Ayuda
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administración de territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de venta
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
 apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +83,Salary Slip Created,Nómina de creación
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,Nómina de creación
 DocType: Company,Default Receivable Account,Cuenta por cobrar por defecto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el salario total pagado según los siguientes criterios
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción
 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.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios.
 DocType: Purchase Invoice,Half-yearly,Semestral
-apps/erpnext/erpnext/accounts/report/financial_statements.py +16,Fiscal Year {0} not found.,El año fiscal {0} no se encuentra.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,Asiento contable para inventario
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,El elemento {0} no existe
 DocType: Attendance Tool Student,Attendance Tool Student,Estudiante de herramientas de asistencia
 DocType: Sales Invoice,Customer Address,Dirección del cliente
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +88,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Completo Cantidad debe ser mayor que cero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +96,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Completo Cantidad debe ser mayor que cero.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 DocType: Account,Root Type,Tipo de root
 DocType: Item,FIFO,FIFO
@@ -2404,16 +2436,16 @@
 DocType: Cheque Print Template,Primary Settings,Ajustes primarios
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar dirección del proveedor
 DocType: Quality Inspection,Quality Inspection,Inspección de calidad
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Extra Small,Extra Pequeño
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +666,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,Extra Pequeño
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,La 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.
 DocType: Payment Request,Mute Email,Silenciar Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +600,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
 apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 DocType: Stock Entry,Subcontract,Sub-contrato
-apps/erpnext/erpnext/public/js/utils/party.js +145,Please enter {0} first,"Por favor, introduzca {0} primero"
+apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,"Por favor, introduzca {0} primero"
 DocType: Production Order Operation,Actual End Time,Hora final real
 DocType: Production Planning Tool,Download Materials Required,Descargar materiales necesarios
 DocType: Item,Manufacturer Part Number,Número de componente del fabricante
@@ -2422,20 +2454,21 @@
 DocType: SMS Log,No of Sent SMS,Número de SMS enviados
 DocType: Account,Expense Account,Cuenta de costos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Colour,Color
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,Color
 DocType: Maintenance Visit,Scheduled,Programado.
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitud de presupuesto.
 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: Student Log,Academic,Académico
 apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Gran Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
-DocType: Examination,Results,resultados
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +158,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
+DocType: Assessment,Results,resultados
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Until,Hasta
+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: Student,Father's/ Guardian 2 Email ID,del padre / tutor 2 ID de correo electrónico
+DocType: Student Applicant,Father's/ Guardian 2 Email ID,del padre / tutor 2 ID de correo electrónico
 DocType: Maintenance Visit Purpose,Against Document No,Contra el Documento No
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrar socios de ventas.
 DocType: Quality Inspection,Inspection Type,Tipo de inspección
@@ -2444,7 +2477,7 @@
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,La asistencia sin marcar
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Researcher,Investigador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,Investigador
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Estudiante Herramienta de Inscripción Programa
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,El nombre o e-mail es obligatorio
 apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,Inspección de calidad de productos entrantes
@@ -2458,7 +2491,7 @@
 DocType: Employee,You can enter any date manually,Puede introducir cualquier fecha manualmente
 DocType: Sales Invoice,Advertisement,Anuncio
 DocType: Asset Category Account,Depreciation Expense Account,Cuenta de gastos de depreciación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +174,Probationary Period,Período de prueba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,Período de prueba
 apps/erpnext/erpnext/hooks.py +102,Announcements,anuncios
 DocType: Customer Group,Only leaf nodes are allowed in transaction,Sólo las sub-cuentas son permitidas en una transacción
 DocType: Expense Claim,Expense Approver,Supervisor de gastos
@@ -2472,10 +2505,10 @@
 apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,Actividades pendientes
 DocType: Payment Gateway,Gateway,Puerta
-DocType: Fee Amount,Fees Category,Tasas Categoría
+DocType: Fee Component,Fees Category,Tasas Categoría
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,"Por favor, introduzca la fecha de relevo"
 apps/erpnext/erpnext/controllers/trends.py +145,Amt,Monto
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +53,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,"Sólo las solicitudes de ausencia con estado ""Aprobado"" puede ser validadas"
 apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,La dirección principal es obligatoria
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene desde esta."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de periódicos
@@ -2492,10 +2525,10 @@
 apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},No se puede encontrar el tipo de cambio para {0} a {1}
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,Medio Día Marcos
 DocType: Sales Invoice,Sales Team,Equipo de ventas
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +88,Duplicate entry,Entrada duplicada
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,Entrada duplicada
 DocType: Program Enrollment Tool,Get Students,Obtener estudiantes
 DocType: Serial No,Under Warranty,Bajo garantía
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +447,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[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
 apps/erpnext/erpnext/controllers/status_updater.py +175,Limit Crossed,límite cruzadas
@@ -2508,6 +2541,7 @@
 DocType: Payment Reconciliation Invoice,Invoice Number,Número de factura
 DocType: Shopping Cart Settings,Orders,Órdenes
 DocType: Employee Leave Approver,Leave Approver,Supervisor de ausencias
+DocType: Assessment Group,Assessment Group Name,Nombre del grupo de evaluación
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para manufacturar
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
 DocType: Landed Cost Item,Receipt Document Type,Recibo de Tipo de Documento
@@ -2518,7 +2552,7 @@
 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 +49,Period Closing Entry,Asiento de cierre de período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,El centro de costos con transacciones existentes no se puede convertir a 'grupo'
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +316,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
 DocType: Account,Depreciation,DEPRECIACIONES
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Herramienta de asistencia de los empleados
@@ -2529,7 +2563,8 @@
 DocType: GL Entry,Voucher No,Comprobante No.
 DocType: Leave Allocation,Leave Allocation,Asignación de vacaciones
 DocType: Payment Request,Recipient Message And Payment Details,Mensaje receptor y formas de pago
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +481,Material Requests {0} created,Requisición de materiales {0} creada
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,Requisición de materiales {0} creada
+DocType: Production Planning Tool,Include sub-contracted raw materials,Incluya materias primas subcontratados
 apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,Configuración de las plantillas de términos y condiciones.
 DocType: Purchase Invoice,Address and Contact,Dirección y contacto
 DocType: Cheque Print Template,Is Account Payable,Es cuenta por pagar
@@ -2555,7 +2590,7 @@
 DocType: Quotation Item,Against Doctype,Contra 'DocType'
 apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1} está cancelado o cerrado
 DocType: Delivery Note,Track this Delivery Note against any Project,Seguir este albarán en contra de cualquier proyecto
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +28,Net Cash from Investing,Efectivo neto de inversión
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,Efectivo neto de inversión
 ,Is Primary Address,Es Dirección Primaria
 DocType: Production Order,Work-in-Progress Warehouse,Almacén de trabajos en proceso
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +104,Asset {0} must be submitted,Activos {0} debe ser presentado
@@ -2567,7 +2602,7 @@
 DocType: Serial No,Warranty / AMC Details,Garantía / Detalles de CMA
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +558,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +848,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),Cierre (Deb)
 DocType: Cheque Print Template,Cheque Size,Cheque Tamaño
@@ -2575,7 +2610,7 @@
 apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.js +49,View attendance,Ver la asistencia
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,El número de serie {0} no se encuentra en stock
 apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1351,Write Off Outstanding Amount,Balance de pagos pendientes
+DocType: Sales Invoice,Write Off Outstanding Amount,Balance de pagos pendientes
 DocType: Account,Accounts Manager,Gerente de Cuentas
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida (UdM) predeterminada para Inventario
 DocType: Asset,Number of Depreciations Booked,Número de reserva Depreciaciones
@@ -2599,14 +2634,14 @@
 DocType: Lead,Lower Income,Ingreso menor
 DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked","La cuenta de patrimonio, en la cual serán registradas las perdidas y/o ganancias"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},"Almacenes de origen y destino no pueden ser los mismos, línea {0}"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +242,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +81,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +17,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
 DocType: Timesheet,"List of employee which has ""Salary Slip Based on Timesheet"" is enabled in salary structure.",Lista de empleados que tiene &quot;nómina Basado en parte de horas&quot; está habilitada en la estructura salarial.
 DocType: Asset,Fully Depreciated,Estando totalmente amortizados
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +351,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Asistencia marcado HTML
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
 apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,Número de serie y de lote
@@ -2629,7 +2664,7 @@
 DocType: Sales Order,%  Delivered,% Entregado
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Bank Overdraft Account,Cuenta de sobre-giros
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +47,Make Salary Slip,Crear nómina salarial
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Crear nómina salarial
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,Prestamos en garantía
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +94,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, establece las cuentas relacionadas de depreciación de activos en Categoría {0} o de su empresa {1}"
@@ -2641,7 +2676,7 @@
 DocType: Opportunity,OPTY-,OPTY-
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,Repetir fecha
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,Firmante autorizado
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +187,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave approver must be one of {0},El supervisor de ausencias debe ser uno de {0}
 DocType: Hub Settings,Seller Email,Correo electrónico de vendedor
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Costo total de compra (vía facturas de compra)
 DocType: Workstation Working Hour,Start Time,Hora de inicio
@@ -2658,7 +2693,7 @@
 DocType: Stock Settings,Item Naming By,Ordenar productos por
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,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 producción
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +29,Account {0} does not exists,La cuenta {0} no existe
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,La cuenta {0} no existe
 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.,Es obligatoria la meta fe facturación.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Costo de diversas actividades
@@ -2682,7 +2717,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 +44,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Wire Transfer,Transferencia bancaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Wire Transfer,Transferencia bancaria
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,Marque todas las
 DocType: Sales Order,Recurring Order,Orden recurrente
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
@@ -2690,14 +2725,14 @@
 DocType: Sales Invoice,Time Sheets,Las hojas de asistencia
 DocType: Payment Gateway Account,Default Payment Request Message,Defecto de solicitud de pago del mensaje
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea mostrarlo en el sitio web
-apps/erpnext/erpnext/config/accounts.py +130,Banking and Payments,De bancos y pagos
+apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,De bancos y pagos
 ,Welcome to ERPNext,Bienvenido a ERPNext
 apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,Iniciativa a cotización
 DocType: Lead,From Customer,Desde cliente
-apps/erpnext/erpnext/demo/setup_data.py +344,Calls,Llamadas
+apps/erpnext/erpnext/demo/setup_data.py +357,Calls,Llamadas
 DocType: Project,Total Costing Amount (via Time Logs),Importe total calculado (a través de la gestión de tiempos)
 DocType: Purchase Order Item Supplied,Stock UOM,Unidad de media utilizada en el almacen
-apps/erpnext/erpnext/stock/doctype/item/item.py +463,"As there are existing transactions for this item, \
+apps/erpnext/erpnext/stock/doctype/item/item.py +466,"As there are existing 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 existentes por este concepto, \ no puede cambiar los valores de &#39;no tiene de serie&#39;, &#39;tiene Nº de lote &quot;,&quot; ¿Es de Punto &quot;y&quot; Método de valoración&#39;"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +217,Purchase Order {0} is not submitted,La orden de compra {0} no se encuentra validada
 apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,Proyectado
@@ -2715,12 +2750,12 @@
 apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,No se han añadido contactos
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Monto de costos de destino estimados
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Listado de facturas emitidas por los proveedores.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1353,Write Off Account,Cuenta de desajuste
+DocType: POS Profile,Write Off Account,Cuenta de desajuste
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Descuento
 DocType: Purchase Invoice,Return Against Purchase Invoice,Devolución contra factura de compra
 DocType: Item,Warranty Period (in days),Período de garantía (en días)
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +40,Acutal qty in stock,Cant acutal en stock
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +16,Net Cash from Operations,Efectivo neto de las operaciones
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,Efectivo neto de las operaciones
 apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,por ejemplo IVA
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Elemento 4
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +20,Sub-contracting,La subcontratación
@@ -2728,15 +2763,16 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Estudiantes
 DocType: Shopping Cart Settings,Quotation Series,Series de ofertas de venta
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"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"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1171,Please select customer,"Por favor, seleccione al cliente"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1190,Please select customer,"Por favor, seleccione al cliente"
 DocType: C-Form,I,yo
 DocType: Company,Asset Depreciation Cost Center,Centro de la amortización del coste de los activos
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si se selecciona, todos los hijos de cada elemento de la producción se incluirán en las solicitudes de materiales."
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,Almacén {0}: Compañía es obligatoria
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +50,Missing Currency Exchange Rates for {0},Se requiere la tasa de cambio para {0}
-DocType: Examination,Examiner,Examinador
+DocType: Assessment,Examiner,Examinador
 DocType: Journal Entry,Stock Entry,Entradas de inventario
 DocType: Payment Entry,Payment References,Referencias de pago
 DocType: C-Form,C-FORM-,C-FORM
@@ -2745,7 +2781,7 @@
 DocType: Pricing Rule,Margin,Margen
 DocType: Salary Slip,Arrear Amount,Cuantía pendiente
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuevos clientes
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Gross Profit %,Beneficio Bruto%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Gross Profit %,Beneficio Bruto%
 DocType: Appraisal Goal,Weightage (%),Porcentaje (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +60,Gross Purchase Amount is mandatory,Compra importe bruto es obligatorio
@@ -2787,7 +2823,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nombre de la empresa no puede ser la empresa
 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 las plantillas de impresión, por ejemplo, Factura proforma."
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +156,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
 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,Coeficiente de la lista de materiales (LdM)
@@ -2811,12 +2847,10 @@
 ,Stock Ledger,Mayor de Inventarios
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Calificación: {0}
 DocType: Company,Exchange Gain / Loss Account,Ganancia de cambio de cuenta / Pérdida
-DocType: Salary Slip Deduction,Salary Slip Deduction,Deducciones en nómina
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empleados y Asistencias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},Propósito debe ser uno de {0}
 apps/erpnext/erpnext/utilities/doctype/address/address.py +79,"Remove reference of customer, supplier, sales partner and lead, as it is your company address","Eliminar la referencia del cliente, proveedor, distribuidor y plomo, ya que es la dirección de la empresa"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Fill the form and save it,Llene el formulario y guárdelo
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +154,Row {0}: From Time and To Time overlap with existing from and to time,Fila {0}: Del tiempo y la superposición de tiempo con el ya existente desde y hacia el tiempo
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Descargar un informe con todas las materias primas y su inventario actual
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Foro de la comunidad
 DocType: Leave Application,Leave Balance Before Application,Ausencias disponibles antes de la solicitud
@@ -2824,7 +2858,6 @@
 DocType: Cheque Print Template,Width of amount in word,Anchura del importe de palabra
 DocType: Company,Default Letter Head,Encabezado predeterminado
 DocType: Purchase Order,Get Items from Open Material Requests,Obtener elementos de solicitudes abierto de materiales
-DocType: Timesheet Detail,Billable,Facturable
 DocType: Item,Standard Selling Rate,Estándar tipo vendedor
 DocType: Account,Rate at which this tax is applied,Valor por el cual el impuesto es aplicado
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Cantidad a reabastecer
@@ -2845,7 +2878,7 @@
 apps/erpnext/erpnext/accounts/party.py +308,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,Importación y exportación de datos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +188,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Existen entradas en existencias de almacén en contra {0}, por lo tanto, no se puede volver a asignar o modificarlo"
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +28,No students Found,No se han encontrado estudiantes
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +29,No students Found,No se han encontrado estudiantes
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fecha de la factura de envío
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +24,Sell,Vender
 DocType: Sales Invoice,Rounded Total,Total redondeado
@@ -2856,14 +2889,14 @@
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,Crear visita de mantenimiento
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +162,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
-apps/erpnext/erpnext/config/accounts.py +50,Company (not Customer or Supplier) master.,Configuración general del sistema.
+apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Configuración general del sistema.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +5,This is based on the attendance of this Student,Esto se basa en la presencia de este Estudiante
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +165,Add more items or open full form,Añadir más elementos o forma totalmente abierta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,La nota de entrega {0} debe ser cancelada antes de cancelar esta orden ventas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,"El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el artículo {1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +128,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},Nota : No cuenta con suficientes días para la ausencia del tipo {0}
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programa de cuota de inscripción
 DocType: Item,Supplier Items,Artículos de proveedor
 DocType: Opportunity,Opportunity Type,Tipo de oportunidad
@@ -2871,7 +2904,6 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},El centro de costos es requerido para la cuenta de 'perdidas y ganancias' {0}
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Las transacciones sólo pueden ser borradas 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.,Se encontró un número incorrecto de entradas del libro mayor. Es posible que haya seleccionado una cuenta equivocada en la transacción.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
 DocType: Cheque Print Template,Cheque Width,Ancho Cheque
 DocType: Program,Fee Schedule,Programa de tarifas
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
@@ -2887,7 +2919,7 @@
 DocType: Warranty Claim,Item and Warranty Details,Objeto y de garantía Detalles
 DocType: Sales Team,Contribution (%),Margen (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Responsibilities,Responsabilidades
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,Responsabilidades
 DocType: Expense Claim Account,Expense Claim Account,Cuenta de Gastos
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,Plantilla
 DocType: Sales Person,Sales Person Name,Nombre de vendedor
@@ -2898,17 +2930,18 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +439,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
+apps/erpnext/erpnext/stock/doctype/item/item.py +442,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente facturado
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} must be a Fixed Asset Item,Elemento {0} debe ser un elemento de activo fijo
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
 apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,"Por favor, vuelva a escribir nombre de la empresa para confirmar"
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Outstanding Amt,Monto total pendiente
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,Monto total pendiente
 DocType: Timesheet,Total Hours,Total de Horas
 DocType: Journal Entry,Printing Settings,Ajustes de impresión
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},El débito total debe ser igual al crédito. La diferencia es {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotores
 DocType: Asset Category Account,Fixed Asset Account,Cuenta de activo fijo
+DocType: Salary Structure Employee,Variable,Variable
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,Desde nota de entrega
 DocType: POS Profile,Allow Partial Payment,Permitir el pago parcial
 DocType: Timesheet Detail,From Time,Desde hora
@@ -2917,9 +2950,10 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
 DocType: Purchase Invoice,Price List Exchange Rate,Tipo de cambio para la lista de precios
 DocType: Purchase Invoice Item,Rate,Precio
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Intern,Interno
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,Interno
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Basic,Base
+DocType: Assessment,Assessment Code,Código evaluación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +97,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,'Hasta la fecha' debe ser igual a 'desde fecha' para una ausencia de medio día
@@ -2930,11 +2964,11 @@
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +699,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,Distribuir materiales
 DocType: Material Request Item,For Warehouse,Para el almacén
 DocType: Employee,Offer Date,Fecha de oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Ofertas de venta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +675,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga la red.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +683,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga la red.
 DocType: Hub Settings,Access Token,Token de acceso
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +31,No Student Groups created.,No hay grupos de estudiantes crearon.
 DocType: Purchase Invoice Item,Serial No,Número de serie
@@ -2942,13 +2976,13 @@
 DocType: Purchase Invoice,Print Language,Lenguaje de impresión
 DocType: Salary Slip,Total Working Hours,Tiempo de trabajo total
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1100,Enter value must be positive,Introducir el valor debe ser positivo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,All Territories,Todos los Territorios
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1122,Enter value must be positive,Introducir el valor debe ser positivo
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +23,Student is already enrolled.,Estudiante ya está inscrito.
 DocType: Fiscal Year,Year Name,Nombre del Año
 DocType: Process Payroll,Process Payroll,Procesar nómina
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +144,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,Existen más vacaciones que días de trabajo en este mes.
 DocType: Product Bundle Item,Product Bundle Item,Artículo del conjunto de productos
 DocType: Sales Partner,Sales Partner Name,Nombre de socio de ventas
 apps/erpnext/erpnext/hooks.py +96,Request for Quotations,Solicitud de ofertas de venta
@@ -2958,16 +2992,16 @@
 DocType: Issue,Opening Time,Hora 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
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Cambios de valores y bienes
-apps/erpnext/erpnext/stock/doctype/item/item.py +625,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para Variant &#39;{0}&#39; debe ser el mismo que en la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
-DocType: Examination,Supervisor Name,Nombre del supervisor
+DocType: Assessment,Supervisor Name,Nombre del supervisor
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
 DocType: Tax Rule,Shipping City,Ciudad de envió
 apps/erpnext/erpnext/stock/doctype/item/item.js +62,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este producto es una variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que la opción 'No copiar' esté seleccionada
 DocType: Account,Purchase User,Usuario de compras
 DocType: Notification Control,Customize the Notification,Personalizar notificación
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Cash Flow from Operations,Flujo de caja operativo
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Cash Flow from Operations,Flujo de caja operativo
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,La plantilla de direcciones por defecto no puede ser eliminada
 DocType: Sales Invoice,Shipping Rule,Regla de envío
 DocType: Manufacturer,Limited to 12 characters,Limitado a 12 caracteres
@@ -2975,7 +3009,6 @@
 DocType: Maintenance Schedule,Maintenance Manager,Gerente de mantenimiento
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,Total no puede ser cero
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Días desde la última orden' debe ser mayor que o igual a cero
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Por favor ajuste de denominación de la serie de {0} a través de Configuración&gt; Configuración&gt; Serie Naming
 DocType: Asset,Amended From,Modificado Desde
 apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
@@ -2995,36 +3028,38 @@
 DocType: Issue,Raised By (Email),Propuesto por (Email)
 DocType: Mode of Payment,General,General
 apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,Adjuntar membrete
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +296,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/accounts/doctype/purchase_invoice/purchase_invoice.js +338,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/public/js/setup_wizard.js +217,"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 obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Número de serie requerido para el producto serializado {0}
-apps/erpnext/erpnext/config/accounts.py +140,Match Payments with Invoices,Conciliacion de pagos con facturas
+apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Conciliacion de pagos con facturas
 DocType: Journal Entry,Bank Entry,Registro de banco
 DocType: Authorization Rule,Applicable To (Designation),Aplicables a (Puesto)
 apps/erpnext/erpnext/templates/generators/item.html +62,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 +256,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
+DocType: Guardian,Interests,Intereses
+apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,Habilitar o deshabilitar el tipo de divisas
 DocType: Production Planning Tool,Get Material Request,Obtener Solicitud de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,GASTOS POSTALES
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,Total Presente
-apps/erpnext/erpnext/config/accounts.py +101,Accounting Statements,Declaraciones de contabilidad
+apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Declaraciones de contabilidad
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,Hora
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +145,"Serialized Item {0} cannot be updated \
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +141,"Serialized Item {0} cannot be updated \
 					using Stock Reconciliation",El producto serializado {0} no se puede actualizar / reconciliar stock
 DocType: Scheduling Tool,Day,Día
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra
 DocType: Lead,Lead Type,Tipo de iniciativa
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +112,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,Usted no está autorizado para aprobar las hojas de bloquear las fechas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,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: Item,Default Material Request Type,El material predeterminado Tipo de solicitud
 DocType: Student Applicant,AP.,AP.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Desconocido
 DocType: Shipping Rule,Shipping Rule Conditions,Condiciones de regla envío
 DocType: BOM Replace Tool,The new BOM after replacement,Nueva lista de materiales después de la sustitución
-apps/erpnext/erpnext/accounts/page/pos/pos.js +631,Point of Sale,Punto de Venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,Punto de Venta
 DocType: Payment Entry,Received Amount,Cantidad recibida
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Crear para la cantidad completa, haciendo caso omiso de la cantidad que ya están en orden"
 DocType: Account,Tax,Impuesto
@@ -3034,7 +3069,7 @@
 DocType: C-Form,Invoices,Facturas
 DocType: Job Opening,Job Title,Título del trabajo
 apps/erpnext/erpnext/public/js/setup_wizard.js +299,Gram,Gramo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +369,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +373,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Reporte de visitas para mantenimiento
 DocType: Stock Entry,Update Rate and Availability,Actualización de tarifas y disponibilidad
 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.,"El porcentaje que ud. tiene permitido para recibir o enviar mas de la cantidad ordenada. Por ejemplo: Si ha pedido 100 unidades, y su asignación es del 10%, entonces tiene permitido recibir hasta 110 unidades."
@@ -3042,23 +3077,23 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: Item,Website Description,Descripción del sitio web
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +83,Next Depreciation Date must be on or after today,La depreciación próxima fecha debe ser a partir del día de hoy
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Net Change in Equity,Cambio en el Patrimonio Neto
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,Cambio en el Patrimonio Neto
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +145,Please cancel Purchase Invoice {0} first,"Por favor, cancelar Factura de Compra {0} primera"
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
 ,Sales Register,Registro de ventas
 DocType: Quotation,Quotation Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Seleccione su dominio
 DocType: Address,Plant,Planta
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Transaction reference no {0} dated {1},Referencia de la transacción no {0} {1} fechado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +330,Transaction reference no {0} dated {1},Referencia de la transacción no {0} {1} fechado
 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/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,Resumen para este mes y actividades pendientes
 DocType: Customer Group,Customer Group Name,Nombre de la categoría de cliente
-apps/erpnext/erpnext/public/js/financial_statements.js +82,Cash Flow Statement,Estado de Flujos de Efectivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta factura {0} de C-Form {1}"
+apps/erpnext/erpnext/public/js/financial_statements.js +54,Cash Flow Statement,Estado de Flujos de Efectivo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},"Por favor, elimine esta 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 'trasladar' si usted desea incluir los saldos del año fiscal anterior a este año
 DocType: GL Entry,Against Voucher Type,Tipo de comprobante
 DocType: Item,Attributes,Atributos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +591,Get Items,Obtener artículos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +644,Get Items,Obtener artículos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Fecha del último pedido
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
@@ -3074,14 +3109,14 @@
 DocType: Project,Expected End Date,Fecha prevista de finalización
 DocType: Budget Account,Budget Amount,Cantidad de presupuesto
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la plantilla de evaluación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Commercial,Comercial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,Comercial
 DocType: Payment Entry,Account Paid To,Cuenta pagado hasta
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,El producto principal {0} no debe ser un artículo de stock
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Todos los productos o servicios.
 DocType: Supplier Quotation,Supplier Address,Dirección de proveedor
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +636,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +648,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Cant. enviada
-apps/erpnext/erpnext/config/accounts.py +272,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
+apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
 apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,La secuencia es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipos de actividades para los registros de tiempo
@@ -3093,7 +3128,7 @@
 DocType: Tax Rule,Billing State,Región de facturación
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,Transferencia
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +187,{0} {1} does not associated with Party Account {2},{0} {1} no asociada a la cuenta del partido {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +772,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
@@ -3105,11 +3140,12 @@
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
 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,Nota de entrega No.
+DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Si está marcada, solamente las solicitudes de compra de material para las materias primas finales se incluyen en las solicitudes de materiales. De lo contrario, se crearán solicitudes de material para artículos padre"
 DocType: Cheque Print Template,Message to show,Mensaje a mostrar
 DocType: Company,Retail,Ventas al por menor
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +118,Customer {0} does not exist,El cliente {0} no existe
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +120,Customer {0} does not exist,El cliente {0} no existe
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +534,Product Bundle,Conjunto / paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,Conjunto / paquete de productos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},Fila {0}: Referencia no válida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Plantilla de impuestos (compras)
 DocType: Upload Attendance,Download Template,Descargar plantilla
@@ -3119,8 +3155,10 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo de código de barras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +689,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +742,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +104,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salario ya procesada para el período entre {0} y {1}, Deja período de aplicación no puede estar entre este intervalo de fechas."
 apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,El registro de la instalación para un número de serie
+DocType: Guardian Interest,Guardian Interest,guardián interés
 DocType: Timesheet,Employee Detail,Detalle de los empleados
 apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,"El día ""siguiente fecha"" y ""repetir un día del mes"" deben ser iguales"
 apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,"Por favor, especifique un/a"
@@ -3131,7 +3169,7 @@
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,Cuenta {0} no puede ser un Grupo
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +111,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,La valoración negativa 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/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),Beneficio provisional / pérdida (Crédito)
@@ -3144,8 +3182,8 @@
 DocType: Production Order Item,Production Order Item,Artículo de la orden de producción
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No se han encontraron registros
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Costo de Activos Scrapped
-apps/erpnext/erpnext/controllers/stock_controller.py +175,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costes es obligatorio para el artículo {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +573,Get Items from Product Bundle,Obtener elementos del paquete del producto
+apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costes es obligatorio para el artículo {2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,Obtener elementos del paquete del producto
 DocType: Asset,Straight Line,Línea recta
 DocType: Project User,Project User,usuario proyecto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,Cuenta {0} está inactiva
@@ -3169,6 +3207,7 @@
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol que permite definir cuentas congeladas y editar asientos congelados
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor de apertura
+DocType: Salary Detail,Formula,Fórmula
 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 +92,Commission on Sales,Comisiones sobre ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
@@ -3207,15 +3246,15 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,A la fecha
 DocType: Appraisal,HR,HORA
 DocType: Program Enrollment,Enrollment Date,Fecha de inscripción
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +58,Probation,Período de prueba
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +56,Probation,Período de prueba
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,componentes de sueldos
 DocType: Program Enrollment Tool,New Academic Year,Nuevo Año Académico
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +168,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},Pago del salario correspondiente al mes {0} del año {1}
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Paid Amount,Importe total pagado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,Importe total pagado
 DocType: Production Order Item,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Planning,Planificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,Planificación
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,Emitido
 DocType: Project,Total Billing Amount (via Time Logs),Importe total de facturación (a través de la gestión de tiempos)
 apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,Vendemos este producto
@@ -3228,10 +3267,11 @@
 DocType: Sales Partner,Contact Desc,Desc. de Contacto
 apps/erpnext/erpnext/config/hr.py +65,"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 resumidos periódicamente por correo electrónico.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1390,Sales invoice submitted sucessfully.,factura de venta presentado con éxito.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Sales invoice submitted sucessfully.,factura de venta presentado con éxito.
 DocType: Payment Entry,PE-,EDUCACIÓN FÍSICA-
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +115,Please set default account in Expense Claim Type {0},"Por favor, establece de forma predeterminada en cuenta Tipo de Gastos {0}"
-DocType: Attendance Tool Student,Student Name,Nombre del estudiante
+DocType: Assessment Result,Student Name,Nombre del estudiante
+apps/erpnext/erpnext/hooks.py +104,Assessment Schedule,Horario evaluación
 DocType: Brand,Item Manager,Administración de elementos
 DocType: Buying Settings,Default Supplier Type,Tipos de Proveedores
 DocType: Production Order,Total Operating Cost,Costo Total de Funcionamiento
@@ -3247,12 +3287,12 @@
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +55,Set Tax Rule for shopping cart,Establezca la regla fiscal (Impuestos) del carrito de compras
 DocType: Purchase Invoice,Taxes and Charges Added,Impuestos y cargos adicionales
 ,Sales Funnel,"""Embudo"" de ventas"
-apps/erpnext/erpnext/setup/doctype/company/company.py +41,Abbreviation is mandatory,La abreviatura es obligatoria
+apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,La abreviatura es obligatoria
 ,Qty to Transfer,Cantidad a transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
 ,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,All Customer Groups,Todas las categorías de clientes
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,Todas las categorías de clientes
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +78,Accumulated Monthly,acumulado Mensual
 apps/erpnext/erpnext/controllers/accounts_controller.py +595,{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}.,{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +38,Tax Template is mandatory.,Plantilla de impuestos es obligatorio.
@@ -3263,28 +3303,27 @@
 DocType: Address,Preferred Billing Address,Dirección de facturación preferida
 DocType: Program,Courses,cursos
 DocType: Monthly Distribution Percentage,Percentage Allocation,Porcentaje de asignación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Secretary,Secretaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,Secretaria
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Si desactivado, &quot;en las palabras de campo no será visible en cualquier transacción"
 DocType: Serial No,Distinct unit of an Item,Unidad distinta del producto
 DocType: Pricing Rule,Buying,Compras
 DocType: HR Settings,Employee Records to be created by,Los registros de empleados se crearán por
 DocType: POS Profile,Apply Discount On,Aplicar de descuento en las
 ,Reqd By Date,Fecha de solicitud
-DocType: Salary Slip Earning,Salary Slip Earning,Ingresos en nómina
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Acreedores
+DocType: Assessment,Assessment Name,Nombre evaluación
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,Línea # {0}: El número de serie es obligatorio
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Instituto Abreviatura
 ,Item-wise Price List Rate,Detalle del listado de precios
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +806,Supplier Quotation,Oferta de venta de proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,Oferta de venta de proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' serán visibles una vez que guarde la oferta de venta
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +7,Collect Fees,cobrar tarifas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +451,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,Próximos eventos
-DocType: Fee Amount,Fee Amount,Importe de la cuota
 DocType: Item,Opening Stock,Stock de apertura
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para la devolución
@@ -3301,7 +3340,7 @@
 DocType: Customer,From Lead,Desde iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Las órdenes publicadas para la producción.
 apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +443,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
 DocType: Program Enrollment Tool,Enroll Students,inscribir a los estudiantes
 DocType: Hub Settings,Name Token,Nombre de Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venta estándar
@@ -3337,7 +3376,6 @@
 DocType: Currency Exchange,To Currency,A 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 días bloqueados.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipos de reembolsos
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Territorio
 DocType: Item,Taxes,Impuestos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,A cargo y no entregados
 DocType: Project,Default Cost Center,Centro de costos por defecto
@@ -3352,6 +3390,7 @@
 DocType: Sales Invoice,Exhibition,Exposición
 apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address","Company es obligatoria, ya que es la dirección de la empresa"
 DocType: Item Attribute,From Range,De Gama
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +81,Syntax error in formula or condition: {0},Error de sintaxis en la fórmula o condición: {0}
 apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,El producto {0} ha sido ignorado ya que no es un elemento de stock
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,Submit this Production Order for further processing.,Enviar esta orden de producción para su posterior procesamiento.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no utilizar la regla de precios en una única transacción, todas las reglas de precios aplicables deben ser desactivadas."
@@ -3364,14 +3403,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),Porcentaje (%)
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Fin del ejercicio contable
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +710,Make Supplier Quotation,Crear oferta de venta de un proveedor
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,Crear oferta de venta de un proveedor
 DocType: Quality Inspection,Incoming,Entrante
 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 goce de salario (LSS)
 apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},Línea # {0}: Número de serie {1} no coincide con {2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Casual Leave,Permiso ocacional
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,Permiso ocacional
 DocType: Batch,Batch ID,ID de lote
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},Nota: {0}
 ,Delivery Note Trends,Evolución de las notas de entrega
@@ -3385,8 +3423,8 @@
 DocType: Request for Quotation Item,Request for Quotation Item,Solicitud de oferta de venta de artículos
 DocType: Purchase Order,To Bill,Por facturar
 DocType: Material Request,% Ordered,% Ordenado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Piecework,Trabajo por obra
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Buying Rate,Precio de compra promedio
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,Trabajo por obra
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,Precio de compra promedio
 DocType: Task,Actual Time (in Hours),Tiempo real (en horas)
 DocType: Employee,History In Company,Historia en la Compañia
 apps/erpnext/erpnext/config/learn.py +112,Newsletters,Boletines
@@ -3402,7 +3440,7 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +350,{0} units of {1} needed in {2} to complete this transaction.,{0} unidades de {1} necesaria en {2} para completar esta transacción.
 DocType: SMS Settings,SMS Settings,Ajustes de SMS
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,Cuentas temporales
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +164,Black,Negro
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,Negro
 DocType: BOM Explosion Item,BOM Explosion Item,Desplegar lista de materiales (LdM) del producto
 DocType: Account,Auditor,Auditor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +56,{0} items produced,{0} artículos producidos
@@ -3416,9 +3454,10 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,ID del cliente
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,Marcos Ausente
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +461,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
 DocType: Homepage,Tag Line,tag Line
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Add items from,Agregar elementos de
+DocType: Fee Component,Fee Component,Cuota de componentes
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,Agregar elementos de
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: La cuenta padre {1} no pertenece a la compañía {2}
 DocType: Cheque Print Template,Regular,Regular
 DocType: BOM,Last Purchase Rate,Tasa de cambio de última compra
@@ -3435,12 +3474,13 @@
 DocType: Employee,Reports to,Enviar Informes a
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para los números de los receptores
 DocType: Payment Entry,Paid Amount,Cantidad pagada
-DocType: Examination,Supervisor,Supervisor
+DocType: Assessment,Supervisor,Supervisor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +710,Online,En línea
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
 apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,Establecer esta plantilla de dirección por defecto ya que no existe una predeterminada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Balance de la cuenta ya en Débito, no le está permitido establecer ""Balance Debe Ser"" como ""Crédito"""
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Quality Management,Gestión de calidad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,Gestión de calidad
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} has been disabled,Elemento {0} ha sido desactivado
 apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
@@ -3452,17 +3492,17 @@
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasa por la cual la divisa del proveedor es convertida como moneda base de la compañía
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Línea #{0}: tiene conflictos de tiempo con la linea {1}
 DocType: Opportunity,Next Contact,Siguiente contacto
-apps/erpnext/erpnext/config/accounts.py +266,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
+apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
 DocType: Employee,Employment Type,Tipo de empleo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,ACTIVOS FIJOS
 DocType: Payment Entry,Set Exchange Gain / Loss,Ajuste de ganancia del intercambio / Pérdida
 ,Cash Flow,Flujo de fondos
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +87,Application period cannot be across two alocation records,Período de aplicación no puede ser a través de dos registros alocation
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,Período de aplicación no puede ser a través de dos registros alocation
 DocType: Item Group,Default Expense Account,Cuenta de gastos por defecto
 DocType: Student,Student Email ID,Estudiante ID de correo electrónico
 DocType: Employee,Notice (days),Aviso (días)
 DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1531,Select items to save the invoice,Seleccione artículos para ahorrar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1520,Select items to save the invoice,Seleccione artículos para ahorrar la factura
 DocType: Employee,Encashment Date,Fecha de cobro
 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 una actividad de costo por defecto para la actividad del tipo - {0}
@@ -3497,29 +3537,30 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"El almacén no se puede eliminar, porque existen registros de inventario para el mismo."
 DocType: Company,Distribution,Distribución
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,Total Pagado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Project Manager,Gerente de proyectos
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,Gerente de proyectos
 ,Quoted Item Comparison,Citado artículo Comparación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +72,Dispatch,Despacho
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,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 el producto: {0} es {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,El valor neto de activos como en
 DocType: Account,Receivable,A cobrar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
 DocType: Sales Invoice,Supplier Reference,Referencia de proveedor
-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 ."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +827,"Master data syncing, it might take some time","Maestro sincronización de datos, que podría tomar algún tiempo"
-DocType: Material Request,Material Issue,Expedición de material
+apps/erpnext/erpnext/accounts/page/pos/pos.js +844,"Master data syncing, it might take some time","Maestro sincronización de datos, que podría tomar algún tiempo"
+DocType: Item,Material Issue,Expedición de material
 DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
 DocType: Item Price,Item Price,Precio de productos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Jabón y detergente
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,Imagén en movimiento y vídeo
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
+DocType: Salary Detail,Component,Componente
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +70,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior a igual a {0}
 DocType: Warehouse,Warehouse Name,Nombre del almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
 DocType: Journal Entry,Write Off Entry,Diferencia de desajuste
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +83,Error in formula or condition,Error en la fórmula o condición
 DocType: BOM,Rate Of Materials Based On,Valor de materiales basado en
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Soporte analítico
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,Desmarcar todos
@@ -3528,24 +3569,24 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 ingresar 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 +193,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +197,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
 DocType: Purchase Invoice,In Words,En palabras
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +224,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,Hoy el cumpleaños de {0} !
 DocType: Production Planning Tool,Material Request For Warehouse,Requisición de materiales para el almacén
 DocType: Sales Order Item,For Production,Por producción
 DocType: Payment Request,payment_url,payment_url
-DocType: Project Task,View Task,Vista de tareas
+DocType: Project Task,View Task,Ver Tareas
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,El año financiero inicia el
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Las depreciaciones de activos y saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +312,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,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 por defecto, haga clic en 'Establecer como predeterminado'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +141,Join,Unirse
+apps/erpnext/erpnext/projects/doctype/project/project.py +143,Join,Unirse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +649,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Salary Slip,Salary Slip,Nómina salarial
 DocType: Pricing Rule,Margin Rate or Amount,Tasa de margen o Monto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +48,'To Date' is required,'Hasta la fecha' es requerido
@@ -3568,14 +3609,14 @@
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},No válida {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Sick Leave,Permiso por enfermedad
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,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/setup_wizard/industry_type.py +22,Department Stores,Tiendas por departamento
 DocType: Warehouse,PIN,ALFILER
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base cantidad de cambio (moneda de la empresa)
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
-apps/erpnext/erpnext/projects/doctype/project/project.js +96,Save the document first.,Guarde el documento primero.
+apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
 DocType: Company,Change Abbreviation,Cambiar abreviación
 DocType: Expense Claim Detail,Expense Date,Fecha de gasto
@@ -3588,9 +3629,10 @@
 DocType: Purchase Invoice,Recurring Print Format,Formato de impresión recurrente
 DocType: C-Form,Series,Secuencia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,La fecha prevista de entrega no puede ser menor que la fecha de la orden de compra
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +187,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Por favor ajuste de denominación de la serie de {0} a través de Configuración&gt; Configuración&gt; Serie Naming
 DocType: Appraisal,Appraisal Template,Plantilla de evaluación
 DocType: Item Group,Item Classification,Clasificación de producto
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Business Development Manager,Gerente de desarrollo de negocios
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Business Development Manager,Gerente de desarrollo de negocios
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de visita
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,Período
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Balance general
@@ -3600,7 +3642,7 @@
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}","El Email debe ser único,  {0} ya existe"
 ,Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto
 DocType: Salary Detail,Salary Detail,Detalle de sueldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +643,Please select {0} first,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,"Por favor, seleccione primero {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
 DocType: Sales Invoice,Commission,Comisión
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Hoja de tiempo para la fabricación.
@@ -3629,13 +3671,12 @@
  {% if email_ID%} Email: {{email_ID}} & lt; br & gt ; {% endif -%} 
  </ code> </ pre>"
 DocType: Salary Detail,Default Amount,Importe por defecto
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +96,Warehouse not found in the system,El almacén no se encuentra en el sistema
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,El almacén no se encuentra en el sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,Resumen de este mes
 DocType: Quality Inspection Reading,Quality Inspection Reading,Lecturas de inspección de calidad
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
 ,Project wise Stock Tracking,Seguimiento preciso del stock--
-DocType: Examination,Exam Code,Código examen
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} ya existe para {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cantidad real (en origen/destino)
 DocType: Item Customer Detail,Ref Code,Código de referencia
@@ -3643,19 +3684,19 @@
 apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
 DocType: Payment Gateway,Payment Gateway,Pasarela de Pago
 DocType: HR Settings,Payroll Settings,Configuración de nómina
-apps/erpnext/erpnext/config/accounts.py +142,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
+apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Realizar pedido
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,la tabla raíz no puede tener un centro de costes padre / principal
 apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Seleccione una marca ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,La depreciación acumulada como en
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +374,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,Almacén es obligatorio
 DocType: Supplier,Address and Contacts,Dirección y contactos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalles de conversión de unidad de medida (UdM)
 apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),Debe Mantenerse adecuado para la web 900px (H) por 100px (V)
 DocType: Program,Program Abbreviation,Abreviatura programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +363,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Appraisal,Start Date,Fecha de inicio
@@ -3664,8 +3705,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignarse a sí misma como cuenta padre
 DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Mostrar 'En stock' o 'No disponible' basado en el stock disponible del almacén.
-apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiales (LdM)
+apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiales (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para el envío
+DocType: Assessment Result,Assessment Result,evaluación de Resultado
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
@@ -3678,52 +3720,52 @@
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acción si se acumula presupuesto mensual excedido
 DocType: Purchase Invoice,Submit on creation,Validar al Crear
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +425,Currency for {0} must be {1},Moneda para {0} debe ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +432,Currency for {0} must be {1},Moneda para {0} debe ser {1}
 DocType: Asset,Disposal Date,disposición Fecha
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
-apps/erpnext/erpnext/stock/doctype/item/item.py +490,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +77,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la oferta de venta ha sido hecha."
+apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque la oferta de venta ha sido hecha."
 DocType: Purchase Taxes and Charges Template,Purchase Master Manager,Director de compras
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +429,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +35,Course is mandatory in row {0},Por supuesto es obligatorio en la fila {0}
 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: Supplier Quotation Item,Prevdoc DocType,DocType Previo
-apps/erpnext/erpnext/stock/doctype/item/item.js +217,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +225,Add / Edit Prices,Añadir / Editar Precios
 DocType: Cheque Print Template,Cheque Print Template,Plantilla de impresión de cheques
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +35,Chart of Cost Centers,Centros de costos
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Centros de costos
 ,Requested Items To Be Ordered,Requisiciones pendientes para ser ordenadas
 DocType: Price List,Price List Name,Nombre de la lista de precios
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +178,Totals,Totales
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,Totales
 DocType: BOM,Manufacturing,Manufactura
 ,Ordered Items To Be Delivered,Ordenes pendientes de entrega
 DocType: Account,Income,Ingresos
 DocType: Industry Type,Industry Type,Tipo de industria
 apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,Algo salió mal!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +103,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,Warning: Leave application contains following block dates,Advertencia: La solicitud de ausencia contiene las siguientes fechas bloqueadas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +245,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Año fiscal {0} no existe
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Fecha de  finalización
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Divisa por defecto)
 apps/erpnext/erpnext/stock/stock_ledger.py +354,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unidades de {1} necesaria en {2} sobre {3} {4} {5} para completar esta transacción.
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +13,Mandatory feild - Get Students From,feild obligatoria - Obtener estudiantes de
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory feild - Get Students From,feild obligatoria - Obtener estudiantes de
 DocType: Announcement,Student,Estudiante
 apps/erpnext/erpnext/config/hr.py +181,Organization unit (department) master.,Unidades de la organización (listado de departamentos.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,"Por favor, ingrese un numero de móvil válido"
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Por favor, ingrese el mensaje antes de enviarlo"
-apps/erpnext/erpnext/config/accounts.py +271,Point-of-Sale Profile,Perfiles de punto de venta (POS)
-apps/erpnext/erpnext/accounts/page/pos/pos.js +785,All records are synced.,Todos los registros se sincronizan.
+apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,Perfiles de punto de venta (POS)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +793,All records are synced.,Todos los registros se sincronizan.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,"Por favor, actualizar la configuración SMS"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,Prestamos sin garantía
 DocType: Cost Center,Cost Center Name,Nombre del centro de costos
 DocType: Employee,B+,B +
+DocType: HR Settings,Max working hours against Timesheet,Máximo las horas de trabajo contra la parte de horas
 DocType: Maintenance Schedule Detail,Scheduled Date,Fecha prevista.
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Total Paid Amt,Monto total pagado
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,Monto total pagado
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Los mensajes con más de 160 caracteres se dividirá en varios envios
 DocType: Purchase Receipt Item,Received and Accepted,Recibidos y aceptados
 ,Serial No Service Contract Expiry,Número de serie de expiracion del contrato de servicios
 DocType: Item,Unit of Measure Conversion,Conversión unidad de medida
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +87,Employee can not be changed,El empleado no se puede cambiar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +272,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'
 DocType: Student Group Creation Tool,Student Group Creation Tool,Herramienta de creación de grupo de alumnos
@@ -3731,16 +3773,17 @@
 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/public/js/setup_wizard.js +260,Your Suppliers,Sus proveedores
 apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
-DocType: Student,Mother's Name,Nombre de la madre
+DocType: Student Applicant,Mother's Name,Nombre de la madre
 DocType: Request for Quotation Item,Supplier Part No,Proveedor de parte
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +319,Received From,Recibido de
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +348,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No se puede deducir que es la categoría de &#39;de Valoración &quot;o&quot; Vaulation y Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,Recibido de
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Posee numero de serie
 DocType: Employee,Date of Issue,Fecha de emisión.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunto de Proveedores para el elemento {1}
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +85,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Horas debe ser mayor que cero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +168,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +93,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Horas debe ser mayor que cero.
+apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,Sitio web Imagen {0} unido al artículo {1} no se puede encontrar
 DocType: Issue,Content Type,Tipo de contenido
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computadora
 DocType: Item,List this Item in multiple groups on the website.,Listar este producto en múltiples grupos del sitio web.
@@ -3754,21 +3797,20 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,¿A qué se dedica?
 DocType: Delivery Note,To Warehouse,Para Almacén
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +412,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +415,'Has Serial No' can not be 'Yes' for non-stock item,"'Posee numero de serie' no puede ser ""Sí"" para los productos que NO son de stock"
 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,Encabezado de cuenta
-apps/erpnext/erpnext/hooks.py +104,Examination Schedule,examen de la Lista
 apps/erpnext/erpnext/config/stock.py +163,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/setup_wizard/install_fixtures.py +111,Electrical,Eléctrico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,Eléctrico
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,Fila {0}: Tipo de cambio es obligatorio
 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}
 DocType: Stock Entry,Default Source Warehouse,Almacén de origen
 DocType: Item,Customer Code,Código de cliente
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +223,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde la última orden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +293,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
@@ -3780,24 +3822,22 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar validada
 DocType: Notification Control,Sales Invoice Message,Mensaje de factura
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Cuenta {0} Clausura tiene que ser de Responsabilidad / Patrimonio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +224,Salary Slip of employee {0} already created for time sheet {1},El resbalón de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
-DocType: Authorization Rule,Based On,Basado en
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +301,Salary Slip of employee {0} already created for time sheet {1},El resbalón de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +670,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +785,BOM does not contain any stock item,BOM no contiene ningún artículo común
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +838,BOM does not contain any stock item,BOM no contiene ningún artículo común
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},Periodo Desde y Período Para fechas obligatorias para los recurrentes {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Actividad del proyecto / tarea.
-DocType: Examination,Exam Name,Nombre del examen
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar nóminas salariales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}","'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado 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
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +106,Last purchase rate not found,tasa de compra de última no encontrado
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +482,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
 DocType: Fees,Program Enrollment,programa de Inscripción
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +53,Please set {0},"Por favor, configure {0}"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},"Por favor, configure {0}"
 DocType: Purchase Invoice,Repeat on Day of Month,Repetir un día al mes
 DocType: Employee,Health Details,Detalles de salud
 DocType: Offer Letter,Offer Letter Terms,Términos y condiciones de carta de oferta
@@ -3837,7 +3877,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,New Account Name,Nombre de la nueva cuenta
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,Costo materias primas suministradas
 DocType: Selling Settings,Settings for Selling Module,Ajustes para módulo de ventas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +73,Customer Service,Servicio al cliente
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,Servicio al cliente
 DocType: Homepage Featured Product,Thumbnail,Miniatura
 DocType: Item Customer Detail,Item Customer Detail,Detalle del producto para el cliente
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,Ofrecer al candidato un empleo.
@@ -3846,7 +3886,8 @@
 DocType: Pricing Rule,Percentage,Porcentaje
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,El producto {0} debe ser un producto en stock
 DocType: Manufacturing Settings,Default Work In Progress Warehouse,Almacén predeterminado de trabajos en proceso
-apps/erpnext/erpnext/config/accounts.py +246,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1570,Total nos of serial no is not equal to quantity.,nn totales de número de serie no es igual a la cantidad.
+apps/erpnext/erpnext/config/accounts.py +252,Default settings for accounting transactions.,Los ajustes por defecto para las transacciones contables.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,La fecha prevista no puede ser menor que la fecha de requisición de materiales
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Error: No es un ID válido?
 DocType: Naming Series,Update Series Number,Actualizar número de serie
@@ -3854,9 +3895,9 @@
 DocType: Sales Order,Printing Details,Detalles de impresión
 DocType: Task,Closing Date,Fecha de cierre
 DocType: Sales Order Item,Produced Quantity,Cantidad producida
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Engineer,Ingeniero
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,Ingeniero
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,Buscar Sub-ensamblajes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +365,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},Código del producto requerido en la línea: {0}
 DocType: Sales Partner,Partner Type,Tipo de socio
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
@@ -3872,7 +3913,7 @@
 DocType: BOM,Raw Material Cost,Costo de materia prima
 DocType: Item Reorder,Re-Order Level,Nivel mínimo de stock.
 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.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +57,Part-time,Tiempo parcial
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,Tiempo parcial
 DocType: Employee,Applicable Holiday List,Lista de días festivos
 DocType: Employee,Cheque,Cheque
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +56,Series Updated,Secuencia actualizada
@@ -3890,7 +3931,7 @@
 apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,Dónde se almacenarán los productos
 DocType: Tax Rule,Validity,Validez
 DocType: Request for Quotation,Supplier Detail,Detalle del proveedor
-apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.html +1,Invoiced Amount,Cantidad facturada
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,Cantidad facturada
 DocType: Attendance,Attendance,Asistencia
 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ñadida a cada departamento donde será aplicada."
@@ -3914,7 +3955,7 @@
 DocType: Customer Group,Parent Customer Group,Categoría principal de cliente
 DocType: Purchase Invoice,Contact Email,Correo electrónico de contacto
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida.
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Notice Period,Período de notificación
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,Período de notificación
 DocType: Asset Category,Asset Category Name,Nombre de la categoría de activos
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este es un territorio principal y no se puede editar.
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +4,New Sales Person Name,Nombre nuevo encargado de ventas
@@ -3927,9 +3968,10 @@
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,Mostrar valores en cero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Cantidad del producto obtenido después de la fabricación / empaquetado desde las cantidades determinadas de materia prima
+apps/erpnext/erpnext/public/js/setup_wizard.js +315,Setup a simple website for my organization,Configuración de un sitio web sencillo para mi organización
 DocType: Payment Reconciliation,Receivable / Payable Account,Cuenta por Cobrar / Pagar
 DocType: Delivery Note Item,Against Sales Order Item,Contra la orden de venta del producto
-apps/erpnext/erpnext/stock/doctype/item/item.py +644,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, ingrese el centro de costos principal"
@@ -3947,23 +3989,23 @@
 DocType: Journal Entry,Debit Note,Nota de débito
 DocType: Stock Entry,As per Stock UOM,Unidad de Medida Según Inventario
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,No ha expirado
+DocType: Student Log,Achievement,Logro
 DocType: Journal Entry,Total Debit,Débito Total
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Almacén predeterminado de productos terminados
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Sales Person,Vendedores
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,Vendedores
 DocType: Sales Invoice,Cold Calling,Llamadas en frío
 DocType: SMS Parameter,SMS Parameter,Parámetros SMS
-apps/erpnext/erpnext/config/accounts.py +191,Budget and Cost Center,Presupuesto y de centros de coste
+apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,Presupuesto y de centros de coste
 DocType: Maintenance Schedule Item,Half Yearly,Semestral
 DocType: Lead,Blog Subscriber,Suscriptor del Blog
 apps/erpnext/erpnext/config/setup.py +83,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,Total anticipo
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +91,Row {0}: Completed Qty cannot be more than {0} for operation {1},Fila {0}: Completo Cantidad no puede contener más de {0} para la operación {1}
 apps/erpnext/erpnext/config/hr.py +253,Processing Payroll,Procesando nómina
 DocType: Opportunity Item,Basic Rate,Precio base
 DocType: GL Entry,Credit Amount,Importe acreditado
 DocType: Cheque Print Template,Signatory Position,Posición signatario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +140,Set as Lost,Establecer como perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,Establecer como perdido
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pago de recibos Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +5,This is based on transactions against this Customer. See timeline below for details,Esto se basa en transacciones en contra de este cliente. Ver cronología abajo para más detalles
 DocType: Supplier,Credit Days Based On,Días de crédito basados en
@@ -3975,7 +4017,7 @@
 ,Items To Be Requested,Solicitud de Productos
 DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/accounts/page/pos/pos.js +925,Select or add new customer,Seleccionar o añadir nuevo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +941,Select or add new customer,Seleccionar o añadir nuevo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +5,This is based on the attendance of this Employee,Esto se basa en la presencia de este empleado
 DocType: Sales Invoice,Frequency,Frecuencia
@@ -3989,12 +4031,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,No permitir a los usuarios crear solicitudes de ausencia en los siguientes días.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Monto de la compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +210,Supplier Quotation {0} created,Oferta de venta de proveedor {0} creado
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Employee Benefits,Beneficios de empleados
+apps/erpnext/erpnext/accounts/report/financial_statements.py +90,End Year cannot be before Start Year,Año de finalización no puede ser anterior inicio año
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +173,Employee Benefits,Beneficios de empleados
 DocType: Sales Invoice,Is POS,Es POS
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +234,Packed quantity must equal quantity for Item {0} in row {1},La cantidad embalada debe ser igual a la del elemento {0} en la línea {1}
 DocType: Production Order,Manufactured Qty,Cantidad producida
 DocType: Purchase Receipt Item,Accepted Quantity,Cantidad Aceptada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +241,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de fiesta por Empleado {0} o de su empresa {1}"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +228,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de fiesta por Empleado {0} o de su empresa {1}"
 apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Listado de facturas emitidas a los clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID del proyecto
@@ -4004,33 +4047,35 @@
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +991,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Expense Claim,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +167,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.","Al seleccionar "" Sí"" le dará una identidad única a cada elemento de este producto que se podrá ver en el numero de serie principal"
+DocType: Guardian,Guardian,guardián
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +39,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
 DocType: Selling Settings,Campaign Naming By,Ordenar campañas por
 DocType: Employee,Current Address Is,La dirección actual es
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
 DocType: Address,Office,Oficina
-apps/erpnext/erpnext/config/accounts.py +55,Accounting journal entries.,Asientos en el diario de contabilidad.
+apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Asientos en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Cantidad a partir de Almacén
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +249,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,"Por favor, primero seleccione el registro del empleado."
+DocType: POS Profile,Account for Change Amount,Cuenta para el Cambio Monto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +239,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Almacén
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +666,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +963,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
 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 la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción
+DocType: Assessment,Assessment Group,Grupo de evaluación
 apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,Inventario de lotes
 DocType: Employee,Contract End Date,Fecha de finalización de contrato
 DocType: Sales Order,Track this Sales Order against any Project,Monitorear esta órden de venta sobre cualquier proyecto
 DocType: Sales Invoice Item,Discount and Margin,Descuento y Margen
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,Obtener ordenes de venta (pendientes de entrega) basadas en los criterios anteriores
-DocType: Deduction Type,Deduction Type,Tipo de deducción
 DocType: Attendance,Half Day,Medio Día
 DocType: Pricing Rule,Min Qty,Cantidad mínima
 DocType: Asset Movement,Transaction Date,Fecha de transacción
@@ -4055,17 +4100,17 @@
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Sobre la línea anterior
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +226,Transfer Asset,Activos transferencia
 DocType: POS Profile,POS Profile,Perfil de POS
-apps/erpnext/erpnext/config/schools.py +29,Admission,Admisión
-apps/erpnext/erpnext/config/accounts.py +215,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
+apps/erpnext/erpnext/config/schools.py +33,Admission,Admisión
+apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
 apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants","El producto {0} es una plantilla, por favor seleccione una de sus variantes"
 DocType: Asset,Asset Category,Categoría activos
 apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,Comprador
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +82,Net pay cannot be negative,El salario neto no puede ser negativo
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,El salario neto no puede ser negativo
 DocType: SMS Settings,Static Parameters,Parámetros estáticos
-DocType: Course Schedule,Room,Habitación
+DocType: Assessment,Room,Habitación
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuestos del producto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +712,Material to Supplier,Materiales de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,Materiales de Proveedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,Impuestos Especiales Factura
 DocType: Expense Claim,Employees Email Id,ID de Email de empleados
 DocType: Employee Attendance Tool,Marked Attendance,Asistencia Marcada
@@ -4076,7 +4121,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,La cantidad real es obligatoria
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +48,Student Groups created.,Grupos estudiantiles creados.
 DocType: Scheduling Tool,Scheduling Tool,Herramienta de programación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +138,Credit Card,Tarjetas de credito
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,Tarjetas de credito
 DocType: BOM,Item to be manufactured or repacked,Producto a manufacturar o re-empacar
 apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,Los ajustes por defecto para las transacciones de inventario.
 DocType: Purchase Invoice,Next Date,Siguiente fecha
@@ -4093,7 +4138,7 @@
 DocType: Item Attribute,Numeric Values,Valores numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,Adjuntar logo
 DocType: Customer,Commission Rate,Comisión de ventas
-apps/erpnext/erpnext/stock/doctype/item/item.js +253,Make Variant,Crear variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +115,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo de pago debe ser uno de Recibir, Pagar y Transferencia interna"
 apps/erpnext/erpnext/config/selling.py +169,Analytics,Analítica
@@ -4110,7 +4155,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,"Por favor, seleccione un archivo csv"
 DocType: Purchase Order,To Receive and Bill,Para recibir y pagar
 apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Productos Destacados
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +94,Designer,Diseñador
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Designer,Diseñador
 apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,Plantillas de términos y condiciones
 DocType: Serial No,Delivery Details,Detalles de la entrega
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}
@@ -4119,22 +4164,22 @@
 DocType: Batch,Expiry Date,Fecha de caducidad
 ,Supplier Addresses and Contacts,Libreta de direcciones de proveedores
 ,accounts-browser,cuentas en navegador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +292,Please select Category first,"Por favor, seleccione primero la categoría"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Listado de todos los proyectos.
 apps/erpnext/erpnext/controllers/status_updater.py +174,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Para permitir que el exceso de facturación o exceso de pedidos, actualizar &quot;Asignación&quot; en el archivo Configuración o el artículo."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +407, (Half Day),(Medio día)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +687,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
 apps/erpnext/erpnext/controllers/accounts_controller.py +549,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Fecha de contabilización debe ser la misma que la fecha de compra {1} de activos {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, introduzca los pedidos de cliente en la tabla anterior"
 ,Stock Summary,Resumen de la
-apps/erpnext/erpnext/config/accounts.py +230,Transfer an asset from one warehouse to another,Transferir un activo de un almacén a otro
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Lista de materiales (LdM)
+apps/erpnext/erpnext/config/accounts.py +236,Transfer an asset from one warehouse to another,Transferir un activo de un almacén a otro
+apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,Lista de materiales
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}
-apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +102,Ref Date,Fecha Ref.
+apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Fecha Ref.
 DocType: Employee,Reason for Leaving,Razones de renuncia
 DocType: Expense Claim Detail,Sanctioned Amount,Monto sancionado
 DocType: GL Entry,Is Opening,De apertura