\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-17 05:00+0000\n"
-"X-Generator: Launchpad (build 13955)\n"
+"X-Launchpad-Export-Date: 2012-10-16 04:46+0000\n"
+"X-Generator: Launchpad (build 16137)\n"
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "last month"
+msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
msgid "System payment"
-msgstr "Sistema de pagos"
+msgstr ""
#. module: account
#: view:account.journal:0
msgid "Other Configuration"
-msgstr "Otra configuración"
-
-#. module: account
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#, python-format
-msgid "No End of year journal defined for the fiscal year"
-msgstr "No hay ningún diario de cierre definido para el ejercicio fiscal"
-
-#. module: account
-#: code:addons/account/account.py:506
-#, python-format
-msgid ""
-"You cannot remove/deactivate an account which is set as a property to any "
-"Partner."
msgstr ""
-"No se puede eliminar/desactivar una cuenta que está vinculada a una empresa."
+
+#. module: account
+#: help:account.tax.code,sequence:0
+msgid ""
+"Determine the display order in the report 'Accounting \\ Reporting \\ "
+"Generic Reporting \\ Taxes \\ Taxes Report'"
+msgstr ""
#. module: account
#: view:account.move.reconcile:0
msgid "Journal Entry Reconcile"
-msgstr "Conciliar asiento contable"
-
-#. module: account
-#: field:account.installer.modules,account_voucher:0
-msgid "Voucher Management"
-msgstr "Gestión de recibos"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -57,68 +51,58 @@ msgstr "Gestión de recibos"
#: view:account.move:0
#: view:account.move.line:0
msgid "Account Statistics"
-msgstr "Estadísticas de cuentas"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma/Open/Paid Invoices"
+msgstr ""
#. module: account
-#: field:account.invoice,residual:0
#: field:report.invoice.created,residual:0
msgid "Residual"
-msgstr "Pendiente"
-
-#. module: account
-#: code:addons/account/invoice.py:785
-#, python-format
-msgid "Please define sequence on invoice journal"
-msgstr "Defina una secuencia en el diario de la factura"
+msgstr ""
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "¡Error! La duración de el/los período(s) no es válida. "
+msgstr ""
#. module: account
#: field:account.analytic.line,currency_id:0
msgid "Account currency"
-msgstr "Moneda contable"
+msgstr ""
#. module: account
#: view:account.tax:0
msgid "Children Definition"
-msgstr "Definición hijos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:302
+#, python-format
+msgid "Journal item \"%s\" is not valid."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_report_aged_receivable
msgid "Aged Receivable Till Today"
-msgstr "A cobrar vencidos hasta hoy"
-
-#. module: account
-#: field:account.partner.ledger,reconcil:0
-msgid "Include Reconciled Entries"
-msgstr "Incluir asientos conciliados"
-
-#. module: account
-#: view:account.pl.report:0
-msgid ""
-"The Profit and Loss report gives you an overview of your company profit and "
-"loss in a single document"
msgstr ""
-"El informe de pérdidas y ganancias (P&G) le da una visión global de las "
-"pérdidas y ganancias de su empresa en un único documento"
#. module: account
#: model:process.transition,name:account.process_transition_invoiceimport0
msgid "Import from invoice or payment"
-msgstr "Importar desde factura o pago"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
+msgstr ""
#. module: account
#: view:account.move:0
msgid "Total Debit"
-msgstr "Total debe"
+msgstr ""
#. module: account
#: view:account.unreconcile:0
@@ -126,51 +110,44 @@ msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
-"Si rompe la conciliación de transacciones, también debe verificar todas la "
-"acciones que están relacionadas con esas transacciones porqué no serán "
-"deshabilitadas."
#. module: account
-#: report:account.tax.code.entries:0
-msgid "Accounting Entries-"
-msgstr "Asientos contables"
-
-#. module: account
-#: code:addons/account/account.py:1291
-#, python-format
-msgid "You can not delete posted movement: \"%s\"!"
-msgstr "¡No puede eliminar el movimiento asentado: \"%s\"!"
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
#. module: account
#: report:account.invoice:0
#: field:account.invoice.line,origin:0
msgid "Origin"
-msgstr "Origen"
+msgstr ""
#. module: account
#: view:account.account:0
-#: field:account.account,reconcile:0
#: view:account.automatic.reconcile:0
#: field:account.move.line,reconcile_id:0
#: view:account.move.line.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Reconcile"
-msgstr "Conciliar"
+msgstr ""
#. module: account
#: field:account.bank.statement.line,ref:0
#: field:account.entries.report,ref:0
+#: view:account.invoice:0
#: field:account.move,ref:0
-#: view:account.move.line:0
#: field:account.move.line,ref:0
#: field:account.subscription,ref:0
+#: xsl:account.transfer:0
msgid "Reference"
-msgstr "Referencia"
+msgstr ""
#. module: account
#: view:account.open.closed.fiscalyear:0
msgid "Choose Fiscal Year "
-msgstr "Seleccione el ejercicio fiscal "
+msgstr ""
#. module: account
#: help:account.payment.term,active:0
@@ -178,41 +155,40 @@ msgid ""
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
msgstr ""
-"Si el campo activo se desmarca, permite ocultar el plazo de pago sin "
-"eliminarlo."
#. module: account
-#: code:addons/account/invoice.py:1421
+#: code:addons/account/account_invoice.py:1430
#, python-format
msgid "Warning!"
-msgstr "¡Aviso!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3129
+#, python-format
+msgid "Miscellaneous Journal"
+msgstr ""
#. module: account
#: field:account.fiscal.position.account,account_src_id:0
#: field:account.fiscal.position.account.template,account_src_id:0
msgid "Account Source"
-msgstr "Origen cuenta"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
msgid "All Analytic Entries"
-msgstr "Todos los asientos analíticos"
+msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
-msgid "Invoices Created Within Past 15 Days"
-msgstr "Facturas creadas en los últimos 15 días"
-
-#. module: account
-#: selection:account.account.type,sign:0
-msgid "Negative"
-msgstr "Negativo"
+#: field:accounting.report,label_filter:0
+msgid "Column Label"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_move_journal.py:95
#, python-format
msgid "Journal: %s"
-msgstr "Diario: %s"
+msgstr ""
#. module: account
#: help:account.analytic.journal,type:0
@@ -221,44 +197,22 @@ msgid ""
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
-"Indica el tipo de diario analítico. Cuando se necesita para un documento "
-"(por ej. una factura) para crear asientos analíticos, OpenERP buscará un "
-"diario coincidente del mismo tipo."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
#: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
msgid "Tax Templates"
-msgstr "Plantillas impuestos"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_tax
msgid "account.tax"
-msgstr "contabilidad.impuesto"
-
-#. module: account
-#: code:addons/account/account.py:901
-#, python-format
-msgid ""
-"No period defined for this date: %s !\n"
-"Please create a fiscal year."
msgstr ""
-"¡No se ha definido un periodo para esta fecha: %s !\n"
-"Cree un ejercicio fiscal."
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
-msgstr "Seleccionar conciliación línea movimiento"
-
-#. module: account
-#: help:account.model.line,sequence:0
-msgid ""
-"The sequence field is used to order the resources from lower sequences to "
-"higher ones"
msgstr ""
-"El campo secuencia se utiliza para ordenar los recursos secuencialmente de "
-"menor a mayor."
#. module: account
#: help:account.tax.code,notprintable:0
@@ -267,76 +221,79 @@ msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
-"Marque esta opción si desea que no aparezca en las facturas ningún IVA "
-"relacionado con este código de impuesto."
#. module: account
-#: code:addons/account/invoice.py:1210
+#: code:addons/account/account_invoice.py:1254
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
msgstr ""
-"La factura '%s' está parcialmente pagada: %s%s de %s%s (%s%s pendiente)"
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
-msgstr "Los asientos contables son una entrada de la conciliación."
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
msgid "Belgian Reports"
-msgstr "Informes Belgas"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1176
+#: code:addons/account/account_move_line.py:1215
#, python-format
msgid "You can not add/modify entries in a closed journal."
-msgstr "No puede añadir/modificar asientos en un diario cerrado."
+msgstr ""
#. module: account
-#: view:account.bank.statement:0
-msgid "Calculated Balance"
-msgstr "Saldo calculado"
+#: help:account.account,user_type:0
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening "
+"entries."
+msgstr ""
+
+#. module: account
+#: report:account.overdue:0
+msgid "Sub-Total :"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
-msgstr "Recurrencia manual"
+msgstr ""
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close Fiscalyear"
-msgstr "Cerrar ejercicio fiscal"
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,allow_write_off:0
msgid "Allow write off"
-msgstr "Permitir desfase"
+msgstr ""
#. module: account
#: view:account.analytic.chart:0
msgid "Select the Period for Analysis"
-msgstr "Seleccione el período de análisis"
+msgstr ""
#. module: account
#: view:account.move.line:0
msgid "St."
-msgstr "Ext."
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:529
+#: code:addons/account/account_invoice.py:560
#, python-format
msgid "Invoice line account company does not match with invoice company."
msgstr ""
-"Compañía de la cuenta de la línea de factura no concuerda con la compañía de "
-"la factura."
#. module: account
#: field:account.journal.column,field:0
msgid "Field Name"
-msgstr "Nombre del campo"
+msgstr ""
#. module: account
#: help:account.installer,charts:0
@@ -344,8 +301,6 @@ msgid ""
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
-"Instala el plan contable de la localización que satisface las necesidades "
-"contables de su compañía basadas en su país."
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@@ -356,27 +311,30 @@ msgid ""
"You can create one in the menu: \n"
"Configuration/Financial Accounting/Accounts/Journals."
msgstr ""
-"No se encuentra ningún diario contable del tipo %s para esta compañía.\n"
-"\n"
-"Puede crear un diario en el menú: \n"
-"Configuración/Contabilidad financiera/Cuentas/Diarios."
#. module: account
#: model:ir.model,name:account.model_account_unreconcile
msgid "Account Unreconcile"
-msgstr "Desconciliar cuenta"
+msgstr ""
#. module: account
#: view:product.product:0
#: view:product.template:0
msgid "Purchase Properties"
-msgstr "Propiedades de compra"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,style_overwrite:0
+msgid ""
+"You can set up here the format you want this record to be displayed. If you "
+"leave the automatic formatting, it will be computed based on the financial "
+"reports hierarchy (auto-computed field 'level')."
+msgstr ""
#. module: account
#: view:account.installer:0
-#: view:account.installer.modules:0
msgid "Configure"
-msgstr "Configurar"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -385,7 +343,7 @@ msgstr "Configurar"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "June"
-msgstr "Junio"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_bank
@@ -394,45 +352,47 @@ msgid ""
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
-"Los contables utilizan esta vista para introducir asientos masivamente en "
-"OpenERP. Cuando utiliza los extractos bancarios, registros de caja, o pagos "
-"de cliente/proveedor OpenERP crea automáticamente apuntes contables."
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_tax_template
msgid "account.tax.template"
-msgstr "cuenta.impuesto.plantilla"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
msgid "account.bank.accounts.wizard"
-msgstr "cuenta.banco.cuentas.asistente"
+msgstr ""
#. module: account
#: field:account.move.line,date_created:0
#: field:account.move.reconcile,create_date:0
msgid "Creation date"
-msgstr "Fecha creación"
+msgstr ""
#. module: account
#: selection:account.journal,type:0
msgid "Purchase Refund"
-msgstr "Abono de compra"
+msgstr ""
#. module: account
#: selection:account.journal,type:0
msgid "Opening/Closing Situation"
-msgstr "Situación apertura/cierre"
+msgstr ""
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
-msgstr "La divisa utilizada para introducir asientos."
+msgstr ""
#. module: account
#: field:account.open.closed.fiscalyear,fyear_id:0
msgid "Fiscal Year to Open"
-msgstr "Ejercicio fiscal a abrir"
+msgstr ""
#. module: account
#: help:account.journal,sequence_id:0
@@ -440,40 +400,39 @@ msgid ""
"This field contains the informatin related to the numbering of the journal "
"entries of this journal."
msgstr ""
-"Este campo contiene la información relacionada con la numeración de los "
-"asientos de este diario."
#. module: account
#: field:account.journal,default_debit_account_id:0
msgid "Default Debit Account"
-msgstr "Cuenta deudora por defecto"
+msgstr ""
#. module: account
#: view:account.move:0
msgid "Total Credit"
-msgstr "Total crédito"
-
-#. module: account
-#: selection:account.account.type,sign:0
-msgid "Positive"
-msgstr "Positivo"
+msgstr ""
#. module: account
#: view:account.move.line.unreconcile.select:0
msgid "Open for Unreconciliation"
-msgstr "Abrir para romper conciliación"
+msgstr ""
#. module: account
+#: field:account.account.template,chart_template_id:0
#: field:account.fiscal.position.template,chart_template_id:0
#: field:account.tax.template,chart_template_id:0
#: field:wizard.multi.charts.accounts,chart_template_id:0
msgid "Chart Template"
-msgstr "Plantilla plan contable"
+msgstr ""
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
-msgstr "El importe expresado en otra divisa opcional."
+msgstr ""
+
+#. module: account
+#: field:accounting.report,enable_filter:0
+msgid "Enable Comparison"
+msgstr ""
#. module: account
#: help:account.journal.period,state:0
@@ -482,9 +441,6 @@ msgid ""
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
-"Cuando se crea el periodo de diario. El estado es 'Borrador'. Si se imprime "
-"un informe, se cambiará el estado a 'Impreso'. Cuando todas las "
-"transacciones se completen, se cambiará el estado a \"Listo\"."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -494,12 +450,6 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
-"La tabla impuestos es una vista en árbol reflejando la estructura de tipos "
-"impositivos (o códigos de impuesto) y muestra la situación impositiva "
-"actual. La tabla de impuestos representa la cantidad económica "
-"correspondiente a cada código de la declaración de impuestos de su país. Se "
-"representa en una estructura jerárquica, que puede ser modificada de acuerdo "
-"a sus necesidades."
#. module: account
#: view:account.analytic.line:0
@@ -509,13 +459,13 @@ msgstr ""
#: report:account.central.journal:0
#: view:account.entries.report:0
#: field:account.entries.report,journal_id:0
-#: report:account.general.ledger:0
#: view:account.invoice:0
#: field:account.invoice,journal_id:0
#: view:account.invoice.report:0
#: field:account.invoice.report,journal_id:0
#: field:account.journal.period,journal_id:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: view:account.model:0
#: field:account.model,journal_id:0
#: view:account.move:0
@@ -523,35 +473,32 @@ msgstr ""
#: field:account.move.bank.reconcile,journal_id:0
#: view:account.move.line:0
#: field:account.move.line,journal_id:0
-#: code:addons/account/account_move_line.py:983
#: view:analytic.entries.report:0
#: field:analytic.entries.report,journal_id:0
#: model:ir.actions.report.xml,name:account.account_journal
#: model:ir.model,name:account.model_account_journal
#: field:validate.account.move,journal_id:0
-#, python-format
msgid "Journal"
-msgstr "Diario"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_invoice_confirm
msgid "Confirm the selected invoices"
-msgstr "Confirmar las facturas seleccionadas"
+msgstr ""
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
msgid "Parent target"
-msgstr "Destino padre"
+msgstr ""
#. module: account
#: field:account.bank.statement,account_id:0
msgid "Account used in this journal"
-msgstr "Cuenta utilizada en este diario"
+msgstr ""
#. module: account
#: help:account.aged.trial.balance,chart_account_id:0
#: help:account.balance.report,chart_account_id:0
-#: help:account.bs.report,chart_account_id:0
#: help:account.central.journal,chart_account_id:0
#: help:account.common.account.report,chart_account_id:0
#: help:account.common.journal.report,chart_account_id:0
@@ -560,77 +507,77 @@ msgstr "Cuenta utilizada en este diario"
#: help:account.general.journal,chart_account_id:0
#: help:account.partner.balance,chart_account_id:0
#: help:account.partner.ledger,chart_account_id:0
-#: help:account.pl.report,chart_account_id:0
#: help:account.print.journal,chart_account_id:0
#: help:account.report.general.ledger,chart_account_id:0
#: help:account.vat.declaration,chart_account_id:0
+#: help:accounting.report,chart_account_id:0
msgid "Select Charts of Accounts"
-msgstr "Seleccionar plan contable."
+msgstr ""
#. module: account
-#: view:product.product:0
-msgid "Purchase Taxes"
-msgstr "Impuestos de compras"
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_invoice_refund
msgid "Invoice Refund"
-msgstr "Abono factura"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Li."
-msgstr "Li."
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,unreconciled:0
msgid "Not reconciled transactions"
-msgstr "Transacciones no conciliadas"
+msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:348
-#, python-format
-msgid "CashBox Balance is not matching with Calculated Balance !"
-msgstr "¡El saldo de caja no coincide con el saldo calculado!"
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+msgid "Counterpart"
+msgstr ""
#. module: account
#: view:account.fiscal.position:0
#: field:account.fiscal.position,tax_ids:0
#: field:account.fiscal.position.template,tax_ids:0
msgid "Tax Mapping"
-msgstr "Mapeo impuestos"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
#: model:ir.ui.menu,name:account.menu_wizard_fy_close_state
msgid "Close a Fiscal Year"
-msgstr "Cerrar un ejercicio fiscal"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "The accountant confirms the statement."
-msgstr "El contable confirma el extracto."
+msgstr ""
#. module: account
+#: report:account.account.balance:0
#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
#: selection:account.common.account.report,display_account:0
-#: selection:account.pl.report,display_account:0
+#: report:account.general.ledger_landscape:0
#: selection:account.report.general.ledger,display_account:0
#: selection:account.tax,type_tax_use:0
#: selection:account.tax.template,type_tax_use:0
msgid "All"
-msgstr "Todas"
+msgstr ""
#. module: account
#: field:account.invoice.report,address_invoice_id:0
msgid "Invoice Address Name"
-msgstr "Nombre dirección factura"
+msgstr ""
#. module: account
#: selection:account.installer,period:0
msgid "3 Monthly"
-msgstr "Trimestral"
+msgstr ""
#. module: account
#: view:account.unreconcile.reconcile:0
@@ -638,166 +585,197 @@ msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disable"
msgstr ""
-"Si rompe la conciliación de las transacciones, también debe verificar todas "
-"las acciones que están relacionadas con estas transacciones, ya que no se "
-"desactivarán."
#. module: account
#: view:analytic.entries.report:0
msgid " 30 Days "
-msgstr " 30 Días "
+msgstr ""
#. module: account
#: field:ir.sequence,fiscal_ids:0
msgid "Sequences"
-msgstr "Secuencias"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,account_report_id:0
+#: selection:account.financial.report,type:0
+msgid "Report Value"
+msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
msgid "Taxes Mapping"
-msgstr "Mapeo de impuestos"
+msgstr ""
#. module: account
#: report:account.central.journal:0
msgid "Centralized Journal"
-msgstr "Diario centralizado"
+msgstr ""
#. module: account
#: sql_constraint:account.sequence.fiscalyear:0
msgid "Main Sequence must be different from current !"
-msgstr "¡La secuencia principal debe ser diferente de la actual!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "No period found or more than one period found for the given date."
+msgstr ""
#. module: account
#: field:account.invoice.tax,tax_amount:0
msgid "Tax Code Amount"
-msgstr "Importe código impuesto"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2779
-#: code:addons/account/installer.py:434
+#: code:addons/account/account.py:3133
#, python-format
msgid "SAJ"
-msgstr "VEN"
-
-#. module: account
-#: help:account.bank.statement,balance_end_real:0
-msgid "closing balance entered by the cashbox verifier"
-msgstr "cerrando balance introducido por el verificador de caja"
+msgstr ""
#. module: account
#: view:account.period:0
#: view:account.period.close:0
msgid "Close Period"
-msgstr "Cerrar período"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_common_partner_report
msgid "Account Common Partner Report"
-msgstr "Rapport du compte commun partenaire"
+msgstr ""
#. module: account
#: field:account.fiscalyear.close,period_id:0
msgid "Opening Entries Period"
-msgstr "Período asientos de apertura"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_journal_period
msgid "Journal Period"
-msgstr "Periodo diario"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
#, python-format
msgid "To reconcile the entries company should be the same for all entries"
msgstr ""
-"Para conciliar los asientos, la compañía debería ser la misma para todos los "
-"asientos"
#. module: account
-#: view:account.account:0
-#: selection:account.aged.trial.balance,result_selection:0
-#: selection:account.common.partner.report,result_selection:0
-#: selection:account.partner.balance,result_selection:0
-#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:302
-#: model:ir.actions.act_window,name:account.action_aged_receivable
-#, python-format
-msgid "Receivable Accounts"
-msgstr "Cuentas a cobrar"
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_report_general_ledger
msgid "General Ledger Report"
-msgstr "Informe del libro mayor"
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Re-Open"
-msgstr "Reabrir"
+msgstr ""
#. module: account
#: view:account.use.model:0
msgid "Are you sure you want to create entries?"
-msgstr "¿Está seguro que desea crear los asientos?"
+msgstr ""
#. module: account
-#: selection:account.bank.accounts.wizard,account_type:0
-msgid "Check"
-msgstr "Comprobar"
+#: view:account.invoice:0
+msgid "Print Invoice"
+msgstr ""
#. module: account
#: field:account.partner.reconcile.process,today_reconciled:0
msgid "Partners Reconciled Today"
-msgstr "Empresas conciliadas hoy"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this year"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children with hierarchy"
+msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
-#: selection:account.tax.template,type:0
msgid "Percent"
-msgstr "Porcentaje"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_charts
msgid "Charts"
-msgstr "Planes contables"
+msgstr ""
#. module: account
#: code:addons/account/project/wizard/project_account_analytic_line.py:47
#: model:ir.model,name:account.model_project_account_analytic_line
#, python-format
msgid "Analytic Entries by line"
-msgstr "Asientos analíticos por línea"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:39
+#: field:account.invoice.refund,filter_refund:0
+msgid "Refund Method"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:38
#, python-format
msgid "You can only change currency for Draft Invoice !"
-msgstr "¡Sólo puede cambiar la moneda para facturas en borrador!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_financial_report
+#: model:ir.ui.menu,name:account.menu_account_report
+msgid "Financial Report"
+msgstr ""
#. module: account
#: view:account.analytic.journal:0
#: field:account.analytic.journal,type:0
#: field:account.bank.statement.line,type:0
+#: field:account.financial.report,type:0
#: field:account.invoice,type:0
#: view:account.invoice.report:0
#: field:account.invoice.report,type:0
#: view:account.journal:0
#: field:account.journal,type:0
#: field:account.move.reconcile,type:0
+#: xsl:account.transfer:0
#: field:report.invoice.created,type:0
msgid "Type"
-msgstr "Tipo"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:747
+#, python-format
+msgid ""
+"Taxes are missing!\n"
+"Click on compute button."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_subscription_line
msgid "Account Subscription Line"
-msgstr "Contabilidad. Línea de subscripción"
+msgstr ""
#. module: account
#: help:account.invoice,reference:0
msgid "The partner reference of this invoice."
-msgstr "La referencia de la empresa de esta factura."
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Supplier Invoices And Refunds"
+msgstr ""
#. module: account
#: view:account.move.line.unreconcile.select:0
@@ -805,27 +783,36 @@ msgstr "La referencia de la empresa de esta factura."
#: view:account.unreconcile.reconcile:0
#: model:ir.model,name:account.model_account_move_line_unreconcile_select
msgid "Unreconciliation"
-msgstr "No conciliación"
+msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_analytic_Journal_report
+#: view:account.payment.term.line:0
+msgid "At 14 net days 2 percent, remaining amount at 30 days end of month."
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_analytic_journal_report
msgid "Account Analytic Journal"
-msgstr "Contabilidad. Diario analítico"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_automatic_reconcile
msgid "Automatic Reconcile"
-msgstr "Conciliación automática"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid "Due date Computation"
-msgstr "Cálculo fecha vencimiento"
+msgstr ""
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "J.C./Move name"
-msgstr "C.Diario / Nombre mov."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_gain_loss
+msgid ""
+"When doing multi-currency transactions, you may loose or gain some amount "
+"due to changes of exchange rate. This menu gives you a forecast of the Gain "
+"or Loss you'd realized if those transactions were ended today. Only for "
+"accounts having a secondary currency set."
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -834,83 +821,86 @@ msgstr "C.Diario / Nombre mov."
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "September"
-msgstr "Septiembre"
+msgstr ""
#. module: account
#: selection:account.subscription,period_type:0
msgid "days"
-msgstr "días"
+msgstr ""
#. module: account
#: help:account.account.template,nocreate:0
msgid ""
"If checked, the new chart of accounts will not contain this by default."
-msgstr "Si está marcado, el nuevo plan contable no lo contendrá por defecto."
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/wizard/account_invoice_refund.py:110
#, python-format
msgid ""
"Can not %s invoice which is already reconciled, invoice should be "
"unreconciled first. You can only Refund this invoice"
msgstr ""
-"No se puede %s factura que ya está conciliada, primero debería romper la "
-"conciliación de la factura. Sólo puede hacer un abono (factura "
-"rectificativa) de esta factura."
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_new
msgid "New Subscription"
-msgstr "Nueva suscripción"
+msgstr ""
#. module: account
#: view:account.payment.term:0
msgid "Computation"
-msgstr "Cálculo"
-
-#. module: account
-#: view:account.move.line:0
-msgid "Next Partner to reconcile"
-msgstr "Próxima empresa a conciliar"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1191
-#, python-format
-msgid ""
-"You can not do this modification on a confirmed entry ! Please note that you "
-"can just change some non important fields !"
msgstr ""
-"¡No puede hacer esta modificación en un asiento confirmado! ¡Observe que "
-"sólo puede cambiar algunos campos no importantes!"
+
+#. module: account
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: refund invoice and reconcile"
+msgstr ""
+
+#. module: account
+#: field:account.cashbox.line,pieces:0
+msgid "Values"
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,delay_to_pay:0
msgid "Avg. Delay To Pay"
-msgstr "Retraso promedio a pagar"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_chart
#: model:ir.actions.act_window,name:account.action_tax_code_tree
#: model:ir.ui.menu,name:account.menu_action_tax_code_tree
msgid "Chart of Taxes"
-msgstr "Tabla de impuestos"
+msgstr ""
#. module: account
#: view:account.fiscalyear:0
msgid "Create 3 Months Periods"
-msgstr "Crear períodos trimestrales"
+msgstr ""
#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.overdue:0
msgid "Due"
-msgstr "Debido"
+msgstr ""
#. module: account
-#: view:account.invoice.report:0
-#: field:account.invoice.report,price_total_tax:0
-msgid "Total With Tax"
-msgstr "Total con impuestos"
+#: code:addons/account/account.py:1353
+#, python-format
+msgid ""
+"You cannot validate this journal entry because account \"%s\" does not "
+"belong to chart of accounts \"%s\"!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:835
+#, python-format
+msgid ""
+"This account does not allow reconciliation! You should update the account "
+"definition to change this."
+msgstr ""
#. module: account
#: view:account.invoice:0
@@ -918,49 +908,53 @@ msgstr "Total con impuestos"
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Approve"
-msgstr "Aprobar"
+msgstr ""
#. module: account
#: view:account.invoice:0
#: view:account.move:0
#: view:report.invoice.created:0
msgid "Total Amount"
-msgstr "Importe total"
+msgstr ""
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Consolidation"
-msgstr "Consolidación"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_liability
+#: model:account.financial.report,name:account.account_financial_report_liability0
+#: model:account.financial.report,name:account.account_financial_report_liabilitysum0
+msgid "Liability"
+msgstr ""
#. module: account
-#: view:account.analytic.line:0
#: view:account.entries.report:0
-#: view:account.invoice.report:0
-#: view:account.move.line:0
msgid "Extended Filters..."
-msgstr "Filtros extendidos..."
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_account_central_journal
msgid "Centralizing Journal"
-msgstr "Diario centralizado"
+msgstr ""
#. module: account
#: selection:account.journal,type:0
msgid "Sale Refund"
-msgstr "Abono ventas"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
msgid "Bank statement"
-msgstr "Extracto bancario"
+msgstr ""
#. module: account
#: field:account.analytic.line,move_id:0
msgid "Move Line"
-msgstr "Línea de movimiento"
+msgstr ""
#. module: account
#: help:account.move.line,tax_amount:0
@@ -969,19 +963,22 @@ msgid ""
"amount.If the tax account is base tax code, this field will contain the "
"basic amount(without tax)."
msgstr ""
-"Si la cuenta es un una cuenta de tipo impositivo, este campo contendrá el "
-"monto del impuesto. Si la cuenta es un tipo base impositiva, el campo "
-"contendrá el monto de base imponible (sin impuesto)."
+
+#. module: account
+#: code:addons/account/account.py:2613
+#, python-format
+msgid "I can not locate a parent code for the template account!"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Purchases"
-msgstr "Compras"
+msgstr ""
#. module: account
#: field:account.model,lines_id:0
msgid "Model Entries"
-msgstr "Asientos del modelo"
+msgstr ""
#. module: account
#: field:account.account,code:0
@@ -998,18 +995,17 @@ msgstr "Asientos del modelo"
#: report:account.partner.balance:0
#: field:account.period,code:0
msgid "Code"
-msgstr "Código"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
-#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:73
-#: code:addons/account/invoice.py:670
-#: code:addons/account/wizard/account_use_model.py:81
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_invoice.py:73
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
#, python-format
msgid "No Analytic Journal !"
-msgstr "¡No diario analítico!"
+msgstr ""
#. module: account
#: report:account.partner.balance:0
@@ -1018,115 +1014,140 @@ msgstr "¡No diario analítico!"
#: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
#: model:ir.ui.menu,name:account.menu_account_partner_balance_report
msgid "Partner Balance"
-msgstr "Balance de empresa"
+msgstr ""
#. module: account
#: field:account.bank.accounts.wizard,acc_name:0
msgid "Account Name."
-msgstr "Nombre cuenta."
+msgstr ""
#. module: account
#: field:account.chart.template,property_reserve_and_surplus_account:0
#: field:res.company,property_reserve_and_surplus_account:0
msgid "Reserve and Profit/Loss Account"
-msgstr "Cuenta de reservas y pérdidas/ganancias"
+msgstr ""
#. module: account
#: field:report.account.receivable,name:0
msgid "Week of Year"
-msgstr "Semana del año"
+msgstr ""
#. module: account
-#: field:account.bs.report,display_type:0
-#: field:account.pl.report,display_type:0
#: field:account.report.general.ledger,landscape:0
msgid "Landscape Mode"
-msgstr "Modo horizontal"
+msgstr ""
#. module: account
-#: view:board.board:0
-msgid "Customer Invoices to Approve"
-msgstr "Facturas de cliente para aprobar"
+#: code:addons/account/account.py:645
+#, python-format
+msgid ""
+"You cannot change the type of account from '%s' to '%s' type as it contains "
+"journal items!"
+msgstr ""
+
+#. module: account
+#: field:account.report.general.ledger,sortby:0
+msgid "Sort by"
+msgstr ""
#. module: account
#: help:account.fiscalyear.close,fy_id:0
msgid "Select a Fiscal year to close"
-msgstr "Seleccione un ejercicio fiscal para cerrar."
+msgstr ""
#. module: account
-#: help:account.account,user_type:0
#: help:account.account.template,user_type:0
msgid ""
"These types are defined according to your country. The type contains more "
"information about the account and its specificities."
msgstr ""
-"Estos tipos se definen de acuerdo a la legislación contable de su país. El "
-"tipo contiene más información acerca de la cuenta y sus especificidades."
+
+#. module: account
+#: code:addons/account/account_move_line.py:856
+#, python-format
+msgid ""
+"You have to provide an account for the write off/exchange difference entry !"
+msgstr ""
#. module: account
#: view:account.tax:0
msgid "Applicability Options"
-msgstr "Opciones para su aplicación"
+msgstr ""
#. module: account
#: report:account.partner.balance:0
msgid "In dispute"
-msgstr "A cuadrar"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
#: model:ir.ui.menu,name:account.journal_cash_move_lines
msgid "Cash Registers"
-msgstr "Registros de caja"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Profit & Loss (Expense Accounts)"
-msgstr "Pérdidas y Ganancias (cuentas de gastos)"
+msgstr ""
#. module: account
#: report:account.analytic.account.journal:0
-#: report:account.move.voucher:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "-"
-msgstr "-"
+msgstr ""
#. module: account
#: view:account.analytic.account:0
+#: model:res.groups,name:account.group_account_manager
msgid "Manager"
-msgstr "Responsable"
+msgstr ""
#. module: account
#: view:account.subscription.generate:0
msgid "Generate Entries before:"
-msgstr "Generar asientos antes:"
+msgstr ""
#. module: account
+#: view:account.move.line:0
+msgid "Unbalanced Journal Items"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_bank
#: selection:account.bank.accounts.wizard,account_type:0
+#: code:addons/account/account.py:3020
+#, python-format
msgid "Bank"
-msgstr "Banco"
+msgstr ""
#. module: account
#: field:account.period,date_start:0
msgid "Start of Period"
-msgstr "Inicio del periodo"
+msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
msgid "Confirm statement"
-msgstr "Confirmar extracto"
+msgstr ""
+
+#. module: account
+#: help:account.account,foreign_balance:0
+msgid ""
+"Total amount (in Secondary currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
#. module: account
#: field:account.fiscal.position.tax,tax_dest_id:0
#: field:account.fiscal.position.tax.template,tax_dest_id:0
msgid "Replacement Tax"
-msgstr "Impuesto sustitución"
+msgstr ""
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Credit Centralisation"
-msgstr "Centralización del haber"
+msgstr ""
+
+#. module: account
+#: view:report.account_type.sales:0
+msgid "All Months Sales by type"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -1136,20 +1157,27 @@ msgid ""
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
-"Con las facturas de proveedor puede introducir y gestionar facturas emitidas "
-"por sus proveedores. OpenERP también puede generar borradores de factura "
-"automáticamente desde pedidos o albaranes de compra. De esta forma, puede "
-"contrastar la factura de su proveedor con lo comprado o recibido."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
+#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
+msgid "Tax Code Templates"
+msgstr ""
#. module: account
#: view:account.invoice.cancel:0
msgid "Cancel Invoices"
-msgstr "Cancelar facturas"
+msgstr ""
#. module: account
-#: view:account.unreconcile.reconcile:0
-msgid "Unreconciliation Transactions"
-msgstr "Transacciones no conciliadas"
+#: help:account.journal,code:0
+msgid "The code will be displayed on reports."
+msgstr ""
+
+#. module: account
+#: view:account.tax.template:0
+msgid "Taxes used in Purchases"
+msgstr ""
#. module: account
#: field:account.invoice.tax,tax_code_id:0
@@ -1157,50 +1185,66 @@ msgstr "Transacciones no conciliadas"
#: field:account.tax.template,tax_code_id:0
#: model:ir.model,name:account.model_account_tax_code
msgid "Tax Code"
-msgstr "Código impuesto"
+msgstr ""
#. module: account
#: field:account.account,currency_mode:0
msgid "Outgoing Currencies Rate"
-msgstr "Tasa de divisas de salida"
+msgstr ""
+
+#. module: account
+#: selection:account.analytic.journal,type:0
+msgid "Situation"
+msgstr ""
#. module: account
#: help:account.move.line,move_id:0
msgid "The move of this entry line."
-msgstr "El asiento de este apunte."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1317
+#, python-format
+msgid ""
+"You can not use this general account in this journal, check the tab 'Entry "
+"Controls' on the related journal !"
+msgstr ""
#. module: account
#: field:account.move.line.reconcile,trans_nbr:0
msgid "# of Transaction"
-msgstr "# de transacción"
+msgstr ""
#. module: account
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
-#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Entry Label"
-msgstr "Etiqueta asiento"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:976
+#: code:addons/account/account.py:1136
#, python-format
msgid "You can not modify/delete a journal with entries for this period !"
msgstr ""
-"¡No puede modificar/eliminar un diario con asientos para este período!"
#. module: account
#: help:account.invoice,origin:0
#: help:account.invoice.line,origin:0
msgid "Reference of the document that produced this invoice."
-msgstr "Referencia del documento que ha creado esta factura."
+msgstr ""
#. module: account
#: view:account.analytic.line:0
#: view:account.journal:0
msgid "Others"
-msgstr "Otros"
+msgstr ""
+
+#. module: account
+#: view:account.subscription:0
+msgid "Draft Subscription"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -1212,9 +1256,11 @@ msgstr "Otros"
#: field:account.entries.report,account_id:0
#: field:account.invoice,account_id:0
#: field:account.invoice.line,account_id:0
+#: view:account.invoice.report:0
#: field:account.invoice.report,account_id:0
#: field:account.journal,account_control_ids:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model.line,account_id:0
#: view:account.move.line:0
#: field:account.move.line,account_id:0
@@ -1227,24 +1273,25 @@ msgstr "Otros"
#: model:ir.model,name:account.model_account_account
#: field:report.account.sales,account_id:0
msgid "Account"
-msgstr "Cuenta"
+msgstr ""
#. module: account
#: field:account.tax,include_base_amount:0
msgid "Included in base amount"
-msgstr "Incluido en importe base"
+msgstr ""
#. module: account
#: view:account.entries.report:0
#: model:ir.actions.act_window,name:account.action_account_entries_report_all
#: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
msgid "Entries Analysis"
-msgstr "Análisis asientos"
+msgstr ""
#. module: account
#: field:account.account,level:0
+#: field:account.financial.report,level:0
msgid "Level"
-msgstr "Nivel"
+msgstr ""
#. module: account
#: report:account.invoice:0
@@ -1259,74 +1306,76 @@ msgstr "Nivel"
#: model:ir.ui.menu,name:account.menu_tax_report
#: model:ir.ui.menu,name:account.next_id_27
msgid "Taxes"
-msgstr "Impuestos"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_common.py:120
+#: code:addons/account/wizard/account_financial_report.py:70
+#: code:addons/account/wizard/account_report_common.py:145
#, python-format
msgid "Select a starting and an ending period"
-msgstr "Seleccione un periodo inicial y final"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitandloss0
+#: model:ir.actions.act_window,name:account.action_account_report_pl
+msgid "Profit and Loss"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_account_template
msgid "Templates for Accounts"
-msgstr "Plantillas para cuentas"
+msgstr ""
#. module: account
#: view:account.tax.code.template:0
msgid "Search tax template"
-msgstr "Buscar plantilla impuestos"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Your Reference"
-msgstr "Su referencia"
+msgstr ""
#. module: account
#: view:account.move.reconcile:0
#: model:ir.actions.act_window,name:account.action_account_reconcile_select
#: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
msgid "Reconcile Entries"
-msgstr "Conciliar los asientos"
+msgstr ""
#. module: account
#: model:ir.actions.report.xml,name:account.account_overdue
#: view:res.company:0
msgid "Overdue Payments"
-msgstr "Pagos fuera de plazo"
+msgstr ""
#. module: account
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Initial Balance"
-msgstr "Saldo inicial"
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Reset to Draft"
-msgstr "Cambiar a borrador"
+msgstr ""
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "Bank Information"
-msgstr "Información bancaria"
+msgstr ""
#. module: account
#: view:account.aged.trial.balance:0
#: view:account.common.report:0
msgid "Report Options"
-msgstr "Opciones del informe"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_entries_report
msgid "Journal Items Analysis"
-msgstr "Análisis elementos diario"
+msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_partner_all
+#: report:account.aged_trial_balance:0
#: model:ir.ui.menu,name:account.next_id_22
msgid "Partners"
-msgstr "Empresas"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
@@ -1335,94 +1384,74 @@ msgstr "Empresas"
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
-msgstr "Extracto bancario"
-
-#. module: account
-#: view:res.partner:0
-msgid "Bank account owner"
-msgstr "Titular de la cuenta bancaria"
+msgstr ""
#. module: account
#: field:res.partner,property_account_receivable:0
msgid "Account Receivable"
-msgstr "Cuenta a cobrar"
+msgstr ""
#. module: account
#: model:ir.actions.report.xml,name:account.account_central_journal
msgid "Central Journal"
-msgstr "Diario central"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1271
-#, python-format
-msgid "You can not use this general account in this journal !"
-msgstr "¡No puede usar esta cuenta general en este diario!"
-
-#. module: account
-#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
-#: selection:account.common.account.report,display_account:0
-#: selection:account.partner.balance,display_partner:0
-#: selection:account.pl.report,display_account:0
-#: selection:account.report.general.ledger,display_account:0
#: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: selection:account.partner.balance,display_partner:0
+#: selection:account.report.general.ledger,display_account:0
msgid "With balance is not equal to 0"
-msgstr "Con balance si no es igual a 0"
+msgstr ""
#. module: account
#: view:account.tax:0
msgid "Search Taxes"
-msgstr "Buscar impuestos"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger
msgid "Account Analytic Cost Ledger"
-msgstr "Contabilidad. Diario de costes analíticos"
+msgstr ""
#. module: account
#: view:account.model:0
msgid "Create entries"
-msgstr "Crear asientos"
+msgstr ""
#. module: account
#: field:account.entries.report,nbr:0
msgid "# of Items"
-msgstr "Nº de elementos"
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,max_amount:0
msgid "Maximum write-off amount"
-msgstr "Importe máximo de desajuste"
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Compute Taxes"
-msgstr "Calcular impuestos"
+msgstr ""
#. module: account
+#: field:account.chart.template,code_digits:0
#: field:wizard.multi.charts.accounts,code_digits:0
msgid "# of Digits"
-msgstr "Núm. de dígitos"
+msgstr ""
#. module: account
#: field:account.journal,entry_posted:0
msgid "Skip 'Draft' State for Manual Entries"
-msgstr "Omitir estado 'Borrador' para asientos manuales."
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,price_total:0
msgid "Total Without Tax"
-msgstr "Total base"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -1432,51 +1461,29 @@ msgid ""
"entry per accounting document: invoice, refund, supplier payment, bank "
"statements, etc."
msgstr ""
-"Un asiento de diario se compone de varias anotaciones, cada una de las "
-"cuales es una operación al debe o al haber. OpenERP crea automáticamente un "
-"asiento por cada documento contable: factura, factura rectificativa (abono), "
-"pago a proveedor, extractos de cuenta bancaria, etc."
#. module: account
#: view:account.entries.report:0
msgid "# of Entries "
-msgstr "Nº de asientos "
+msgstr ""
+
+#. module: account
+#: help:account.fiscal.position,active:0
+msgid ""
+"By unchecking the active field, you may hide a fiscal position without "
+"deleting it."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_temp_range
msgid "A Temporary table used for Dashboard view"
-msgstr "Una tabla temporal utilizada para la vista de tablero"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree4
#: model:ir.ui.menu,name:account.menu_action_invoice_tree4
msgid "Supplier Refunds"
-msgstr "Facturas rectificativas de proveedor"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid ""
-"Example: at 14 net days 2 percents, remaining amount at 30 days end of month."
msgstr ""
-"Por ejemplo: a 14 días netos 2 por ciento, importe restante a 30 días fin de "
-"mes."
-
-#. module: account
-#: code:addons/account/invoice.py:815
-#, python-format
-msgid ""
-"Cannot create the invoice !\n"
-"The payment term defined gives a computed amount greater than the total "
-"invoiced amount."
-msgstr ""
-"¡No se puede crear la factura!\n"
-"El plazo de pago definido genera un importe superior que el importe total "
-"facturado."
-
-#. module: account
-#: field:account.installer.modules,account_anglo_saxon:0
-msgid "Anglo-Saxon Accounting"
-msgstr "Contabilidad anglo-sajona"
#. module: account
#: selection:account.account,type:0
@@ -1487,89 +1494,81 @@ msgstr "Contabilidad anglo-sajona"
#: selection:account.fiscalyear,state:0
#: selection:account.period,state:0
msgid "Closed"
-msgstr "Cierre"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
msgid "Recurring Entries"
-msgstr "Asientos recurrentes"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_template
msgid "Template for Fiscal Position"
-msgstr "Plantilla para posición fiscal"
-
-#. module: account
-#: model:account.tax.code,name:account.account_tax_code_0
-msgid "Tax Code Test"
-msgstr "Test código impuesto"
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,reconciled:0
msgid "Reconciled transactions"
-msgstr "Transacciones conciliadas"
+msgstr ""
#. module: account
#: field:account.journal.view,columns_id:0
msgid "Columns"
-msgstr "Columnas"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "."
-msgstr "."
+msgstr ""
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "and Journals"
-msgstr "y diarios"
+msgstr ""
#. module: account
#: field:account.journal,groups_id:0
msgid "Groups"
-msgstr "Grupos"
+msgstr ""
#. module: account
#: field:account.invoice,amount_untaxed:0
#: field:report.invoice.created,amount_untaxed:0
msgid "Untaxed"
-msgstr "Base"
+msgstr ""
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Go to Next Partner"
-msgstr "Ir a la siguiente empresa"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Search Bank Statements"
-msgstr "Buscar extractos bancarios"
+msgstr ""
#. module: account
-#: sql_constraint:account.model.line:0
-msgid ""
-"Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!"
+#: view:account.move.line:0
+msgid "Unposted Journal Items"
msgstr ""
-"¡Valores debe o haber incorrectos en el modelo (debe + haber debe ser mayor "
-"que \"0\")!"
#. module: account
#: view:account.chart.template:0
#: field:account.chart.template,property_account_payable:0
msgid "Payable Account"
-msgstr "Cuenta a pagar"
+msgstr ""
#. module: account
#: field:account.tax,account_paid_id:0
#: field:account.tax.template,account_paid_id:0
msgid "Refund Tax Account"
-msgstr "Cuenta impuestos de reintegros"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
#: field:account.bank.statement,line_ids:0
msgid "Statement lines"
-msgstr "Líneas extracto"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -1581,29 +1580,23 @@ msgid ""
"the Payment column of a line, you can press F1 to open the reconciliation "
"form."
msgstr ""
-"Un extracto de cuenta bancaria es un resumen de todas las transacciones "
-"financieras ocurridas en un periodo de tiempo en una cuenta de depósito, una "
-"tarjeta de crédito o cualquier otro tipo de cuenta financiera. El balance "
-"inicial será propuesto automáticamente y el balance de cierre se basará en "
-"su extracto. Situándose sobre la columna Pagos de una línea, puede pulsar F1 "
-"para abrir el formulario de conciliación."
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "Date/Code"
-msgstr "Fecha/Código"
+msgstr ""
#. module: account
#: field:account.analytic.line,general_account_id:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,general_account_id:0
msgid "General Account"
-msgstr "Cuenta general"
+msgstr ""
#. module: account
#: field:res.partner,debit_limit:0
msgid "Payable Limit"
-msgstr "Límite a pagar"
+msgstr ""
#. module: account
#: report:account.invoice:0
@@ -1613,39 +1606,28 @@ msgstr "Límite a pagar"
#: model:ir.model,name:account.model_account_invoice
#: model:res.request.link,name:account.req_link_invoice
msgid "Invoice"
-msgstr "Factura"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_analytic0
#: model:process.node,note:account.process_node_analyticcost0
msgid "Analytic costs to invoice"
-msgstr "Costes analíticos a facturar"
+msgstr ""
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequence"
-msgstr "Secuencia ejercicio fiscal"
+msgstr ""
#. module: account
#: field:wizard.multi.charts.accounts,seq_journal:0
msgid "Separated Journal Sequences"
-msgstr "Secuencias de diarios separadas"
+msgstr ""
#. module: account
-#: field:account.bank.statement,user_id:0
#: view:account.invoice:0
msgid "Responsible"
-msgstr "Responsable"
-
-#. module: account
-#: report:account.overdue:0
-msgid "Sub-Total :"
-msgstr "Subtotal :"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
-msgid "Sales by Account Type"
-msgstr "Ventas por tipo de cuenta"
+msgstr ""
#. module: account
#: view:account.invoice.refund:0
@@ -1653,39 +1635,34 @@ msgid ""
"Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
"cancel the current invoice."
msgstr ""
-"Cancelar factura: Crea la factura de abono (rectificativa), la valida y "
-"concilia para cancelar la factura actual."
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_invoicing
msgid "Invoicing"
-msgstr "Facturación"
+msgstr ""
#. module: account
-#: field:account.chart.template,tax_code_root_id:0
-msgid "Root Tax Code"
-msgstr "Código impuesto raíz"
-
-#. module: account
-#: field:account.partner.ledger,initial_balance:0
-#: field:account.report.general.ledger,initial_balance:0
-msgid "Include initial balances"
-msgstr "Incluir balances iniciales"
+#: code:addons/account/report/account_partner_balance.py:115
+#, python-format
+msgid "Unknown Partner"
+msgstr ""
#. module: account
#: field:account.tax.code,sum:0
msgid "Year Sum"
-msgstr "Suma del año"
+msgstr ""
#. module: account
-#: model:ir.actions.report.xml,name:account.report_account_voucher_new
-msgid "Print Voucher"
-msgstr "Imprimir recibo"
+#: code:addons/account/account_invoice.py:1431
+#, python-format
+msgid ""
+"You selected an Unit of Measure which is not compatible with the product."
+msgstr ""
#. module: account
#: view:account.change.currency:0
msgid "This wizard will change the currency of the invoice"
-msgstr "Este asistente cambiará la moneda de la factura"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_chart
@@ -1694,25 +1671,16 @@ msgid ""
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
-"Muestra el plan de cuentas de su compañía por ejercicio fiscal y filtrado "
-"por periodo. Obtiene una vista en árbol completa de todos los asientos por "
-"código de cuenta que puede expandir haciendo clic sobre una cuenta."
#. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error! You cannot define overlapping fiscal years"
-msgstr "¡Error! No puede definir ejercicios fiscales que se superpongan"
+#: view:account.analytic.account:0
+msgid "Pending Accounts"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:808
-#, python-format
-msgid "The account is not defined to be reconciled !"
-msgstr "¡No se ha definido la cuenta como conciliable!"
-
-#. module: account
-#: field:account.cashbox.line,pieces:0
-msgid "Values"
-msgstr "Valores"
+#: view:account.tax.template:0
+msgid "Tax Declaration"
+msgstr ""
#. module: account
#: help:account.journal.period,active:0
@@ -1720,226 +1688,196 @@ msgid ""
"If the active field is set to False, it will allow you to hide the journal "
"period without removing it."
msgstr ""
-"Si el campo activo está establecido a falso, le permitirá ocultar el período "
-"de diario sin borrarlo."
#. module: account
#: view:res.partner:0
msgid "Supplier Debit"
-msgstr "Debe del proveedor"
-
-#. module: account
-#: help:account.model.line,quantity:0
-msgid "The optional quantity on entries"
-msgstr "La cantidad opcional en los asientos"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
msgid "Receivables & Payables"
-msgstr "Cuentas a cobrar y pagar"
-
-#. module: account
-#: code:addons/account/account_move_line.py:815
-#, python-format
-msgid "You have to provide an account for the write off entry !"
-msgstr "¡Debe indicar una cuenta para el asiento de ajuste!"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_common_journal_report
msgid "Account Common Journal Report"
-msgstr "Contabilidad. Informe diario común"
+msgstr ""
#. module: account
#: selection:account.partner.balance,display_partner:0
msgid "All Partners"
-msgstr "Todas empresas"
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Ref. :"
-msgstr "Ref. :"
+msgstr ""
#. module: account
#: view:account.analytic.chart:0
msgid "Analytic Account Charts"
-msgstr "Planes de cuentas analíticas"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
+#: view:analytic.entries.report:0
msgid "My Entries"
-msgstr "Mis asientos"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Customer Ref:"
-msgstr "Ref. cliente:"
+msgstr ""
#. module: account
-#: code:addons/account/account_cash_statement.py:328
+#: code:addons/account/account_cash_statement.py:293
#, python-format
msgid "User %s does not have rights to access %s journal !"
-msgstr "¡El usuario %s no tienen derechos para acceder al diario %s !"
+msgstr ""
#. module: account
#: help:account.period,special:0
msgid "These periods can overlap."
-msgstr "Estos períodos se pueden solapar."
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_draftstatement0
msgid "Draft statement"
-msgstr "Extracto borrador"
+msgstr ""
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Credit Notes"
-msgstr "Declaración de impuestos: Facturas rectificativas"
-
-#. module: account
-#: code:addons/account/account.py:499
-#, python-format
-msgid "You cannot deactivate an account that contains account moves."
-msgstr "No puede desactivar una cuenta que contiene asientos contables."
+msgstr ""
#. module: account
#: field:account.move.line.reconcile,credit:0
msgid "Credit amount"
-msgstr "Importe haber"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on closed account."
-msgstr "No puede crear una línea de movimiento en una cuenta cerrada."
-
-#. module: account
-#: code:addons/account/account.py:519
-#, python-format
-msgid ""
-"You cannot change the type of account from 'Closed' to any other type which "
-"contains account entries!"
msgstr ""
-"¡No puede cambiar el tipo de cuenta de 'Cerrado' a cualquier otro tipo si "
-"contiene asientos contables!"
#. module: account
-#: view:res.company:0
-msgid "Reserve And Profit/Loss Account"
-msgstr "Cuenta de reservas y pérdidas/ganancias"
+#: code:addons/account/account.py:407
+#: code:addons/account/account.py:412
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Error!"
+msgstr ""
#. module: account
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
-msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_report_all
#: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
msgid "Invoices Analysis"
-msgstr "Análisis de facturas"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_period_close
msgid "period close"
-msgstr "cierre periodo"
+msgstr ""
#. module: account
#: view:account.installer:0
msgid "Configure Fiscal Year"
-msgstr "Configurar ejercicio fiscal"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
msgid "Entries By Line"
-msgstr "Asientos por línea"
+msgstr ""
#. module: account
-#: report:account.tax.code.entries:0
-msgid "A/c Code"
-msgstr "Código cuenta"
+#: field:account.vat.declaration,based_on:0
+msgid "Based on"
+msgstr ""
#. module: account
#: field:account.invoice,move_id:0
#: field:account.invoice,move_name:0
msgid "Journal Entry"
-msgstr "Asiento contable"
+msgstr ""
#. module: account
#: view:account.tax:0
msgid "Tax Declaration: Invoices"
-msgstr "Declaración de impuestos: Facturas"
+msgstr ""
#. module: account
#: field:account.cashbox.line,subtotal:0
msgid "Sub Total"
-msgstr "Subtotal"
+msgstr ""
#. module: account
#: view:account.account:0
+#: view:account.treasury.report:0
+#: model:ir.actions.act_window,name:account.action_account_treasury_report_all
+#: model:ir.model,name:account.model_account_treasury_report
+#: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
msgid "Treasury Analysis"
-msgstr "Análisis de tesorería"
+msgstr ""
#. module: account
#: constraint:res.company:0
msgid "Error! You can not create recursive companies."
-msgstr "¡Error! No puede crear compañías recursivas."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
+msgid "Sale/Purchase Journal"
+msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Analytic account"
-msgstr "Cuenta analítica"
+msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:332
+#: code:addons/account/account_bank_statement.py:339
#, python-format
msgid "Please verify that an account is defined in the journal."
-msgstr "Compruebe que se ha definido una cuenta en el diario."
+msgstr ""
#. module: account
#: selection:account.entries.report,move_line_state:0
#: selection:account.move.line,state:0
msgid "Valid"
-msgstr "Válido"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_print_journal
#: model:ir.model,name:account.model_account_print_journal
msgid "Account Print Journal"
-msgstr "Contabilidad. Imprimir diario"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_product_category
msgid "Product Category"
-msgstr "Categoría de producto"
+msgstr ""
#. module: account
#: selection:account.account.type,report_type:0
msgid "/"
-msgstr "/"
-
-#. module: account
-#: field:account.bs.report,reserve_account_id:0
-msgid "Reserve & Profit/Loss Account"
-msgstr "Cuenta de Reservas y Pérdidas/Ganancias"
-
-#. module: account
-#: help:account.bank.statement,balance_end:0
-msgid "Closing balance based on Starting Balance and Cash Transactions"
msgstr ""
-"Saldo de cierre calculado a partir del balance inicial y las transiciones de "
-"caja."
+
+#. module: account
+#: help:res.company,property_reserve_and_surplus_account:0
+msgid ""
+"This account is used for transferring Profit/Loss (If It is Profit: Amount "
+"will be added, Loss : Amount will be deducted.), as calculated in Profit & "
+"Loss Report"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_reconciliation0
#: model:process.node,note:account.process_node_supplierreconciliation0
msgid "Comparison between accounting and payment entries"
-msgstr "Comparación entre asientos contables y de pago"
+msgstr ""
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Tax Definition"
-msgstr "Definición de impuestos"
+msgstr ""
#. module: account
#: help:wizard.multi.charts.accounts,seq_journal:0
@@ -1947,8 +1885,6 @@ msgid ""
"Check this box if you want to use a different sequence for each created "
"journal. Otherwise, all will use the same sequence."
msgstr ""
-"Marque esta opción si desea utilizar una secuencia diferente para cada "
-"diario creado. De lo contrario, todos utilizarán la misma secuencia."
#. module: account
#: help:account.partner.ledger,amount_currency:0
@@ -1957,8 +1893,6 @@ msgid ""
"It adds the currency column if the currency is different then the company "
"currency"
msgstr ""
-"Añade la columna de moneda si la moneda es distinta de la moneda de la "
-"compañía."
#. module: account
#: help:account.journal,allow_date:0
@@ -1966,31 +1900,37 @@ msgid ""
"If set to True then do not accept the entry if the entry date is not into "
"the period dates"
msgstr ""
-"Si se marca esta opción no acepta asientos que la fecha del asiento no esté "
-"dentro de las fechas del periodo."
#. module: account
-#: model:ir.actions.act_window,name:account.action_account_pl_report
-msgid "Account Profit And Loss"
-msgstr "Cuenta de pérdidas y ganancias"
+#: code:addons/account/account_invoice.py:73
+#, python-format
+msgid "You must define an analytic journal of type '%s'!"
+msgstr ""
#. module: account
#: field:account.installer,config_logo:0
-#: field:account.installer.modules,config_logo:0
#: field:wizard.multi.charts.accounts,config_logo:0
msgid "Image"
-msgstr "Imagen"
+msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Canceled"
-msgstr "Cancelado"
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_financial_report_tree
+msgid "Makes a generic system to draw financial reports easily."
+msgstr ""
#. module: account
#: view:account.invoice:0
#: view:report.invoice.created:0
msgid "Untaxed Amount"
-msgstr "Base imponible"
+msgstr ""
#. module: account
#: help:account.tax,active:0
@@ -1998,57 +1938,66 @@ msgid ""
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
-"Si el campo activo está desmarcardo, le permitirá ocultar el impuesto sin "
-"eliminarlo."
#. module: account
-#: help:account.bank.statement,name:0
-msgid ""
-"if you give the Name other then /, its created Accounting Entries Move will "
-"be with same name as statement name. This allows the statement entries to "
-"have the same references than the statement itself"
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a sale journal."
msgstr ""
-"si le da un nombre distinto de /, su asiento contable tendrá el mismo nombre "
-"que el extracto. Esto permite que los asientos del extracto tengan las "
-"mismas referencias que el extracto en sí"
#. module: account
-#: model:ir.actions.act_window,name:account.action_account_unreconcile
-#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
-#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
-msgid "Unreconcile Entries"
-msgstr "Romper conciliación de los asientos"
+#: selection:account.financial.report,style_overwrite:0
+msgid "Italic Text (smaller)"
+msgstr ""
+
+#. module: account
+#: view:account.bank.statement:0
+#: view:account.invoice:0
+#: selection:account.invoice,state:0
+#: view:account.invoice.report:0
+#: selection:account.invoice.report,state:0
+#: selection:account.journal.period,state:0
+#: view:account.subscription:0
+#: selection:account.subscription,state:0
+#: selection:report.invoice.created,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT Declaration"
+msgstr ""
#. module: account
#: field:account.move.reconcile,line_partial_ids:0
msgid "Partial Entry lines"
-msgstr "Apuntes de conciliación parcial"
+msgstr ""
#. module: account
#: view:account.fiscalyear:0
+#: field:account.treasury.report,fiscalyear_id:0
msgid "Fiscalyear"
-msgstr "Ejercicio fiscal"
+msgstr ""
#. module: account
#: view:account.journal.select:0
#: view:project.account.analytic.line:0
msgid "Open Entries"
-msgstr "Abrir asientos"
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,account_ids:0
msgid "Accounts to Reconcile"
-msgstr "Cuentas a conciliar"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_filestatement0
msgid "Import of the statement in the system from an electronic file"
-msgstr "Importa al sistema un extracto desde un fichero electrónico"
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_importinvoice0
msgid "Import from invoice"
-msgstr "Importa desde factura"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -2057,22 +2006,22 @@ msgstr "Importa desde factura"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "January"
-msgstr "Enero"
+msgstr ""
#. module: account
#: view:account.journal:0
msgid "Validations"
-msgstr "Validaciones"
+msgstr ""
#. module: account
#: view:account.entries.report:0
msgid "This F.Year"
-msgstr "Este ejercicio fiscal"
+msgstr ""
#. module: account
#: view:account.tax.chart:0
msgid "Account tax charts"
-msgstr "Plan de impuestos contables"
+msgstr ""
#. module: account
#: constraint:account.period:0
@@ -2080,8 +2029,12 @@ msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
-"¡Periodo inválido! Algunos periodos se superponen o la fecha del periodo no "
-"está dentro del intervalo del ejercicio fiscal. "
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:357
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
#. module: account
#: selection:account.invoice,state:0
@@ -2089,26 +2042,17 @@ msgstr ""
#: selection:account.invoice.report,state:0
#: selection:report.invoice.created,state:0
msgid "Pro-forma"
-msgstr "Pro-forma"
+msgstr ""
#. module: account
-#: code:addons/account/installer.py:348
-#, python-format
-msgid " Journal"
-msgstr " Diario"
-
-#. module: account
-#: code:addons/account/account.py:1319
+#: code:addons/account/account.py:1478
#, python-format
msgid ""
"There is no default default debit account defined \n"
"on journal \"%s\""
msgstr ""
-"No se ha definido una cuenta debe por defecto \n"
-"en el diario \"%s\""
#. module: account
-#: help:account.account,type:0
#: help:account.account.template,type:0
#: help:account.entries.report,type:0
msgid ""
@@ -2118,16 +2062,33 @@ msgid ""
"partners accounts (for debit/credit computations), closed for depreciated "
"accounts."
msgstr ""
-"Esta clasificación se utiliza para diferenciar tipos con efectos especiales "
-"en OpenERP: vista no puede tener asientos, consolidación son cuentas que "
-"pueden tener cuentas hijas para consolidaciones multi-empresa, "
-"pagable/cobrable son para cuentas de empresas (para los cálculos de crédito "
-"/ débito), cerrado es para cuentas de depreciación."
#. module: account
#: view:account.chart.template:0
msgid "Search Chart of Account Templates"
-msgstr "Buscar plantillas de plan contable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1292
+#, python-format
+msgid ""
+"Can not create an automatic sequence for this piece!\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:787
+#, python-format
+msgid ""
+"You can not modify the company of this journal as its related record exist "
+"in journal items"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Customer Code"
+msgstr ""
#. module: account
#: view:account.installer:0
@@ -2136,9 +2097,6 @@ msgid ""
"certified Chart of Accounts exists for your specified country, a generic one "
"can be installed and will be selected by default."
msgstr ""
-"El plan contable por defecto se ajusta a su selección de país. Si no existe "
-"un plan contable certificado para el país especificado, se puede instalar "
-"uno genérico que será seleccionado por defecto."
#. module: account
#: view:account.account.type:0
@@ -2157,91 +2115,107 @@ msgstr ""
#: field:analytic.entries.report,name:0
#: field:report.invoice.created,name:0
msgid "Description"
-msgstr "Descripción"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2844
-#: code:addons/account/installer.py:498
+#: code:addons/account/account.py:3136
#, python-format
msgid "ECNJ"
-msgstr "ACOMPRA"
+msgstr ""
#. module: account
#: view:account.subscription:0
#: selection:account.subscription,state:0
msgid "Running"
-msgstr "En proceso"
+msgstr ""
#. module: account
#: view:account.chart.template:0
#: field:product.category,property_account_income_categ:0
#: field:product.template,property_account_income:0
msgid "Income Account"
-msgstr "Cuenta de ingresos"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:352
+#: code:addons/account/account_invoice.py:379
#, python-format
msgid "There is no Accounting Journal of type Sale/Purchase defined!"
-msgstr "¡No se ha definido un diario contable de tipo Venta/Compra!"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid "The RIB and/or IBAN is not valid"
+msgstr ""
#. module: account
#: view:product.category:0
msgid "Accounting Properties"
-msgstr "Propiedades de contabilidad"
+msgstr ""
#. module: account
-#: report:account.journal.period.print:0
-#: field:account.print.journal,sort_selection:0
-#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
msgid "Entries Sorted By"
-msgstr "Asientos ordenados por"
+msgstr ""
#. module: account
#: field:account.change.currency,currency_id:0
msgid "Change to"
-msgstr "Cambiar a"
+msgstr ""
#. module: account
#: view:account.entries.report:0
msgid "# of Products Qty "
-msgstr "Nº ctdad de productos "
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_product_template
msgid "Product Template"
-msgstr "Plantilla de producto"
+msgstr ""
#. module: account
#: report:account.account.balance:0
+#: field:account.aged.trial.balance,fiscalyear_id:0
+#: report:account.aged_trial_balance:0
+#: field:account.balance.report,fiscalyear_id:0
#: report:account.central.journal:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.central.journal,fiscalyear_id:0
+#: field:account.common.account.report,fiscalyear_id:0
+#: field:account.common.journal.report,fiscalyear_id:0
+#: field:account.common.partner.report,fiscalyear_id:0
+#: field:account.common.report,fiscalyear_id:0
#: view:account.entries.report:0
#: field:account.entries.report,fiscalyear_id:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,name:0
#: report:account.general.journal:0
+#: field:account.general.journal,fiscalyear_id:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.journal.period,fiscalyear_id:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
+#: field:account.partner.balance,fiscalyear_id:0
+#: field:account.partner.ledger,fiscalyear_id:0
#: field:account.period,fiscalyear_id:0
+#: field:account.print.journal,fiscalyear_id:0
+#: field:account.report.general.ledger,fiscalyear_id:0
#: field:account.sequence.fiscalyear,fiscalyear_id:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
+#: field:account.vat.declaration,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id:0
+#: field:accounting.report,fiscalyear_id_cmp:0
#: model:ir.model,name:account.model_account_fiscalyear
msgid "Fiscal Year"
-msgstr "Ejercicio fiscal"
+msgstr ""
#. module: account
#: help:account.aged.trial.balance,fiscalyear_id:0
#: help:account.balance.report,fiscalyear_id:0
-#: help:account.bs.report,fiscalyear_id:0
#: help:account.central.journal,fiscalyear_id:0
#: help:account.common.account.report,fiscalyear_id:0
#: help:account.common.journal.report,fiscalyear_id:0
@@ -2250,22 +2224,57 @@ msgstr "Ejercicio fiscal"
#: help:account.general.journal,fiscalyear_id:0
#: help:account.partner.balance,fiscalyear_id:0
#: help:account.partner.ledger,fiscalyear_id:0
-#: help:account.pl.report,fiscalyear_id:0
#: help:account.print.journal,fiscalyear_id:0
#: help:account.report.general.ledger,fiscalyear_id:0
#: help:account.vat.declaration,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id:0
+#: help:accounting.report,fiscalyear_id_cmp:0
msgid "Keep empty for all open fiscal year"
-msgstr "Dejarlo vacío para todos los ejercicios fiscales abiertos."
+msgstr ""
+
+#. module: account
+#: field:account.invoice.report,account_line_id:0
+msgid "Account Line"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1485
+#, python-format
+msgid ""
+"There is no default default credit account defined \n"
+"on journal \"%s\""
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_financial_journals_installer
+msgid ""
+"Setup your accounting journals. For bank accounts, it's better to use the "
+"'Setup Your Bank Accounts' tool that will automatically create the accounts "
+"and journals for you."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_move
msgid "Account Entry"
-msgstr "Asiento contable"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
#. module: account
#: field:account.sequence.fiscalyear,sequence_main_id:0
msgid "Main Sequence"
-msgstr "Secuencia principal"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:403
+#, python-format
+msgid ""
+"In order to delete a bank statement, you must first cancel it to delete "
+"related journal items."
+msgstr ""
#. module: account
#: field:account.invoice,payment_term:0
@@ -2277,23 +2286,29 @@ msgstr "Secuencia principal"
#: model:ir.model,name:account.model_account_payment_term
#: field:res.partner,property_payment_term:0
msgid "Payment Term"
-msgstr "Plazo de pago"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
msgid "Fiscal Positions"
-msgstr "Posiciones fiscales"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+#: constraint:account.tax.code:0
+msgid "Error ! You can not create recursive accounts."
+msgstr ""
#. module: account
#: field:account.period.close,sure:0
msgid "Check this box"
-msgstr "Marque esta opción"
+msgstr ""
#. module: account
#: view:account.common.report:0
msgid "Filters"
-msgstr "Filtros"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
@@ -2308,35 +2323,27 @@ msgstr "Filtros"
#: selection:report.invoice.created,state:0
#, python-format
msgid "Open"
-msgstr "Abierto"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_draftinvoices0
#: model:process.node,note:account.process_node_supplierdraftinvoices0
msgid "Draft state of an invoice"
-msgstr "Estado borrador de una factura"
-
-#. module: account
-#: help:account.account,reconcile:0
-msgid ""
-"Check this if the user is allowed to reconcile entries in this account."
msgstr ""
-"Marque esta opción si el usuario se le permite conciliar asientos en esta "
-"cuenta."
#. module: account
#: view:account.partner.reconcile.process:0
msgid "Partner Reconciliation"
-msgstr "Conciliciación empresa"
+msgstr ""
#. module: account
#: field:account.tax,tax_code_id:0
#: view:account.tax.code:0
msgid "Account Tax Code"
-msgstr "Código impuesto contable"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:545
+#: code:addons/account/account_invoice.py:581
#, python-format
msgid ""
"Can't find any account journal of %s type for this company.\n"
@@ -2344,23 +2351,28 @@ msgid ""
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
-"No se encuentra ningún diario del tipo %s para esta compañía.\n"
-"\n"
-"Debe crear uno en el menú: \n"
-"Configuración\\Contabilidad financiera\\Cuentas\\Diarios."
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_advance
+#: model:account.payment.term,note:account.account_payment_term_advance
+msgid "30% Advance End 30 Days"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Unreconciled entries"
+msgstr ""
#. module: account
#: field:account.invoice.tax,base_code_id:0
#: field:account.tax.template,base_code_id:0
msgid "Base Code"
-msgstr "Código base"
+msgstr ""
#. module: account
#: help:account.invoice.tax,sequence:0
msgid "Gives the sequence order when displaying a list of invoice tax."
msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de impuestos de "
-"factura."
#. module: account
#: field:account.tax,base_sign:0
@@ -2368,7 +2380,7 @@ msgstr ""
#: field:account.tax.template,base_sign:0
#: field:account.tax.template,ref_base_sign:0
msgid "Base Code Sign"
-msgstr "Signo código base"
+msgstr ""
#. module: account
#: view:account.vat.declaration:0
@@ -2380,24 +2392,17 @@ msgid ""
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
-"Este menú imprime una declaración de IVA basada en facturas o pagos. "
-"Seleccione uno o varios periodos del ejercicio fiscal. La información "
-"necesaria para la declaración de IVA es generada automáticamente por OpenERP "
-"a partir de las facturas (o pagos, en algunos países). Esta información se "
-"actualiza en tiempo real. Es muy útil porque le permite previsualizar en "
-"cualquier momento los impuestos que debe al principio y fin del mes o "
-"trimestre."
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Debit Centralisation"
-msgstr "Centralización del debe"
+msgstr ""
#. module: account
#: view:account.invoice.confirm:0
#: model:ir.actions.act_window,name:account.action_account_invoice_confirm
msgid "Confirm Draft Invoices"
-msgstr "Confirmar facturas borrador"
+msgstr ""
#. module: account
#: field:account.entries.report,day:0
@@ -2406,29 +2411,33 @@ msgstr "Confirmar facturas borrador"
#: view:analytic.entries.report:0
#: field:analytic.entries.report,day:0
msgid "Day"
-msgstr "Día"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_account_renew_view
msgid "Accounts to Renew"
-msgstr "Cuentas a renovar"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_model_line
msgid "Account Model Entries"
-msgstr "Contabilidad. Líneas de modelo"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2796
-#: code:addons/account/installer.py:454
+#: code:addons/account/account.py:3134
#, python-format
msgid "EXJ"
-msgstr "COMPRA"
+msgstr ""
#. module: account
#: field:product.template,supplier_taxes_id:0
msgid "Supplier Taxes"
-msgstr "Impuestos proveedor"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "entries"
+msgstr ""
#. module: account
#: help:account.invoice,date_due:0
@@ -2439,26 +2448,21 @@ msgid ""
"date empty, it means direct payment. The payment term may compute several "
"due dates, for example 50% now, 50% in one month."
msgstr ""
-"Si utiliza los plazos de pago, la fecha de vencimiento será calculada "
-"automáticamente en la generación de los asientos contables. Si se mantiene "
-"el plazo de pago y la fecha de vencimiento vacía, significa que es un pago "
-"directo. El plazo de pago podrá calcular varias fechas de vencimiento, por "
-"ejemplo, 50% ahora, 50% en un mes."
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Select period"
-msgstr "Seleccionar período"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_account_pp_statements
msgid "Statements"
-msgstr "Declaraciones"
+msgstr ""
#. module: account
#: report:account.analytic.account.journal:0
msgid "Move Name"
-msgstr "Mover nombre"
+msgstr ""
#. module: account
#: help:res.partner,property_account_position:0
@@ -2466,28 +2470,25 @@ msgid ""
"The fiscal position will determine taxes and the accounts used for the "
"partner."
msgstr ""
-"La posición fiscal calculará los impuestos y las cuentas contables "
-"utilizados para esta empresa."
#. module: account
#: view:account.print.journal:0
msgid ""
"This report gives you an overview of the situation of a specific journal"
msgstr ""
-"Este informe le proporciona una visión global sobre la situación de un "
-"diario específico"
#. module: account
-#: constraint:product.category:0
-msgid "Error ! You can not create recursive categories."
-msgstr "¡Error! No puede crear categorías recursivas."
+#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
+msgid "Account move line reconcile (writeoff)"
+msgstr ""
#. module: account
+#: model:account.account.type,name:account.account_type_tax
#: report:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
msgid "Tax"
-msgstr "Impuesto"
+msgstr ""
#. module: account
#: view:account.analytic.account:0
@@ -2498,10 +2499,12 @@ msgstr "Impuesto"
#: field:account.move.line,analytic_account_id:0
#: field:account.move.line.reconcile.writeoff,analytic_id:0
msgid "Analytic Account"
-msgstr "Cuenta analítica"
+msgstr ""
#. module: account
#: view:account.account:0
+#: field:account.financial.report,account_ids:0
+#: selection:account.financial.report,type:0
#: view:account.journal:0
#: model:ir.actions.act_window,name:account.action_account_form
#: model:ir.ui.menu,name:account.account_account_menu
@@ -2509,120 +2512,118 @@ msgstr "Cuenta analítica"
#: model:ir.ui.menu,name:account.menu_action_account_form
#: model:ir.ui.menu,name:account.menu_analytic
msgid "Accounts"
-msgstr "Cuentas"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:351
+#: code:addons/account/account_invoice.py:378
#, python-format
msgid "Configuration Error!"
-msgstr "¡Error de configuración!"
+msgstr ""
#. module: account
-#: view:account.invoice.report:0
#: field:account.invoice.report,price_average:0
msgid "Average Price"
-msgstr "Precio promedio"
+msgstr ""
#. module: account
-#: report:account.move.voucher:0
#: report:account.overdue:0
msgid "Date:"
-msgstr "Fecha:"
-
-#. module: account
-#: code:addons/account/account.py:640
-#, python-format
-msgid ""
-"You cannot modify company of this journal as its related record exist in "
-"Entry Lines"
msgstr ""
-"No puede modificar la compañía de este diario porqué ya contiene asientos"
#. module: account
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
msgid "Label"
-msgstr "Etiqueta"
+msgstr ""
#. module: account
#: view:account.tax:0
+#: view:res.partner.bank:0
msgid "Accounting Information"
-msgstr "Información contable"
+msgstr ""
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Special Computation"
-msgstr "Cálculo especial"
+msgstr ""
#. module: account
#: view:account.move.bank.reconcile:0
#: model:ir.actions.act_window,name:account.action_account_bank_reconcile_tree
msgid "Bank reconciliation"
-msgstr "Conciliación bancaria"
+msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Disc.(%)"
-msgstr "Desc.(%)"
+msgstr ""
#. module: account
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
-#: report:account.journal.period.print:0
#: report:account.overdue:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Ref"
-msgstr "Ref."
+msgstr ""
#. module: account
#: help:account.move.line,tax_code_id:0
msgid "The Account can either be a base tax code or a tax code account."
msgstr ""
-"La cuenta puede ser una cuenta de un código de impuesto base o de un código "
-"de impuesto."
+
+#. module: account
+#: sql_constraint:account.model.line:0
+msgid "Wrong credit or debit value in model, they must be positive!"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_automatic_reconcile
msgid "Automatic Reconciliation"
-msgstr "Conciliación automática"
+msgstr ""
#. module: account
#: field:account.invoice,reconciled:0
msgid "Paid/Reconciled"
-msgstr "Pagado/Conciliado"
+msgstr ""
#. module: account
#: field:account.tax,ref_base_code_id:0
#: field:account.tax.template,ref_base_code_id:0
msgid "Refund Base Code"
-msgstr "Código base reintegro"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree
-msgid "Bank Statements"
-msgstr "Extractos bancarios"
+msgstr ""
#. module: account
#: selection:account.tax.template,applicable_type:0
msgid "True"
-msgstr "Verdadero"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
#: view:account.common.report:0
#: view:account.move:0
#: view:account.move.line:0
+#: view:accounting.report:0
msgid "Dates"
-msgstr "Fechas"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,parent_id:0
+msgid "Parent Chart Template"
+msgstr ""
#. module: account
#: field:account.tax,parent_id:0
#: field:account.tax.template,parent_id:0
msgid "Parent Tax Account"
-msgstr "Cuenta impuestos padre"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:59
+#, python-format
+msgid "New currency is not configured properly !"
+msgstr ""
#. module: account
#: view:account.subscription.generate:0
@@ -2630,26 +2631,30 @@ msgid ""
"Automatically generate entries based on what has been entered in the system "
"before a specific date."
msgstr ""
-"Genera automáticamente los asientos a partir de lo que se ha entrado en el "
-"sistema antes de una fecha concreta."
#. module: account
#: view:account.aged.trial.balance:0
#: model:ir.actions.act_window,name:account.action_account_aged_balance_view
+#: model:ir.actions.report.xml,name:account.account_aged_partner_balance
#: model:ir.ui.menu,name:account.menu_aged_trial_balance
msgid "Aged Partner Balance"
-msgstr "Saldos vencidos de empresa"
+msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_entriesreconcile0
#: model:process.transition,name:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries"
-msgstr "Asientos contables"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,reference_type:0
+msgid "Communication Type"
+msgstr ""
#. module: account
#: field:account.invoice.line,discount:0
msgid "Discount (%)"
-msgstr "Descuento (%)"
+msgstr ""
#. module: account
#: help:account.journal,entry_posted:0
@@ -2660,65 +2665,69 @@ msgid ""
"Note that journal entries that are automatically created by the system are "
"always skipping that state."
msgstr ""
-"Marque esta opción si no desea que los nuevos asientos pasen por el estado "
-"'No asentado' y por tanto vayan directamente al estado 'Asentado' sin "
-"ninguna validación manual. \n"
-"Tenga en cuenta que los apuntes creados automáticamente por el sistema "
-"siempre obvian ese estado."
#. module: account
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
msgid "New Company Financial Setting"
-msgstr "Configuración financiera para nueva compañía"
+msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
-#: view:report.account.sales:0
-#: view:report.account_type.sales:0
-msgid "Sales by Account"
-msgstr "Ventas por cuenta"
+#: view:account.installer:0
+msgid "Configure Your Chart of Accounts"
+msgstr ""
#. module: account
#: view:account.use.model:0
msgid "This wizard will create recurring accounting entries"
-msgstr "Este asistente creará asientos contables recurrentes"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:1181
+#: code:addons/account/account.py:1329
#, python-format
msgid "No sequence defined on the journal !"
-msgstr "¡No se ha definido una secuencia en el diario!"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2083
-#: code:addons/account/account_bank_statement.py:350
-#: code:addons/account/account_move_line.py:170
-#: code:addons/account/invoice.py:670
-#: code:addons/account/wizard/account_use_model.py:81
+#: code:addons/account/account.py:2285
+#: code:addons/account/account_invoice.py:697
+#: code:addons/account/account_move_line.py:173
#, python-format
msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "¡Debe definir un diario analítico en el diario '%s'!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:407
+#, python-format
+msgid ""
+"You need an Opening journal with centralisation checked to set the initial "
+"balance!"
+msgstr ""
#. module: account
#: view:account.invoice.tax:0
#: model:ir.actions.act_window,name:account.action_tax_code_list
#: model:ir.ui.menu,name:account.menu_action_tax_code_list
msgid "Tax Codes"
-msgstr "Códigos de impuestos"
+msgstr ""
+
+#. module: account
+#: view:account.account:0
+msgid "Unrealized Gains and losses"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_account_customer
#: model:ir.ui.menu,name:account.menu_finance_receivables
msgid "Customers"
-msgstr "Clientes"
+msgstr ""
#. module: account
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.journal:0
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Period to"
-msgstr "Periodo hasta"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -2727,30 +2736,12 @@ msgstr "Periodo hasta"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "August"
-msgstr "Agosto"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:306
-#, python-format
-msgid ""
-"The statement balance is incorrect !\n"
-"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
msgid "Payment entries are the second input of the reconciliation."
-msgstr "Asientos de pago son la segunda entrada para la conciliación."
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Number:"
-msgstr "Número:"
-
-#. module: account
-#: selection:account.print.journal,sort_selection:0
-msgid "Reference Number"
-msgstr "Número de referencia"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -2759,7 +2750,7 @@ msgstr "Número de referencia"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "October"
-msgstr "Octubre"
+msgstr ""
#. module: account
#: help:account.move.line,quantity:0
@@ -2767,50 +2758,58 @@ msgid ""
"The optional quantity expressed by this line, eg: number of product sold. "
"The quantity is not a legal requirement but is very useful for some reports."
msgstr ""
-"La cantidad opcional expresadas por esta línea, por ejemplo: el número de "
-"productos vendidos. La cantidad no es un requisito legal, pero es muy útil "
-"para algunos informes."
#. module: account
#: view:account.payment.term.line:0
msgid "Line 2:"
-msgstr "Línea 2:"
+msgstr ""
#. module: account
#: field:account.journal.column,required:0
msgid "Required"
-msgstr "Requerido"
+msgstr ""
#. module: account
#: view:account.chart.template:0
#: field:product.category,property_account_expense_categ:0
#: field:product.template,property_account_expense:0
msgid "Expense Account"
-msgstr "Cuenta de gastos"
+msgstr "Cuenta Costo de Venta"
#. module: account
#: help:account.invoice,period_id:0
msgid "Keep empty to use the period of the validation(invoice) date."
msgstr ""
-"Dejarlo vacío para utilizar el período de la fecha de validación (factura)."
#. module: account
#: help:account.bank.statement,account_id:0
msgid ""
"used in statement reconciliation domain, but shouldn't be used elswhere."
msgstr ""
-"Utilizado en el dominio de conciliación de extractos, pero no debería ser "
-"usado en otro sitio."
#. module: account
#: field:account.invoice.tax,base_amount:0
msgid "Base Code Amount"
-msgstr "Importe código base"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:401
+#, python-format
+msgid ""
+"You can not delete an invoice which is open or paid. We suggest you to "
+"refund it instead."
+msgstr ""
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
-msgstr "Impuesto de venta por defecto"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1025
+#, python-format
+msgid "Invoice '%s' is validated."
+msgstr ""
#. module: account
#: help:account.model.line,date_maturity:0
@@ -2819,22 +2818,16 @@ msgid ""
"between the creation date or the creation date of the entries plus the "
"partner payment terms."
msgstr ""
-"La fecha de vencimiento de los asientos generados por este modelo. Puede "
-"elegir entre la fecha de creación o la fecha de creación de los asientos más "
-"los plazos de pago de la empresa."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_accounting
msgid "Financial Accounting"
-msgstr "Contabilidad financiera"
+msgstr ""
#. module: account
-#: view:account.pl.report:0
-#: model:ir.ui.menu,name:account.menu_account_pl_report
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: model:ir.ui.menu,name:account.menu_account_report_pl
msgid "Profit And Loss"
-msgstr "Pérdidas y ganancias"
+msgstr ""
#. module: account
#: view:account.fiscal.position:0
@@ -2848,33 +2841,26 @@ msgstr "Pérdidas y ganancias"
#: model:ir.model,name:account.model_account_fiscal_position
#: field:res.partner,property_account_position:0
msgid "Fiscal Position"
-msgstr "Posición fiscal"
-
-#. module: account
-#: help:account.partner.ledger,initial_balance:0
-#: help:account.report.general.ledger,initial_balance:0
-msgid ""
-"It adds initial balance row on report which display previous sum amount of "
-"debit/credit/balance"
msgstr ""
-"Añade una fila de saldo inicial en el informe que muestra el importe previo "
-"del debe/haber/saldo."
#. module: account
-#: view:account.analytic.line:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
-msgid "Analytic Entries"
-msgstr "Asientos analíticos"
-
-#. module: account
-#: code:addons/account/account.py:822
+#: code:addons/account/account_invoice.py:744
#, python-format
msgid ""
-"No fiscal year defined for this date !\n"
-"Please create one."
+"Tax base different!\n"
+"Click on compute to update the tax base."
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,page_split:0
+msgid "One Partner Per Page"
+msgstr ""
+
+#. module: account
+#: field:account.account,child_parent_ids:0
+#: field:account.account.template,child_parent_ids:0
+msgid "Children"
msgstr ""
-"¡No se ha definido un ejercicio fiscal para esta fecha!\n"
-"Por favor, cree uno."
#. module: account
#: selection:account.invoice,type:0
@@ -2882,7 +2868,7 @@ msgstr ""
#: model:process.process,name:account.process_process_invoiceprocess0
#: selection:report.invoice.created,type:0
msgid "Customer Invoice"
-msgstr "Factura de cliente"
+msgstr ""
#. module: account
#: help:account.tax.template,include_base_amount:0
@@ -2890,43 +2876,52 @@ msgid ""
"Set if the amount of tax must be included in the base amount before "
"computing the next taxes."
msgstr ""
-"Indica si el importe del impuesto deberá incluirse en el importe base antes "
-"de calcular los siguientes impuestos."
#. module: account
#: help:account.journal,user_id:0
msgid "The user responsible for this journal"
-msgstr "El usuario responsable de este diario"
+msgstr ""
#. module: account
#: view:account.period:0
msgid "Search Period"
-msgstr "Buscar periodo"
+msgstr ""
#. module: account
#: view:account.change.currency:0
msgid "Invoice Currency"
-msgstr "Moneda factura"
+msgstr ""
+
+#. module: account
+#: field:accounting.report,account_report_id:0
+#: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
+msgid "Account Reports"
+msgstr ""
#. module: account
#: field:account.payment.term,line_ids:0
msgid "Terms"
-msgstr "Plazos de pago"
+msgstr ""
#. module: account
#: field:account.bank.statement,total_entry_encoding:0
msgid "Cash Transaction"
-msgstr "Transición de caja"
+msgstr ""
#. module: account
#: view:res.partner:0
msgid "Bank account"
-msgstr "Cuenta bancaria"
+msgstr ""
#. module: account
#: field:account.chart.template,tax_template_ids:0
msgid "Tax Template List"
-msgstr "Lista plantilla impuestos"
+msgstr ""
+
+#. module: account
+#: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
+msgid "Sale/Purchase Journals"
+msgstr ""
#. module: account
#: help:account.account,currency_mode:0
@@ -2937,114 +2932,110 @@ msgid ""
"software system you may have to use the rate at date. Incoming transactions "
"always use the rate at date."
msgstr ""
-"Permite seleccionar la forma en que se calcula la tasa de la divisa actual "
-"en las transacciones de salida. En la mayoría de los países el método legal "
-"es \"Promedio\", pero sólo unos pocos sistemas de software son capaces de "
-"gestionarlo. Por lo tanto, si la importación procede de otro sistema de "
-"software, es posible que tenga que utilizar la tasa \"En fecha\". Las "
-"transacciones de entrada siempre utilizan la tasa \"En fecha\"."
#. module: account
+#: help:account.chart.template,code_digits:0
#: help:wizard.multi.charts.accounts,code_digits:0
msgid "No. of Digits to use for account code"
-msgstr "Núm. de dígitos a usar para código de cuenta."
+msgstr ""
#. module: account
#: field:account.payment.term.line,name:0
msgid "Line Name"
-msgstr "Nombre línea"
+msgstr ""
#. module: account
#: view:account.fiscalyear:0
msgid "Search Fiscalyear"
-msgstr "Buscar ejercicio fiscal"
+msgstr ""
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Always"
-msgstr "Siempre"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "Month-1"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Total Quantity"
-msgstr "Cantidad total"
+msgstr ""
#. module: account
#: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
msgid "Write-Off account"
-msgstr "Cuenta de desajuste"
+msgstr ""
#. module: account
#: field:account.model.line,model_id:0
#: view:account.subscription:0
#: field:account.subscription,model_id:0
msgid "Model"
-msgstr "Modelo"
+msgstr ""
#. module: account
#: help:account.invoice.tax,base_code_id:0
msgid "The account basis of the tax declaration."
-msgstr "La cuenta base de la declaración de impuestos."
+msgstr ""
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
+#: selection:account.financial.report,type:0
msgid "View"
-msgstr "Vista"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2951
-#, python-format
-msgid "BNK%s"
-msgstr "BNC%s"
-
-#. module: account
-#: code:addons/account/account.py:2906
-#: code:addons/account/installer.py:296
+#: code:addons/account/account.py:3380
+#: code:addons/account/account_bank.py:90
#, python-format
msgid "BNK"
-msgstr "BANCO"
+msgstr ""
#. module: account
#: field:account.move.line,analytic_lines:0
msgid "Analytic lines"
-msgstr "Líneas analíticas"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "Proforma Invoices"
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_electronicfile0
msgid "Electronic File"
-msgstr "Archivo electrónico"
+msgstr ""
#. module: account
#: view:res.partner:0
msgid "Customer Credit"
-msgstr "Haber del cliente"
+msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_tax_code_template
-msgid "Tax Code Template"
-msgstr "Plantilla códigos de impuestos"
+#: view:account.payment.term.line:0
+msgid " Day of the Month: 0"
+msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Starts on"
-msgstr "Empieza en"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_partner_ledger
msgid "Account Partner Ledger"
-msgstr "Contabilidad. Libro mayor empresa"
+msgstr ""
#. module: account
#: help:account.journal.column,sequence:0
msgid "Gives the sequence order to journal column."
-msgstr "Indica el orden de secuencia de la columna del diario."
-
-#. module: account
-#: view:account.tax.template:0
-msgid "Tax Declaration"
-msgstr "Declaración de impuestos"
+msgstr ""
#. module: account
#: help:account.account,currency_id:0
@@ -3052,7 +3043,6 @@ msgstr "Declaración de impuestos"
#: help:account.bank.accounts.wizard,currency_id:0
msgid "Forces all moves for this account to have this secondary currency."
msgstr ""
-"Fuerza a todos los movimientos de esta cuenta tener esta moneda secundaria."
#. module: account
#: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3060,24 +3050,32 @@ msgid ""
"This wizard will validate all journal entries of a particular journal and "
"period. Once journal entries are validated, you can not update them anymore."
msgstr ""
-"Este asistente validará todos los asientos de un diario y período en "
-"particular. Una vez que se validan los asientos, no se pueden modificar más."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_chart_template_form
#: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
msgid "Chart of Accounts Templates"
-msgstr "Plantillas para el plan contable"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_wizard_multi_chart
-msgid "Generate Chart of Accounts from a Chart Template"
-msgstr "Generar plan contable a partir de una plantilla de plan contable"
+msgid "Set Your Accounting Options"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This months' Sales by type"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_unreconcile_reconcile
msgid "Account Unreconcile Reconcile"
-msgstr "Contabilidad. Romper conciliación. Conciliar"
+msgstr ""
+
+#. module: account
+#: sql_constraint:account.tax:0
+msgid "The description must be unique per company!"
+msgstr ""
#. module: account
#: help:account.account.type,close_method:0
@@ -3092,27 +3090,23 @@ msgid ""
" 'Unreconciled' will copy only the journal items that were unreconciled on "
"the first day of the new fiscal year."
msgstr ""
-"Establezca aquí el método que usará el asistente genérico para crear el "
-"asiento de cierre de ejercicio para todas las cuentas de este tipo.\n"
-"\n"
-" 'Ninguno' significa que no se hará nada.\n"
-" 'Saldo' normalmente se usará para cuentas de efectivo.\n"
-" 'Detallado' copiará cada apunte del ejercicio anterior, incluso los no "
-"conciliados.\n"
-" 'Sin conciliar' copiará sólo los apuntes aun no conciliados el primer día "
-"del nuevo ejercicio fiscal."
+
+#. module: account
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
+#, python-format
+msgid "No End of year journal defined for the fiscal year"
+msgstr ""
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Keep empty to use the expense account"
-msgstr "Dejar vacío para la cuenta de gastos"
+msgstr ""
#. module: account
#: field:account.aged.trial.balance,journal_ids:0
#: field:account.analytic.cost.ledger.journal.report,journal:0
#: field:account.balance.report,journal_ids:0
-#: field:account.bs.report,journal_ids:0
#: field:account.central.journal,journal_ids:0
#: field:account.common.account.report,journal_ids:0
#: field:account.common.journal.report,journal_ids:0
@@ -3121,44 +3115,38 @@ msgstr "Dejar vacío para la cuenta de gastos"
#: field:account.common.report,journal_ids:0
#: report:account.general.journal:0
#: field:account.general.journal,journal_ids:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: view:account.journal.period:0
+#: report:account.partner.balance:0
#: field:account.partner.balance,journal_ids:0
#: field:account.partner.ledger,journal_ids:0
-#: field:account.pl.report,journal_ids:0
#: view:account.print.journal:0
#: field:account.print.journal,journal_ids:0
#: field:account.report.general.ledger,journal_ids:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,journal_ids:0
+#: field:accounting.report,journal_ids:0
#: model:ir.actions.act_window,name:account.action_account_journal_form
#: model:ir.actions.act_window,name:account.action_account_journal_period_tree
#: model:ir.ui.menu,name:account.menu_account_print_journal
#: model:ir.ui.menu,name:account.menu_action_account_journal_form
#: model:ir.ui.menu,name:account.menu_journals
#: model:ir.ui.menu,name:account.menu_journals_report
-#: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.central.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
msgid "Journals"
-msgstr "Diarios"
+msgstr ""
#. module: account
#: field:account.partner.reconcile.process,to_reconcile:0
msgid "Remaining Partners"
-msgstr "Empresas restantes"
+msgstr ""
#. module: account
#: view:account.subscription:0
#: field:account.subscription,lines_id:0
msgid "Subscription Lines"
-msgstr "Apuntes de asientos periódicos"
+msgstr ""
#. module: account
#: selection:account.analytic.journal,type:0
@@ -3169,49 +3157,58 @@ msgstr "Apuntes de asientos periódicos"
#: view:account.tax.template:0
#: selection:account.tax.template,type_tax_use:0
msgid "Purchase"
-msgstr "Compra"
+msgstr ""
#. module: account
#: view:account.installer:0
-#: view:account.installer.modules:0
-#: model:ir.actions.act_window,name:account.action_account_installer
#: view:wizard.multi.charts.accounts:0
msgid "Accounting Application Configuration"
-msgstr "Configuración aplicaciones contabilidad"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Value amount: 0.02"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.open_board_account
#: model:ir.ui.menu,name:account.menu_board_account
msgid "Accounting Dashboard"
-msgstr "Tablero de contabilidad"
+msgstr ""
#. module: account
#: field:account.bank.statement,balance_start:0
+#: field:account.treasury.report,starting_balance:0
msgid "Starting Balance"
-msgstr "Saldo inicial"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/account_invoice.py:1345
#, python-format
msgid "No Partner Defined !"
-msgstr "¡No se ha definido empresa!"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_period_close
#: model:ir.actions.act_window,name:account.action_account_period_tree
#: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
msgid "Close a Period"
-msgstr "Cerrar un periodo"
+msgstr ""
#. module: account
-#: field:account.analytic.balance,empty_acc:0
-msgid "Empty Accounts ? "
-msgstr "¿Cuentas vacías? "
+#: field:account.financial.report,display_detail:0
+msgid "Display details"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "VAT:"
-msgstr "IVA:"
+msgstr ""
+
+#. module: account
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
#. module: account
#: help:account.analytic.line,amount_currency:0
@@ -3219,65 +3216,53 @@ msgid ""
"The amount expressed in the related account currency if not equal to the "
"company one."
msgstr ""
-"El importe expresado en la moneda contable relacionada no es igual al de la "
-"compañía."
#. module: account
-#: report:account.move.voucher:0
-msgid "Journal:"
-msgstr "Diario:"
-
-#. module: account
-#: view:account.bank.statement:0
-#: selection:account.bank.statement,state:0
-#: view:account.invoice:0
-#: selection:account.invoice,state:0
-#: view:account.invoice.report:0
-#: selection:account.invoice.report,state:0
-#: selection:account.journal.period,state:0
-#: report:account.move.voucher:0
-#: view:account.subscription:0
-#: selection:account.subscription,state:0
-#: selection:report.invoice.created,state:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_configuration_installer
-msgid "Accounting Chart Configuration"
-msgstr "Configuración plan contable"
+#: model:ir.actions.act_window,name:account.action_account_unreconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
+#: model:ir.actions.act_window,name:account.action_account_unreconcile_select
+msgid "Unreconcile Entries"
+msgstr ""
#. module: account
#: field:account.tax.code,notprintable:0
#: field:account.tax.code.template,notprintable:0
msgid "Not Printable in Invoice"
-msgstr "No se imprime en factura"
+msgstr ""
#. module: account
#: report:account.vat.declaration:0
#: field:account.vat.declaration,chart_tax_id:0
msgid "Chart of Tax"
-msgstr "Plan de impuestos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_cash_statement.py:315
+#, python-format
+msgid "The closing balance should be the same than the computed balance!"
+msgstr ""
#. module: account
#: view:account.journal:0
msgid "Search Account Journal"
-msgstr "Buscar diario"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
msgid "Pending Invoice"
-msgstr "Factura pendiente"
+msgstr ""
#. module: account
+#: view:account.invoice.report:0
#: selection:account.subscription,period_type:0
+#: view:analytic.entries.report:0
msgid "year"
-msgstr "año"
+msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Authorised Signatory"
-msgstr "Firma autorizada"
+#: view:product.product:0
+msgid "Purchase Taxes"
+msgstr ""
#. module: account
#: view:validate.account.move.lines:0
@@ -3285,61 +3270,38 @@ msgid ""
"All selected journal entries will be validated and posted. It means you "
"won't be able to modify their accounting fields anymore."
msgstr ""
-"Todos los asientos seleccionados serán validados y asentados. Esto significa "
-"que ya no podrá modificar sus campos contables."
-
-#. module: account
-#: code:addons/account/invoice.py:370
-#, python-format
-msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr "¡No se puede eliminar factura(s) que ya estan abiertas o pagadas!"
-
-#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Total :"
-msgstr "Total :"
#. module: account
#: model:ir.actions.report.xml,name:account.account_transfers
msgid "Transfers"
-msgstr "Transferencias"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: n.a"
-msgstr " importe valor: n.a"
+msgstr ""
#. module: account
#: view:account.chart:0
msgid "Account charts"
-msgstr "Planes contables"
+msgstr ""
#. module: account
#: report:account.vat.declaration:0
msgid "Tax Amount"
-msgstr "Importe impuesto"
-
-#. module: account
-#: view:account.installer:0
-msgid "Your bank and cash accounts"
-msgstr "Sus cuentas bancarias y de caja"
+msgstr ""
#. module: account
#: view:account.move:0
msgid "Search Move"
-msgstr "Buscar movimiento"
+msgstr ""
#. module: account
#: field:account.tax.code,name:0
#: field:account.tax.code.template,name:0
msgid "Tax Case Name"
-msgstr "Nombre código de impuesto"
+msgstr ""
#. module: account
#: report:account.invoice:0
#: model:process.node,name:account.process_node_draftinvoices0
msgid "Draft Invoice"
-msgstr "Factura borrador"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:68
@@ -3348,127 +3310,131 @@ msgid ""
"Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' "
"or 'Done' state!"
msgstr ""
-"¡La(s) factura(s) seleccionada(s) no se puede cancelar ya que está en estado "
-"'Cancelada' o 'Realizada'!"
#. module: account
-#: code:addons/account/account.py:522
-#, python-format
-msgid ""
-"You cannot change the type of account from '%s' to '%s' type as it contains "
-"account entries!"
+#: view:account.invoice.line:0
+msgid "Quantity :"
msgstr ""
-"¡No puede cambiar el tipo de cuenta de '%s' a '%s' si contiene asientos "
-"contables!"
#. module: account
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-msgid "Counterpart"
-msgstr "Contrapartida"
+#: field:account.aged.trial.balance,period_length:0
+#: report:account.aged_trial_balance:0
+msgid "Period Length (days)"
+msgstr ""
#. module: account
-#: view:account.journal:0
-msgid "Invoicing Data"
-msgstr "Datos facturación"
+#: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
+msgid "Print Sale/Purchase Journal"
+msgstr ""
#. module: account
#: field:account.invoice.report,state:0
msgid "Invoice State"
-msgstr "Estado factura"
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,categ_id:0
msgid "Category of Product"
-msgstr "Categoría de producto"
-
-#. module: account
-#: view:account.move:0
-#: field:account.move,narration:0
-#: view:account.move.line:0
-#: field:account.move.line,narration:0
-msgid "Narration"
-msgstr "Notas"
+msgstr ""
#. module: account
#: view:account.addtmpl.wizard:0
#: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
msgid "Create Account"
-msgstr "Crear cuenta"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_report_account_type_sales
msgid "Report of the Sales by Account Type"
-msgstr "Informe de las ventas por tipo de cuenta"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Unreconciled Journal Items"
+msgstr ""
+
+#. module: account
+#: sql_constraint:res.currency:0
+msgid "The currency code must be unique per company!"
+msgstr ""
#. module: account
#: selection:account.account.type,close_method:0
msgid "Detail"
-msgstr "Detalle"
+msgstr ""
#. module: account
-#: field:account.installer,bank_accounts_id:0
-msgid "Your Bank and Cash Accounts"
-msgstr "Sus cuentas de banco y caja"
+#: code:addons/account/account_invoice.py:850
+#, python-format
+msgid ""
+"Can not create the invoice !\n"
+"The related payment term is probably misconfigured as it gives a computed "
+"amount greater than the total invoiced amount. The latest line of your "
+"payment term must be of type 'balance' to avoid rounding issues."
+msgstr ""
#. module: account
#: report:account.invoice:0
msgid "VAT :"
-msgstr "CIF/NIF:"
+msgstr ""
#. module: account
-#: field:account.installer,charts:0
-#: model:ir.actions.act_window,name:account.action_account_chart
-#: model:ir.actions.act_window,name:account.action_account_tree
-#: model:ir.ui.menu,name:account.menu_action_account_tree2
#: report:account.account.balance:0
+#: report:account.aged_trial_balance:0
+#: report:account.central.journal:0
+#: report:account.financial.report:0
+#: report:account.general.journal:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: field:account.installer,charts:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: model:ir.actions.act_window,name:account.action_account_chart
+#: model:ir.actions.act_window,name:account.action_account_tree
+#: model:ir.ui.menu,name:account.menu_action_account_tree2
msgid "Chart of Accounts"
-msgstr "Plan contable"
+msgstr ""
#. module: account
#: view:account.tax.chart:0
msgid "(If you do not select period it will take all open periods)"
-msgstr "(si no selecciona periodo se usarán todos los periodos abiertos)"
+msgstr ""
#. module: account
#: field:account.journal,centralisation:0
msgid "Centralised counterpart"
-msgstr "Homólogo centralizado"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#, python-format
+msgid "You can not create journal items on a \"view\" account %s %s"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_partner_reconcile_process
msgid "Reconcilation Process partner by partner"
-msgstr "Proceso conciliación empresa por empresa"
+msgstr ""
#. module: account
#: selection:account.automatic.reconcile,power:0
msgid "2"
-msgstr "2"
+msgstr ""
#. module: account
#: view:account.chart:0
msgid "(If you do not select Fiscal year it will take all open fiscal years)"
msgstr ""
-"(Si no selecciona un ejercicio fiscal se tendrán en cuenta todos los "
-"ejercicios fiscales)"
#. module: account
#: selection:account.aged.trial.balance,filter:0
#: report:account.analytic.account.journal:0
#: selection:account.balance.report,filter:0
#: field:account.bank.statement,date:0
-#: field:account.bank.statement.line,date:0
-#: selection:account.bs.report,filter:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@@ -3478,90 +3444,90 @@ msgstr ""
#: field:account.entries.report,date:0
#: selection:account.general.journal,filter:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.invoice.report,date:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: view:account.move:0
#: field:account.move,date:0
#: field:account.move.line.reconcile.writeoff,date_p:0
#: report:account.overdue:0
#: selection:account.partner.balance,filter:0
#: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
#: selection:account.print.journal,filter:0
#: selection:account.print.journal,sort_selection:0
#: selection:account.report.general.ledger,filter:0
#: selection:account.report.general.ledger,sortby:0
#: field:account.subscription.generate,date:0
#: field:account.subscription.line,date:0
-#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: xsl:account.transfer:0
#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/account_journal.py:195
+#: code:addons/account/report/account_journal.py:198
#: code:addons/account/report/common_report_header.py:97
#: field:analytic.entries.report,date:0
#, python-format
msgid "Date"
-msgstr "Fecha"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Post"
+msgstr ""
#. module: account
#: view:account.unreconcile:0
#: view:account.unreconcile.reconcile:0
msgid "Unreconcile"
-msgstr "Romper conciliación"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:79
-#, python-format
-msgid "The journal must have default credit and debit account"
-msgstr "El diario debe tener una cuenta haber y debe por defecto."
+#: view:account.analytic.line:0
+#: field:account.bank.statement,user_id:0
+#: view:account.journal:0
+#: field:account.journal,user_id:0
+#: view:analytic.entries.report:0
+#: field:analytic.entries.report,user_id:0
+msgid "User"
+msgstr ""
#. module: account
#: view:account.chart.template:0
msgid "Chart of Accounts Template"
-msgstr "Plantilla del plan contable"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2095
+#: code:addons/account/account.py:2297
#, python-format
msgid ""
"Maturity date of entry line generated by model line '%s' of model '%s' is "
"based on partner payment term!\n"
"Please define partner on it!"
msgstr ""
-"La fecha de vencimiento del apunte generado por la línea del modelo '%s' del "
-"modelo '%s' se basa en el plazo de pago de la empresa.\n"
-"¡Por favor, defina la empresa en él!"
#. module: account
-#: code:addons/account/account_move_line.py:810
+#: code:addons/account/account_move_line.py:846
#, python-format
msgid "Some entries are already reconciled !"
-msgstr "¡Algunos asientos ya están conciliados!"
-
-#. module: account
-#: code:addons/account/account.py:1204
-#, python-format
-msgid ""
-"You cannot validate a Journal Entry unless all journal items are in same "
-"chart of accounts !"
msgstr ""
-"¡No puede validar un asiento hasta que todos los movimientos estén en el "
-"mismo plan contable!"
#. module: account
#: view:account.tax:0
msgid "Account Tax"
-msgstr "Cuenta de impuestos"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
msgid "Budgets"
-msgstr "Presupuestos"
+msgstr ""
#. module: account
#: selection:account.aged.trial.balance,filter:0
#: selection:account.balance.report,filter:0
-#: selection:account.bs.report,filter:0
#: selection:account.central.journal,filter:0
#: selection:account.common.account.report,filter:0
#: selection:account.common.journal.report,filter:0
@@ -3570,22 +3536,25 @@ msgstr "Presupuestos"
#: selection:account.general.journal,filter:0
#: selection:account.partner.balance,filter:0
#: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
#: selection:account.print.journal,filter:0
#: selection:account.report.general.ledger,filter:0
#: selection:account.vat.declaration,filter:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
+#: code:addons/account/report/common_report_header.py:100
+#, python-format
msgid "No Filters"
-msgstr "No filtros"
+msgstr ""
#. module: account
-#: selection:account.analytic.journal,type:0
-msgid "Situation"
-msgstr "Situación"
+#: view:account.invoice.report:0
+msgid "Pro-forma Invoices"
+msgstr ""
#. module: account
#: view:res.partner:0
msgid "History"
-msgstr "Historial"
+msgstr ""
#. module: account
#: help:account.tax,applicable_type:0
@@ -3594,119 +3563,105 @@ msgid ""
"If not applicable (computed through a Python code), the tax won't appear on "
"the invoice."
msgstr ""
-"Si no es aplicable (calculado a través de un código Python), el impuesto no "
-"aparecerá en la factura."
#. module: account
#: view:account.tax:0
#: view:account.tax.template:0
msgid "Applicable Code (if type=code)"
-msgstr "Código aplicable (si tipo=código)"
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,product_qty:0
msgid "Qty"
-msgstr "Cantidad"
+msgstr ""
#. module: account
#: field:account.invoice.report,address_contact_id:0
msgid "Contact Address Name"
-msgstr "Nombre dirección contacto"
+msgstr ""
#. module: account
#: field:account.move.line,blocked:0
msgid "Litigation"
-msgstr "Desacuerdo"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Search Analytic Lines"
-msgstr "Buscar líneas analíticas"
+msgstr ""
#. module: account
#: field:res.partner,property_account_payable:0
msgid "Account Payable"
-msgstr "Cuenta a pagar"
-
-#. module: account
-#: constraint:account.move:0
-msgid ""
-"You cannot create entries on different periods/journals in the same move"
msgstr ""
-"No puede crear asientos con movimientos en distintos periodos/diarios"
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
msgid "Payment Order"
-msgstr "Orden de pago"
+msgstr ""
#. module: account
#: help:account.account.template,reconcile:0
msgid ""
"Check this option if you want the user to reconcile entries in this account."
msgstr ""
-"Marque esta opción si desea que el usuario concilie asientos en esta cuenta."
#. module: account
#: model:ir.actions.report.xml,name:account.account_account_balance_landscape
msgid "Account balance"
-msgstr "Balance contable"
+msgstr ""
#. module: account
#: report:account.invoice:0
#: field:account.invoice.line,price_unit:0
msgid "Unit Price"
-msgstr "Precio unidad"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tree1
msgid "Analytic Items"
-msgstr "Apuntes analíticos"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1168
#, python-format
msgid "Unable to change tax !"
-msgstr "¡No ha sido posible cambiar el impuesto!"
+msgstr ""
#. module: account
#: field:analytic.entries.report,nbr:0
msgid "#Entries"
-msgstr "Nº asientos"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1422
-#, python-format
-msgid ""
-"You selected an Unit of Measure which is not compatible with the product."
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft Refund"
msgstr ""
-"Ha seleccionado una unidad de medida que no es compatible con el producto."
-
-#. module: account
-#: code:addons/account/invoice.py:473
-#, python-format
-msgid ""
-"The Payment Term of Supplier does not have Payment Term Lines(Computation) "
-"defined !"
-msgstr ""
-"¡El plazo de pago de los proveedores no tiene líneas de plazo de pago "
-"(Cálculo) definidas!"
#. module: account
#: view:account.state.open:0
msgid "Open Invoice"
-msgstr "Abrir factura"
+msgstr ""
#. module: account
#: field:account.invoice.tax,factor_tax:0
msgid "Multipication factor Tax code"
-msgstr "Código impuesto factor multiplicación"
+msgstr ""
#. module: account
#: view:account.fiscal.position:0
msgid "Mapping"
-msgstr "Asignaciones"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:932
+#, python-format
+msgid ""
+"You cannot create an invoice on a centralised journal. Uncheck the "
+"centralised counterpart box in the related journal from the configuration "
+"menu."
+msgstr ""
#. module: account
#: field:account.account,name:0
@@ -3714,35 +3669,69 @@ msgstr "Asignaciones"
#: report:account.analytic.account.inverted.balance:0
#: field:account.bank.statement,name:0
#: field:account.chart.template,name:0
+#: report:account.financial.report:0
#: field:account.model.line,name:0
#: field:account.move.line,name:0
#: field:account.move.reconcile,name:0
#: field:account.subscription,name:0
msgid "Name"
-msgstr "Nombre"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_aged_trial_balance
msgid "Account Aged Trial balance Report"
-msgstr "Informe de balance de comprobación de vencimientos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "You can not create journal items on a closed account %s %s"
+msgstr ""
#. module: account
#: field:account.move.line,date:0
msgid "Effective date"
-msgstr "Fecha vigencia"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_bank_tree
+#: model:ir.ui.menu,name:account.menu_action_bank_tree
+msgid "Setup your Bank Accounts"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:53
#, python-format
msgid "Standard Encoding"
-msgstr "Codificación estándar"
+msgstr ""
#. module: account
#: help:account.journal,analytic_journal_id:0
msgid "Journal for analytic entries"
-msgstr "Diario para asientos analíticos"
+msgstr ""
#. module: account
+#: constraint:account.aged.trial.balance:0
+#: constraint:account.balance.report:0
+#: constraint:account.central.journal:0
+#: constraint:account.common.account.report:0
+#: constraint:account.common.journal.report:0
+#: constraint:account.common.partner.report:0
+#: constraint:account.common.report:0
+#: constraint:account.general.journal:0
+#: constraint:account.partner.balance:0
+#: constraint:account.partner.ledger:0
+#: constraint:account.print.journal:0
+#: constraint:account.report.general.ledger:0
+#: constraint:account.vat.declaration:0
+#: constraint:accounting.report:0
+msgid ""
+"The fiscalyear, periods or chart of account chosen have to belong to the "
+"same company."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.todo.category,name:account.category_accounting_configuration
#: model:ir.ui.menu,name:account.menu_finance
#: model:process.node,name:account.process_node_accountingentries0
#: model:process.node,name:account.process_node_supplieraccountingentries0
@@ -3750,7 +3739,12 @@ msgstr "Diario para asientos analíticos"
#: view:product.template:0
#: view:res.partner:0
msgid "Accounting"
-msgstr "Contabilidad"
+msgstr ""
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current year"
+msgstr ""
#. module: account
#: help:account.central.journal,amount_currency:0
@@ -3761,18 +3755,23 @@ msgid ""
"Print Report with the currency column if the currency is different then the "
"company currency"
msgstr ""
-"Imprime informe con la columna de la moneda si la moneda es distinta de la "
-"moneda de la compañía."
+
+#. module: account
+#: help:account.account,unrealized_gain_loss:0
+msgid ""
+"Value of Loss or Gain due to changes in exchange rate when doing multi-"
+"currency transactions."
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "General Accounting"
-msgstr "Contabilidad general"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Balance :"
-msgstr "Saldo :"
+msgstr ""
#. module: account
#: help:account.fiscalyear.close,journal_id:0
@@ -3782,125 +3781,93 @@ msgid ""
"debit/credit accounts, of type 'situation' and with a centralized "
"counterpart."
msgstr ""
-"Lo más recomendable es usar un diario dedicado a contener los asientos de "
-"apertura de todos los ejercicios. Tenga en cuenta que lo debería definir con "
-"cuentas de debe/haber por defecto, de tipo 'situación' y con una "
-"contrapartida centralizada."
#. module: account
#: view:account.installer:0
-#: view:account.installer.modules:0
#: view:wizard.multi.charts.accounts:0
msgid "title"
-msgstr "título"
+msgstr ""
#. module: account
#: view:account.invoice:0
#: view:account.period:0
#: view:account.subscription:0
msgid "Set to Draft"
-msgstr "Cambiar a borrador"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form
msgid "Recurring Lines"
-msgstr "Líneas recurrentes"
+msgstr ""
#. module: account
#: field:account.partner.balance,display_partner:0
msgid "Display Partners"
-msgstr "Mostrar empresas"
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Validate"
-msgstr "Validar"
+msgstr ""
#. module: account
-#: sql_constraint:account.model.line:0
-msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
+#: report:account.analytic.account.cost_ledger:0
+#: report:account.analytic.account.quantity_cost_ledger:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_cost
+#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
+msgid "Cost Ledger"
msgstr ""
-"¡Valor de haber o debe en el modelo erróneo (haber o debe debería ser \"0\")!"
#. module: account
-#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
-msgid ""
-"From this report, you can have an overview of the amount invoiced to your "
-"customer as well as payment delays. The tool search can also be used to "
-"personalise your Invoices reports and so, match this analysis to your needs."
+#: model:account.financial.report,name:account.account_financial_report_assets0
+msgid "Assets"
msgstr ""
-"A partir de este informe, puede tener una visión general del importe "
-"facturado a sus clientes, así como los retrasos en los pagos. La herramienta "
-"de búsqueda también se puede utilizar para personalizar los informes de las "
-"facturas y por tanto, adaptar este análisis a sus necesidades."
#. module: account
#: view:account.invoice.confirm:0
msgid "Confirm Invoices"
-msgstr "Confirmar facturas"
+msgstr ""
#. module: account
#: selection:account.account,currency_mode:0
msgid "Average Rate"
-msgstr "Tasa promedio"
+msgstr ""
+
+#. module: account
+#: field:account.balance.report,display_account:0
+#: field:account.common.account.report,display_account:0
+#: field:account.report.general.ledger,display_account:0
+msgid "Display Accounts"
+msgstr ""
#. module: account
#: view:account.state.open:0
msgid "(Invoice should be unreconciled if you want to open it)"
-msgstr "(debería romper la conciliación si desea abrir la factura)"
+msgstr ""
#. module: account
-#: field:account.aged.trial.balance,period_from:0
-#: field:account.balance.report,period_from:0
-#: field:account.bs.report,period_from:0
-#: field:account.central.journal,period_from:0
#: field:account.chart,period_from:0
-#: field:account.common.account.report,period_from:0
-#: field:account.common.journal.report,period_from:0
-#: field:account.common.partner.report,period_from:0
-#: field:account.common.report,period_from:0
-#: field:account.general.journal,period_from:0
-#: field:account.partner.balance,period_from:0
-#: field:account.partner.ledger,period_from:0
-#: field:account.pl.report,period_from:0
-#: field:account.print.journal,period_from:0
-#: field:account.report.general.ledger,period_from:0
-#: field:account.vat.declaration,period_from:0
msgid "Start period"
-msgstr "Periodo inicial"
+msgstr ""
#. module: account
#: field:account.tax,name:0
#: field:account.tax.template,name:0
#: report:account.vat.declaration:0
msgid "Tax Name"
-msgstr "Nombre impuesto"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_finance_configuration
-#: view:res.company:0
-msgid "Configuration"
-msgstr "Configuración"
+msgstr ""
#. module: account
#: model:account.payment.term,name:account.account_payment_term
#: model:account.payment.term,note:account.account_payment_term
msgid "30 Days End of Month"
-msgstr "30 días fin de mes"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_balance
#: model:ir.actions.report.xml,name:account.account_analytic_account_balance
msgid "Analytic Balance"
-msgstr "Saldo analítico"
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-msgid "Net Loss"
-msgstr "Pérdida neta"
+msgstr ""
#. module: account
#: help:account.account,active:0
@@ -3908,23 +3875,42 @@ msgid ""
"If the active field is set to False, it will allow you to hide the account "
"without removing it."
msgstr ""
-"Si el campo activo se desmarca, permite ocultar la cuenta sin eliminarla."
+
+#. module: account
+#: view:account.move.line:0
+msgid "Posted Journal Items"
+msgstr ""
#. module: account
#: view:account.tax.template:0
msgid "Search Tax Templates"
-msgstr "Buscar plantillas impuestos"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
msgid "Draft Entries"
-msgstr "Asientos borrador"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Day of the Month= -1"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Number of Days: 30"
+msgstr ""
#. module: account
#: field:account.account,shortcut:0
#: field:account.account.template,shortcut:0
msgid "Shortcut"
-msgstr "Abreviación"
+msgstr ""
+
+#. module: account
+#: constraint:account.fiscalyear:0
+msgid "Error! The start date of the fiscal year must be before his end date."
+msgstr ""
#. module: account
#: view:account.account:0
@@ -3932,13 +3918,20 @@ msgstr "Abreviación"
#: view:account.account.template:0
#: field:account.account.template,user_type:0
#: view:account.account.type:0
+#: field:account.account.type,name:0
#: field:account.bank.accounts.wizard,account_type:0
#: field:account.entries.report,user_type:0
+#: selection:account.financial.report,type:0
#: model:ir.model,name:account.model_account_account_type
#: field:report.account.receivable,type:0
#: field:report.account_type.sales,user_type:0
msgid "Account Type"
-msgstr "Tipo de cuenta"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Bank Account Owner"
+msgstr ""
#. module: account
#: report:account.account.balance:0
@@ -3947,12 +3940,12 @@ msgstr "Tipo de cuenta"
#: model:ir.actions.report.xml,name:account.account_account_balance
#: model:ir.ui.menu,name:account.menu_general_Balance_report
msgid "Trial Balance"
-msgstr "Balance de sumas y saldos"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_invoice_cancel
msgid "Cancel the Selected Invoices"
-msgstr "Cancelar las facturas seleccionadas"
+msgstr ""
#. module: account
#: help:product.category,property_account_income_categ:0
@@ -3961,13 +3954,19 @@ msgid ""
"This account will be used to value outgoing stock for the current product "
"category using sale price"
msgstr ""
-"Esta cuenta se utilizará para valorar el stock saliente para la categoría de "
-"producto actual utilizando el precio de venta."
#. module: account
#: selection:account.automatic.reconcile,power:0
msgid "3"
-msgstr "3"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:97
+#, python-format
+msgid ""
+"You haven't supplied enough argument to compute the initial balance, please "
+"select a period and journal in the context."
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_supplieranalyticcost0
@@ -3975,32 +3974,22 @@ msgid ""
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft supplier invoices."
msgstr ""
-"Los costes analíticos (hojas de servicios, algunos productos comprados, ...) "
-"provienen de las cuentas analíticas. Estos generan facturas borrador de "
-"proveedor."
#. module: account
#: view:account.bank.statement:0
msgid "Close CashBox"
-msgstr "Cerrar caja"
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,due_delay:0
msgid "Avg. Due Delay"
-msgstr "Retraso promedio deuda"
+msgstr ""
#. module: account
#: view:account.entries.report:0
msgid "Acc.Type"
-msgstr "Tipo cuenta"
-
-#. module: account
-#: code:addons/account/invoice.py:714
-#, python-format
-msgid "Global taxes defined, but are not in invoice lines !"
msgstr ""
-"¡Impuestos globales definidos, pero no están en líneas de la factura!"
#. module: account
#: field:account.entries.report,month:0
@@ -4011,76 +4000,84 @@ msgstr ""
#: field:report.account.sales,month:0
#: field:report.account_type.sales,month:0
msgid "Month"
-msgstr "Mes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1231
+#, python-format
+msgid ""
+"You can not do this modification on a confirmed entry! You can just change "
+"some non legal fields or you must unconfirm the journal entry first! \n"
+"%s"
+msgstr ""
+
+#. module: account
+#: field:res.company,paypal_account:0
+msgid "Paypal Account"
+msgstr ""
#. module: account
#: field:account.invoice.report,uom_name:0
msgid "Reference UoM"
-msgstr "Referencia UdM"
+msgstr ""
#. module: account
#: field:account.account,note:0
#: field:account.account.template,note:0
msgid "Note"
-msgstr "Nota"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Reverse balance sign"
+msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Overdue Account"
-msgstr "Cuenta atrasos"
+msgstr ""
#. module: account
-#: selection:account.invoice,state:0
-#: report:account.overdue:0
-msgid "Paid"
-msgstr "Pagado"
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:184
+#, python-format
+msgid "Balance Sheet (Liability account)"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,date_invoice:0
+msgid "Keep empty to use the current date"
+msgstr ""
#. module: account
#: field:account.invoice,tax_line:0
msgid "Tax Lines"
-msgstr "Líneas de impuestos"
+msgstr ""
#. module: account
#: field:account.tax,base_code_id:0
msgid "Account Base Code"
-msgstr "Código base cuenta"
-
-#. module: account
-#: help:account.move,state:0
-msgid ""
-"All manually created new journal entry are usually in the state 'Unposted', "
-"but you can set the option to skip that state on the related journal. In "
-"that case, they will be behave as journal entries automatically created by "
-"the system on document validation (invoices, bank statements...) and will be "
-"created in 'Posted' state."
msgstr ""
-"Todos los asientos creados manualmente están, por lo general, en el estado "
-"'No asentado', pero puede configurar la opción de omitir ese estado en el "
-"diario correspondiente. En ese caso, se comportan como asientos creados "
-"automáticamente por el sistema en la validación de documentos (facturas, "
-"extractos bancarios, ...) y se crearán en estado 'Asentado'."
#. module: account
#: code:addons/account/account_analytic_line.py:91
#, python-format
msgid "There is no expense account defined for this product: \"%s\" (id:%d)"
msgstr ""
-"No se ha definido una cuenta de gastos para este producto: \"%s\" (id:%d)"
#. module: account
#: view:res.partner:0
msgid "Customer Accounting Properties"
-msgstr "Propiedades de contabilidad del cliente"
+msgstr ""
#. module: account
-#: field:account.invoice.tax,name:0
-msgid "Tax Description"
-msgstr "Descripción impuesto"
+#: help:res.company,paypal_account:0
+msgid "Paypal username (usually email) for receiving online payments."
+msgstr ""
#. module: account
#: selection:account.aged.trial.balance,target_move:0
#: selection:account.balance.report,target_move:0
-#: selection:account.bs.report,target_move:0
#: selection:account.central.journal,target_move:0
#: selection:account.chart,target_move:0
#: selection:account.common.account.report,target_move:0
@@ -4091,58 +4088,57 @@ msgstr "Descripción impuesto"
#: selection:account.move.journal,target_move:0
#: selection:account.partner.balance,target_move:0
#: selection:account.partner.ledger,target_move:0
-#: selection:account.pl.report,target_move:0
#: selection:account.print.journal,target_move:0
#: selection:account.report.general.ledger,target_move:0
#: selection:account.tax.chart,target_move:0
#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
#: code:addons/account/report/common_report_header.py:68
#, python-format
msgid "All Posted Entries"
-msgstr "Todos los asientos asentados"
+msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:357
+#: code:addons/account/account_bank_statement.py:367
#, python-format
msgid "Statement %s is confirmed, journal items are created."
msgstr ""
-"Se ha confirmado el extracto %s, se han creado los asientos contables."
-
-#. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr "¡Error! La duración del ejercicio fiscal no es válido. "
#. module: account
#: field:report.aged.receivable,name:0
msgid "Month Range"
-msgstr "Rango mensual"
+msgstr ""
#. module: account
#: help:account.analytic.balance,empty_acc:0
msgid "Check if you want to display Accounts with 0 balance too."
-msgstr "Compruebe si también desea mostrar cuentas con saldo 0."
+msgstr ""
#. module: account
#: view:account.tax:0
msgid "Compute Code"
-msgstr "Código cálculo"
+msgstr ""
#. module: account
#: view:account.account.template:0
msgid "Default taxes"
-msgstr "Impuestos por defecto"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
#, python-format
-msgid "Free Reference"
-msgstr "Referencia libre"
+msgid "End of Fiscal Year Entry"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
msgid "Periodical Processing"
-msgstr "Procesamiento periódico"
+msgstr ""
+
+#. module: account
+#: constraint:account.analytic.line:0
+msgid "You can not create analytic line on view account."
+msgstr ""
#. module: account
#: help:account.move.line,state:0
@@ -4150,198 +4146,191 @@ msgid ""
"When new move line is created the state will be 'Draft'.\n"
"* When all the payments are done it will be in 'Valid' state."
msgstr ""
-"Cuando se crea un nuevo apunte, el estado será 'Borrador'.\n"
-"* Cuando se realicen todos los pagos, el estado será 'Válido'"
#. module: account
#: field:account.journal,view_id:0
msgid "Display Mode"
-msgstr "Modo de visualización"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_importinvoice0
msgid "Statement from invoice or payment"
-msgstr "Extracto desde factura o pago"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid " day of the month: 0"
-msgstr " día del mes: 0"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_chart
msgid "Account chart"
-msgstr "Plan contable"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Main Title 1 (bold, underlined)"
+msgstr ""
#. module: account
-#: report:account.account.balance.landscape:0
#: report:account.analytic.account.balance:0
#: report:account.central.journal:0
msgid "Account Name"
-msgstr "Nombre de cuenta"
+msgstr ""
#. module: account
#: help:account.fiscalyear.close,report_name:0
msgid "Give name of the new entries"
-msgstr "Indique el nombre de los nuevos asientos."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_invoice_report
msgid "Invoices Statistics"
-msgstr "Estadísticas de facturas"
+msgstr ""
+
+#. module: account
+#: field:account.account,exchange_rate:0
+msgid "Exchange Rate"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderreconcilation0
msgid "Bank statements are entered in the system."
-msgstr "Han sido introducidos los extractos bancarios en el sistema."
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_reconcile.py:133
#, python-format
msgid "Reconcile Writeoff"
-msgstr "Desfase conciliación"
-
-#. module: account
-#: field:account.model.line,date_maturity:0
-#: report:account.overdue:0
-msgid "Maturity date"
-msgstr "Fecha vencimiento"
+msgstr ""
#. module: account
#: view:report.account.receivable:0
msgid "Accounts by Type"
-msgstr "Cuentas por tipo"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
-#: field:account.bank.statement,balance_end_real:0
+#: field:account.bank.statement,balance_end_cash:0
msgid "Closing Balance"
-msgstr "Saldo de cierre"
+msgstr ""
#. module: account
#: code:addons/account/report/common_report_header.py:92
#, python-format
msgid "Not implemented"
-msgstr "No implementado"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,visible:0
+msgid "Can be Visible?"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_journal_select
msgid "Account Journal Select"
-msgstr "Contabilidad. Seleccionar diario"
-
-#. module: account
-#: view:account.invoice:0
-msgid "Print Invoice"
-msgstr "Imprimir factura"
+msgstr ""
#. module: account
#: view:account.tax.template:0
msgid "Credit Notes"
-msgstr "Abonos"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2067
-#: code:addons/account/wizard/account_use_model.py:69
-#, python-format
-msgid "Unable to find a valid period !"
-msgstr "¡No ha sido posible encontrar un período válido!"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "Voucher No"
-msgstr "Núm. de bono"
+#: sql_constraint:account.period:0
+msgid "The name of the period must be unique per company!"
+msgstr ""
#. module: account
#: view:wizard.multi.charts.accounts:0
msgid "res_config_contents"
-msgstr "res_config_contenidos"
+msgstr ""
#. module: account
#: view:account.unreconcile:0
msgid "Unreconciliate Transactions"
-msgstr "Romper conciliación transacciones"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,visible:0
+msgid ""
+"Set this to False if you don't want this template to be used actively in the "
+"wizard that generate Chart of Accounts from templates, this is useful when "
+"you want to generate accounts of this template only when loading its child "
+"template."
+msgstr ""
#. module: account
#: view:account.use.model:0
msgid "Create Entries From Models"
-msgstr "Crear asientos desde modelos"
+msgstr ""
#. module: account
+#: field:account.account,reconcile:0
#: field:account.account.template,reconcile:0
msgid "Allow Reconciliation"
-msgstr "Permitir conciliación"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1082
+#, python-format
+msgid ""
+"You can not modify company of this period as some journal items exists."
+msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Analytic Account Statistics"
-msgstr "Estadísticas cuenta analítica"
+msgstr ""
#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid ""
-"This will automatically configure your chart of accounts, bank accounts, "
-"taxes and journals according to the selected template"
+#: report:account.vat.declaration:0
+msgid "Based On"
msgstr ""
-"Permite configurar automáticamente su plan contable, cuentas de bancos, "
-"impuestos y diarios según la plantilla seleccionada"
#. module: account
#: field:account.tax,price_include:0
#: field:account.tax.template,price_include:0
msgid "Tax Included in Price"
-msgstr "Impuestos incluidos en precio"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr "Contabilidad. Libro de costes analíticos para informe diario"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_model_form
#: model:ir.ui.menu,name:account.menu_action_model_form
msgid "Recurring Models"
-msgstr "Modelos recurrentes"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1266
+#, python-format
+msgid "Encoding error"
+msgstr ""
#. module: account
#: selection:account.automatic.reconcile,power:0
msgid "4"
-msgstr "4"
+msgstr ""
#. module: account
#: view:account.invoice:0
+#: xsl:account.transfer:0
msgid "Change"
-msgstr "Cambiar"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:1290
-#: code:addons/account/account.py:1318
-#: code:addons/account/account.py:1325
-#: code:addons/account/account_move_line.py:1055
-#: code:addons/account/invoice.py:896
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
-#: code:addons/account/wizard/account_fiscalyear_close.py:78
-#: code:addons/account/wizard/account_fiscalyear_close.py:81
-#: code:addons/account/wizard/account_move_journal.py:165
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
-#, python-format
-msgid "UserError"
-msgstr "Error de usuario"
+#: selection:account.journal,type:0
+msgid "Bank and Cheques"
+msgstr ""
#. module: account
#: field:account.journal,type_control_ids:0
msgid "Type Controls"
-msgstr "Controles de tipo"
+msgstr ""
#. module: account
#: help:account.journal,default_credit_account_id:0
msgid "It acts as a default account for credit amount"
-msgstr "Actúa como una cuenta por defecto para los importes en el haber."
-
-#. module: account
-#: help:account.partner.ledger,reconcil:0
-msgid "Consider reconciled entries"
-msgstr "Considerar asientos conciliados."
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_validate_account_move_line
@@ -4349,101 +4338,112 @@ msgstr "Considerar asientos conciliados."
#: view:validate.account.move:0
#: view:validate.account.move.lines:0
msgid "Post Journal Entries"
-msgstr "Asentar asientos"
+msgstr ""
#. module: account
#: selection:account.invoice,state:0
#: selection:account.invoice.report,state:0
#: selection:report.invoice.created,state:0
msgid "Cancelled"
-msgstr "Cancelado"
+msgstr ""
#. module: account
#: help:account.bank.statement,balance_end_cash:0
msgid "Closing balance based on cashBox"
-msgstr "Saldo de cierre basado en la caja."
-
-#. module: account
-#: constraint:account.account:0
-#: constraint:account.tax.code:0
-msgid "Error ! You can not create recursive accounts."
-msgstr "¡Error! No se pueden crear cuentas recursivas."
-
-#. module: account
-#: constraint:account.account:0
-msgid ""
-"You cannot create an account! \n"
-"Make sure if the account has children then it should be type \"View\"!"
msgstr ""
-"¡No se puede crear la cuenta! \n"
-"¡Asegúrese de que si la cuenta tiene hijos su tipo sea \"Vista\"!"
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid "Example"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:839
+#, python-format
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
+msgstr ""
+
+#. module: account
+#: view:account.tax:0
+#: view:account.tax.template:0
+msgid "Keep empty to use the income account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3316
+#, python-format
+msgid "Purchase Tax %.2f%%"
+msgstr ""
#. module: account
#: view:account.subscription.generate:0
#: model:ir.actions.act_window,name:account.action_account_subscription_generate
#: model:ir.ui.menu,name:account.menu_generate_subscription
msgid "Generate Entries"
-msgstr "Generar asientos"
+msgstr ""
#. module: account
#: help:account.vat.declaration,chart_tax_id:0
msgid "Select Charts of Taxes"
-msgstr "Selecciona plan de impuestos."
+msgstr ""
#. module: account
#: view:account.fiscal.position:0
#: field:account.fiscal.position,account_ids:0
#: field:account.fiscal.position.template,account_ids:0
msgid "Account Mapping"
-msgstr "Mapeo de cuentas"
+msgstr ""
#. module: account
#: selection:account.bank.statement.line,type:0
#: view:account.invoice:0
#: view:account.invoice.report:0
-#: code:addons/account/invoice.py:320
+#: code:addons/account/account_invoice.py:346
#, python-format
msgid "Customer"
-msgstr "Cliente"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Confirmed"
-msgstr "Confirmado"
+msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Cancelled Invoice"
-msgstr "Factura cancelada"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:73
-#, python-format
-msgid "You must define an analytic journal of type '%s' !"
-msgstr "¡Debe definir un diario analítico de tipo '%s'!"
-
-#. module: account
-#: code:addons/account/account.py:1397
+#: code:addons/account/account.py:1584
#, python-format
msgid ""
"Couldn't create move with currency different from the secondary currency of "
"the account \"%s - %s\". Clear the secondary currency field of the account "
"definition if you want to accept all currencies."
msgstr ""
-"No se pudo crear movimiento con moneda distinta de la moneda secundaria de "
-"la cuenta \"%s - %s\". Borrar el campo de moneda secundaria de la definición "
-"de la cuenta si desea aceptar todas las monedas."
+
+#. module: account
+#: selection:account.bank.statement,state:0
+msgid "New"
+msgstr ""
#. module: account
#: field:account.invoice.refund,date:0
msgid "Operation date"
-msgstr "Fecha operación"
+msgstr ""
+
+#. module: account
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconciliation Transactions"
+msgstr ""
#. module: account
#: field:account.tax,ref_tax_code_id:0
#: field:account.tax.template,ref_tax_code_id:0
msgid "Refund Tax Code"
-msgstr "Código impuesto reintegro"
+msgstr ""
#. module: account
#: view:validate.account.move:0
@@ -4451,58 +4451,67 @@ msgid ""
"All draft account entries in this journal and period will be validated. It "
"means you won't be able to modify their accounting fields anymore."
msgstr ""
-"Todos los asientos borrador de este diario y periodo serán validados. Esto "
-"significa que ya no podrá modificar sus campos contables."
#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Account Balance -"
-msgstr "Balance cuenta -"
+#: model:ir.ui.menu,name:account.menu_finance_configuration
+msgid "Configuration"
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,date1:0
msgid "Starting Date"
-msgstr "Fecha inicial"
+msgstr ""
#. module: account
#: field:account.chart.template,property_account_income:0
msgid "Income Account on Product Template"
-msgstr "Cuenta de ingresos en plantilla producto"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3137
+#, python-format
+msgid "MISC"
+msgstr ""
+
+#. module: account
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
+msgstr ""
#. module: account
#: help:res.partner,last_reconciliation_date:0
msgid ""
"Date on which the partner accounting entries were reconciled last time"
msgstr ""
-"Fecha en que los asientos contables de la empresa fueron conciliados por "
-"última vez."
#. module: account
#: field:account.fiscalyear.close,fy2_id:0
msgid "New Fiscal Year"
-msgstr "Nuevo ejercicio fiscal"
+msgstr ""
#. module: account
#: view:account.invoice:0
#: view:account.tax.template:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:68
#: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened
#: model:ir.actions.act_window,name:account.action_invoice_tree
#: model:ir.actions.report.xml,name:account.account_invoices
#: view:report.invoice.created:0
#: field:res.partner,invoice_ids:0
+#, python-format
msgid "Invoices"
-msgstr "Facturas"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
-#, python-format
-msgid ""
-"Please verify the price of the invoice !\n"
-"The real total does not match the computed total."
+#: view:account.invoice:0
+msgid "My invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.bank.accounts.wizard,account_type:0
+msgid "Check"
msgstr ""
-"¡Compruebe el importe de la factura!\n"
-"El total real no concuerda con el total calculado."
#. module: account
#: view:account.invoice:0
@@ -4510,68 +4519,96 @@ msgstr ""
#: view:account.invoice.report:0
#: field:account.invoice.report,user_id:0
msgid "Salesman"
-msgstr "Comercial"
+msgstr ""
#. module: account
#: view:account.invoice.report:0
msgid "Invoiced"
-msgstr "Facturado"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Posted Journal Entries"
+msgstr ""
#. module: account
#: view:account.use.model:0
msgid "Use Model"
-msgstr "Usar modelo"
+msgstr ""
+
+#. module: account
+#: help:account.invoice,partner_bank_id:0
+msgid ""
+"Bank Account Number to which the invoice will be paid. A Company bank "
+"account if this is a Customer Invoice or Supplier Refund, otherwise a "
+"Partner bank account number."
+msgstr ""
#. module: account
#: view:account.state.open:0
msgid "No"
-msgstr "No"
+msgstr ""
#. module: account
#: help:account.invoice.tax,tax_code_id:0
msgid "The tax basis of the tax declaration."
-msgstr "La base del impuesto de la declaración de impuestos."
+msgstr ""
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Add"
-msgstr "Añadir"
+msgstr ""
#. module: account
-#: help:account.invoice,date_invoice:0
-msgid "Keep empty to use the current date"
-msgstr "Dejarlo vacío para utilizar la fecha actual."
-
-#. module: account
-#: selection:account.journal,type:0
-msgid "Bank and Cheques"
-msgstr "Banco y cheques"
+#: selection:account.invoice,state:0
+#: report:account.overdue:0
+msgid "Paid"
+msgstr ""
#. module: account
#: view:account.period.close:0
msgid "Are you sure?"
-msgstr "¿Está seguro?"
+msgstr ""
#. module: account
#: help:account.move.line,statement_id:0
msgid "The bank statement used for bank reconciliation"
-msgstr "El extracto bancario utilizado para la conciliación bancaria"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
msgid "Draft invoices are validated. "
-msgstr "Facturas borrador son validadas. "
+msgstr ""
+
+#. module: account
+#: constraint:account.account.template:0
+msgid ""
+"Configuration Error!\n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:923
+#, python-format
+msgid "Opening Period"
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Journal Entries to Review"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
#: view:account.subscription:0
msgid "Compute"
-msgstr "Calcular"
+msgstr ""
#. module: account
#: field:account.tax,type_tax_use:0
msgid "Tax Application"
-msgstr "Aplicación impuesto"
+msgstr ""
#. module: account
#: view:account.move:0
@@ -4596,63 +4633,51 @@ msgstr "Aplicación impuesto"
#: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale
#, python-format
msgid "Journal Items"
-msgstr "Apuntes contables"
+msgstr ""
#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Assets Accounts)"
-msgstr "Balance de situación (cuentas de activos)"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "Third Party (Country)"
-msgstr "Tercera parte (país)"
-
-#. module: account
-#: code:addons/account/account.py:938
-#: code:addons/account/account.py:940
-#: code:addons/account/account.py:1181
-#: code:addons/account/account.py:1393
-#: code:addons/account/account.py:1397
-#: code:addons/account/account_cash_statement.py:249
-#: code:addons/account/account_move_line.py:780
-#: code:addons/account/account_move_line.py:803
-#: code:addons/account/account_move_line.py:805
-#: code:addons/account/account_move_line.py:808
-#: code:addons/account/account_move_line.py:810
-#: code:addons/account/account_move_line.py:1117
+#: code:addons/account/account.py:1095
+#: code:addons/account/account.py:1097
+#: code:addons/account/account.py:1329
+#: code:addons/account/account.py:1580
+#: code:addons/account/account.py:1584
+#: code:addons/account/account.py:3385
+#: code:addons/account/account_move_line.py:823
+#: code:addons/account/account_move_line.py:843
+#: code:addons/account/account_move_line.py:846
#: code:addons/account/report/common_report_header.py:92
-#: code:addons/account/wizard/account_change_currency.py:39
-#: code:addons/account/wizard/account_change_currency.py:60
-#: code:addons/account/wizard/account_change_currency.py:65
-#: code:addons/account/wizard/account_change_currency.py:71
+#: code:addons/account/wizard/account_change_currency.py:38
+#: code:addons/account/wizard/account_change_currency.py:59
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#: code:addons/account/wizard/account_financial_report.py:70
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40
-#: code:addons/account/wizard/account_report_common.py:120
-#: code:addons/account/wizard/account_report_common.py:126
+#: code:addons/account/wizard/account_report_common.py:145
+#: code:addons/account/wizard/account_report_common.py:151
#, python-format
msgid "Error"
-msgstr "Error"
+msgstr ""
#. module: account
-#: field:account.analytic.Journal.report,date2:0
#: field:account.analytic.balance,date2:0
#: field:account.analytic.cost.ledger,date2:0
#: field:account.analytic.cost.ledger.journal.report,date2:0
#: field:account.analytic.inverted.balance,date2:0
+#: field:account.analytic.journal.report,date2:0
msgid "End of period"
-msgstr "Fin del período"
+msgstr ""
#. module: account
#: view:res.partner:0
msgid "Bank Details"
-msgstr "Detalles del banco"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:720
-#, python-format
-msgid "Taxes missing !"
-msgstr "¡Faltan impuestos!"
+#: model:ir.actions.act_window,help:account.action_account_partner_balance
+msgid ""
+"This report is analysis by partner. It is a PDF report containing one line "
+"per partner representing the cumulative credit balance."
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree
@@ -4660,96 +4685,124 @@ msgid ""
"To print an analytics (or costs) journal for a given period. The report give "
"code, move name, account number, general amount and analytic amount."
msgstr ""
-"Para imprimir un diario analítico (o costes) para un periodo determinado. En "
-"el informe se lista el código, el nombre de movimiento, número de cuenta, el "
-"importe general y el importe analítico."
#. module: account
-#: help:account.journal,refund_journal:0
-msgid "Fill this if the journal is to be used for refunds of invoices."
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_receivable_graph
+msgid "Balance by Type of Account"
msgstr ""
-"Marque esta opción si el diario se utilizará para facturas rectificativas "
-"(abonos)."
#. module: account
#: view:account.fiscalyear.close:0
msgid "Generate Fiscal Year Opening Entries"
-msgstr "Generar asientos apertura ejercicio fiscal"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_user
+msgid "Accountant"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_treasury_report_all
+msgid ""
+"From this view, have an analysis of your treasury. It sums the balance of "
+"every accounting entries made on liquidity accounts per period."
+msgstr ""
#. module: account
#: field:account.journal,group_invoice_lines:0
msgid "Group Invoice Lines"
-msgstr "Agrupar líneas de factura"
+msgstr ""
#. module: account
#: view:account.invoice.cancel:0
#: view:account.invoice.confirm:0
msgid "Close"
-msgstr "Cerrar"
+msgstr ""
#. module: account
#: field:account.bank.statement.line,move_ids:0
msgid "Moves"
-msgstr "Movimientos"
+msgstr ""
+
+#. module: account
+#: view:report.hr.timesheet.invoice.journal:0
+msgid "Sale journal in this month"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_vat_declaration
#: model:ir.model,name:account.model_account_vat_declaration
msgid "Account Vat Declaration"
-msgstr "Contabilidad. Declaración IVA"
+msgstr ""
+
+#. module: account
+#: report:account.invoice:0
+msgid "Price"
+msgstr ""
#. module: account
#: view:account.period:0
msgid "To Close"
-msgstr "Para cerrar"
+msgstr ""
#. module: account
-#: field:account.journal,allow_date:0
-msgid "Check Date not in the Period"
-msgstr "Comprobar fecha no está en el periodo"
+#: field:account.treasury.report,date:0
+msgid "Beginning of Period Date"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:1210
+#: code:addons/account/account.py:1361
#, python-format
msgid ""
"You can not modify a posted entry of this journal !\n"
"You should set the journal to allow cancelling entries if you want to do "
"that."
msgstr ""
-"¡No se puede modificar una asiento asentado de este diario!\n"
-"Debe configurar el diario para permitir la cancelación de los asientos si "
-"quiere hacerlo."
#. module: account
#: model:ir.ui.menu,name:account.account_template_folder
msgid "Templates"
-msgstr "Plantillas"
+msgstr ""
+
+#. module: account
+#: field:account.invoice.tax,name:0
+msgid "Tax Description"
+msgstr ""
#. module: account
#: field:account.tax,child_ids:0
msgid "Child Tax Accounts"
-msgstr "Cuentas impuestos hijas"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:940
+#: code:addons/account/account.py:1097
#, python-format
msgid "Start period should be smaller then End period"
-msgstr "Periodo inicial debería ser más pequeño que el periodo final"
+msgstr ""
#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "5"
-msgstr "5"
+#: help:account.tax,price_include:0
+#: help:account.tax.template,price_include:0
+msgid ""
+"Check this if the price you use on the product and invoices includes this "
+"tax."
+msgstr ""
#. module: account
#: report:account.analytic.account.balance:0
msgid "Analytic Balance -"
-msgstr "Balance analítico -"
+msgstr ""
#. module: account
+#: report:account.account.balance:0
#: field:account.aged.trial.balance,target_move:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,target_move:0
-#: field:account.bs.report,target_move:0
#: report:account.central.journal:0
#: field:account.central.journal,target_move:0
#: field:account.chart,target_move:0
@@ -4759,75 +4812,91 @@ msgstr "Balance analítico -"
#: field:account.common.report,target_move:0
#: report:account.general.journal:0
#: field:account.general.journal,target_move:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.move.journal,target_move:0
+#: report:account.partner.balance:0
#: field:account.partner.balance,target_move:0
#: field:account.partner.ledger,target_move:0
-#: field:account.pl.report,target_move:0
#: field:account.print.journal,target_move:0
#: field:account.report.general.ledger,target_move:0
#: field:account.tax.chart,target_move:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,target_move:0
-#: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:accounting.report,target_move:0
msgid "Target Moves"
-msgstr "Movimientos destino"
+msgstr ""
+
+#. module: account
+#: model:account.payment.term,name:account.account_payment_term_net
+#: model:account.payment.term,note:account.account_payment_term_net
+msgid "30 Net Days"
+msgstr ""
#. module: account
#: field:account.subscription,period_type:0
msgid "Period Type"
-msgstr "Período: Unidad de tiempo"
+msgstr ""
#. module: account
#: view:account.invoice:0
#: field:account.invoice,payment_ids:0
#: selection:account.vat.declaration,based_on:0
+#: code:addons/account/report/account_tax_report.py:70
+#, python-format
msgid "Payments"
-msgstr "Pagos"
+msgstr ""
#. module: account
#: view:account.tax:0
msgid "Reverse Compute Code"
-msgstr "Código cálculo inverso"
+msgstr ""
#. module: account
#: field:account.subscription.line,move_id:0
msgid "Entry"
-msgstr "Asiento"
+msgstr ""
#. module: account
#: field:account.tax,python_compute_inv:0
#: field:account.tax.template,python_compute_inv:0
msgid "Python Code (reverse)"
-msgstr "Código Python (inverso)"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_payment_term_form
#: model:ir.ui.menu,name:account.menu_action_payment_term_form
msgid "Payment Terms"
-msgstr "Plazos de pago"
+msgstr ""
+
+#. module: account
+#: help:account.chart.template,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sale and purchase rates or choose from list of taxes. This last "
+"choice assumes that the set of tax defined on this template is complete"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: field:account.financial.report,children_ids:0
+#: model:ir.model,name:account.model_account_financial_report
+msgid "Account Report"
+msgstr ""
#. module: account
#: field:account.journal.column,name:0
msgid "Column Name"
-msgstr "Nombre columna"
+msgstr ""
#. module: account
#: view:account.general.journal:0
msgid ""
"This report gives you an overview of the situation of your general journals"
msgstr ""
-"Este informe proporciona una vista general de la situación de sus diarios"
#. module: account
#: field:account.entries.report,year:0
@@ -4838,74 +4907,72 @@ msgstr ""
#: field:report.account.sales,name:0
#: field:report.account_type.sales,name:0
msgid "Year"
-msgstr "Año"
+msgstr ""
#. module: account
#: field:account.bank.statement,starting_details_ids:0
msgid "Opening Cashbox"
-msgstr "Apertura caja"
+msgstr ""
#. module: account
#: view:account.payment.term.line:0
msgid "Line 1:"
-msgstr "Línea 1:"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:1167
+#: code:addons/account/account.py:1315
#, python-format
msgid "Integrity Error !"
-msgstr "¡Error de integridad!"
+msgstr ""
#. module: account
#: field:account.tax.template,description:0
msgid "Internal Name"
-msgstr "Nombre interno"
+msgstr ""
#. module: account
#: selection:account.subscription,period_type:0
msgid "month"
-msgstr "mes"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:293
-#, python-format
-msgid "Journal Item \"%s\" is not valid"
-msgstr "Apunte \"%s\" no es válido"
-
-#. module: account
-#: view:account.payment.term:0
-msgid "Description on invoices"
-msgstr "Descripción en facturas"
+msgstr ""
#. module: account
#: field:account.partner.reconcile.process,next_partner_id:0
msgid "Next Partner to Reconcile"
-msgstr "Próxima empresa a conciliar"
+msgstr ""
#. module: account
#: field:account.invoice.tax,account_id:0
#: field:account.move.line,tax_code_id:0
msgid "Tax Account"
-msgstr "Cuenta impuesto"
+msgstr ""
#. module: account
#: view:account.automatic.reconcile:0
msgid "Reconciliation Result"
-msgstr "Resultado de conciliación"
+msgstr ""
#. module: account
-#: view:account.bs.report:0
-#: model:ir.actions.act_window,name:account.action_account_bs_report
-#: model:ir.ui.menu,name:account.menu_account_bs_report
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
+#: model:account.financial.report,name:account.account_financial_report_balancesheet0
+#: model:ir.actions.act_window,name:account.action_account_report_bs
+#: model:ir.ui.menu,name:account.menu_account_report_bs
msgid "Balance Sheet"
-msgstr "Balance de situación"
+msgstr ""
+
+#. module: account
+#: view:account.general.journal:0
+#: model:ir.ui.menu,name:account.menu_account_general_journal
+msgid "General Journals"
+msgstr ""
+
+#. module: account
+#: field:account.journal,allow_date:0
+msgid "Check Date in Period"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.final_accounting_reports
msgid "Accounting Reports"
-msgstr "Informes contables"
+msgstr ""
#. module: account
#: field:account.move,line_id:0
@@ -4913,29 +4980,29 @@ msgstr "Informes contables"
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open
#: model:ir.actions.act_window,name:account.action_move_line_form
msgid "Entries"
-msgstr "Asientos"
+msgstr ""
#. module: account
#: view:account.entries.report:0
msgid "This Period"
-msgstr "Este periodo"
+msgstr ""
#. module: account
#: field:account.analytic.line,product_uom_id:0
#: field:account.move.line,product_uom_id:0
msgid "UoM"
-msgstr "UdM"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:138
+#: code:addons/account/wizard/account_invoice_refund.py:146
#, python-format
msgid "No Period found on Invoice!"
-msgstr "No se encontro un período en la factura"
+msgstr ""
#. module: account
#: view:account.tax.template:0
msgid "Compute Code (if type=code)"
-msgstr "Código para calcular (si tipo=código)"
+msgstr ""
#. module: account
#: selection:account.analytic.journal,type:0
@@ -4946,7 +5013,12 @@ msgstr "Código para calcular (si tipo=código)"
#: view:account.tax.template:0
#: selection:account.tax.template,type_tax_use:0
msgid "Sale"
-msgstr "Venta"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Report"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
@@ -4958,16 +5030,11 @@ msgstr "Venta"
#: view:account.move.line:0
#: field:account.tax,amount:0
#: field:account.tax.template,amount:0
+#: xsl:account.transfer:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,amount:0
msgid "Amount"
-msgstr "Importe"
-
-#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:41
-#, python-format
-msgid "End of Fiscal Year Entry"
-msgstr "Asiento fin de ejercicio fiscal"
+msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_customerinvoice0
@@ -4977,57 +5044,43 @@ msgstr "Asiento fin de ejercicio fiscal"
#: model:process.transition,name:account.process_transition_suppliervalidentries0
#: model:process.transition,name:account.process_transition_validentries0
msgid "Validation"
-msgstr "Validación"
-
-#. module: account
-#: help:account.invoice,reconciled:0
-msgid ""
-"The Journal Entry of the invoice have been totally reconciled with one or "
-"several Journal Entries of payment."
msgstr ""
-"El asiento de la factura ha sido totalmente conciliado con uno o varios "
-"asientos de pago."
#. module: account
#: field:account.tax,child_depend:0
#: field:account.tax.template,child_depend:0
msgid "Tax on Children"
-msgstr "Impuesto en hijos"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid ""
-"You can not create move line on receivable/payable account without partner"
msgstr ""
-"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin "
-"una empresa."
#. module: account
-#: code:addons/account/account.py:2067
-#: code:addons/account/wizard/account_use_model.py:69
-#, python-format
-msgid "No period found !"
-msgstr "¡No se ha encontrado período!"
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Template Tax Fiscal Position"
+msgstr ""
#. module: account
#: field:account.journal,update_posted:0
msgid "Allow Cancelling Entries"
-msgstr "Permitir cancelación de asientos"
+msgstr ""
#. module: account
#: field:account.tax.code,sign:0
msgid "Coefficent for parent"
-msgstr "Coeficiente para padre"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Analytic Accounts with a past deadline."
+msgstr ""
#. module: account
#: report:account.partner.balance:0
msgid "(Account/Partner) Name"
-msgstr "Nombre de Cuenta/Empresa"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Transaction"
-msgstr "Transacción"
+msgstr ""
#. module: account
#: help:account.tax,base_code_id:0
@@ -5039,33 +5092,32 @@ msgstr "Transacción"
#: help:account.tax.template,ref_tax_code_id:0
#: help:account.tax.template,tax_code_id:0
msgid "Use this code for the VAT declaration."
-msgstr "Utilice este código para la declaración del IVA."
+msgstr ""
#. module: account
-#: view:account.move.line:0
-msgid "Debit/Credit"
-msgstr "Debe/Haber"
+#: field:account.partner.reconcile.process,progress:0
+msgid "Progress"
+msgstr ""
#. module: account
#: view:report.hr.timesheet.invoice.journal:0
msgid "Analytic Entries Stats"
-msgstr "Estadística de asientos analíticos"
+msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
-#: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
-msgid "Tax Code Templates"
-msgstr "Plantillas códigos de impuestos"
+#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+msgid "Cash and Banks"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_installer
msgid "account.installer"
-msgstr "account.instalador"
+msgstr ""
#. module: account
#: field:account.tax.template,include_base_amount:0
msgid "Include in Base Amount"
-msgstr "Incluir en importe base"
+msgstr ""
#. module: account
#: help:account.payment.term.line,days:0
@@ -5073,75 +5125,66 @@ msgid ""
"Number of days to add before computation of the day of month.If Date=15/01, "
"Number of Days=22, Day of Month=-1, then the due date is 28/02."
msgstr ""
-"Número de días a añadir antes del cálculo del día de mes. Si fecha=15/01, "
-"Número de días=22, Día de mes=-1, entonces la fecha de vencimiento es 28/02."
#. module: account
-#: code:addons/account/account.py:2896
-#: code:addons/account/installer.py:283
-#: code:addons/account/installer.py:295
-#, python-format
-msgid "Bank Journal "
-msgstr "Diario bancario "
+#: view:account.payment.term.line:0
+msgid "Amount Computation"
+msgstr ""
#. module: account
#: view:account.journal:0
msgid "Entry Controls"
-msgstr "Controles de asiento"
+msgstr ""
#. module: account
#: view:account.analytic.chart:0
#: view:project.account.analytic.line:0
msgid "(Keep empty to open the current situation)"
-msgstr "(dejarlo vacío para abrir la situación actual)"
+msgstr ""
#. module: account
-#: field:account.analytic.Journal.report,date1:0
#: field:account.analytic.balance,date1:0
#: field:account.analytic.cost.ledger,date1:0
#: field:account.analytic.cost.ledger.journal.report,date1:0
#: field:account.analytic.inverted.balance,date1:0
+#: field:account.analytic.journal.report,date1:0
msgid "Start of period"
-msgstr "Inicio del período"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1193
-#, python-format
-msgid ""
-"You can not do this modification on a reconciled entry ! Please note that "
-"you can just change some non important fields !"
msgstr ""
-"¡No puede hacer esta modificación en un asiento conciliado! ¡Observe que "
-"sólo puede cambiar algunos campos no importantes!"
#. module: account
#: model:ir.model,name:account.model_account_common_account_report
msgid "Account Common Account Report"
-msgstr "Contabilidad. Informe contable común"
+msgstr ""
#. module: account
#: field:account.bank.statement.line,name:0
+#: field:account.invoice,reference:0
msgid "Communication"
-msgstr "Comunicación"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_analytic_accounting
msgid "Analytic Accounting"
-msgstr "Contabilidad analítica"
+msgstr ""
+
+#. module: account
+#: field:account.partner.ledger,initial_balance:0
+#: field:account.report.general.ledger,initial_balance:0
+msgid "Include Initial Balances"
+msgstr ""
#. module: account
#: selection:account.invoice,type:0
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Customer Refund"
-msgstr "Factura rectificativa de cliente"
+msgstr ""
#. module: account
-#: view:account.account:0
-#: field:account.account,tax_ids:0
-#: field:account.account.template,tax_ids:0
-msgid "Default Taxes"
-msgstr "Impuestos por defecto"
+#: constraint:account.move:0
+msgid ""
+"You can not create more than one move per period on centralized journal"
+msgstr ""
#. module: account
#: field:account.tax,ref_tax_sign:0
@@ -5149,30 +5192,40 @@ msgstr "Impuestos por defecto"
#: field:account.tax.template,ref_tax_sign:0
#: field:account.tax.template,tax_sign:0
msgid "Tax Code Sign"
-msgstr "Signo código impuesto"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_report_invoice_created
msgid "Report of Invoices Created within Last 15 days"
-msgstr "Informe de facturas creadas en los últimos 15 días"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Number of Days: 14"
+msgstr ""
#. module: account
#: field:account.fiscalyear,end_journal_period_id:0
msgid "End of Year Entries Journal"
-msgstr "Diario asientos cierre del ejercicio"
+msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:331
-#: code:addons/account/invoice.py:405
-#: code:addons/account/invoice.py:505
-#: code:addons/account/invoice.py:520
-#: code:addons/account/invoice.py:528
-#: code:addons/account/invoice.py:545
-#: code:addons/account/invoice.py:1347
+#: code:addons/account/account.py:3463
+#: code:addons/account/account_bank_statement.py:338
+#: code:addons/account/account_invoice.py:436
+#: code:addons/account/account_invoice.py:536
+#: code:addons/account/account_invoice.py:551
+#: code:addons/account/account_invoice.py:559
+#: code:addons/account/account_invoice.py:581
#: code:addons/account/wizard/account_move_journal.py:63
#, python-format
msgid "Configuration Error !"
-msgstr "¡Error de configuración!"
+msgstr ""
+
+#. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Amount To Pay"
+msgstr ""
#. module: account
#: help:account.partner.reconcile.process,to_reconcile:0
@@ -5181,19 +5234,16 @@ msgid ""
"something to reconcile or not. This figure already count the current partner "
"as reconciled."
msgstr ""
-"Estos son las empresas restantes a las que debería comprobar si hay algo "
-"para conciliar o no. Esta cifra ya contabiliza la empresa actual como "
-"conciliada."
#. module: account
#: view:account.subscription.line:0
msgid "Subscription lines"
-msgstr "Líneas de los asientos periódicos"
+msgstr ""
#. module: account
#: field:account.entries.report,quantity:0
msgid "Products Quantity"
-msgstr "Cantidad de productos"
+msgstr ""
#. module: account
#: view:account.entries.report:0
@@ -5202,69 +5252,50 @@ msgstr "Cantidad de productos"
#: selection:account.move,state:0
#: view:account.move.line:0
msgid "Unposted"
-msgstr "No asentado"
+msgstr ""
#. module: account
#: view:account.change.currency:0
#: model:ir.actions.act_window,name:account.action_account_change_currency
#: model:ir.model,name:account.model_account_change_currency
msgid "Change Currency"
-msgstr "Cambiar moneda"
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+msgid "This action will erase taxes"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_accountingentries0
#: model:process.node,note:account.process_node_supplieraccountingentries0
msgid "Accounting entries."
-msgstr "Asientos contables."
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Payment Date"
-msgstr "Fecha de pago"
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "6"
-msgstr "6"
+msgstr ""
#. module: account
#: view:account.analytic.account:0
#: model:ir.actions.act_window,name:account.action_account_analytic_account_form
-#: model:ir.actions.act_window,name:account.action_analytic_open
#: model:ir.ui.menu,name:account.account_analytic_def_account
msgid "Analytic Accounts"
-msgstr "Cuentas analíticas"
-
-#. module: account
-#: help:account.account.type,report_type:0
-msgid ""
-"According value related accounts will be display on respective reports "
-"(Balance Sheet Profit & Loss Account)"
msgstr ""
-"Según el valor relacionado las cuentas se mostrarán en sus respectivos "
-"informes (Balance de situación contable pérdidas y ganancias)."
#. module: account
-#: field:account.report.general.ledger,sortby:0
-msgid "Sort By"
-msgstr "Ordenar por"
-
-#. module: account
-#: code:addons/account/account.py:1326
-#, python-format
-msgid ""
-"There is no default default credit account defined \n"
-"on journal \"%s\""
+#: view:account.invoice.report:0
+msgid "Customer Invoices And Refunds"
msgstr ""
-"No se ha definido una cuenta haber por defecto \n"
-"en el diario \"%s\""
#. module: account
+#: field:account.analytic.line,amount_currency:0
#: field:account.entries.report,amount_currency:0
#: field:account.model.line,amount_currency:0
#: field:account.move.line,amount_currency:0
msgid "Amount Currency"
-msgstr "Importe divisa"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:39
@@ -5273,13 +5304,11 @@ msgid ""
"Specified Journal does not have any account move entries in draft state for "
"this period"
msgstr ""
-"El diario indicado no tiene asientos contables en estado borrador para este "
-"período"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_move_line
msgid "Lines to reconcile"
-msgstr "Líneas a conciliar"
+msgstr ""
#. module: account
#: report:account.analytic.account.balance:0
@@ -5289,22 +5318,34 @@ msgstr "Líneas a conciliar"
#: field:account.invoice.line,quantity:0
#: field:account.model.line,quantity:0
#: field:account.move.line,quantity:0
+#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,unit_amount:0
#: field:report.account.sales,quantity:0
#: field:report.account_type.sales,quantity:0
msgid "Quantity"
-msgstr "Cantidad"
+msgstr ""
#. module: account
#: view:account.move.line:0
msgid "Number (Move)"
-msgstr "Número (movimiento)"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries during last 7 days"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Normal Text"
+msgstr ""
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice Options"
-msgstr "Opciones factura rectificativa (abono)"
+msgstr ""
#. module: account
#: help:account.automatic.reconcile,power:0
@@ -5312,8 +5353,6 @@ msgid ""
"Number of partial amounts that can be combined to find a balance point can "
"be chosen as the power of the automatic reconciliation"
msgstr ""
-"La potencia de la conciliación automática a seleccionar es el número de los "
-"importes parciales que se pueden combinar para encontrar un saldo a cero."
#. module: account
#: help:account.payment.term.line,sequence:0
@@ -5321,21 +5360,19 @@ msgid ""
"The sequence field is used to order the payment term lines from the lowest "
"sequences to the higher ones"
msgstr ""
-"El campo secuencia es usado para ordenar las líneas de plazos de pago en "
-"orden ascendente."
#. module: account
#: view:account.fiscal.position.template:0
#: field:account.fiscal.position.template,name:0
msgid "Fiscal Position Template"
-msgstr "Plantilla de posición fiscal"
+msgstr ""
#. module: account
#: view:account.analytic.chart:0
#: view:account.chart:0
#: view:account.tax.chart:0
msgid "Open Charts"
-msgstr "Abrir plan contable"
+msgstr ""
#. module: account
#: view:account.fiscalyear.close.state:0
@@ -5345,11 +5382,6 @@ msgid ""
"impossible any new entry record. Close a fiscal year when you need to "
"finalize your end of year results definitive "
msgstr ""
-"Si no debe introducir más asientos en un ejercicio fiscal, lo puede cerrar "
-"desde aquí. Se cerrarán todos los períodos abiertos en este ejercicio que "
-"hará imposible introducir ningún asiento nuevo. Cierre un ejercicio fiscal "
-"cuando necesite finalizar los resultados de fin de ejercicio "
-"definitivamente. "
#. module: account
#: field:account.central.journal,amount_currency:0
@@ -5359,118 +5391,136 @@ msgstr ""
#: field:account.print.journal,amount_currency:0
#: field:account.report.general.ledger,amount_currency:0
msgid "With Currency"
-msgstr "Con divisa"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Open CashBox"
-msgstr "Abrir caja"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Automatic formatting"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:963
+#, python-format
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one from the configuration of the accounting menu."
+msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
msgid "Reconcile With Write-Off"
-msgstr "Conciliación con desfase"
+msgstr ""
#. module: account
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
msgid "Fixed Amount"
-msgstr "Importe fijo"
+msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Valid Up to"
-msgstr "Válido hasta"
+msgstr ""
#. module: account
-#: view:board.board:0
-msgid "Aged Receivables"
-msgstr "A cobrar vencidos"
+#: view:account.journal:0
+msgid "Invoicing Data"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
msgid "Account Automatic Reconcile"
-msgstr "Contabilidad. Conciliación automática"
+msgstr ""
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Journal Item"
-msgstr "Apunte contable"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_move_journal
msgid "Move journal"
-msgstr "Diario movimientos"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
#: model:ir.ui.menu,name:account.menu_wizard_fy_close
msgid "Generate Opening Entries"
-msgstr "Generar asientos apertura"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
+#: code:addons/account/account_move_line.py:775
#, python-format
msgid "Already Reconciled!"
-msgstr "¡Ya está conciliado!"
+msgstr ""
#. module: account
#: help:account.tax,type:0
+#: help:account.tax.template,type:0
msgid "The computation method for the tax amount."
-msgstr "El método de cálculo del importe del impuesto."
+msgstr ""
#. module: account
-#: help:account.installer.modules,account_anglo_saxon:0
-msgid ""
-"This module will support the Anglo-Saxons accounting methodology by changing "
-"the accounting logic with stock transactions."
+#: view:account.payment.term.line:0
+msgid "Due Date Computation"
msgstr ""
-"Este módulo soporta la metodología contable anglosajón, cambiando la lógica "
-"contable en las transacciones de stock."
#. module: account
#: field:report.invoice.created,create_date:0
msgid "Create Date"
-msgstr "Fecha de creación"
+msgstr ""
#. module: account
#: view:account.analytic.journal:0
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
#: model:ir.ui.menu,name:account.account_def_analytic_journal
msgid "Analytic Journals"
-msgstr "Diarios analíticos"
+msgstr ""
#. module: account
#: field:account.account,child_id:0
msgid "Child Accounts"
-msgstr "Cuentas hijas"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1229
+#, python-format
+msgid "Move name (id): %s (%s)"
+msgstr ""
#. module: account
#: view:account.move.line.reconcile:0
-#: code:addons/account/account_move_line.py:830
+#: code:addons/account/account_move_line.py:871
#, python-format
msgid "Write-Off"
-msgstr "Desajuste"
+msgstr ""
#. module: account
#: field:res.partner,debit:0
msgid "Total Payable"
-msgstr "Total a pagar"
+msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
-msgid "account.analytic.line.extended"
-msgstr "account.analytic.line.extended"
+#: model:account.account.type,name:account.data_account_type_income
+#: model:account.financial.report,name:account.account_financial_report_income0
+msgid "Income"
+msgstr ""
#. module: account
#: selection:account.bank.statement.line,type:0
#: view:account.invoice:0
#: view:account.invoice.report:0
-#: code:addons/account/invoice.py:322
+#: code:addons/account/account_invoice.py:348
#, python-format
msgid "Supplier"
-msgstr "Proveedor"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -5479,67 +5529,71 @@ msgstr "Proveedor"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "March"
-msgstr "Marzo"
+msgstr ""
#. module: account
#: view:account.account.template:0
msgid "Account Template"
-msgstr "Plantilla de cuenta"
+msgstr ""
+
+#. module: account
+#: report:account.journal.period.print.sale.purchase:0
+msgid "VAT"
+msgstr ""
#. module: account
#: report:account.analytic.account.journal:0
msgid "Account n°"
-msgstr "Cuenta n°"
+msgstr ""
#. module: account
-#: help:account.installer.modules,account_payment:0
-msgid ""
-"Streamlines invoice payment and creates hooks to plug automated payment "
-"systems in."
+#: code:addons/account/account_invoice.py:91
+#, python-format
+msgid "Free Reference"
msgstr ""
-"Agiliza el pago de facturas y crea interfaces para conectar sistemas de pago "
-"automatizados."
#. module: account
#: field:account.payment.term.line,value:0
msgid "Valuation"
-msgstr "Valoración"
+msgstr ""
#. module: account
#: selection:account.aged.trial.balance,result_selection:0
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:306
+#: code:addons/account/report/account_aged_partner_balance.py:376
+#: code:addons/account/report/account_partner_balance.py:301
+#: code:addons/account/report/account_partner_ledger.py:398
#, python-format
msgid "Receivable and Payable Accounts"
-msgstr "Cuentas a cobrar y pagar"
+msgstr ""
#. module: account
#: field:account.fiscal.position.account.template,position_id:0
msgid "Fiscal Mapping"
-msgstr "Mapeo fiscal"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_state_open
#: model:ir.model,name:account.model_account_state_open
msgid "Account State Open"
-msgstr "Contabilidad. Abrir estado"
+msgstr ""
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Max Qty:"
-msgstr "Ctdad máx."
+msgstr ""
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice"
-msgstr "Reintegrar factura"
+msgstr ""
#. module: account
#: field:account.invoice,address_invoice_id:0
msgid "Invoice Address"
-msgstr "Dirección de factura"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -5548,9 +5602,6 @@ msgid ""
"document shows your debit and credit taking in consideration some criteria "
"you can choose by using the search tool."
msgstr ""
-"Desde esta vista obtiene un análisis de sus distintas cuentas financieras. "
-"El documento muestra el debe y haber teniendo en consideración algún "
-"criterio que puede seleccionar usando la herramienta de búsqueda."
#. module: account
#: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5559,10 +5610,6 @@ msgid ""
"OpenERP allows you to define the tax structure and manage it from this menu. "
"You can define both numeric and alphanumeric tax codes."
msgstr ""
-"La definición de los códigos de impuestos depende de la declaración de "
-"impuestos de su país. OpenERP le permite definir y gestionar la estructura "
-"de impuestos desde este menú. Puede definir códigos tanto numéricos como "
-"alfanuméricos."
#. module: account
#: help:account.partner.reconcile.process,progress:0
@@ -5570,8 +5617,6 @@ msgid ""
"Shows you the progress made today on the reconciliation process. Given by \n"
"Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
msgstr ""
-"Le muestra el progreso realizado hoy en el proceso de conciliación. Indica:\n"
-"Empresas conciliadas hoy / (Empresas restantes + Empresas conciliadas hoy)"
#. module: account
#: help:account.payment.term.line,value:0
@@ -5580,9 +5625,6 @@ msgid ""
"that you should have your last line with the type 'Balance' to ensure that "
"the whole amount will be threated."
msgstr ""
-"Seleccione aquí el tipo de valoración relacionada con esta línea de plazo de "
-"pago. Tenga en cuenta que debe tener la última línea con el tipo 'Saldo' "
-"para garantizar que el importe total sea procesado."
#. module: account
#: field:account.invoice,period_id:0
@@ -5590,24 +5632,17 @@ msgstr ""
#: field:report.account.sales,period_id:0
#: field:report.account_type.sales,period_id:0
msgid "Force Period"
-msgstr "Forzar período"
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,nbr:0
msgid "# of Lines"
-msgstr "Nº de líneas"
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:60
-#, python-format
-msgid "New currency is not confirured properly !"
-msgstr "¡La nueva moneda no está configurada correctamente!"
+msgstr ""
#. module: account
#: field:account.aged.trial.balance,filter:0
#: field:account.balance.report,filter:0
-#: field:account.bs.report,filter:0
#: field:account.central.journal,filter:0
#: field:account.common.account.report,filter:0
#: field:account.common.journal.report,filter:0
@@ -5616,139 +5651,140 @@ msgstr "¡La nueva moneda no está configurada correctamente!"
#: field:account.general.journal,filter:0
#: field:account.partner.balance,filter:0
#: field:account.partner.ledger,filter:0
-#: field:account.pl.report,filter:0
#: field:account.print.journal,filter:0
#: field:account.report.general.ledger,filter:0
#: field:account.vat.declaration,filter:0
+#: field:accounting.report,filter:0
+#: field:accounting.report,filter_cmp:0
msgid "Filter by"
-msgstr "Filtrar por"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
+#: code:addons/account/account.py:2273
+#, python-format
+msgid "You have a wrong expression \"%(...)s\" in your model !"
+msgstr ""
+
+#. module: account
+#: field:account.bank.statement.line,date:0
+msgid "Entry Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
#, python-format
msgid "You can not use an inactive account!"
-msgstr "¡No puede utilizar una cuenta inactiva!"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:803
+#: code:addons/account/account_move_line.py:830
#, python-format
msgid "Entries are not of the same account or already reconciled ! "
-msgstr "¡Asientos no son de la misma cuenta o ya están conciliados! "
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,balance_end:0
+msgid "Balance as calculated based on Starting Balance and transaction lines"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_change_currency.py:64
+#: code:addons/account/wizard/account_change_currency.py:70
+#, python-format
+msgid "Current currency is not configured properly !"
+msgstr ""
#. module: account
#: field:account.tax,account_collected_id:0
#: field:account.tax.template,account_collected_id:0
msgid "Invoice Tax Account"
-msgstr "Cuenta impuestos de facturas"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_general_journal
#: model:ir.model,name:account.model_account_general_journal
msgid "Account General Journal"
-msgstr "Contabilidad. Diario general"
-
-#. module: account
-#: code:addons/account/report/common_report_header.py:100
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-#: report:account.vat.declaration:0
-#, python-format
-msgid "No Filter"
-msgstr "Sin filtro"
+msgstr ""
#. module: account
#: field:account.payment.term.line,days:0
msgid "Number of Days"
-msgstr "Número de días"
+msgstr ""
#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "7"
-msgstr "7"
-
-#. module: account
-#: code:addons/account/account_bank_statement.py:391
-#: code:addons/account/invoice.py:370
+#: code:addons/account/account_bank_statement.py:403
+#: code:addons/account/account_invoice.py:401
+#: code:addons/account/wizard/account_period_close.py:51
#, python-format
msgid "Invalid action !"
-msgstr "¡Acción no válida!"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_move_journal.py:102
#, python-format
msgid "Period: %s"
-msgstr "Período: %s"
+msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Template Tax Fiscal Position"
-msgstr "Plantilla posición fiscal impuesto"
+#: model:ir.actions.act_window,name:account.action_review_financial_journals_installer
+msgid "Review your Financial Journals"
+msgstr ""
#. module: account
#: help:account.tax,name:0
msgid "This name will be displayed on reports"
-msgstr "Este nombre se mostrará en los informes"
+msgstr ""
#. module: account
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Printing date"
-msgstr "Fecha impresión"
+msgstr ""
#. module: account
#: selection:account.account.type,close_method:0
#: selection:account.tax,type:0
#: selection:account.tax.template,type:0
msgid "None"
-msgstr "Ninguno"
+msgstr ""
#. module: account
#: view:analytic.entries.report:0
msgid " 365 Days "
-msgstr " 365 Días "
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree3
#: model:ir.ui.menu,name:account.menu_action_invoice_tree3
msgid "Customer Refunds"
-msgstr "Facturas rectificativas de cliente"
+msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid "Amount Computation"
-msgstr "Calculo importe"
+#: field:account.account,foreign_balance:0
+msgid "Foreign Balance"
+msgstr ""
#. module: account
#: field:account.journal.period,name:0
msgid "Journal-Period Name"
-msgstr "Nombre diario-período"
+msgstr ""
#. module: account
#: field:account.invoice.tax,factor_base:0
msgid "Multipication factor for Base code"
-msgstr "Factor de multiplicación para código base"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_common.py:126
+#: code:addons/account/wizard/account_report_common.py:151
#, python-format
msgid "not implemented"
-msgstr "no implementado"
+msgstr ""
#. module: account
#: help:account.journal,company_id:0
msgid "Company related to this journal"
-msgstr "Compañía relacionada con este diario"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_invoice_state.py:44
@@ -5757,36 +5793,56 @@ msgid ""
"Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
"Forma' state!"
msgstr ""
-"¡La(s) factura(s) seleccionada(s) no se puede confirmar ya que no está en "
-"estado 'Borrador' o 'Pro-forma'!"
+
+#. module: account
+#: view:account.subscription:0
+msgid "Running Subscription"
+msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Fiscal Position Remark :"
-msgstr "Observación posición fiscal :"
+msgstr ""
#. module: account
#: view:analytic.entries.report:0
#: model:ir.actions.act_window,name:account.action_analytic_entries_report
#: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
msgid "Analytic Entries Analysis"
-msgstr "Análisis asientos analíticos"
+msgstr ""
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:381
+#, python-format
msgid "Past"
-msgstr "Anterior"
+msgstr ""
+
+#. module: account
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not define children to an account with internal type different of "
+"\"View\"! "
+msgstr ""
+
+#. module: account
+#: help:res.partner.bank,journal_id:0
+msgid ""
+"This journal will be created automatically for this bank account when you "
+"save the record"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Analytic Entry"
-msgstr "Asiento analítico"
+msgstr ""
#. module: account
#: view:res.company:0
#: field:res.company,overdue_msg:0
msgid "Overdue Payments Message"
-msgstr "Mensaje pagos vencidos"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -5796,34 +5852,21 @@ msgid ""
"line of the expense account. OpenERP will propose to you automatically the "
"Tax related to this account and the counterpart \"Account Payable\"."
msgstr ""
-"Esta vista puede ser utilizada por los contables para registrar asientos "
-"rápidamente en OpenERP. Si desea registrar una factura de proveedor, "
-"comience registrando el apunte de la cuenta de gastos. OpenERP le propondrá "
-"automáticamente el impuesto asociado a esta cuenta y la \"cuenta a pagar\" "
-"de contrapartida."
#. module: account
#: field:account.entries.report,date_created:0
msgid "Date Created"
-msgstr "Fecha de creación"
-
-#. module: account
-#: field:account.payment.term.line,value_amount:0
-msgid "Value Amount"
-msgstr "Valor importe"
-
-#. module: account
-#: help:account.journal,code:0
-msgid ""
-"The code will be used to generate the numbers of the journal entries of this "
-"journal."
msgstr ""
-"El código se usará para generar los números de los asientos de este diario."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
+msgid "account.analytic.line.extended"
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "(keep empty to use the current period)"
-msgstr "(vacío para período actual)"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
@@ -5831,139 +5874,137 @@ msgid ""
"As soon as the reconciliation is done, the invoice's state turns to “done” "
"(i.e. paid) in the system."
msgstr ""
-"Tan pronto como la conciliación se ha realizado, el estado de la factura se "
-"convierte en \"Realizada\" (es decir, pagada) en el sistema."
-
-#. module: account
-#: code:addons/account/invoice.py:997
-#, python-format
-msgid "Invoice '%s' is validated."
-msgstr "Factura '%s' es validada."
#. module: account
#: view:account.chart.template:0
#: field:account.chart.template,account_root_id:0
msgid "Root Account"
-msgstr "Cuenta principal"
+msgstr ""
#. module: account
#: field:res.partner,last_reconciliation_date:0
msgid "Latest Reconciliation Date"
-msgstr "Fecha última conciliación"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_line
msgid "Analytic Line"
-msgstr "Línea analítica"
+msgstr ""
#. module: account
#: field:product.template,taxes_id:0
msgid "Customer Taxes"
-msgstr "Impuestos cliente"
+msgstr ""
+
+#. module: account
+#: help:account.model,name:0
+msgid "This is a model for recurring accounting entries"
+msgstr ""
+
+#. module: account
+#: field:wizard.multi.charts.accounts,sale_tax_rate:0
+msgid "Sales Tax(%)"
+msgstr ""
#. module: account
#: view:account.addtmpl.wizard:0
msgid "Create an Account Based on this Template"
-msgstr "Crear una cuenta basada en esta plantilla"
+msgstr ""
#. module: account
#: view:account.account.type:0
#: view:account.tax.code:0
msgid "Reporting Configuration"
-msgstr "Configuración informes"
-
-#. module: account
-#: constraint:account.move.line:0
-msgid "Company must be same for its related account and period."
-msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados."
+msgstr ""
#. module: account
#: field:account.tax,type:0
#: field:account.tax.template,type:0
msgid "Tax Type"
-msgstr "Tipo impuesto"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_template_form
#: model:ir.ui.menu,name:account.menu_action_account_template_form
msgid "Account Templates"
-msgstr "Plantillas de cuentas"
+msgstr ""
+
+#. module: account
+#: help:wizard.multi.charts.accounts,complete_tax_set:0
+msgid ""
+"This boolean helps you to choose if you want to propose to the user to "
+"encode the sales and purchase rates or use the usual m2o fields. This last "
+"choice assumes that the set of tax defined for the chosen template is "
+"complete"
+msgstr ""
#. module: account
#: report:account.vat.declaration:0
msgid "Tax Statement"
-msgstr "Declaración de impuestos"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_res_company
msgid "Companies"
-msgstr "Compañías"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:532
+#: view:account.invoice.report:0
+msgid "Open and Paid Invoices"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,display_detail:0
+msgid "Display children flat"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:629
#, python-format
msgid ""
-"You cannot modify Company of account as its related record exist in Entry "
-"Lines"
+"You can not remove/desactivate an account which is set on a customer or "
+"supplier."
msgstr ""
-"No puede modificar la compañía de la cuenta porqué ya hay apuntes con esta "
-"cuenta"
#. module: account
#: help:account.fiscalyear.close.state,fy_id:0
msgid "Select a fiscal year to close"
-msgstr "Seleccionar un ejercicio fiscal a cerrar."
+msgstr ""
#. module: account
#: help:account.chart.template,tax_template_ids:0
msgid "List of all the taxes that have to be installed by the wizard"
msgstr ""
-"Lista de todos los impuestos que deben ser instalados por el asistente"
#. module: account
#: model:ir.actions.report.xml,name:account.account_intracom
msgid "IntraCom"
-msgstr "IntraCom"
+msgstr ""
#. module: account
#: view:account.move.line.reconcile.writeoff:0
msgid "Information addendum"
-msgstr "Información adicional"
+msgstr ""
#. module: account
-#: field:account.aged.trial.balance,fiscalyear_id:0
-#: field:account.balance.report,fiscalyear_id:0
-#: field:account.bs.report,fiscalyear_id:0
-#: field:account.central.journal,fiscalyear_id:0
#: field:account.chart,fiscalyear:0
-#: field:account.common.account.report,fiscalyear_id:0
-#: field:account.common.journal.report,fiscalyear_id:0
-#: field:account.common.partner.report,fiscalyear_id:0
-#: field:account.common.report,fiscalyear_id:0
-#: field:account.general.journal,fiscalyear_id:0
-#: field:account.partner.balance,fiscalyear_id:0
-#: field:account.partner.ledger,fiscalyear_id:0
-#: field:account.pl.report,fiscalyear_id:0
-#: field:account.print.journal,fiscalyear_id:0
-#: field:account.report.general.ledger,fiscalyear_id:0
-#: field:account.vat.declaration,fiscalyear_id:0
msgid "Fiscal year"
-msgstr "Ejercicio fiscal"
+msgstr ""
#. module: account
#: view:account.move.reconcile:0
msgid "Partial Reconcile Entries"
-msgstr "Asientos parcialmente conciliados"
+msgstr ""
#. module: account
#: view:account.addtmpl.wizard:0
#: view:account.aged.trial.balance:0
-#: view:account.analytic.Journal.report:0
#: view:account.analytic.balance:0
#: view:account.analytic.chart:0
#: view:account.analytic.cost.ledger:0
#: view:account.analytic.cost.ledger.journal.report:0
#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
#: view:account.automatic.reconcile:0
#: view:account.bank.statement:0
#: view:account.change.currency:0
@@ -5973,7 +6014,6 @@ msgstr "Asientos parcialmente conciliados"
#: view:account.fiscalyear.close.state:0
#: view:account.invoice:0
#: view:account.invoice.refund:0
-#: selection:account.invoice.refund,filter_refund:0
#: view:account.journal.select:0
#: view:account.move:0
#: view:account.move.bank.reconcile:0
@@ -5996,95 +6036,83 @@ msgstr "Asientos parcialmente conciliados"
#: view:validate.account.move.lines:0
#, python-format
msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: account
-#: field:account.account.type,name:0
-msgid "Acc. Type Name"
-msgstr "Nombre tipo cuenta"
+msgstr ""
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_receivable
#: selection:account.entries.report,type:0
msgid "Receivable"
-msgstr "A cobrar"
+msgstr ""
+
+#. module: account
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Other Info"
-msgstr "Otra información"
+msgstr ""
#. module: account
#: field:account.journal,default_credit_account_id:0
msgid "Default Credit Account"
-msgstr "Cuenta haber por defecto"
-
-#. module: account
-#: view:account.installer:0
-msgid "Configure Your Accounting Chart"
-msgstr "Configure su plan contable"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid " number of days: 30"
-msgstr " número de días: 30"
+msgstr ""
#. module: account
#: help:account.analytic.line,currency_id:0
msgid "The related account currency if not equal to the company one."
-msgstr "La moneda contable relacionada si no es igual a la de la compañía."
+msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Current"
-msgstr "Actual"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "CashBox"
-msgstr "Caja"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.account_type_cash_equity
+msgid "Equity"
+msgstr ""
#. module: account
#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
msgid "Percentage"
-msgstr "Porcentaje"
+msgstr ""
#. module: account
#: selection:account.report.general.ledger,sortby:0
msgid "Journal & Partner"
-msgstr "Diario y Empresa"
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,power:0
msgid "Power"
-msgstr "Fuerza"
+msgstr ""
#. module: account
-#: field:account.invoice.refund,filter_refund:0
-msgid "Refund Type"
-msgstr "Tipo abono"
-
-#. module: account
-#: report:account.invoice:0
-msgid "Price"
-msgstr "Precio"
+#: code:addons/account/account.py:3385
+#, python-format
+msgid "Cannot generate an unused journal code."
+msgstr ""
#. module: account
#: view:project.account.analytic.line:0
msgid "View Account Analytic Lines"
-msgstr "Ver líneas contables analíticas"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Balance Sheet (Liability Accounts)"
-msgstr "Balance de situación (cuentas de riesgos)"
+msgstr ""
#. module: account
#: field:account.invoice,internal_number:0
#: field:report.invoice.created,number:0
msgid "Invoice Number"
-msgstr "Número factura"
+msgstr ""
#. module: account
#: help:account.tax,include_base_amount:0
@@ -6092,30 +6120,27 @@ msgid ""
"Indicates if the amount of tax must be included in the base amount for the "
"computation of the next taxes"
msgstr ""
-"Indica si el importe del impuesto debe ser incluido en el importe base para "
-"el cálculo de los siguientes impuestos."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_partner_reconcile
msgid "Reconciliation: Go to Next Partner"
-msgstr "Conciliación: Ir a siguiente empresa"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
#: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
msgid "Inverted Analytic Balance"
-msgstr "Saldo analítico invertido"
+msgstr ""
#. module: account
#: field:account.tax.template,applicable_type:0
msgid "Applicable Type"
-msgstr "Tipo aplicable"
+msgstr ""
#. module: account
-#: field:account.invoice,reference:0
#: field:account.invoice.line,invoice_id:0
msgid "Invoice Reference"
-msgstr "Referencia factura"
+msgstr ""
#. module: account
#: help:account.tax.template,sequence:0
@@ -6124,22 +6149,19 @@ msgid ""
"higher ones. The order is important if you have a tax that has several tax "
"children. In this case, the evaluation order is important."
msgstr ""
-"El campo secuencia es usado para ordenar las líneas de impuestos de menor a "
-"mayor secuencia. El orden es importante si tiene un impuesto que tiene "
-"varios impuesto hijos. En este caso, el orden de evaluación es importante."
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: view:account.journal:0
msgid "Liquidity"
-msgstr "Liquidez"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
#: model:ir.ui.menu,name:account.account_analytic_journal_entries
msgid "Analytic Journal Items"
-msgstr "Apuntes analíticos"
+msgstr ""
#. module: account
#: view:account.fiscalyear.close:0
@@ -6148,15 +6170,11 @@ msgid ""
"year. Note that you can run this wizard many times for the same fiscal year: "
"it will simply replace the old opening entries with the new ones."
msgstr ""
-"Este asistente generará los asientos de fin de ejercicio para el ejercicio "
-"fiscal seleccionado. Tenga en cuenta que puede ejecutar este asistente "
-"varias veces para el mismo ejercicio fiscal: simplemente se sustituyen los "
-"asientos de apertura viejos por los nuevos."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
msgid "Bank and Cash"
-msgstr "Banco y caja"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6166,36 +6184,30 @@ msgid ""
"the tool search to analyse information about analytic entries generated in "
"the system."
msgstr ""
-"Desde esta vista, dispone de un análisis de los distintos asientos "
-"analíticos de la cuenta analítica que ha definido para ajustarse a sus "
-"necesidades del negocio. Utilice la herramienta de búsqueda para analizar la "
-"información sobre los asientos analíticos generados en el sistema."
#. module: account
#: sql_constraint:account.journal:0
msgid "The name of the journal must be unique per company !"
-msgstr "¡El nombre del diaro debe ser único por compañía!"
+msgstr ""
#. module: account
#: field:account.account.template,nocreate:0
msgid "Optional create"
-msgstr "Crear opcional"
-
-#. module: account
-#: code:addons/account/invoice.py:406
-#: code:addons/account/invoice.py:506
-#: code:addons/account/invoice.py:1348
-#, python-format
-msgid "Can not find account chart for this company, Please Create account."
msgstr ""
-"No se ha encontrado un plan contable para esta compañía. Cree un plan "
-"contable."
#. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:57
+#: code:addons/account/account.py:664
+#, python-format
+msgid ""
+"You cannot change the owner company of an account that already contains "
+"journal items."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
#, python-format
msgid "Enter a Start date !"
-msgstr "¡Introduzca una fecha inicial!"
+msgstr ""
#. module: account
#: report:account.invoice:0
@@ -6203,27 +6215,17 @@ msgstr "¡Introduzca una fecha inicial!"
#: selection:account.invoice.report,type:0
#: selection:report.invoice.created,type:0
msgid "Supplier Refund"
-msgstr "Factura rectificativa de proveedor"
-
-#. module: account
-#: model:ir.ui.menu,name:account.menu_dashboard_acc
-msgid "Dashboard"
-msgstr "Tablero"
+msgstr ""
#. module: account
#: field:account.bank.statement,move_line_ids:0
msgid "Entry lines"
-msgstr "Apuntes"
+msgstr ""
#. module: account
#: field:account.move.line,centralisation:0
msgid "Centralisation"
-msgstr "Centralización"
-
-#. module: account
-#: view:wizard.multi.charts.accounts:0
-msgid "Generate Your Accounting Chart from a Chart Template"
-msgstr "Generar su plan contable desde una plantilla de plan contable"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -6234,6 +6236,7 @@ msgstr "Generar su plan contable desde una plantilla de plan contable"
#: view:account.bank.statement:0
#: view:account.chart.template:0
#: view:account.entries.report:0
+#: view:account.financial.report:0
#: view:account.fiscalyear:0
#: view:account.invoice:0
#: view:account.invoice.report:0
@@ -6245,22 +6248,22 @@ msgstr "Generar su plan contable desde una plantilla de plan contable"
#: view:account.tax.code.template:0
#: view:analytic.entries.report:0
msgid "Group By..."
-msgstr "Agrupar por..."
+msgstr ""
#. module: account
#: field:account.journal.column,readonly:0
msgid "Readonly"
-msgstr "Sólo lectura"
+msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_pl_report
-msgid "Account Profit And Loss Report"
-msgstr "Contabilidad. Informe de pérdida y ganancias"
+#: view:account.payment.term.line:0
+msgid " Valuation: Balance"
+msgstr ""
#. module: account
#: field:account.invoice.line,uos_id:0
msgid "Unit of Measure"
-msgstr "Unidad de medida"
+msgstr ""
#. module: account
#: constraint:account.payment.term.line:0
@@ -6268,13 +6271,16 @@ msgid ""
"Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
"2% "
msgstr ""
-"Los porcentajes de una línea de plazo de pago deben estar entre 0 y 1. Por "
-"ejemplo: 0.02 para 2% "
+
+#. module: account
+#: field:account.installer,has_default_company:0
+msgid "Has Default Company"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_sequence_fiscalyear
msgid "account.sequence.fiscalyear"
-msgstr "contabilidad.secuencia.ejerciciofiscal"
+msgstr ""
#. module: account
#: report:account.analytic.account.journal:0
@@ -6285,39 +6291,45 @@ msgstr "contabilidad.secuencia.ejerciciofiscal"
#: model:ir.actions.report.xml,name:account.analytic_journal_print
#: model:ir.model,name:account.model_account_analytic_journal
msgid "Analytic Journal"
-msgstr "Diario analítico"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:622
+#, python-format
+msgid "You can not desactivate an account that contains some journal items."
+msgstr ""
#. module: account
#: view:account.entries.report:0
msgid "Reconciled"
-msgstr "Conciliado"
+msgstr ""
#. module: account
#: report:account.invoice:0
#: field:account.invoice.tax,base:0
msgid "Base"
-msgstr "Base"
+msgstr ""
#. module: account
#: field:account.model,name:0
msgid "Model Name"
-msgstr "Nombre modelo"
+msgstr ""
#. module: account
#: field:account.chart.template,property_account_expense_categ:0
msgid "Expense Category Account"
-msgstr "Cuenta categoría gastos"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Cash Transactions"
-msgstr "Transacciones de caja"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_state_open.py:37
#, python-format
msgid "Invoice is already reconciled"
-msgstr "La factura ya está conciliada"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -6326,33 +6338,45 @@ msgstr "La factura ya está conciliada"
#: field:account.bank.statement.line,note:0
#: view:account.fiscal.position:0
#: field:account.fiscal.position,note:0
+#: field:account.fiscal.position.template,note:0
#: view:account.invoice.line:0
#: field:account.invoice.line,note:0
msgid "Notes"
-msgstr "Notas"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_analytic_entries_report
msgid "Analytic Entries Statistics"
-msgstr "Estadísticas asientos analíticos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:624
+#, python-format
+msgid "You can not remove an account containing journal items."
+msgstr ""
#. module: account
#: code:addons/account/account_analytic_line.py:143
-#: code:addons/account/account_move_line.py:905
+#: code:addons/account/account_move_line.py:947
#, python-format
msgid "Entries: "
-msgstr "Asientos: "
+msgstr ""
#. module: account
#: view:account.use.model:0
msgid "Create manual recurring entries in a chosen journal."
-msgstr "Crear asientos recurrentes manuales en un diario seleccionado."
+msgstr ""
#. module: account
-#: code:addons/account/account.py:1393
+#: help:res.partner.bank,currency_id:0
+msgid "Currency of the related account journal."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1580
#, python-format
msgid "Couldn't create move between different companies"
-msgstr "No se ha podido crear movimiento entre diferentes compañías"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_type_form
@@ -6365,13 +6389,13 @@ msgid ""
"account. From this view, you can create and manage the account types you "
"need for your company."
msgstr ""
-"Un tipo de cuenta es usado para determinar cómo se utiliza una cuenta en "
-"cada diario. El método por defecto de un tipo de cuenta determina el proceso "
-"para el cierre anual. Informes como el informe de balance y el de pérdidas y "
-"ganancias usan la categoría (perdidas/ganancias o balance). Por ejemplo, el "
-"tipo de cuenta puede ser asociado a una cuenta de activos, gastos o pagos. "
-"Desde esta vista, puede crear y gestionar los tipos de cuenta necesarios "
-"para su compañía."
+
+#. module: account
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:183
+#, python-format
+msgid "Balance Sheet (Asset account)"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_bank_reconcile_tree
@@ -6380,38 +6404,36 @@ msgid ""
"corresponds with the entries (or records) of that account in your accounting "
"system."
msgstr ""
-"La conciliación bancaria consiste en verificar que su extracto bancario "
-"corresponde con las entradas (o registros) de esa cuenta en su sistema "
-"contable."
#. module: account
#: model:process.node,note:account.process_node_draftstatement0
msgid "State is draft"
-msgstr "Estado es borrador"
+msgstr ""
#. module: account
#: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1003
+#: code:addons/account/account_move_line.py:1058
#, python-format
msgid "Total debit"
-msgstr "Total debe"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:781
+#: code:addons/account/account_move_line.py:824
#, python-format
msgid "Entry \"%s\" is not valid !"
-msgstr "¡El asiento \"%s\" no es válido!"
+msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Fax :"
-msgstr "Fax :"
+msgstr ""
#. module: account
-#: report:account.vat.declaration:0
-#: field:account.vat.declaration,based_on:0
-msgid "Based On"
-msgstr "Basado en"
+#: view:wizard.multi.charts.accounts:0
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
#. module: account
#: help:res.partner,property_account_receivable:0
@@ -6419,8 +6441,6 @@ msgid ""
"This account will be used instead of the default one as the receivable "
"account for the current partner"
msgstr ""
-"Esta cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a "
-"cobrar para la empresa actual."
#. module: account
#: field:account.tax,python_applicable:0
@@ -6431,16 +6451,12 @@ msgstr ""
#: field:account.tax.template,python_compute:0
#: selection:account.tax.template,type:0
msgid "Python Code"
-msgstr "Código Python"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_balance_sheet.py:70
-#, python-format
-msgid ""
-"Please define the Reserve and Profit/Loss account for current user company !"
+#: view:account.entries.report:0
+msgid "Journal Entries with period in current period"
msgstr ""
-"¡Defina la cuenta de reservas y pérdidas/ganancias para la compañía del "
-"usuario actual!"
#. module: account
#: help:account.journal,update_posted:0
@@ -6448,75 +6464,94 @@ msgid ""
"Check this box if you want to allow the cancellation the entries related to "
"this journal or of the invoice related to this journal"
msgstr ""
-"Marque esta opción si quiere permitir la cancelación de asientos "
-"relacionados con este diario o de la factura relacionada con este diario."
#. module: account
#: view:account.fiscalyear.close:0
msgid "Create"
-msgstr "Crear"
+msgstr ""
#. module: account
#: model:process.transition.action,name:account.process_transition_action_createentries0
msgid "Create entry"
-msgstr "Crear asiento"
+msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " valuation: percent"
-msgstr " valoración: porcentaje"
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:182
+#, python-format
+msgid "Profit & Loss (Expense account)"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:499
-#: code:addons/account/account.py:501
-#: code:addons/account/account.py:822
-#: code:addons/account/account.py:901
-#: code:addons/account/account.py:976
-#: code:addons/account/account.py:1204
-#: code:addons/account/account.py:1210
-#: code:addons/account/account.py:2095
-#: code:addons/account/account.py:2333
+#: code:addons/account/account.py:622
+#: code:addons/account/account.py:624
+#: code:addons/account/account.py:963
+#: code:addons/account/account.py:1057
+#: code:addons/account/account.py:1136
+#: code:addons/account/account.py:1352
+#: code:addons/account/account.py:1359
+#: code:addons/account/account.py:1361
+#: code:addons/account/account.py:2297
+#: code:addons/account/account.py:2613
#: code:addons/account/account_analytic_line.py:90
#: code:addons/account/account_analytic_line.py:99
-#: code:addons/account/account_bank_statement.py:292
-#: code:addons/account/account_bank_statement.py:305
-#: code:addons/account/account_bank_statement.py:345
-#: code:addons/account/account_cash_statement.py:328
-#: code:addons/account/account_cash_statement.py:348
-#: code:addons/account/account_move_line.py:1176
-#: code:addons/account/account_move_line.py:1191
-#: code:addons/account/account_move_line.py:1193
-#: code:addons/account/invoice.py:785
-#: code:addons/account/invoice.py:815
-#: code:addons/account/invoice.py:1008
-#: code:addons/account/wizard/account_invoice_refund.py:100
-#: code:addons/account/wizard/account_invoice_refund.py:102
+#: code:addons/account/account_bank_statement.py:301
+#: code:addons/account/account_bank_statement.py:314
+#: code:addons/account/account_bank_statement.py:352
+#: code:addons/account/account_cash_statement.py:293
+#: code:addons/account/account_cash_statement.py:315
+#: code:addons/account/account_invoice.py:819
+#: code:addons/account/account_invoice.py:850
+#: code:addons/account/account_invoice.py:1042
+#: code:addons/account/account_move_line.py:1215
+#: code:addons/account/account_move_line.py:1231
+#: code:addons/account/account_move_line.py:1233
+#: code:addons/account/wizard/account_invoice_refund.py:108
+#: code:addons/account/wizard/account_invoice_refund.py:110
+#: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
#: code:addons/account/wizard/account_use_model.py:44
#, python-format
msgid "Error !"
-msgstr "¡Error!"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,style_overwrite:0
+msgid "Financial Report Style"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,sign:0
+msgid "Preserve balance sign"
+msgstr ""
#. module: account
#: view:account.vat.declaration:0
#: model:ir.actions.report.xml,name:account.account_vat_declaration
#: model:ir.ui.menu,name:account.menu_account_vat_declaration
msgid "Taxes Report"
-msgstr "Informe impuestos"
+msgstr ""
#. module: account
#: selection:account.journal.period,state:0
msgid "Printed"
-msgstr "Impreso"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:575
+#: code:addons/account/account_move_line.py:582
+#, python-format
+msgid "Error :"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Project line"
-msgstr "Línea de proyecto"
+msgstr ""
#. module: account
#: field:account.invoice.tax,manual:0
msgid "Manual"
-msgstr "Manual"
+msgstr ""
#. module: account
#: view:account.automatic.reconcile:0
@@ -6527,17 +6562,21 @@ msgid ""
"reconcile in a series of accounts. It finds entries for each partner where "
"the amounts correspond."
msgstr ""
-"Para que una factura se considere pagada, los apuntes contables de la "
-"factura deben estar conciliados con sus contrapartidas, normalmente pagos. "
-"Con la funcionalidad de reconciliación automática, OpenERP realiza su propia "
-"búsqueda de apuntes a conciliar en una serie de cuentas. Encuentra los "
-"apuntes, para cada empresa, cuando las cantidades se correspondan."
#. module: account
#: view:account.move:0
#: field:account.move,to_check:0
msgid "To Review"
-msgstr "A revisar"
+msgstr ""
+
+#. module: account
+#: help:account.partner.ledger,initial_balance:0
+#: help:account.report.general.ledger,initial_balance:0
+msgid ""
+"If you selected to filter by date or period, this field allow you to add a "
+"row to display the amount of debit/credit/balance that precedes the filter "
+"you've set."
+msgstr ""
#. module: account
#: view:account.bank.statement:0
@@ -6546,12 +6585,29 @@ msgstr "A revisar"
#: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
#: model:ir.ui.menu,name:account.menu_finance_entries
msgid "Journal Entries"
-msgstr "Asientos contables"
+msgstr ""
#. module: account
#: help:account.partner.ledger,page_split:0
msgid "Display Ledger Report with One partner per page"
-msgstr "Mostrar informe libro mayor con una empresa por página."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1233
+#, python-format
+msgid ""
+"You can not do this modification on a reconciled entry! You can just change "
+"some non legal fields or you must unreconcile first!\n"
+"%s"
+msgstr ""
+
+#. module: account
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
+#: report:account.third_party_ledger:0
+#: report:account.third_party_ledger_other:0
+msgid "JRNL"
+msgstr ""
#. module: account
#: view:account.partner.balance:0
@@ -6560,8 +6616,6 @@ msgid ""
"This report is an analysis done by a partner. It is a PDF report containing "
"one line per partner representing the cumulative credit balance"
msgstr ""
-"Este informe es un análisis realizado por una empresa. Es un informe PDF que "
-"contiene una línea por empresa representando el saldo del haber acumulativo."
#. module: account
#: code:addons/account/wizard/account_validate_account_move.py:61
@@ -6569,13 +6623,10 @@ msgstr ""
msgid ""
"Selected Entry Lines does not have any account move enties in draft state"
msgstr ""
-"Los apuntes seleccionados no tienen ningún movimiento contable en estado "
-"borrador"
#. module: account
#: selection:account.aged.trial.balance,target_move:0
#: selection:account.balance.report,target_move:0
-#: selection:account.bs.report,target_move:0
#: selection:account.central.journal,target_move:0
#: selection:account.chart,target_move:0
#: selection:account.common.account.report,target_move:0
@@ -6586,45 +6637,44 @@ msgstr ""
#: selection:account.move.journal,target_move:0
#: selection:account.partner.balance,target_move:0
#: selection:account.partner.ledger,target_move:0
-#: selection:account.pl.report,target_move:0
#: selection:account.print.journal,target_move:0
#: selection:account.report.general.ledger,target_move:0
#: selection:account.tax.chart,target_move:0
#: selection:account.vat.declaration,target_move:0
+#: selection:accounting.report,target_move:0
#: code:addons/account/report/common_report_header.py:67
-#: model:ir.actions.report.xml,name:account.account_move_line_list
#, python-format
msgid "All Entries"
-msgstr "Todos los asientos"
+msgstr ""
#. module: account
#: constraint:product.template:0
msgid ""
"Error: The default UOM and the purchase UOM must be in the same category."
msgstr ""
-"Error: La UdM por defecto y la UdM de compra deben estar en la misma "
-"categoría."
#. module: account
#: view:account.journal.select:0
msgid "Journal Select"
-msgstr "Seleccionar diario"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_change_currency.py:65
+#: view:account.bank.statement:0
+#: code:addons/account/account.py:420
+#: code:addons/account/account.py:432
#, python-format
-msgid "Currnt currency is not confirured properly !"
-msgstr "¡La moneda actual no está configurada correctamente!"
+msgid "Opening Balance"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_move_reconcile
msgid "Account Reconciliation"
-msgstr "Contabilidad. Conciliación"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_tax
msgid "Taxes Fiscal Position"
-msgstr "Posición fiscal impuestos"
+msgstr ""
#. module: account
#: report:account.general.ledger:0
@@ -6632,26 +6682,23 @@ msgstr "Posición fiscal impuestos"
#: view:account.report.general.ledger:0
#: model:ir.actions.act_window,name:account.action_account_general_ledger_menu
#: model:ir.actions.report.xml,name:account.account_general_ledger
+#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
#: model:ir.ui.menu,name:account.menu_general_ledger
msgid "General Ledger"
-msgstr "Libro mayor"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_paymentorderbank0
msgid "The payment order is sent to the bank."
-msgstr "La orden de pago ha sido enviada al banco."
+msgstr ""
#. module: account
#: view:account.balance.report:0
-#: view:account.bs.report:0
msgid ""
"This report allows you to print or generate a pdf of your trial balance "
"allowing you to quickly check the balance of each of your accounts in a "
"single report"
msgstr ""
-"Este informe le permite imprimir o generar un pdf de su balance de sumas y "
-"saldos permitiendo comprobar con rapidez el saldo de cada una de sus cuentas "
-"en un único informe."
#. module: account
#: help:account.move,to_check:0
@@ -6659,28 +6706,30 @@ msgid ""
"Check this box if you are unsure of that journal entry and if you want to "
"note it as 'to be reviewed' by an accounting expert."
msgstr ""
-"Marque esta opción si no está seguro de este asiento y desea marcarlo como "
-"'Para ser revisado' por un experto contable."
#. module: account
-#: help:account.installer.modules,account_voucher:0
-msgid ""
-"Account Voucher module includes all the basic requirements of Voucher "
-"Entries for Bank, Cash, Sales, Purchase, Expenses, Contra, etc... "
+#: field:account.chart.template,complete_tax_set:0
+#: field:wizard.multi.charts.accounts,complete_tax_set:0
+msgid "Complete Set of Taxes"
msgstr ""
-"El módulo de recibos (justificantes) contables incluye todos los requisitos "
-"básicos de justificantes bancarios, de caja, ventas, compras, gastos, "
-"contrapartidas, etc... "
#. module: account
#: view:account.chart.template:0
msgid "Properties"
-msgstr "Propiedades"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_tax_chart
msgid "Account tax chart"
-msgstr "Contabilidad. Plan de impuestos"
+msgstr ""
+
+#. module: account
+#: constraint:res.partner.bank:0
+msgid ""
+"\n"
+"Please define BIC/Swift code on bank for bank type IBAN Account to make "
+"valid payments"
+msgstr ""
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -6688,12 +6737,14 @@ msgstr "Contabilidad. Plan de impuestos"
#: report:account.central.journal:0
#: report:account.general.journal:0
#: report:account.invoice:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: report:account.partner.balance:0
msgid "Total:"
-msgstr "Total:"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2050
+#: code:addons/account/account.py:2246
#, python-format
msgid ""
"You can specify year, month and date in the name of the model using the "
@@ -6705,58 +6756,51 @@ msgid ""
"\n"
"e.g. My model on %(date)s"
msgstr ""
-"Puede indicar el año, mes y fecha en el nombre del modelo usando las "
-"siguientes etiquetas : \n"
-"\n"
-"%(year)s: Para especificar el año \n"
-"%(month)s: Para especificar el mes \n"
-"%(date)s: Fecha actual\n"
-"Ejemplo: Mi modelo del %(date)s"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_aged_income
-msgid "Income Accounts"
-msgstr "Cuentas de ingresos"
#. module: account
#: help:report.invoice.created,origin:0
msgid "Reference of the document that generated this invoice report."
-msgstr "Referencia del documento que ha generado este informe de factura."
+msgstr ""
#. module: account
#: field:account.tax.code,child_ids:0
#: field:account.tax.code.template,child_ids:0
msgid "Child Codes"
-msgstr "Códigos hijos"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:473
-#: code:addons/account/wizard/account_invoice_refund.py:137
+#: view:account.tax.template:0
+msgid "Taxes used in Sales"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:504
+#: code:addons/account/wizard/account_invoice_refund.py:145
#, python-format
msgid "Data Insufficient !"
-msgstr "¡Datos insuficientes!"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree1
#: model:ir.ui.menu,name:account.menu_action_invoice_tree1
msgid "Customer Invoices"
-msgstr "Facturas de cliente"
+msgstr ""
#. module: account
#: field:account.move.line.reconcile,writeoff:0
msgid "Write-Off amount"
-msgstr "Importe desajuste"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Sales"
-msgstr "Ventas"
+msgstr ""
#. module: account
#: view:account.journal.column:0
#: model:ir.model,name:account.model_account_journal_column
msgid "Journal Column"
-msgstr "Columna diario"
+msgstr ""
#. module: account
#: selection:account.invoice.report,state:0
@@ -6764,13 +6808,21 @@ msgstr "Columna diario"
#: selection:account.subscription,state:0
#: selection:report.invoice.created,state:0
msgid "Done"
-msgstr "Realizado"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_bank_tree
+msgid ""
+"Configure your company's bank account and select those that must appear on "
+"the report footer. You can reorder banks in the list view. If you use the "
+"accounting application of OpenERP, journals and accounts will be created "
+"automatically based on these data."
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_invoicemanually0
msgid "A statement with manual entries becomes a draft statement."
msgstr ""
-"Un extracto con entradas manuales se convierte en un extracto borrador."
#. module: account
#: view:account.aged.trial.balance:0
@@ -6782,48 +6834,46 @@ msgid ""
"you request an interval of 30 days OpenERP generates an analysis of "
"creditors for the past month, past two months, and so on. "
msgstr ""
-"Saldos vencidos de empresa es un informe más detallado de sus efectos a "
-"cobrar por intervalos. Al abrir el informe, OpenERP pregunta por el nombre "
-"de la compañía, el periodo fiscal, y el tamaño del intervalo a analizar (en "
-"días). Luego OpenERP calcula una tabla del saldo deudor por periodo. Así que "
-"si solicita un intervalo de 30 días, OpenERP genera un análisis de todos los "
-"deudores para el mes pasado, últimos dos meses, etc. "
#. module: account
#: field:account.invoice,origin:0
#: field:report.invoice.created,origin:0
msgid "Source Document"
-msgstr "Documento origen"
-
-#. module: account
-#: help:account.account.type,sign:0
-msgid ""
-"Allows you to change the sign of the balance amount displayed in the "
-"reports, so that you can see positive figures instead of negative ones in "
-"expenses accounts."
msgstr ""
-"Permite cambiar el signo del saldo que se muestra en los informes, para que "
-"pueda ver cifras positivas en vez de negativas en cuentas de gastos."
#. module: account
+#: code:addons/account/account.py:1449
+#, python-format
+msgid "You can not delete a posted journal entry \"%s\"!"
+msgstr ""
+
+#. module: account
+#: selection:account.partner.ledger,filter:0
+#: code:addons/account/report/account_partner_ledger.py:59
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
+#, python-format
msgid "Unreconciled Entries"
-msgstr "Asientos no conciliados"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_menu_Bank_process
msgid "Statements Reconciliation"
-msgstr "Conciliación de extractos"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_accounting_report
+msgid "Accounting Report"
+msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Taxes:"
-msgstr "Impuestos:"
+msgstr ""
#. module: account
#: help:account.tax,amount:0
msgid "For taxes of type percentage, enter % ratio between 0-1."
-msgstr "Para impuestos de tipo porcentaj, introduzca valor % entre 0-1."
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_subscription_form
@@ -6833,18 +6883,18 @@ msgid ""
"an agreement with a customer or a supplier. With Define Recurring Entries, "
"you can create such entries to automate the postings in the system."
msgstr ""
-"Un asiento recurrente es un asiento contable que ocurre de forma recurrente "
-"desde una determinada fecha. Por ejemplo la firma de un contrato o un "
-"acuerdo con un cliente o un proveedor. Con la definición de asientos "
-"recurrentes, puede crear estos asientos para automatizar las anotaciones "
-"contables en el sistema."
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
+msgid "Financial Reports Hierarchy"
+msgstr ""
#. module: account
#: field:account.entries.report,product_uom_id:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,product_uom_id:0
msgid "Product UOM"
-msgstr "UdM del producto"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -6854,16 +6904,6 @@ msgid ""
"basis. You can enter the coins that are in your cash box, and then post "
"entries when money comes in or goes out of the cash box."
msgstr ""
-"Un registro de caja le permite gestionar los asientos de caja en sus diarios "
-"de caja. Esta funcionalidad provee una forma fácil de realizar el "
-"seguimiento de los pagos de caja diariamente. Puede introducir las monedas "
-"que tiene en su caja y luego registrar asientos cuando el dinero entra o "
-"sale de la caja."
-
-#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "9"
-msgstr "9"
#. module: account
#: help:account.invoice.refund,date:0
@@ -6871,84 +6911,68 @@ msgid ""
"This date will be used as the invoice date for Refund Invoice and Period "
"will be chosen accordingly!"
msgstr ""
-"Esta fecha se utilizará como la fecha de facturación de la factura "
-"rectificativa (abono) y el período será elegido en consecuencia."
-
-#. module: account
-#: field:account.aged.trial.balance,period_length:0
-msgid "Period length (days)"
-msgstr "Longitud del período (días)"
#. module: account
#: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
msgid "Monthly Turnover"
-msgstr "Volumen mensual"
+msgstr ""
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Analytic Lines"
-msgstr "Líneas analíticas"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
-msgid ""
-"The normal chart of accounts has a structure defined by the legal "
-"requirement of the country. The analytic chart of account structure should "
-"reflect your own business needs in term of costs/revenues reporting. They "
-"are usually structured by contracts, projects, products or departements. "
-"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
-"generate analytic entries on the related account."
msgstr ""
-"El plan de cuentas normales tiene una estructura predefinida por los "
-"requisitos legales del país. La estructura del plan de cuentas analíticas "
-"debería reflejar las necesidades de su negocio de cara al análisis de costes "
-"e ingresos. Por lo general se estructuran por contratos, proyectos, "
-"productos o departamentos. La mayoría de las operaciones de OpenERP "
-"(facturas, hojas de servicio, gastos, etc) generan asientos analíticos en la "
-"cuenta asociada."
#. module: account
#: field:account.analytic.journal,line_ids:0
#: field:account.tax.code,line_ids:0
msgid "Lines"
-msgstr "Líneas"
-
-#. module: account
-#: code:addons/account/invoice.py:521
-#, python-format
-msgid ""
-"Can not find account chart for this company in invoice line account, Please "
-"Create account."
msgstr ""
-"No se ha encontrado un plan contable para esta compañía en la cuenta de la "
-"línea de factura. Cree una cuenta."
#. module: account
#: view:account.tax.template:0
msgid "Account Tax Template"
-msgstr "Plantilla de impuestos"
+msgstr ""
#. module: account
#: view:account.journal.select:0
msgid "Are you sure you want to open Journal Entries?"
-msgstr "¿Está seguro que quiere abrir los asientos?"
+msgstr ""
#. module: account
#: view:account.state.open:0
msgid "Are you sure you want to open this invoice ?"
-msgstr "¿Está seguro que desea abrir esta factura?"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:963
+#: code:addons/account/account_invoice.py:537
+#: code:addons/account/account_invoice.py:552
+#, python-format
+msgid ""
+"Can not find a chart of account, you should create one from the "
+"configuration of the accounting menu."
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_expense_opening:0
+msgid "Opening Entries Expense Account"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1014
#, python-format
msgid "Accounting Entries"
-msgstr "Asientos contables"
+msgstr ""
#. module: account
#: field:account.account.template,parent_id:0
msgid "Parent Account Template"
-msgstr "Plantilla cuenta padre"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_account_configuration_installer
+msgid "Configure your Chart of Accounts"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
@@ -6956,57 +6980,12 @@ msgstr "Plantilla cuenta padre"
#: field:account.move.line,statement_id:0
#: model:process.process,name:account.process_process_statementprocess0
msgid "Statement"
-msgstr "Extracto"
+msgstr ""
#. module: account
#: help:account.journal,default_debit_account_id:0
msgid "It acts as a default account for debit amount"
-msgstr "Actúa como una cuenta por defecto para importes en el debe."
-
-#. module: account
-#: model:ir.module.module,description:account.module_meta_information
-msgid ""
-"Financial and accounting module that covers:\n"
-" General accountings\n"
-" Cost / Analytic accounting\n"
-" Third party accounting\n"
-" Taxes management\n"
-" Budgets\n"
-" Customer and Supplier Invoices\n"
-" Bank statements\n"
-" Reconciliation process by partner\n"
-" Creates a dashboard for accountants that includes:\n"
-" * List of uninvoiced quotations\n"
-" * Graph of aged receivables\n"
-" * Graph of aged incomes\n"
-"\n"
-"The processes like maintaining of general ledger is done through the defined "
-"financial Journals (entry move line or\n"
-"grouping is maintained through journal) for a particular financial year and "
-"for preparation of vouchers there is a\n"
-"module named account_voucher.\n"
-" "
msgstr ""
-"Módulo financiero y contable que cubre:\n"
-" Contabilidad general\n"
-" Contabilidad analítica / de costes\n"
-" Gestión de terceros\n"
-" Gestión de impuestos\n"
-" Presupuestos\n"
-" Facturación de clientes y proveedores\n"
-" Extractos bancarios\n"
-" Conciliación por tercero\n"
-" Crea un cuadro de mandos para contables que incluye:\n"
-" * Lista de presupuestos sin facturar\n"
-" * Gráfica de cuentas vencidas a cobrar\n"
-" * Gráfica de efectos a cobrar\n"
-"\n"
-"Los procesos, como el mantenimiento del libro mayor se realizan a través de "
-"los diarios financieros definidos\n"
-"(los asientos se agrupan por diario) para un ejercicio fiscal determinado; y "
-"para la preparación de recibos \n"
-"existe un módulo llamado account_voucher.\n"
-" "
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7014,49 +6993,55 @@ msgid ""
"You can search for individual account entries through useful information. To "
"search for account entries, open a journal, then select a record line."
msgstr ""
-"Puede buscar un asiento contable en concreto a través de información útil. "
-"Para buscar asientos contables, abra un diario, luego seleccione un apunte."
+
+#. module: account
+#: view:account.entries.report:0
+msgid "Posted entries"
+msgstr ""
+
+#. module: account
+#: help:account.payment.term.line,value_amount:0
+msgid "For percent enter a ratio between 0-1."
+msgstr ""
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
#: field:account.invoice,date_invoice:0
-#: view:account.invoice.report:0
#: field:report.invoice.created,date_invoice:0
msgid "Invoice Date"
-msgstr "Fecha factura"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by year of Invoice Date"
+msgstr ""
#. module: account
#: help:res.partner,credit:0
msgid "Total amount this customer owes you."
-msgstr "Importe total que este cliente le debe."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_ir_sequence
msgid "ir.sequence"
-msgstr "ir.secuencia"
+msgstr ""
#. module: account
#: field:account.journal.period,icon:0
msgid "Icon"
-msgstr "Icono"
+msgstr ""
#. module: account
#: view:account.automatic.reconcile:0
#: view:account.use.model:0
msgid "Ok"
-msgstr "Aceptar"
+msgstr ""
#. module: account
-#: code:addons/account/report/account_partner_balance.py:115
-#, python-format
-msgid "Unknown Partner"
-msgstr "Empresa desconocida"
-
-#. module: account
-#: view:account.bank.statement:0
-msgid "Opening Balance"
-msgstr "Saldo de apertura"
+#: field:account.chart.template,tax_code_root_id:0
+msgid "Root Tax Code"
+msgstr ""
#. module: account
#: help:account.journal,centralisation:0
@@ -7065,44 +7050,36 @@ msgid ""
"new counterpart but will share the same counterpart. This is used in fiscal "
"year closing."
msgstr ""
-"Marque esta opción para que cada asiento de este diario no crea una nueva "
-"contrapartida, sino que comparta la misma contrapartida. Se usa en el cierre "
-"del ejercicio fiscal."
#. module: account
#: field:account.bank.statement,closing_date:0
msgid "Closed On"
-msgstr "Cerrado en"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_line
msgid "Bank Statement Line"
-msgstr "Línea de extracto bancario"
+msgstr ""
#. module: account
#: field:account.automatic.reconcile,date2:0
msgid "Ending Date"
-msgstr "Fecha final"
+msgstr ""
#. module: account
#: field:wizard.multi.charts.accounts,purchase_tax:0
msgid "Default Purchase Tax"
-msgstr "Impuesto de compra por defecto"
+msgstr ""
+
+#. module: account
+#: field:account.chart.template,property_account_income_opening:0
+msgid "Opening Entries Income Account"
+msgstr ""
#. module: account
#: view:account.bank.statement:0
msgid "Confirm"
-msgstr "Confirmar"
-
-#. module: account
-#: help:account.invoice,partner_bank_id:0
-msgid ""
-"Bank Account Number, Company bank account if Invoice is customer or supplier "
-"refund, otherwise Partner bank account number."
msgstr ""
-"Número de cuenta bancaria, cuenta bancaria de la compañía si la factura es "
-"un abono de cliente o proveedor, si no cuenta bancaria de la empresa cliente "
-"o proveedor."
#. module: account
#: help:account.tax,domain:0
@@ -7111,52 +7088,71 @@ msgid ""
"This field is only used if you develop your own module allowing developers "
"to create specific taxes in a custom domain."
msgstr ""
-"Este campo sólo se usará si desarrolla su propio módulo permitiendo a los "
-"desarrolladores crear impuestos específicos en una configuración "
-"personalizada."
#. module: account
-#: code:addons/account/account.py:938
+#: code:addons/account/account.py:1095
#, python-format
msgid "You should have chosen periods that belongs to the same company"
msgstr ""
-"Debería haber seleccionado periodos que pertenezcan a la misma compañía"
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_review_payment_terms_installer
+msgid "Review your Payment Terms"
+msgstr ""
#. module: account
#: field:account.fiscalyear.close,report_name:0
msgid "Name of new entries"
-msgstr "Nombre de nuevos asientos"
+msgstr ""
#. module: account
#: view:account.use.model:0
msgid "Create Entries"
-msgstr "Crear asientos"
+msgstr ""
+
+#. module: account
+#: view:res.partner:0
+msgid "Information About the Bank"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_reporting
msgid "Reporting"
-msgstr "Informe"
+msgstr ""
#. module: account
-#: sql_constraint:account.journal:0
-msgid "The code of the journal must be unique per company !"
-msgstr "¡El código del diario debe ser único por compañía!"
+#: code:addons/account/account_move_line.py:775
+#: code:addons/account/account_move_line.py:856
+#: code:addons/account/wizard/account_invoice_state.py:44
+#: code:addons/account/wizard/account_invoice_state.py:68
+#: code:addons/account/wizard/account_state_open.py:37
+#: code:addons/account/wizard/account_validate_account_move.py:39
+#: code:addons/account/wizard/account_validate_account_move.py:61
+#, python-format
+msgid "Warning"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_analytic_open
+msgid "Contracts/Analytic Accounts"
+msgstr ""
#. module: account
#: field:account.bank.statement,ending_details_ids:0
msgid "Closing Cashbox"
-msgstr "Cierre de caja"
+msgstr ""
#. module: account
#: view:account.journal:0
+#: field:res.partner.bank,journal_id:0
msgid "Account Journal"
-msgstr "Diario de contabilidad"
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_paidinvoice0
#: model:process.node,name:account.process_node_supplierpaidinvoice0
msgid "Paid invoice"
-msgstr "Factura pagada"
+msgstr ""
#. module: account
#: help:account.partner.reconcile.process,next_partner_id:0
@@ -7165,25 +7161,28 @@ msgid ""
"the system to go through the reconciliation process, based on the latest day "
"it have been reconciled."
msgstr ""
-"Este campo muestra la siguiente empresa que será elegida automáticamente por "
-"el sistema para pasar por el proceso de conciliación, basado en el último "
-"día que ha sido conciliada."
#. module: account
#: field:account.move.line.reconcile.writeoff,comment:0
msgid "Comment"
-msgstr "Comentario"
+msgstr ""
#. module: account
#: field:account.tax,domain:0
#: field:account.tax.template,domain:0
msgid "Domain"
-msgstr "Dominio"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_use_model
msgid "Use model"
-msgstr "Usar modelo"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:429
+#, python-format
+msgid "Unable to adapt the initial balance (negative value)!"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7193,129 +7192,86 @@ msgid ""
"line of the expense account, OpenERP will propose to you automatically the "
"Tax related to this account and the counter-part \"Account Payable\"."
msgstr ""
-"Esta vista es usada por los contables para registrar asientos masivamente en "
-"OpenERP. Si quiere registrar una factura de proveedor, comience "
-"introduciendo el apunte de la cuenta de gastos. OpenERP le propondrá "
-"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a pagar\" "
-"de contrapartida."
-
-#. module: account
-#: help:res.company,property_reserve_and_surplus_account:0
-msgid ""
-"This Account is used for transferring Profit/Loss(If It is Profit: Amount "
-"will be added, Loss : Amount will be deducted.), Which is calculated from "
-"Profit & Loss Report"
-msgstr ""
-"Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una "
-"Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se "
-"calcula en el informe de Pérdidas y Ganancias."
#. module: account
#: view:account.invoice.line:0
#: field:account.invoice.tax,invoice_id:0
#: model:ir.model,name:account.model_account_invoice_line
msgid "Invoice Line"
-msgstr "Línea de factura"
-
-#. module: account
-#: field:account.balance.report,display_account:0
-#: field:account.bs.report,display_account:0
-#: field:account.common.account.report,display_account:0
-#: field:account.pl.report,display_account:0
-#: field:account.report.general.ledger,display_account:0
-msgid "Display accounts"
-msgstr "Mostrar cuentas"
-
-#. module: account
-#: field:account.account.type,sign:0
-msgid "Sign on Reports"
-msgstr "Signo en informes"
-
-#. module: account
-#: code:addons/account/account_cash_statement.py:249
-#, python-format
-msgid "You can not have two open register for the same journal"
-msgstr "No puede tener dos registros abiertos para el mismo diario"
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid " day of the month= -1"
-msgstr " día del mes= -1"
-
-#. module: account
-#: constraint:res.partner:0
-msgid "Error ! You can not create recursive associated members."
-msgstr "¡Error! No puede crear miembros asociados recursivos."
-
-#. module: account
-#: help:account.journal,type:0
-msgid ""
-"Select 'Sale' for Sale journal to be used at the time of making invoice. "
-"Select 'Purchase' for Purchase Journal to be used at the time of approving "
-"purchase order. Select 'Cash' to be used at the time of making payment. "
-"Select 'General' for miscellaneous operations. Select 'Opening/Closing "
-"Situation' to be used at the time of new fiscal year creation or end of year "
-"entries generation."
msgstr ""
-"Seleccione 'Ventas' para el diario de ventas que será usado cuando se creen "
-"facturas. Seleccione 'Compras' para el diario a usar cuando se aprueben "
-"pedidos de compra. Seleccione 'Efectivo' (Caja) para que se use a la hora de "
-"hacer pagos. Seleccione 'General' para operaciones misceláneas. Seleccione "
-"'Situación apertura/cierre' para usarlo cuando se crea un nuevo ejercicio "
-"fiscal o la generación del asiento de cierre."
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Refunds"
+msgstr ""
+
+#. module: account
+#: field:account.financial.report,sign:0
+msgid "Sign on Reports"
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#, python-format
+msgid "The periods to generate opening entries were not found"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_view
+msgid "Root/View"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3138
+#, python-format
+msgid "OPEJ"
+msgstr ""
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
-#: report:account.move.voucher:0
msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
-
-#. module: account
-#: help:account.installer.modules,account_followup:0
-msgid ""
-"Helps you generate reminder letters for unpaid invoices, including multiple "
-"levels of reminding and customized per-partner policies."
msgstr ""
-"Le ayuda a generar cartas recordatorias para las facturas pendientes de "
-"pago, incluyendo múltiples niveles de recordatorio y políticas "
-"personalizadas por empresa."
#. module: account
#: selection:account.entries.report,move_line_state:0
#: view:account.move.line:0
#: selection:account.move.line,state:0
msgid "Unbalanced"
-msgstr "Descuadrado"
+msgstr ""
#. module: account
#: selection:account.move.line,centralisation:0
msgid "Normal"
-msgstr "Normal"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_email_templates
+#: model:ir.ui.menu,name:account.menu_email_templates
+msgid "Email Templates"
+msgstr ""
#. module: account
#: view:account.move.line:0
msgid "Optional Information"
-msgstr "Información opcional"
+msgstr ""
#. module: account
-#: view:account.analytic.line:0
-#: view:account.journal:0
-#: field:account.journal,user_id:0
-#: view:analytic.entries.report:0
-#: field:analytic.entries.report,user_id:0
-msgid "User"
-msgstr "Usuario"
+#: code:addons/account/wizard/account_fiscalyear_close.py:100
+#, python-format
+msgid "The journal must have default credit and debit account"
+msgstr ""
#. module: account
#: report:account.general.journal:0
+#: xsl:account.transfer:0
msgid ":"
-msgstr ":"
+msgstr ""
#. module: account
#: selection:account.account,currency_mode:0
msgid "At Date"
-msgstr "En fecha"
+msgstr ""
#. module: account
#: help:account.move.line,date_maturity:0
@@ -7323,72 +7279,122 @@ msgid ""
"This field is used for payable and receivable journal entries. You can put "
"the limit date for the payment of this line."
msgstr ""
-"Este campo se usa para asientos a pagar y a cobrar. Puede introducir la "
-"fecha límite para el pago de esta línea."
#. module: account
-#: code:addons/account/account_move_line.py:1271
+#: model:ir.ui.menu,name:account.menu_multi_currency
+msgid "Multi-Currencies"
+msgstr ""
+
+#. module: account
+#: field:account.model.line,date_maturity:0
+msgid "Maturity Date"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1317
#, python-format
msgid "Bad account !"
-msgstr "¡Cuenta incorrecta!"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2777
-#: code:addons/account/installer.py:432
+#: code:addons/account/account.py:3125
#, python-format
msgid "Sales Journal"
-msgstr "Diario de ventas"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_move_journal.py:104
#, python-format
msgid "Open Journal Items !"
-msgstr "¡Asientos abiertos!"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_invoice_tax
msgid "Invoice Tax"
-msgstr "Impuesto de factura"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1246
+#: code:addons/account/account_move_line.py:1292
#, python-format
msgid "No piece number !"
-msgstr "¡Ningún trozo de número!"
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+#: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
+msgid "Account Reports Hierarchy"
+msgstr ""
+
+#. module: account
+#: help:account.account.template,chart_template_id:0
+msgid ""
+"This optional field allow you to link an account template to a specific "
+"chart template that may differ from the one its root parent belongs to. This "
+"allow you to define chart templates that extend another and complete it with "
+"few new accounts (You don't need to define the whole structure that is "
+"common to both several times)."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+msgid "Unposted Journal Entries"
+msgstr ""
#. module: account
#: view:product.product:0
#: view:product.template:0
msgid "Sales Properties"
-msgstr "Propiedades de venta"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_manual_reconcile
msgid "Manual Reconciliation"
-msgstr "Conciliación manual"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Total amount due:"
-msgstr "Importe total debido:"
+msgstr ""
#. module: account
#: field:account.analytic.chart,to_date:0
#: field:project.account.analytic.line,to_date:0
msgid "To"
-msgstr "Hasta"
+msgstr ""
+
+#. module: account
+#: selection:account.move.line,centralisation:0
+#: code:addons/account/account.py:1535
+#, python-format
+msgid "Currency Adjustment"
+msgstr ""
#. module: account
#: field:account.fiscalyear.close,fy_id:0
#: field:account.fiscalyear.close.state,fy_id:0
msgid "Fiscal Year to close"
-msgstr "Ejercicio fiscal a cerrar"
+msgstr ""
#. module: account
#: view:account.invoice.cancel:0
#: model:ir.actions.act_window,name:account.action_account_invoice_cancel
msgid "Cancel Selected Invoices"
-msgstr "Cancelar facturas seleccionadas"
+msgstr ""
+
+#. module: account
+#: help:account.account.type,report_type:0
+msgid ""
+"This field is used to generate legal reports: profit and loss, balance sheet."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_review_payment_terms_installer
+msgid ""
+"Payment terms define the conditions to pay a customer or supplier invoice in "
+"one or several payments. Customers periodic reminders will use the payment "
+"terms for each letter. Each customer or supplier can be assigned to one of "
+"these payment terms."
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -7397,7 +7403,7 @@ msgstr "Cancelar facturas seleccionadas"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "May"
-msgstr "Mayo"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -7406,53 +7412,94 @@ msgstr "Mayo"
#: selection:account.common.partner.report,result_selection:0
#: selection:account.partner.balance,result_selection:0
#: selection:account.partner.ledger,result_selection:0
-#: code:addons/account/report/account_partner_balance.py:304
+#: code:addons/account/report/account_aged_partner_balance.py:374
+#: code:addons/account/report/account_partner_balance.py:299
+#: code:addons/account/report/account_partner_ledger.py:396
#, python-format
msgid "Payable Accounts"
-msgstr "Cuentas a pagar"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:741
+#, python-format
+msgid "Global taxes defined, but they are not in invoice lines !"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_chart_template
msgid "Templates for Account Chart"
-msgstr "Plantillas para el plan contable"
+msgstr ""
+
+#. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from lower sequences to "
+"higher ones."
+msgstr ""
#. module: account
#: field:account.tax.code,code:0
#: field:account.tax.code.template,code:0
msgid "Case Code"
-msgstr "Código"
+msgstr ""
#. module: account
#: view:validate.account.move:0
msgid "Post Journal Entries of a Journal"
-msgstr "Asentar asientos de un diario"
+msgstr ""
#. module: account
#: view:product.product:0
msgid "Sale Taxes"
-msgstr "Impuestos de ventas"
+msgstr ""
#. module: account
+#: field:account.financial.report,name:0
+msgid "Report Name"
+msgstr ""
+
+#. module: account
+#: model:account.account.type,name:account.data_account_type_cash
#: selection:account.analytic.journal,type:0
#: selection:account.bank.accounts.wizard,account_type:0
#: selection:account.entries.report,type:0
#: selection:account.journal,type:0
+#: code:addons/account/account.py:3020
+#, python-format
msgid "Cash"
-msgstr "Efectivo"
+msgstr ""
#. module: account
#: field:account.fiscal.position.account,account_dest_id:0
#: field:account.fiscal.position.account.template,account_dest_id:0
msgid "Account Destination"
-msgstr "Cuenta destino"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1448
+#: code:addons/account/account.py:1477
+#: code:addons/account/account.py:1484
+#: code:addons/account/account_invoice.py:931
+#: code:addons/account/account_move_line.py:1119
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
+#: code:addons/account/wizard/account_fiscalyear_close.py:88
+#: code:addons/account/wizard/account_fiscalyear_close.py:99
+#: code:addons/account/wizard/account_fiscalyear_close.py:102
+#: code:addons/account/wizard/account_move_journal.py:165
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:58
+#, python-format
+msgid "UserError"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_supplierpaymentorder0
msgid "Payment of invoices"
-msgstr "Pago de facturas"
+msgstr ""
#. module: account
#: field:account.bank.statement.line,sequence:0
+#: field:account.financial.report,sequence:0
#: field:account.invoice.tax,sequence:0
#: view:account.journal:0
#: field:account.journal.column,sequence:0
@@ -7460,44 +7507,45 @@ msgstr "Pago de facturas"
#: field:account.payment.term.line,sequence:0
#: field:account.sequence.fiscalyear,sequence_id:0
#: field:account.tax,sequence:0
+#: field:account.tax.code,sequence:0
#: field:account.tax.template,sequence:0
msgid "Sequence"
-msgstr "Secuencia"
-
-#. module: account
-#: model:ir.model,name:account.model_account_bs_report
-msgid "Account Balance Sheet Report"
-msgstr "Contabilidad. Informe balance de situación"
-
-#. module: account
-#: help:account.tax,price_include:0
-#: help:account.tax.template,price_include:0
-msgid ""
-"Check this if the price you use on the product and invoices includes this "
-"tax."
msgstr ""
-"Marque esta opción si el precio que utiliza en el producto y en las facturas "
-"incluye este impuesto."
+
+#. module: account
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: account
+#: help:account.model.line,quantity:0
+msgid "The optional quantity on entries."
+msgstr ""
+
+#. module: account
+#: view:account.financial.report:0
+msgid "Parent Report"
+msgstr ""
#. module: account
#: view:account.state.open:0
msgid "Yes"
-msgstr "Sí"
+msgstr ""
#. module: account
#: view:report.account_type.sales:0
msgid "Sales by Account type"
-msgstr "Ventas por tipo de cuenta"
+msgstr ""
#. module: account
#: help:account.invoice,move_id:0
msgid "Link to the automatically generated Journal Items."
-msgstr "Enlace a los asientos generados automáticamente."
+msgstr ""
#. module: account
#: selection:account.installer,period:0
msgid "Monthly"
-msgstr "Mensual"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_view
@@ -7508,37 +7556,27 @@ msgid ""
"in which they will appear. Then you can create a new journal and link your "
"view to it."
msgstr ""
-"Aquí puede personalizar una vista de un diario existente o crear una nueva "
-"vista. Las vistas de diarios determinan la forma en la que puede registrar "
-"asientos en sus diarios. Seleccione los campos que desea que aparezcan en un "
-"diario y determine la secuencia en que aparecen. Después puede crear un "
-"diario nuevo y asociarle una vista."
#. module: account
-#: view:account.payment.term.line:0
-msgid " number of days: 14"
-msgstr " número de días: 14"
+#: model:account.account.type,name:account.data_account_type_asset
+msgid "Asset"
+msgstr ""
#. module: account
#: view:analytic.entries.report:0
msgid " 7 Days "
-msgstr " 7 Días "
+msgstr ""
#. module: account
-#: field:account.partner.reconcile.process,progress:0
-msgid "Progress"
-msgstr "Progreso"
+#: field:account.bank.statement,balance_end:0
+msgid "Computed Balance"
+msgstr ""
#. module: account
#: field:account.account,parent_id:0
-#: view:account.analytic.account:0
+#: field:account.financial.report,parent_id:0
msgid "Parent"
-msgstr "Padre"
-
-#. module: account
-#: field:account.installer.modules,account_analytic_plans:0
-msgid "Multiple Analytic Plans"
-msgstr "Planes analíticos múltiples"
+msgstr ""
#. module: account
#: help:account.payment.term.line,days2:0
@@ -7547,19 +7585,16 @@ msgid ""
"positive, it gives the day of the next month. Set 0 for net days (otherwise "
"it's based on the beginning of the month)."
msgstr ""
-"Día del mes, introduzca -1 para el último día del mes actual. Si es "
-"positivo, indica el día del próximo mes. Introduzca 0 para días netos (de lo "
-"contrario se calcula desde principio del mes)."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
msgid "Legal Reports"
-msgstr "Informes legales"
+msgstr ""
#. module: account
#: field:account.tax.code,sum_period:0
msgid "Period Sum"
-msgstr "Suma del período"
+msgstr ""
#. module: account
#: help:account.tax,sequence:0
@@ -7568,14 +7603,11 @@ msgid ""
"to the higher ones. The order is important if you have a tax with several "
"tax children. In this case, the evaluation order is important."
msgstr ""
-"El campo secuencia es usado para ordenar las líneas de impuestos de menor a "
-"mayor secuencia. El orden es importante si un impuesto tiene varios impuesto "
-"hijos. En este caso, el orden de evaluación es importante."
#. module: account
#: model:ir.model,name:account.model_account_cashbox_line
msgid "CashBox Line"
-msgstr "Línea de caja"
+msgstr ""
#. module: account
#: view:account.partner.ledger:0
@@ -7585,55 +7617,46 @@ msgstr "Línea de caja"
#: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
#: model:ir.ui.menu,name:account.menu_account_partner_ledger
msgid "Partner Ledger"
-msgstr "Libro mayor de empresa"
-
-#. module: account
-#: report:account.account.balance.landscape:0
-msgid "Year :"
-msgstr "Ejercicio :"
+msgstr ""
#. module: account
#: selection:account.tax.template,type:0
msgid "Fixed"
-msgstr "Fijo"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:506
-#: code:addons/account/account.py:519
-#: code:addons/account/account.py:522
-#: code:addons/account/account.py:532
-#: code:addons/account/account.py:640
-#: code:addons/account/account.py:927
-#: code:addons/account/account_move_line.py:732
-#: code:addons/account/account_move_line.py:776
-#: code:addons/account/invoice.py:714
-#: code:addons/account/invoice.py:717
-#: code:addons/account/invoice.py:720
+#: code:addons/account/account.py:629
+#: code:addons/account/account.py:642
+#: code:addons/account/account.py:645
+#: code:addons/account/account.py:664
+#: code:addons/account/account.py:787
+#: code:addons/account/account.py:1082
+#: code:addons/account/account_invoice.py:741
+#: code:addons/account/account_invoice.py:744
+#: code:addons/account/account_invoice.py:747
+#: code:addons/account/account_move_line.py:97
+#: code:addons/account/account_move_line.py:766
+#: code:addons/account/account_move_line.py:819
+#: code:addons/account/wizard/account_fiscalyear_close.py:62
#, python-format
msgid "Warning !"
-msgstr "¡Atención!"
+msgstr ""
#. module: account
#: field:account.entries.report,move_line_state:0
msgid "State of Move Line"
-msgstr "Estado de línea movimiento"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile
-#: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
msgid "Account move line reconcile"
-msgstr "Contabilidad. Conciliar línea movimiento"
+msgstr ""
#. module: account
#: view:account.subscription.generate:0
#: model:ir.model,name:account.model_account_subscription_generate
msgid "Subscription Compute"
-msgstr "Calcular asientos periódicos"
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "Amount (in words) :"
-msgstr "Importe (en palabras):"
+msgstr ""
#. module: account
#: field:account.bank.statement.line,partner_id:0
@@ -7647,6 +7670,7 @@ msgstr "Importe (en palabras):"
#: view:account.invoice.report:0
#: field:account.invoice.report,partner_id:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model.line,partner_id:0
#: view:account.move:0
#: field:account.move,partner_id:0
@@ -7657,26 +7681,39 @@ msgstr "Importe (en palabras):"
#: model:ir.model,name:account.model_res_partner
#: field:report.invoice.created,partner_id:0
msgid "Partner"
-msgstr "Empresa"
+msgstr ""
#. module: account
#: help:account.change.currency,currency_id:0
msgid "Select a currency to apply on the invoice"
-msgstr "Seleccione una moneda a aplicar en la factura."
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_invoice_refund.py:100
+#: code:addons/account/account.py:3463
+#, python-format
+msgid ""
+"The bank account defined on the selected chart of accounts hasn't a code."
+msgstr ""
+
+#. module: account
+#: code:addons/account/wizard/account_invoice_refund.py:108
#, python-format
msgid "Can not %s draft/proforma/cancel invoice."
-msgstr "No se puede %s factura borrador/proforma/cancelada."
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/account_invoice.py:821
#, python-format
msgid "No Invoice Lines !"
-msgstr "¡No hay líneas de factura!"
+msgstr ""
#. module: account
+#: view:account.financial.report:0
+msgid "Report Type"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
#: view:account.bank.statement:0
#: field:account.bank.statement,state:0
#: field:account.entries.report,move_state:0
@@ -7694,7 +7731,7 @@ msgstr "¡No hay líneas de factura!"
#: field:account.subscription,state:0
#: field:report.invoice.created,state:0
msgid "State"
-msgstr "Estado"
+msgstr ""
#. module: account
#: help:account.open.closed.fiscalyear,fyear_id:0
@@ -7702,45 +7739,57 @@ msgid ""
"Select Fiscal Year which you want to remove entries for its End of year "
"entries journal"
msgstr ""
-"Seleccione el ejercicio fiscal que desea eliminar asientos de su diario de "
-"asientos fin de ejercicio."
#. module: account
#: field:account.tax.template,type_tax_use:0
msgid "Tax Use In"
-msgstr "Impuesto usado en"
+msgstr ""
#. module: account
-#: code:addons/account/account_bank_statement.py:346
+#: code:addons/account/account_bank_statement.py:315
+#, python-format
+msgid ""
+"The statement balance is incorrect !\n"
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:353
#, python-format
msgid "The account entries lines are not in valid state."
-msgstr "Las líneas de los asientos contables no están en estado válido."
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_analytic_account_tree2
+msgid ""
+"The normal chart of accounts has a structure defined by the legal "
+"requirement of the country. The analytic chart of accounts structure should "
+"reflect your own business needs in term of costs/revenues reporting. They "
+"are usually structured by contracts, projects, products or departements. "
+"Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
+"generate analytic entries on the related account."
+msgstr ""
#. module: account
#: field:account.account.type,close_method:0
msgid "Deferral Method"
-msgstr "Método cierre"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:359
+#: code:addons/account/account_invoice.py:388
#, python-format
msgid "Invoice '%s' is paid."
-msgstr "La factura '%s' está pagada."
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_electronicfile0
msgid "Automatic entry"
-msgstr "Asiento automático"
+msgstr ""
#. module: account
#: constraint:account.tax.code.template:0
msgid "Error ! You can not create recursive Tax Codes."
-msgstr "¡Error! No puede crear códigos de impuestos recursivos."
-
-#. module: account
-#: view:account.invoice.line:0
-msgid "Line"
-msgstr "Línea"
+msgstr ""
#. module: account
#: help:account.journal,group_invoice_lines:0
@@ -7748,8 +7797,12 @@ msgid ""
"If this box is checked, the system will try to group the accounting lines "
"when generating them from invoices."
msgstr ""
-"Si esta opción está marcada, el sistema tratará de agrupar las líneas del "
-"asiento cuando se generen desde facturas."
+
+#. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this box if this account allows reconciliation of journal items."
+msgstr ""
#. module: account
#: help:account.period,state:0
@@ -7757,63 +7810,70 @@ msgid ""
"When monthly periods are created. The state is 'Draft'. At the end of "
"monthly period it is in 'Done' state."
msgstr ""
-"Cuando se crean los periodos mensuales el estado es 'Borrador'. Al final del "
-"periodo mensual está en estado 'Realizado'."
#. module: account
#: report:account.analytic.account.inverted.balance:0
msgid "Inverted Analytic Balance -"
-msgstr "Balance analítico invertido -"
+msgstr ""
#. module: account
#: view:account.move.bank.reconcile:0
msgid "Open for Bank Reconciliation"
-msgstr "Abrir para la conciliación bancaria"
+msgstr ""
#. module: account
-#: field:account.partner.ledger,page_split:0
-msgid "One Partner Per Page"
-msgstr "Una empresa por página"
+#: view:account.analytic.line:0
+#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+msgid "Analytic Entries"
+msgstr ""
#. module: account
-#: field:account.account,child_parent_ids:0
-#: field:account.account.template,child_parent_ids:0
-msgid "Children"
-msgstr "Hijos"
+#: view:report.account_type.sales:0
+msgid "This Months Sales by type"
+msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Associated Partner"
-msgstr "Empresa asociada"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:1284
+#: code:addons/account/account_invoice.py:1345
#, python-format
msgid "You must first select a partner !"
-msgstr "¡Primero debe seleccionar una empresa!"
+msgstr ""
#. module: account
#: view:account.invoice:0
#: field:account.invoice,comment:0
msgid "Additional Information"
-msgstr "Información adicional"
+msgstr ""
#. module: account
-#: view:account.installer:0
-msgid "Bank and Cash Accounts"
-msgstr "Cuentas de banco y caja"
+#: help:account.invoice,state:0
+msgid ""
+" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
+"Invoice. \n"
+"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
+"an invoice number. \n"
+"* The 'Open' state is used when user create invoice,a invoice number is "
+"generated.Its in open state till user does not pay invoice. \n"
+"* The 'Paid' state is set automatically when the invoice is paid. Its "
+"related journal entries may or may not be reconciled. \n"
+"* The 'Cancelled' state is used when user cancel invoice."
+msgstr ""
#. module: account
#: view:account.invoice.report:0
#: field:account.invoice.report,residual:0
msgid "Total Residual"
-msgstr "Total residual"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_invoiceinvoice0
#: model:process.node,note:account.process_node_supplierinvoiceinvoice0
msgid "Invoice's state is Open"
-msgstr "Estado de la factura es Abierta"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_tax_code_tree
@@ -7822,55 +7882,49 @@ msgid ""
"will see the taxes with codes related to your legal statement according to "
"your country."
msgstr ""
-"El plan de impuestos se usa para generar sus informes periódicos de "
-"impuestos. Verá los impuestos con códigos relativos a sus requisitos legales "
-"de acuerdo a su país."
#. module: account
-#: view:account.installer.modules:0
-msgid "Add extra Accounting functionalities to the ones already installed."
+#: code:addons/account/account_invoice.py:437
+#, python-format
+msgid ""
+"Can not find a chart of accounts for this company, you should create one."
msgstr ""
-"Añade funcionalidades contables extras a las que ya tiene instaladas."
-
-#. module: account
-#: report:account.analytic.account.cost_ledger:0
-#: report:account.analytic.account.quantity_cost_ledger:0
-#: model:ir.actions.act_window,name:account.action_account_analytic_cost
-#: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
-msgid "Cost Ledger"
-msgstr "Costo contable"
#. module: account
#: view:account.invoice:0
msgid "Proforma"
-msgstr "Proforma"
+msgstr ""
#. module: account
#: report:account.analytic.account.cost_ledger:0
msgid "J.C. /Move name"
-msgstr "Cód. diario/Nombre mov."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_open_closed_fiscalyear
msgid "Choose Fiscal Year"
-msgstr "Seleccione el ejercicio fiscal"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2841
-#: code:addons/account/installer.py:495
+#: code:addons/account/account.py:3128
#, python-format
msgid "Purchase Refund Journal"
-msgstr "Diario de abono de compras"
+msgstr ""
#. module: account
#: help:account.tax.template,amount:0
msgid "For Tax Type percent enter % ratio between 0-1."
-msgstr "Para los porcentaje del tipo de pago introduzca valor % entre 0-1."
+msgstr ""
#. module: account
-#: selection:account.automatic.reconcile,power:0
-msgid "8"
-msgstr "8"
+#: view:account.analytic.account:0
+msgid "Current Accounts"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by Invoice Date"
+msgstr ""
#. module: account
#: view:account.invoice.refund:0
@@ -7878,13 +7932,6 @@ msgid ""
"Modify Invoice: Cancels the current invoice and creates a new copy of it "
"ready for editing."
msgstr ""
-"Modificar factura: Cancela la factura actual y crea una nueva copia "
-"preparada para editar."
-
-#. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
-msgid "Accounting and Financial Management"
-msgstr "Gestión contable y financiera"
#. module: account
#: field:account.automatic.reconcile,period_id:0
@@ -7893,9 +7940,12 @@ msgstr "Gestión contable y financiera"
#: view:account.entries.report:0
#: field:account.entries.report,period_id:0
#: view:account.fiscalyear:0
+#: report:account.general.ledger_landscape:0
#: view:account.invoice:0
#: view:account.invoice.report:0
#: field:account.journal.period,period_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: view:account.move:0
#: field:account.move,period_id:0
#: view:account.move.line:0
@@ -7903,39 +7953,32 @@ msgstr "Gestión contable y financiera"
#: view:account.period:0
#: field:account.subscription,period_nbr:0
#: field:account.tax.chart,period_id:0
-#: code:addons/account/account_move_line.py:982
+#: field:account.treasury.report,period_id:0
#: field:validate.account.move,period_id:0
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-#: report:account.vat.declaration:0
-#, python-format
msgid "Period"
-msgstr "Período"
+msgstr ""
+
+#. module: account
+#: help:account.account,adjusted_balance:0
+msgid ""
+"Total amount (in Company currency) for transactions held in secondary "
+"currency for this account."
+msgstr ""
#. module: account
#: report:account.invoice:0
msgid "Net Total:"
-msgstr "Base:"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_generic_reporting
msgid "Generic Reporting"
-msgstr "Informes genéricos"
+msgstr ""
#. module: account
#: field:account.move.line.reconcile.writeoff,journal_id:0
msgid "Write-Off Journal"
-msgstr "Diario de desajuste"
+msgstr ""
#. module: account
#: help:res.partner,property_payment_term:0
@@ -7943,34 +7986,50 @@ msgid ""
"This payment term will be used instead of the default one for the current "
"partner"
msgstr ""
-"Este plazo de pago se utilizará en lugar del plazo por defecto para la "
-"empresa actual."
#. module: account
#: view:account.tax.template:0
msgid "Compute Code for Taxes Included Prices"
-msgstr "Código para el cálculo de los impuestos en precios incluidos"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:1042
+#, python-format
+msgid ""
+"You can not cancel an invoice which is partially paid! You need to "
+"unreconcile related payment entries first!"
+msgstr ""
#. module: account
#: field:account.chart.template,property_account_income_categ:0
msgid "Income Category Account"
-msgstr "Cuenta de la categoría de ingresos"
+msgstr ""
+
+#. module: account
+#: field:account.account,adjusted_balance:0
+msgid "Adjusted Balance"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
#: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
msgid "Fiscal Position Templates"
-msgstr "Plantillas de posiciones fiscales"
+msgstr ""
#. module: account
#: view:account.entries.report:0
msgid "Int.Type"
-msgstr "Tipo interno"
+msgstr ""
#. module: account
#: field:account.move.line,tax_amount:0
msgid "Tax/Base Amount"
-msgstr "Importe impuestos/base"
+msgstr ""
+
+#. module: account
+#: view:account.payment.term.line:0
+msgid " Valuation: Percent"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree3
@@ -7980,10 +8039,6 @@ msgid ""
"can easily generate refunds and reconcile them directly from the invoice "
"form."
msgstr ""
-"Con las facturas rectificativas (abonos) a clientes puede gestionar las "
-"devoluciones de sus clientes. Una factura rectificativa es un documento que "
-"abona una factura completa o parcialmente. Puede generar fácilmente facturas "
-"rectificativas y conciliarlas directamente desde el formulario de factura."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_vat_declaration
@@ -7995,40 +8050,46 @@ msgid ""
"useful because it enables you to preview at any time the tax that you owe at "
"the start and end of the month or quarter."
msgstr ""
-"Este menú imprime una declaración de IVA basada en facturas o pagos. Puede "
-"seleccionar uno o varios periodos del ejercicio fiscal. La información "
-"necesaria para la declaración de impuestos es generada por OpenERP a partir "
-"de las facturas (o pagos, en algunos países). Esta información se actualiza "
-"en tiempo real; lo cual es muy útil porque le permite previsualizar en "
-"cualquier momento los impuestos a pagar al principio y al final del mes o "
-"trimestre."
#. module: account
#: report:account.invoice:0
msgid "Tel. :"
-msgstr "Tel. :"
+msgstr ""
#. module: account
#: field:account.account,company_currency_id:0
msgid "Company Currency"
-msgstr "Divisa de la compañía"
+msgstr ""
+
+#. module: account
+#: field:account.aged.trial.balance,chart_account_id:0
+#: field:account.balance.report,chart_account_id:0
+#: field:account.central.journal,chart_account_id:0
+#: field:account.common.account.report,chart_account_id:0
+#: field:account.common.journal.report,chart_account_id:0
+#: field:account.common.partner.report,chart_account_id:0
+#: field:account.common.report,chart_account_id:0
+#: field:account.general.journal,chart_account_id:0
+#: field:account.partner.balance,chart_account_id:0
+#: field:account.partner.ledger,chart_account_id:0
+#: field:account.print.journal,chart_account_id:0
+#: field:account.report.general.ledger,chart_account_id:0
+#: field:account.vat.declaration,chart_account_id:0
+#: field:accounting.report,chart_account_id:0
+msgid "Chart of Account"
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_paymententries0
#: model:process.transition,name:account.process_transition_reconcilepaid0
msgid "Payment"
-msgstr "Pago"
+msgstr ""
#. module: account
-#: help:account.bs.report,reserve_account_id:0
-msgid ""
-"This Account is used for transfering Profit/Loss (Profit: Amount will be "
-"added, Loss: Amount will be duducted), which is calculated from Profilt & "
-"Loss Report"
+#: field:account.bank.statement,balance_end_real:0
+#: field:account.treasury.report,ending_balance:0
+msgid "Ending Balance"
msgstr ""
-"Esta cuenta se usa para transferir pérdidas/ganancias (Ganancia: El importe "
-"será añadido, Pérdida: El importe será deducido), que se calcula en el "
-"informe de pérdidas y ganancias."
#. module: account
#: help:account.move.line,blocked:0
@@ -8036,57 +8097,64 @@ msgid ""
"You can check this box to mark this journal item as a litigation with the "
"associated partner"
msgstr ""
-"Puede marcar esta opción para indicar este asiento como un litigio con la "
-"empresa asociada."
#. module: account
#: field:account.move.line,reconcile_partial_id:0
#: view:account.move.line.reconcile:0
msgid "Partial Reconcile"
-msgstr "Conciliación parcial"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_inverted_balance
msgid "Account Analytic Inverted Balance"
-msgstr "Contabilidad. Balance invertido analítico"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_common_report
msgid "Account Common Report"
-msgstr "Contabilidad. Informe común"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+#: view:analytic.entries.report:0
+msgid "current month"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1057
+#, python-format
+msgid ""
+"No period defined for this date: %s !\n"
+"Please create one."
+msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_filestatement0
msgid "Automatic import of the bank sta"
-msgstr "Importación automática del extracto bancario"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_journal_view
#: model:ir.ui.menu,name:account.menu_action_account_journal_view
msgid "Journal Views"
-msgstr "Vistas de diario"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_move_bank_reconcile
msgid "Move bank reconcile"
-msgstr "Conciliar movimientos banco"
+msgstr ""
#. module: account
+#: field:account.financial.report,account_type_ids:0
#: model:ir.actions.act_window,name:account.action_account_type_form
#: model:ir.ui.menu,name:account.menu_action_account_type_form
msgid "Account Types"
-msgstr "Tipos de cuentas"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:897
-#, python-format
-msgid "Cannot create invoice move on centralised journal"
-msgstr "No se puede crear asiento factura en el diario centralizado"
-
-#. module: account
-#: field:account.account.type,report_type:0
-msgid "P&L / BS Category"
-msgstr "Categoría Balance / PyG"
+#: view:account.payment.term.line:0
+msgid " Value amount: n.a"
+msgstr ""
#. module: account
#: view:account.automatic.reconcile:0
@@ -8100,43 +8168,45 @@ msgstr "Categoría Balance / PyG"
#: model:process.node,name:account.process_node_supplierreconciliation0
#, python-format
msgid "Reconciliation"
-msgstr "Conciliación"
+msgstr ""
#. module: account
#: view:account.chart.template:0
#: field:account.chart.template,property_account_receivable:0
msgid "Receivable Account"
-msgstr "Cuenta a cobrar"
+msgstr ""
#. module: account
-#: view:account.bank.statement:0
-msgid "CashBox Balance"
-msgstr "Saldo de caja"
+#: view:account.invoice:0
+msgid ""
+"This button only appears when the state of the invoice is 'paid' (showing "
+"that it has been fully reconciled) and auto-computed boolean 'reconciled' is "
+"False (depicting that it's not the case anymore). In other words, the "
+"invoice has been dereconciled and it does not fit anymore the 'paid' state. "
+"You should press this button to re-open it and let it continue its normal "
+"process after having resolved the eventual exceptions it may have created."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close_state
msgid "Fiscalyear Close state"
-msgstr "Cerrar estado ejercicio fiscal"
+msgstr ""
#. module: account
#: field:account.invoice.refund,journal_id:0
-#: field:account.journal,refund_journal:0
msgid "Refund Journal"
-msgstr "Diario reintegro"
+msgstr ""
#. module: account
#: report:account.account.balance:0
#: report:account.central.journal:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
-#: report:account.partner.balance:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: report:account.partner.balance:0
msgid "Filter By"
-msgstr "Filtrar por"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -8146,62 +8216,74 @@ msgid ""
"sales orders or deliveries. You should only confirm them before sending them "
"to your customers."
msgstr ""
-"Con las facturas de cliente puede crear y gestionar las facturas de venta "
-"emitidas a sus clientes. OpenERP también puede generar automáticamente "
-"facturas borrador desde los pedidos o desde albaranes. Sólo deberá "
-"confirmarlas antes de ser enviadas a sus clientes."
+
+#. module: account
+#: code:addons/account/wizard/account_period_close.py:51
+#, python-format
+msgid ""
+"In order to close a period, you must first post related journal entries."
+msgstr ""
#. module: account
#: view:account.entries.report:0
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_company_analysis_tree
msgid "Company Analysis"
-msgstr "Análisis compañía"
+msgstr ""
#. module: account
#: help:account.invoice,account_id:0
msgid "The partner account used for this invoice."
-msgstr "La cuenta de la empresa utilizada para esta factura."
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:3313
+#, python-format
+msgid "Tax %.2f%%"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contacts"
+msgstr ""
#. module: account
#: field:account.tax.code,parent_id:0
#: view:account.tax.code.template:0
#: field:account.tax.code.template,parent_id:0
msgid "Parent Code"
-msgstr "Código padre"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_payment_term_line
msgid "Payment Term Line"
-msgstr "Línea de plazo de pago"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2794
-#: code:addons/account/installer.py:452
+#: code:addons/account/account.py:3126
#, python-format
msgid "Purchase Journal"
-msgstr "Diario de compras"
+msgstr ""
#. module: account
#: view:account.invoice.refund:0
msgid "Refund Invoice: Creates the refund invoice, ready for editing."
msgstr ""
-"Factura rectificativa: Crea la factura de abono, preparada para editarla."
#. module: account
#: field:account.invoice.line,price_subtotal:0
msgid "Subtotal"
-msgstr "Subtotal"
+msgstr ""
#. module: account
#: view:account.vat.declaration:0
msgid "Print Tax Statement"
-msgstr "Imprimir declaración de impuestos"
+msgstr ""
#. module: account
#: view:account.model.line:0
msgid "Journal Entry Model Line"
-msgstr "Línea de modelo de asiento"
+msgstr ""
#. module: account
#: view:account.invoice:0
@@ -8210,30 +8292,23 @@ msgstr "Línea de modelo de asiento"
#: field:account.invoice.report,date_due:0
#: field:report.invoice.created,date_due:0
msgid "Due Date"
-msgstr "Fecha vencimiento"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_account_supplier
#: model:ir.ui.menu,name:account.menu_finance_payables
msgid "Suppliers"
-msgstr "Proveedores"
-
-#. module: account
-#: constraint:account.move:0
-msgid ""
-"You cannot create more than one move per period on centralized journal"
msgstr ""
-"No puede crear más de un movimiento por periodo en un diario centralizado"
#. module: account
#: view:account.journal:0
msgid "Accounts Type Allowed (empty for no control)"
-msgstr "Tipo de cuentas permitidas (vacío para ningún control)"
+msgstr ""
#. module: account
#: view:res.partner:0
msgid "Supplier Accounting Properties"
-msgstr "Propiedades de contabilidad del proveedor"
+msgstr ""
#. module: account
#: help:account.move.line,amount_residual:0
@@ -8241,96 +8316,114 @@ msgid ""
"The residual amount on a receivable or payable of a journal entry expressed "
"in the company currency."
msgstr ""
-"El importe residual de un apunte a cobrar o a pagar expresado en la moneda "
-"de la compañía."
-
-#. module: account
-#: view:account.payment.term.line:0
-msgid " valuation: balance"
-msgstr " valoración: saldo"
#. module: account
#: view:account.tax.code:0
msgid "Statistics"
-msgstr "Estadísticas"
+msgstr ""
#. module: account
#: field:account.analytic.chart,from_date:0
#: field:project.account.analytic.line,from_date:0
msgid "From"
-msgstr "Desde"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscalyear_close
msgid "Fiscalyear Close"
-msgstr "Cierre ejercicio fiscal"
+msgstr ""
#. module: account
#: sql_constraint:account.account:0
msgid "The code of the account must be unique per company !"
-msgstr "¡El código de la cuenta debe ser único por compañía!"
+msgstr ""
#. module: account
+#: view:account.invoice:0
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
msgid "Unpaid Invoices"
-msgstr "Facturas impagadas"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:504
+#, python-format
+msgid "The payment term of supplier does not have a payment term line!"
+msgstr ""
#. module: account
#: field:account.move.line.reconcile,debit:0
msgid "Debit amount"
-msgstr "Importe debe"
+msgstr ""
#. module: account
#: view:board.board:0
#: model:ir.actions.act_window,name:account.action_treasory_graph
msgid "Treasury"
-msgstr "Tesorería"
+msgstr ""
#. module: account
#: view:account.aged.trial.balance:0
-#: view:account.analytic.Journal.report:0
#: view:account.analytic.balance:0
#: view:account.analytic.cost.ledger:0
#: view:account.analytic.cost.ledger.journal.report:0
#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
#: view:account.common.report:0
msgid "Print"
-msgstr "Imprimir"
+msgstr ""
#. module: account
#: view:account.journal:0
msgid "Accounts Allowed (empty for no control)"
-msgstr "Cuentas permitidas (vacío para ningún control)"
+msgstr ""
#. module: account
-#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
-#: model:ir.actions.act_window,name:account.action_account_analytic_chart
-#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
-msgid "Chart of Analytic Accounts"
-msgstr "Plan de cuentas analíticas"
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Template Account Fiscal Mapping"
+msgstr ""
+
+#. module: account
+#: view:board.board:0
+msgid "Draft Customer Invoices"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_configuration_misc
msgid "Miscellaneous"
-msgstr "Varios"
+msgstr ""
#. module: account
#: help:res.partner,debit:0
msgid "Total amount you have to pay to this supplier."
-msgstr "Importe total que debe pagar a este proveedor."
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_analytic0
#: model:process.node,name:account.process_node_analyticcost0
msgid "Analytic Costs"
-msgstr "Costes analíticos"
+msgstr ""
#. module: account
#: field:account.analytic.journal,name:0
#: report:account.general.journal:0
#: field:account.journal,name:0
msgid "Journal Name"
-msgstr "Nombre del diario"
+msgstr ""
+
+#. module: account
+#: view:account.move.line:0
+msgid "Next Partner Entries to reconcile"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Smallest Text"
+msgstr ""
+
+#. module: account
+#: model:res.groups,name:account.group_account_invoice
+msgid "Invoicing & Payments"
+msgstr ""
#. module: account
#: help:account.invoice,internal_number:0
@@ -8338,8 +8431,6 @@ msgid ""
"Unique number of the invoice, computed automatically when the invoice is "
"created."
msgstr ""
-"Número único de la factura, calculado automáticamente cuando se valida la "
-"factura."
#. module: account
#: constraint:account.bank.statement.line:0
@@ -8347,26 +8438,23 @@ msgid ""
"The amount of the voucher must be the same amount as the one on the "
"statement line"
msgstr ""
-"El importe del recibo debe ser el mismo importe que el de la línea del "
-"extracto"
#. module: account
-#: code:addons/account/account_move_line.py:1131
-#: code:addons/account/account_move_line.py:1214
-#, python-format
-msgid "Bad account!"
-msgstr "¡Cuenta incorrecta!"
+#: model:account.account.type,name:account.data_account_type_expense
+#: model:account.financial.report,name:account.account_financial_report_expense0
+msgid "Expense"
+msgstr ""
#. module: account
#: help:account.chart,fiscalyear:0
msgid "Keep empty for all open fiscal years"
-msgstr "Dejarlo vacío para abrir todos los ejercicios fiscales."
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1056
+#: code:addons/account/account_move_line.py:1120
#, python-format
msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr "¡El movimiento contable (%s) para centralización ha sido confirmado!"
+msgstr ""
#. module: account
#: help:account.move.line,amount_currency:0
@@ -8374,8 +8462,15 @@ msgid ""
"The amount expressed in an optional other currency if it is a multi-currency "
"entry."
msgstr ""
-"El importe expresado en una otra divisa opcional si se trata de un asiento "
-"multi-divisa."
+
+#. module: account
+#: code:addons/account/account.py:1315
+#, python-format
+msgid ""
+"You can not validate a non-balanced entry !\n"
+"Make sure you have configured payment terms properly !\n"
+"The latest payment term line should be of the type \"Balance\" !"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -8391,6 +8486,7 @@ msgstr ""
#: field:account.invoice.report,currency_id:0
#: field:account.journal,currency:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model.line,currency_id:0
#: view:account.move:0
#: view:account.move.line:0
@@ -8402,22 +8498,20 @@ msgstr ""
#: field:report.account.sales,currency_id:0
#: field:report.account_type.sales,currency_id:0
#: field:report.invoice.created,currency_id:0
+#: field:res.partner.bank,currency_id:0
msgid "Currency"
-msgstr "Divisa"
+msgstr ""
#. module: account
#: help:account.bank.statement.line,sequence:0
msgid ""
"Gives the sequence order when displaying a list of bank statement lines."
msgstr ""
-"Indica el orden de secuencia cuando se muestra una lista de líneas de "
-"extracto bancario."
#. module: account
#: model:process.transition,note:account.process_transition_validentries0
msgid "Accountant validates the accounting entries coming from the invoice."
msgstr ""
-"El contable valida los asientos contables provenientes de la factura."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_fiscalyear_form
@@ -8430,78 +8524,70 @@ msgid ""
"would be referred to as FY 2011. You are not obliged to follow the actual "
"calendar year."
msgstr ""
-"Defina el ejercicio fiscal de su compañía de acuerdo a sus necesidades. Un "
-"ejercicio fiscal es un periodo al final del cual se cierran las cuentas "
-"(usualmente 12 meses). El ejercicio fiscal usualmente se referencia por el "
-"año en el que acaba. Por ejemplo, si el ejercicio fiscal de una compañía "
-"termina el 30 de noviembre de 2011, entonces todo lo que haya entre el 1 de "
-"diciembre de 2010 y el 30 de noviembre de 2011 se referencia como EF2011. No "
-"está obligado a seguir el año de calendario real."
#. module: account
+#: view:account.entries.report:0
#: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
msgid "Reconciled entries"
-msgstr "Asientos conciliados"
+msgstr ""
#. module: account
#: field:account.invoice,address_contact_id:0
msgid "Contact Address"
-msgstr "Dirección contacto"
+msgstr ""
#. module: account
-#: help:account.invoice,state:0
-msgid ""
-" * The 'Draft' state is used when a user is encoding a new and unconfirmed "
-"Invoice. \n"
-"* The 'Pro-forma' when invoice is in Pro-forma state,invoice does not have "
-"an invoice number. \n"
-"* The 'Open' state is used when user create invoice,a invoice number is "
-"generated.Its in open state till user does not pay invoice. \n"
-"* The 'Paid' state is set automatically when invoice is paid. \n"
-"* The 'Cancelled' state is used when user cancel invoice."
+#: code:addons/account/account.py:2273
+#, python-format
+msgid "Wrong model !"
msgstr ""
-" * El estado 'Borrador' se utiliza cuando un usuario está introduciendo una "
-"nueva factura sin confirmar. \n"
-"* El estado 'Pro-forma' se utiliza cuando la factura es una Pro-forma sin "
-"número de factura. \n"
-"* El estado 'Abierto' se utiliza cuando el usuario confirma una factura; se "
-"genera automáticamente un número de factura. Permanece en estado abierto "
-"mientras el usuario no paga la factura. \n"
-"* El estado 'Pagado' se establece automáticamente cuando se paga la factura. "
-" \n"
-"* El estado 'Cancelado' se utiliza cuando el usuario cancela la factura."
#. module: account
#: field:account.invoice.refund,period:0
msgid "Force period"
-msgstr "Forzar período"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_partner_balance
msgid "Print Account Partner Balance"
-msgstr "Imprimir balance contable de empresa"
+msgstr ""
+
+#. module: account
+#: help:account.financial.report,sign:0
+msgid ""
+"For accounts that are typically more debited than credited and that you "
+"would like to print as negative amounts in your reports, you should reverse "
+"the sign of the balance; e.g.: Expense account. The same applies for "
+"accounts that are typically more credited than debited and that you would "
+"like to print as positive amounts in your reports; e.g.: Income account."
+msgstr ""
#. module: account
#: field:res.partner,contract_ids:0
msgid "Contracts"
-msgstr "Contratos"
+msgstr ""
#. module: account
#: field:account.cashbox.line,ending_id:0
#: field:account.cashbox.line,starting_id:0
#: field:account.entries.report,reconcile_id:0
+#: field:account.financial.report,balance:0
+#: field:account.financial.report,credit:0
+#: field:account.financial.report,debit:0
msgid "unknown"
-msgstr "desconocido"
+msgstr ""
#. module: account
#: field:account.fiscalyear.close,journal_id:0
+#: code:addons/account/account.py:3130
+#, python-format
msgid "Opening Entries Journal"
-msgstr "Diario asientos de apertura"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_customerinvoice0
msgid "Draft invoices are checked, validated and printed."
-msgstr "Facturas borrador son comprobadas, validadas e impresas."
+msgstr ""
#. module: account
#: help:account.chart.template,property_reserve_and_surplus_account:0
@@ -8510,19 +8596,30 @@ msgid ""
"will be added, Loss: Amount will be deducted.), Which is calculated from "
"Profilt & Loss Report"
msgstr ""
-"Esta cuenta se utiliza para transferir las Pérdidas/Ganancias (si es una "
-"Ganancia: Importe será añadido, Pérdida: Importe será deducido), que se "
-"calcula en el informe de Pérdidas y Ganancias."
#. module: account
-#: field:account.invoice,reference_type:0
-msgid "Reference Type"
-msgstr "Tipo de referencia"
+#: code:addons/account/account_invoice.py:819
+#, python-format
+msgid "Please define sequence on the journal related to this invoice."
+msgstr ""
+
+#. module: account
+#: view:account.move:0
+#: field:account.move,narration:0
+#: view:account.move.line:0
+#: field:account.move.line,narration:0
+msgid "Internal Note"
+msgstr ""
+
+#. module: account
+#: view:report.account.sales:0
+msgid "This year's Sales by type"
+msgstr ""
#. module: account
#: view:account.analytic.cost.ledger.journal.report:0
msgid "Cost Ledger for Period"
-msgstr "Resumen de costes por periodo"
+msgstr ""
#. module: account
#: help:account.tax,child_depend:0
@@ -8531,18 +8628,16 @@ msgid ""
"Set if the tax computation is based on the computation of child taxes rather "
"than on the total amount."
msgstr ""
-"Indica si el cálculo de impuestos se basa en el cálculo de los impuestos "
-"hijos en lugar del importe total."
#. module: account
#: selection:account.tax,applicable_type:0
msgid "Given by Python Code"
-msgstr "Calculado por código Python"
+msgstr ""
#. module: account
#: field:account.analytic.journal,code:0
msgid "Journal Code"
-msgstr "Código diario"
+msgstr ""
#. module: account
#: help:account.tax.code,sign:0
@@ -8551,79 +8646,70 @@ msgid ""
"the amount of this case into its parent. For example, set 1/-1 if you want "
"to add/substract it."
msgstr ""
-"Puede indicar aquí el coeficiente que se utilizará cuando se consolide el "
-"importe de este código dentro de su padre. Por ejemplo, indique 1/-1 si "
-"desea sumar/restar el importe."
#. module: account
#: view:account.invoice:0
#: field:account.move.line,amount_residual:0
#: field:account.move.line,amount_residual_currency:0
msgid "Residual Amount"
-msgstr "Importe residual"
+msgstr ""
#. module: account
#: field:account.invoice,move_lines:0
#: field:account.move.reconcile,line_id:0
msgid "Entry Lines"
-msgstr "Apuntes"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer
+msgid "Review your Financial Accounts"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_open_journal_button
#: model:ir.actions.act_window,name:account.action_validate_account_move
msgid "Open Journal"
-msgstr "Abrir diario"
+msgstr ""
#. module: account
#: report:account.analytic.account.journal:0
msgid "KI"
-msgstr "KI"
+msgstr ""
#. module: account
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.journal:0
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Period from"
-msgstr "Período desde"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2817
-#: code:addons/account/installer.py:476
+#: code:addons/account/account.py:3127
#, python-format
msgid "Sales Refund Journal"
-msgstr "Diario de abono de ventas"
-
-#. module: account
-#: code:addons/account/account.py:927
-#, python-format
-msgid ""
-"You cannot modify company of this period as its related record exist in "
-"Entry Lines"
msgstr ""
-"No puede modificar la compañía de este periodo porqué ya hay apuntes en este "
-"período."
#. module: account
#: view:account.move:0
#: view:account.move.line:0
#: view:account.payment.term:0
msgid "Information"
-msgstr "Información"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_bankstatement0
msgid "Registered payment"
-msgstr "Pago registrado"
+msgstr ""
#. module: account
#: view:account.fiscalyear.close.state:0
msgid "Close states of Fiscal year and periods"
-msgstr "Cerrar estados de ejercicio fiscal y periodos"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Product Information"
-msgstr "Información del producto"
+msgstr ""
#. module: account
#: report:account.analytic.account.journal:0
@@ -8631,41 +8717,40 @@ msgstr "Información del producto"
#: view:account.move.line:0
#: model:ir.ui.menu,name:account.next_id_40
msgid "Analytic"
-msgstr "Analítico"
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_invoiceinvoice0
#: model:process.node,name:account.process_node_supplierinvoiceinvoice0
msgid "Create Invoice"
-msgstr "Crear factura"
+msgstr ""
#. module: account
-#: field:account.installer,purchase_tax:0
+#: field:wizard.multi.charts.accounts,purchase_tax_rate:0
msgid "Purchase Tax(%)"
-msgstr "Impuesto compra (%)"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:787
+#: code:addons/account/account_invoice.py:821
#, python-format
msgid "Please create some invoice lines."
-msgstr "Cree algunas líneas de factura"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Dear Sir/Madam,"
-msgstr "Apreciado Sr./Sra.,"
+msgstr ""
#. module: account
-#: view:account.installer.modules:0
-msgid "Configure Your Accounting Application"
-msgstr "Configure su aplicación de contabilidad"
+#: field:account.vat.declaration,display_detail:0
+msgid "Display Detail"
+msgstr ""
#. module: account
-#: code:addons/account/account.py:2820
-#: code:addons/account/installer.py:479
+#: code:addons/account/account.py:3135
#, python-format
msgid "SCNJ"
-msgstr "AVENTA"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -8673,8 +8758,6 @@ msgid ""
"Analytic costs (timesheets, some purchased products, ...) come from analytic "
"accounts. These generate draft invoices."
msgstr ""
-"Los costes analíticos (hojas de servicios, algunos productos comprados, ...) "
-"provienen de las cuentas analíticas. Estos generan facturas borrador."
#. module: account
#: help:account.journal,view_id:0
@@ -8684,55 +8767,61 @@ msgid ""
"in which order. You can create your own view for a faster encoding in each "
"journal."
msgstr ""
-"Establece la vista usada cuando se escriben o consultan asientos en este "
-"diario. La vista le indica a OpenERP qué campos deben ser visibles, "
-"requeridos o de sólo lectura, y en qué orden. Puede crear su propia vista en "
-"cada diario para introducir apuntes más rápido."
#. module: account
#: field:account.period,date_stop:0
#: model:ir.ui.menu,name:account.menu_account_end_year_treatments
msgid "End of Period"
-msgstr "Fin de período"
+msgstr ""
#. module: account
-#: field:account.installer.modules,account_followup:0
-msgid "Followups Management"
-msgstr "Gestión de seguimientos"
+#: field:account.account,financial_report_ids:0
+#: field:account.account.template,financial_report_ids:0
+#: model:ir.actions.act_window,name:account.action_account_financial_report_tree
+#: model:ir.actions.act_window,name:account.action_account_report
+#: model:ir.ui.menu,name:account.menu_account_reports
+msgid "Financial Reports"
+msgstr ""
#. module: account
#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_from:0
+#: field:account.balance.report,period_from:0
#: report:account.central.journal:0
+#: field:account.central.journal,period_from:0
+#: field:account.common.account.report,period_from:0
+#: field:account.common.journal.report,period_from:0
+#: field:account.common.partner.report,period_from:0
+#: field:account.common.report,period_from:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
-#: report:account.journal.period.print:0
+#: field:account.general.journal,period_from:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: field:account.partner.balance,period_from:0
+#: field:account.partner.ledger,period_from:0
+#: field:account.print.journal,period_from:0
+#: field:account.report.general.ledger,period_from:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.vat.declaration,period_from:0
+#: field:accounting.report,period_from:0
+#: field:accounting.report,period_from_cmp:0
msgid "Start Period"
-msgstr "Periodo inicial"
-
-#. module: account
-#: code:addons/account/account.py:2333
-#, python-format
-msgid "Cannot locate parent code for template account!"
-msgstr "¡No se puede localizar código padre para plantilla de cuentas!"
+msgstr ""
#. module: account
#: field:account.aged.trial.balance,direction_selection:0
+#: report:account.aged_trial_balance:0
msgid "Analysis Direction"
-msgstr "Dirección análisis"
+msgstr ""
#. module: account
#: field:res.partner,ref_companies:0
msgid "Companies that refers to partner"
-msgstr "Compañías que se refieren a la empresa"
+msgstr ""
#. module: account
#: view:account.journal:0
@@ -8741,56 +8830,44 @@ msgstr "Compañías que se refieren a la empresa"
#: field:account.journal.view,name:0
#: model:ir.model,name:account.model_account_journal_view
msgid "Journal View"
-msgstr "Vista de diario"
+msgstr ""
#. module: account
#: view:account.move.line:0
-#: code:addons/account/account_move_line.py:1006
+#: code:addons/account/account_move_line.py:1061
#, python-format
msgid "Total credit"
-msgstr "Total haber"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_suppliervalidentries0
msgid "Accountant validates the accounting entries coming from the invoice. "
msgstr ""
-"El contable valida los asientos contables provenientes de la factura. "
-
-#. module: account
-#: code:addons/account/invoice.py:1008
-#, python-format
-msgid ""
-"You cannot cancel the Invoice which is Partially Paid! You need to "
-"unreconcile concerned payment entries!"
-msgstr ""
-"¡No puede cancelar la factura que está pagada parcialmente! ¡Es necesario "
-"romper la conciliación de los asientos de pago relacionados!"
#. module: account
#: report:account.overdue:0
msgid "Best regards."
-msgstr "Atentamente,"
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Unpaid"
-msgstr "Impagada"
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_account_tax_code_template
+msgid "Tax Code Template"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Document: Customer account statement"
-msgstr "Documento: Estado contable del cliente"
+msgstr ""
#. module: account
-#: constraint:account.move.line:0
-msgid "You can not create move line on view account."
-msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista."
-
-#. module: account
-#: code:addons/account/wizard/account_change_currency.py:71
-#, python-format
-msgid "Current currency is not confirured properly !"
-msgstr "¡La moneda actual no está configurada correctamente!"
+#: field:account.account.type,report_type:0
+msgid "P&L / BS Category"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -8800,130 +8877,92 @@ msgid ""
"partially. You can easily generate refunds and reconcile them directly from "
"the invoice form."
msgstr ""
-"Con facturas rectificativas de proveedor puede gestionar las facturas de "
-"abono que recibe de sus proveedores. Una factura rectificativa es un "
-"documento que abona una factura total o parcialmente. Puede fácilmente "
-"generar facturas rectificativas y conciliarlas directamente desde el "
-"formulario de factura."
#. module: account
#: view:account.account.template:0
msgid "Receivale Accounts"
-msgstr "Cuentas a cobrar"
+msgstr ""
#. module: account
-#: report:account.move.voucher:0
-msgid "Particulars"
-msgstr "Particulares"
-
-#. module: account
-#: selection:account.account.type,report_type:0
-msgid "Profit & Loss (Income Accounts)"
-msgstr "Pérdida y ganancias (cuentas de ingresos)"
-
-#. module: account
-#: view:account.tax:0
-#: view:account.tax.template:0
-msgid "Keep empty to use the income account"
-msgstr "Dejarlo vacío para usar la cuenta de ingresos"
+#: model:ir.actions.act_window,name:account.action_bank_statement_periodic_tree
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree
+msgid "Bank Statements"
+msgstr ""
#. module: account
#: field:account.account,balance:0
#: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
#: selection:account.account.type,close_method:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.inverted.balance:0
-#: field:account.bank.statement,balance_end:0
-#: field:account.bank.statement,balance_end_cash:0
#: report:account.central.journal:0
#: field:account.entries.report,balance:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.invoice,residual:0
#: field:account.move.line,balance:0
#: report:account.partner.balance:0
#: selection:account.payment.term.line,value:0
#: selection:account.tax,type:0
+#: selection:account.tax.template,type:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,balance:0
#: field:report.account.receivable,balance:0
#: field:report.aged.receivable,balance:0
msgid "Balance"
-msgstr "Saldo pendiente"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_supplierbankstatement0
msgid "Manually or automatically entered in the system"
-msgstr "Introducido manualmente o automáticamente en el sistema"
+msgstr ""
#. module: account
#: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
msgid "Display Account"
-msgstr "Mostrar cuenta"
-
-#. module: account
-#: report:account.tax.code.entries:0
-msgid "("
-msgstr "("
-
-#. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify"
-msgstr "Modificar"
+msgstr ""
#. module: account
#: view:account.account.type:0
msgid "Closing Method"
-msgstr "Método de cierre"
-
-#. module: account
-#: model:ir.actions.act_window,help:account.action_account_partner_balance
-msgid ""
-"This report is analysis by partner. It is a PDF report containing one line "
-"per partner representing the cumulative credit balance."
msgstr ""
-"Este informe es el análisis por empresa. Es un informe PDF que contiene una "
-"línea por empresa representando el saldo de crédito acumulativo."
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
+#: model:account.account.type,name:account.data_account_type_payable
#: selection:account.entries.report,type:0
msgid "Payable"
-msgstr "A pagar"
+msgstr ""
#. module: account
#: view:report.account.sales:0
#: view:report.account_type.sales:0
#: view:report.hr.timesheet.invoice.journal:0
msgid "This Year"
-msgstr "Este año"
+msgstr ""
#. module: account
#: view:board.board:0
msgid "Account Board"
-msgstr "Tablero de contabilidad"
+msgstr ""
#. module: account
#: view:account.model:0
#: field:account.model,legend:0
msgid "Legend"
-msgstr "Leyenda"
+msgstr ""
+
+#. module: account
+#: view:account.analytic.account:0
+msgid "Contract Data"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_moves_sale
@@ -8934,35 +8973,17 @@ msgid ""
"the income account. OpenERP will propose to you automatically the Tax "
"related to this account and the counter-part \"Account receivable\"."
msgstr ""
-"Esta vista es usada por los contables para registrar asientos masivamente en "
-"OpenERP. Si quiere registrar una factura de cliente, seleccione el diario y "
-"el periodo en la barra de herramientas de búsqueda. Luego, comience "
-"introduciendo el apunte de la cuenta de ingresos. OpenERP le propondrá "
-"automáticamente el impuesto asociado a esta cuenta, y la \"cuenta a cobrar\" "
-"de contrapartida."
#. module: account
-#: code:addons/account/account_bank_statement.py:391
-#, python-format
-msgid "Cannot delete bank statement(s) which are already confirmed !"
-msgstr ""
-"¡No se puede eliminar extracto(s) bancario(s) que ya esté confirmado!"
-
-#. module: account
-#: code:addons/account/wizard/account_automatic_reconcile.py:152
+#: code:addons/account/wizard/account_automatic_reconcile.py:148
#, python-format
msgid "You must select accounts to reconcile"
-msgstr "Debe seleccionar las cuentas a conciliar"
-
-#. module: account
-#: model:ir.actions.act_window,name:account.action_account_receivable_graph
-msgid "Balance by Type of Account"
-msgstr "Saldo por tipo de cuenta"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_entriesreconcile0
msgid "Accounting entries are the first input of the reconciliation."
-msgstr "Asientos contables son la primera entrada de la conciliación."
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period_form
@@ -8974,68 +8995,60 @@ msgid ""
"closed or left open depending on your company's activities over a specific "
"period."
msgstr ""
-"Aquí puede definir un periodo fiscal, un intervalo de tiempo dentro del "
-"ejercicio fiscal de su compañía. Un periodo contable típicamente es un mes o "
-"un trimestre. Usualmente corresponde a los periodos de la declaración de "
-"impuestos. Cree y gestione periodos aquí y decida qué periodo se debería "
-"cerrar o dejar abierto dependiendo de las actividades de su compañía en un "
-"periodo específico."
#. module: account
-#: report:account.move.voucher:0
-msgid "Receiver's Signature"
-msgstr "Recibí"
-
-#. module: account
-#: report:account.general.ledger:0
-#: report:account.journal.period.print:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Filters By"
-msgstr "Filtros por"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_manually0
#: model:process.transition,name:account.process_transition_invoicemanually0
msgid "Manual entry"
-msgstr "Entrada manual"
+msgstr ""
#. module: account
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.move.line,move_id:0
#: field:analytic.entries.report,move_id:0
msgid "Move"
-msgstr "Asiento"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:1128
+#: code:addons/account/account_move_line.py:1168
#, python-format
msgid "You can not change the tax, you should remove and recreate lines !"
msgstr ""
-"¡No se puede cambiar el impuesto, debe eliminar y recrear las líneas!"
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 365 days"
+msgstr ""
#. module: account
#: report:account.central.journal:0
msgid "A/C No."
-msgstr "Nº cuenta"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
msgid "Bank statements"
-msgstr "Extractos bancarios"
+msgstr ""
#. module: account
#: help:account.addtmpl.wizard,cparent_id:0
msgid ""
"Creates an account with the selected template under this existing parent."
msgstr ""
-"Crea una cuenta con la plantilla seleccionada debajo el padre existente."
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Date of the day"
-msgstr "Fecha del día"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -9044,41 +9057,42 @@ msgid ""
"You have to define the bank account\n"
"in the journal definition for reconciliation."
msgstr ""
-"Debe definir la cuenta del banco\n"
-"en la definición del diario para conciliar."
#. module: account
#: view:account.move.line.reconcile:0
msgid "Reconciliation Transactions"
-msgstr "Conciliación de transacciones"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_common_menu
msgid "Common Report"
-msgstr "Informe común"
+msgstr ""
#. module: account
#: view:account.account:0
#: field:account.account,child_consol_ids:0
msgid "Consolidated Children"
-msgstr "Hijos consolidados"
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:82
+#: code:addons/account/wizard/account_fiscalyear_close.py:103
#, python-format
msgid ""
"The journal must have centralised counterpart without the Skipping draft "
"state option checked!"
msgstr ""
-"¡El diario debe tener una contrapartida centralizada sin la opción de omitir "
-"el estado borrador marcada!"
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Customer And Supplier Invoices"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_paymententries0
#: model:process.transition,name:account.process_transition_paymentorderbank0
#: model:process.transition,name:account.process_transition_paymentreconcile0
msgid "Payment entries"
-msgstr "Asientos de pago"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -9087,140 +9101,158 @@ msgstr "Asientos de pago"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "July"
-msgstr "Julio"
+msgstr ""
#. module: account
#: view:account.account:0
msgid "Chart of accounts"
-msgstr "Plan contable"
+msgstr ""
#. module: account
#: field:account.subscription.line,subscription_id:0
msgid "Subscription"
-msgstr "Asientos periódicos"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_balance
msgid "Account Analytic Balance"
-msgstr "Contabilidad. Saldo analítico"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:412
+#, python-format
+msgid ""
+"No opening/closing period defined, please create one to set the initial "
+"balance!"
+msgstr ""
#. module: account
#: report:account.account.balance:0
+#: field:account.aged.trial.balance,period_to:0
+#: field:account.balance.report,period_to:0
#: report:account.central.journal:0
+#: field:account.central.journal,period_to:0
+#: field:account.common.account.report,period_to:0
+#: field:account.common.journal.report,period_to:0
+#: field:account.common.partner.report,period_to:0
+#: field:account.common.report,period_to:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
-#: report:account.journal.period.print:0
+#: field:account.general.journal,period_to:0
+#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: report:account.partner.balance:0
+#: field:account.partner.balance,period_to:0
+#: field:account.partner.ledger,period_to:0
+#: field:account.print.journal,period_to:0
+#: field:account.report.general.ledger,period_to:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: report:account.vat.declaration:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: field:account.vat.declaration,period_to:0
+#: field:accounting.report,period_to:0
+#: field:accounting.report,period_to_cmp:0
msgid "End Period"
-msgstr "Periodo final"
-
-#. module: account
-#: field:account.aged.trial.balance,chart_account_id:0
-#: field:account.balance.report,chart_account_id:0
-#: field:account.bs.report,chart_account_id:0
-#: field:account.central.journal,chart_account_id:0
-#: field:account.common.account.report,chart_account_id:0
-#: field:account.common.journal.report,chart_account_id:0
-#: field:account.common.partner.report,chart_account_id:0
-#: field:account.common.report,chart_account_id:0
-#: field:account.general.journal,chart_account_id:0
-#: field:account.partner.balance,chart_account_id:0
-#: field:account.partner.ledger,chart_account_id:0
-#: field:account.pl.report,chart_account_id:0
-#: field:account.print.journal,chart_account_id:0
-#: field:account.report.general.ledger,chart_account_id:0
-#: field:account.vat.declaration,chart_account_id:0
-msgid "Chart of account"
-msgstr "Plan contable"
+msgstr ""
#. module: account
#: field:account.move.line,date_maturity:0
msgid "Due date"
-msgstr "Fecha vencimiento"
+msgstr ""
#. module: account
#: view:account.move.journal:0
msgid "Standard Entries"
-msgstr "Asientos estándares"
+msgstr ""
+
+#. module: account
+#: help:account.journal,type:0
+msgid ""
+"Select 'Sale' for customer invoices journals. Select 'Purchase' for supplier "
+"invoices journals. Select 'Cash' or 'Bank' for journals that are used in "
+"customer or supplier payments. Select 'General' for miscellaneous operations "
+"journals. Select 'Opening/Closing Situation' for entries generated for new "
+"fiscal years."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_subscription
msgid "Account Subscription"
-msgstr "Asiento periódico"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:717
-#, python-format
-msgid ""
-"Tax base different !\n"
-"Click on compute to update tax base"
-msgstr "¡Base de impuesto diferente!"
+#: report:account.overdue:0
+msgid "Maturity date"
+msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Entry Subscription"
-msgstr "Asiento periódico"
+msgstr ""
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,date_from:0
+#: report:account.aged_trial_balance:0
#: field:account.balance.report,date_from:0
-#: field:account.bs.report,date_from:0
#: report:account.central.journal:0
#: field:account.central.journal,date_from:0
#: field:account.common.account.report,date_from:0
#: field:account.common.journal.report,date_from:0
#: field:account.common.partner.report,date_from:0
#: field:account.common.report,date_from:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_start:0
#: report:account.general.journal:0
#: field:account.general.journal,date_from:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_start:0
-#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: field:account.partner.balance,date_from:0
#: field:account.partner.ledger,date_from:0
-#: field:account.pl.report,date_from:0
#: field:account.print.journal,date_from:0
#: field:account.report.general.ledger,date_from:0
#: field:account.subscription,date_start:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_from:0
+#: field:accounting.report,date_from:0
+#: field:accounting.report,date_from_cmp:0
msgid "Start Date"
-msgstr "Fecha inicial"
+msgstr ""
#. module: account
+#: help:account.invoice,reconciled:0
+msgid ""
+"It indicates that the invoice has been paid and the journal entry of the "
+"invoice has been reconciled with one or several journal entries of payment."
+msgstr ""
+
+#. module: account
+#: view:account.invoice:0
+#: view:account.invoice.report:0
#: model:process.node,name:account.process_node_supplierdraftinvoices0
msgid "Draft Invoices"
-msgstr "Facturas borrador"
+msgstr ""
#. module: account
#: selection:account.account.type,close_method:0
#: view:account.entries.report:0
#: view:account.move.line:0
msgid "Unreconciled"
-msgstr "No conciliado"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:804
+#: code:addons/account/account_invoice.py:839
#, python-format
msgid "Bad total !"
-msgstr "¡Total erróneo!"
+msgstr ""
#. module: account
#: field:account.journal,sequence_id:0
msgid "Entry Sequence"
-msgstr "Secuencia del asiento"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -9233,69 +9265,48 @@ msgid ""
"open period. Close a period when you do not want to record new entries and "
"want to lock this period for tax related calculation."
msgstr ""
-"Un periodo es una plazo de tiempo fiscal durante la cual se deben registrar "
-"en asientos las actividades relacionadas con la contabilidad. Lo normal es "
-"un periodo mensual pero, dependiendo del país y las necesidades de su "
-"compañía, podría usar también periodos trimestrales (por ejemplo en España "
-"las PYMES habitualmente usan periodos trimestrales). Cerrar un periodo "
-"impide registrar nuevos asientos, cualquier nuevo asiento deberá anotarse en "
-"el siguiente periodo abierto. Cierre un periodo cuando no vaya a escribir "
-"nuevos asientos y desee bloquear este periodo por motivos relacionados con "
-"el cálculo de impuestos."
#. module: account
#: view:account.analytic.account:0
msgid "Pending"
-msgstr "Pendiente"
+msgstr ""
#. module: account
#: model:process.transition,name:account.process_transition_analyticinvoice0
#: model:process.transition,name:account.process_transition_supplieranalyticcost0
msgid "From analytic accounts"
-msgstr "Desde cuentas analíticas"
-
-#. module: account
-#: field:account.installer.modules,account_payment:0
-msgid "Suppliers Payment Management"
-msgstr "Gestión de los pagos a proveedores"
+msgstr ""
#. module: account
#: field:account.period,name:0
msgid "Period Name"
-msgstr "Nombre del período"
+msgstr ""
#. module: account
#: report:account.analytic.account.quantity_cost_ledger:0
msgid "Code/Date"
-msgstr "Código/Fecha"
+msgstr ""
#. module: account
#: field:account.account,active:0
#: field:account.analytic.journal,active:0
+#: field:account.fiscal.position,active:0
#: field:account.journal.period,active:0
#: field:account.payment.term,active:0
#: field:account.tax,active:0
msgid "Active"
-msgstr "Activo"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:354
+#: view:accounting.report:0
+msgid "Comparison"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_invoice.py:381
#, python-format
msgid "Unknown Error"
-msgstr "Error desconocido"
-
-#. module: account
-#: code:addons/account/account.py:1167
-#, python-format
-msgid ""
-"You cannot validate a non-balanced entry !\n"
-"Make sure you have configured Payment Term properly !\n"
-"It should contain atleast one Payment Term Line with type \"Balance\" !"
msgstr ""
-"¡ No se puede confirmar un asiento descuadrado !\n"
-"¡ Asegúrese de haber configurado el plazo de pago correctamente !\n"
-"¡ Debería contener al menos una línea de plazo de pago con de tipo \"Saldo\" "
-"!"
#. module: account
#: help:res.partner,property_account_payable:0
@@ -9303,50 +9314,48 @@ msgid ""
"This account will be used instead of the default one as the payable account "
"for the current partner"
msgstr ""
-"Este cuenta se utilizará en lugar de la cuenta por defecto como la cuenta a "
-"pagar para la empresa actual."
#. module: account
#: field:account.period,special:0
msgid "Opening/Closing Period"
-msgstr "Período de apertura/cierre"
+msgstr ""
#. module: account
#: field:account.account,currency_id:0
#: field:account.account.template,currency_id:0
#: field:account.bank.accounts.wizard,currency_id:0
msgid "Secondary Currency"
-msgstr "Divisa secundaria"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_validate_account_move
msgid "Validate Account Move"
-msgstr "Validar movimiento contable"
+msgstr ""
#. module: account
#: field:account.account,credit:0
#: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,credit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model.line,credit:0
#: field:account.move.line,credit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
-#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,credit:0
#: report:account.vat.declaration:0
#: field:report.account.receivable,credit:0
msgid "Credit"
-msgstr "Haber"
+msgstr ""
#. module: account
#: help:account.invoice.refund,journal_id:0
@@ -9355,25 +9364,26 @@ msgid ""
"created. If you leave that field empty, it will use the same journal as the "
"current invoice."
msgstr ""
-"Puede seleccionar aquí el diario a usar para la factura rectificativa "
-"(abono) que se creará. Si deja este campo vacío, se usará el mismo diario "
-"que la factura actual."
#. module: account
-#: report:account.move.voucher:0
-msgid "Through :"
-msgstr "A través de :"
+#: selection:account.account.type,report_type:0
+#: code:addons/account/account.py:181
+#, python-format
+msgid "Profit & Loss (Income account)"
+msgstr ""
#. module: account
-#: view:account.general.journal:0
-#: model:ir.ui.menu,name:account.menu_account_general_journal
-msgid "General Journals"
-msgstr "Diarios generales"
+#: constraint:account.account:0
+msgid ""
+"Configuration Error! \n"
+"You can not select an account type with a deferral method different of "
+"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! "
+msgstr ""
#. module: account
#: view:account.model:0
msgid "Journal Entry Model"
-msgstr "Modelo de asiento"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_use_model.py:44
@@ -9383,16 +9393,13 @@ msgid ""
"payment term!\n"
"Please define partner on it!"
msgstr ""
-"La fecha de vencimiento del apunte generado por la línea del modelo '%s' se "
-"basa en el plazo de pago de la empresa.\n"
-"¡Por favor, defina la empresa en él!"
#. module: account
#: field:account.cashbox.line,number:0
#: field:account.invoice,number:0
#: field:account.move,name:0
msgid "Number"
-msgstr "Número"
+msgstr ""
#. module: account
#: report:account.analytic.account.journal:0
@@ -9400,12 +9407,16 @@ msgstr "Número"
#: selection:account.bank.statement.line,type:0
#: selection:account.journal,type:0
msgid "General"
-msgstr "General"
+msgstr ""
+
+#. module: account
+#: view:analytic.entries.report:0
+msgid "Analytic Entries of last 30 days"
+msgstr ""
#. module: account
#: selection:account.aged.trial.balance,filter:0
#: selection:account.balance.report,filter:0
-#: selection:account.bs.report,filter:0
#: selection:account.central.journal,filter:0
#: view:account.chart:0
#: selection:account.common.account.report,filter:0
@@ -9419,41 +9430,34 @@ msgstr "General"
#: field:account.installer,period:0
#: selection:account.partner.balance,filter:0
#: selection:account.partner.ledger,filter:0
-#: selection:account.pl.report,filter:0
+#: view:account.print.journal:0
#: selection:account.print.journal,filter:0
#: selection:account.report.general.ledger,filter:0
-#: report:account.account.balance:0
-#: report:account.central.journal:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.journal:0
-#: report:account.general.ledger:0
-#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
#: report:account.vat.declaration:0
#: view:account.vat.declaration:0
#: selection:account.vat.declaration,filter:0
+#: view:accounting.report:0
+#: selection:accounting.report,filter:0
+#: selection:accounting.report,filter_cmp:0
#: code:addons/account/report/common_report_header.py:99
#: model:ir.actions.act_window,name:account.action_account_period_form
#: model:ir.ui.menu,name:account.menu_action_account_period_form
#: model:ir.ui.menu,name:account.next_id_23
#, python-format
msgid "Periods"
-msgstr "Periodos"
+msgstr ""
#. module: account
#: field:account.invoice.report,currency_rate:0
msgid "Currency Rate"
-msgstr "Tipo de cambio"
+msgstr ""
#. module: account
-#: help:account.payment.term.line,value_amount:0
-msgid "For Value percent enter % ratio between 0-1."
-msgstr "Para porcentajes introduzca valores % entre 0-1."
+#: view:account.account:0
+#: field:account.account,tax_ids:0
+#: field:account.account.template,tax_ids:0
+msgid "Default Taxes"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -9462,17 +9466,22 @@ msgstr "Para porcentajes introduzca valores % entre 0-1."
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "April"
-msgstr "Abril"
+msgstr ""
+
+#. module: account
+#: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
+msgid "Profit (Loss) to report"
+msgstr ""
#. module: account
#: view:account.move.line.reconcile.select:0
msgid "Open for Reconciliation"
-msgstr "Abrir para conciliación"
+msgstr ""
#. module: account
#: field:account.account,parent_left:0
msgid "Parent Left"
-msgstr "Padre izquierdo"
+msgstr ""
#. module: account
#: help:account.invoice.refund,filter_refund:0
@@ -9480,27 +9489,17 @@ msgid ""
"Refund invoice base on this type. You can not Modify and Cancel if the "
"invoice is already reconciled"
msgstr ""
-"Factura rectificativa (abono) basada en este tipo. No puede modificar y "
-"cancelar si la factura ya está conciliada."
#. module: account
-#: help:account.installer.modules,account_analytic_plans:0
-msgid ""
-"Allows invoice lines to impact multiple analytic accounts simultaneously."
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 2 (bold)"
msgstr ""
-"Permite a las líneas de factura impactar múltiples cuentas analíticas "
-"simultáneamente."
-
-#. module: account
-#: field:account.installer,sale_tax:0
-msgid "Sale Tax(%)"
-msgstr "Impuesto venta (%)"
#. module: account
#: model:ir.actions.act_window,name:account.action_invoice_tree2
#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
msgid "Supplier Invoices"
-msgstr "Facturas de proveedor"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
@@ -9516,7 +9515,7 @@ msgstr "Facturas de proveedor"
#: field:report.account.sales,product_id:0
#: field:report.account_type.sales,product_id:0
msgid "Product"
-msgstr "Producto"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_validate_account_move
@@ -9525,23 +9524,23 @@ msgid ""
"and is the process of transferring debit and credit amounts from a journal "
"of original entry to a ledger book."
msgstr ""
-"El proceso de validación de asientos, también llamado 'asentar', transfiere "
-"los importes del debe y haber de la anotación original a un libro mayor."
#. module: account
-#: report:account.tax.code.entries:0
-msgid ")"
-msgstr ")"
+#: help:account.bank.statement,state:0
+msgid ""
+"When new statement is created the state will be 'Draft'.\n"
+"And after getting confirmation from the bank it will be in 'Confirmed' state."
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_period
msgid "Account period"
-msgstr "Período contable"
+msgstr ""
#. module: account
#: view:account.subscription:0
msgid "Remove Lines"
-msgstr "Eliminar líneas"
+msgstr ""
#. module: account
#: view:account.report.general.ledger:0
@@ -9549,15 +9548,13 @@ msgid ""
"This report allows you to print or generate a pdf of your general ledger "
"with details of all your account journals"
msgstr ""
-"Este informe le permite imprimir o generar un pdf de su libro mayor con el "
-"detalle de todos sus diarios contables."
#. module: account
#: selection:account.account,type:0
#: selection:account.account.template,type:0
#: selection:account.entries.report,type:0
msgid "Regular"
-msgstr "Regular"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -9566,33 +9563,28 @@ msgstr "Regular"
#: field:account.account.template,type:0
#: field:account.entries.report,type:0
msgid "Internal Type"
-msgstr "Tipo interno"
-
-#. module: account
-#: report:account.move.voucher:0
-msgid "State:"
-msgstr "Estado:"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_subscription_form_running
msgid "Running Subscriptions"
-msgstr "Asientos periódicos en proceso"
+msgstr ""
#. module: account
#: view:report.account.sales:0
#: view:report.account_type.sales:0
#: view:report.hr.timesheet.invoice.journal:0
msgid "This Month"
-msgstr "Este mes"
+msgstr ""
#. module: account
-#: view:account.analytic.Journal.report:0
#: view:account.analytic.balance:0
#: view:account.analytic.cost.ledger:0
#: view:account.analytic.inverted.balance:0
+#: view:account.analytic.journal.report:0
#: model:ir.actions.act_window,name:account.action_account_partner_ledger
msgid "Select Period"
-msgstr "Seleccionar periodo"
+msgstr ""
#. module: account
#: view:account.entries.report:0
@@ -9600,92 +9592,83 @@ msgstr "Seleccionar periodo"
#: view:account.move:0
#: selection:account.move,state:0
#: view:account.move.line:0
-#: report:account.move.voucher:0
msgid "Posted"
-msgstr "Asentado"
+msgstr ""
#. module: account
#: report:account.account.balance:0
#: field:account.aged.trial.balance,date_to:0
#: field:account.balance.report,date_to:0
-#: field:account.bs.report,date_to:0
#: report:account.central.journal:0
#: field:account.central.journal,date_to:0
#: field:account.common.account.report,date_to:0
#: field:account.common.journal.report,date_to:0
#: field:account.common.partner.report,date_to:0
#: field:account.common.report,date_to:0
+#: report:account.financial.report:0
#: field:account.fiscalyear,date_stop:0
#: report:account.general.journal:0
#: field:account.general.journal,date_to:0
#: report:account.general.ledger:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,date_stop:0
-#: report:account.journal.period.print:0
#: report:account.partner.balance:0
#: field:account.partner.balance,date_to:0
#: field:account.partner.ledger,date_to:0
-#: field:account.pl.report,date_to:0
#: field:account.print.journal,date_to:0
#: field:account.report.general.ledger,date_to:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
#: field:account.vat.declaration,date_to:0
+#: field:accounting.report,date_to:0
+#: field:accounting.report,date_to_cmp:0
msgid "End Date"
-msgstr "Fecha final"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
msgid "Cancel Opening Entries"
-msgstr "Cancelar asientos de apertura"
+msgstr ""
#. module: account
#: field:account.payment.term.line,days2:0
msgid "Day of the Month"
-msgstr "Día del mes"
+msgstr ""
#. module: account
#: field:account.fiscal.position.tax,tax_src_id:0
#: field:account.fiscal.position.tax.template,tax_src_id:0
msgid "Tax Source"
-msgstr "Origen impuesto"
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
-msgid "Net Profit"
-msgstr "Beneficio neto"
+msgstr ""
#. module: account
#: view:ir.sequence:0
msgid "Fiscal Year Sequences"
-msgstr "Secuencias ejercicios fiscales"
+msgstr ""
#. module: account
-#: help:account.model,name:0
-msgid "This is a model for recurring accounting entries"
-msgstr "Este es un modelo para asientos contables recurrentes"
+#: selection:account.financial.report,display_detail:0
+msgid "No detail"
+msgstr ""
#. module: account
#: code:addons/account/account_analytic_line.py:100
#, python-format
msgid "There is no income account defined for this product: \"%s\" (id:%d)"
msgstr ""
-"No se ha definido una cuenta de ingresos para este producto: \"%s\" (id:%d)"
#. module: account
-#: report:account.general.ledger:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-msgid "JRNL"
-msgstr "LIBRO"
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
#. module: account
-#: view:account.payment.term.line:0
-msgid " value amount: 0.02"
-msgstr " importe valor: 0.02"
+#: field:account.account,unrealized_gain_loss:0
+#: model:ir.actions.act_window,name:account.action_account_gain_loss
+#: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
+msgid "Unrealized Gain or Loss"
+msgstr ""
#. module: account
#: view:account.fiscalyear:0
@@ -9693,37 +9676,58 @@ msgstr " importe valor: 0.02"
#: view:account.move.line:0
#: view:account.period:0
msgid "States"
-msgstr "Estados"
+msgstr ""
#. module: account
+#: model:ir.actions.server,name:account.ir_actions_server_edi_invoice
+msgid "Auto-email confirmed invoices"
+msgstr ""
+
+#. module: account
+#: field:account.invoice,check_total:0
+msgid "Verification Total"
+msgstr ""
+
+#. module: account
+#: report:account.aged_trial_balance:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.inverted.balance:0
#: report:account.analytic.account.quantity_cost_ledger:0
#: view:account.analytic.line:0
#: view:account.bank.statement:0
#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
#: field:report.account.sales,amount_total:0
#: field:report.account_type.sales,amount_total:0
#: field:report.invoice.created,amount_total:0
msgid "Total"
-msgstr "Total"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_move_journal.py:97
#, python-format
msgid "Journal: All"
-msgstr "Diario: Todos"
+msgstr ""
#. module: account
#: field:account.account,company_id:0
+#: report:account.account.balance:0
+#: field:account.aged.trial.balance,company_id:0
#: field:account.analytic.journal,company_id:0
+#: field:account.balance.report,company_id:0
#: field:account.bank.statement,company_id:0
#: field:account.bank.statement.line,company_id:0
+#: field:account.central.journal,company_id:0
+#: field:account.common.account.report,company_id:0
+#: field:account.common.journal.report,company_id:0
+#: field:account.common.partner.report,company_id:0
+#: field:account.common.report,company_id:0
#: view:account.entries.report:0
#: field:account.entries.report,company_id:0
#: field:account.fiscal.position,company_id:0
#: field:account.fiscalyear,company_id:0
+#: report:account.general.journal:0
+#: field:account.general.journal,company_id:0
+#: report:account.general.ledger_landscape:0
#: field:account.installer,company_id:0
#: field:account.invoice,company_id:0
#: field:account.invoice.line,company_id:0
@@ -9733,32 +9737,41 @@ msgstr "Diario: Todos"
#: view:account.journal:0
#: field:account.journal,company_id:0
#: field:account.journal.period,company_id:0
+#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model,company_id:0
#: field:account.move,company_id:0
#: field:account.move.line,company_id:0
+#: field:account.partner.balance,company_id:0
+#: field:account.partner.ledger,company_id:0
#: field:account.period,company_id:0
+#: field:account.print.journal,company_id:0
+#: field:account.report.general.ledger,company_id:0
#: field:account.tax,company_id:0
#: field:account.tax.code,company_id:0
+#: field:account.treasury.report,company_id:0
+#: field:account.vat.declaration,company_id:0
+#: field:accounting.report,company_id:0
#: view:analytic.entries.report:0
#: field:analytic.entries.report,company_id:0
#: field:wizard.multi.charts.accounts,company_id:0
msgid "Company"
-msgstr "Compañía"
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_action_subscription_form
msgid "Define Recurring Entries"
-msgstr "Definir asientos recurrentes"
+msgstr ""
#. module: account
#: field:account.entries.report,date_maturity:0
msgid "Date Maturity"
-msgstr "Fecha vencimiento"
+msgstr ""
#. module: account
#: help:account.bank.statement,total_entry_encoding:0
msgid "Total cash transactions"
-msgstr "Total transiciones de caja."
+msgstr ""
#. module: account
#: help:account.partner.reconcile.process,today_reconciled:0
@@ -9767,74 +9780,57 @@ msgid ""
"reconciliation process today. The current partner is counted as already "
"processed."
msgstr ""
-"Esta cifra representa el número total de empresas que hoy han pasado a "
-"través del proceso de conciliación. La empresa actual se contabiliza como "
-"que ya se ha procesado."
#. module: account
#: view:account.fiscalyear:0
msgid "Create Monthly Periods"
-msgstr "Crear períodos mensuales"
+msgstr ""
#. module: account
#: field:account.tax.code.template,sign:0
msgid "Sign For Parent"
-msgstr "Signo para padre"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_balance_report
msgid "Trial Balance Report"
-msgstr "Informe de sumas y saldos"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
msgid "Draft statements"
-msgstr "Extractos bancarios borrador"
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_statemententries0
msgid ""
"Manual or automatic creation of payment entries according to the statements"
msgstr ""
-"Creación manual o automática de asientos de pago acorde a los extractos"
+
+#. module: account
+#: field:account.analytic.balance,empty_acc:0
+msgid "Empty Accounts ? "
+msgstr ""
+
+#. module: account
+#: constraint:account.bank.statement:0
+msgid "The journal and period chosen have to belong to the same company."
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Invoice lines"
-msgstr "Líneas de factura"
+msgstr ""
#. module: account
-#: field:account.aged.trial.balance,period_to:0
-#: field:account.balance.report,period_to:0
-#: field:account.bs.report,period_to:0
-#: field:account.central.journal,period_to:0
#: field:account.chart,period_to:0
-#: field:account.common.account.report,period_to:0
-#: field:account.common.journal.report,period_to:0
-#: field:account.common.partner.report,period_to:0
-#: field:account.common.report,period_to:0
-#: field:account.general.journal,period_to:0
-#: field:account.partner.balance,period_to:0
-#: field:account.partner.ledger,period_to:0
-#: field:account.pl.report,period_to:0
-#: field:account.print.journal,period_to:0
-#: field:account.report.general.ledger,period_to:0
-#: field:account.vat.declaration,period_to:0
msgid "End period"
-msgstr "Periodo final"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:738
-#: code:addons/account/account_move_line.py:815
-#: code:addons/account/wizard/account_invoice_state.py:44
-#: code:addons/account/wizard/account_invoice_state.py:68
-#: code:addons/account/wizard/account_report_balance_sheet.py:70
-#: code:addons/account/wizard/account_state_open.py:37
-#: code:addons/account/wizard/account_validate_account_move.py:39
-#: code:addons/account/wizard/account_validate_account_move.py:61
-#, python-format
-msgid "Warning"
-msgstr "Aviso"
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
#. module: account
#: help:product.category,property_account_expense_categ:0
@@ -9843,34 +9839,40 @@ msgid ""
"This account will be used to value outgoing stock for the current product "
"category using cost price"
msgstr ""
-"Esta cuenta se utilizará para valorar el stock saliente para la categoría de "
-"producto actual utilizando el precio de coste."
#. module: account
-#: report:account.move.voucher:0
-msgid "On Account of :"
-msgstr "En cuenta de :"
+#: view:wizard.multi.charts.accounts:0
+msgid "Generate Your Chart of Accounts from a Chart Template"
+msgstr ""
+
+#. module: account
+#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
+msgid ""
+"From this report, you can have an overview of the amount invoiced to your "
+"customer as well as payment delays. The tool search can also be used to "
+"personalise your Invoices reports and so, match this analysis to your needs."
+msgstr ""
#. module: account
#: view:account.automatic.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Write-Off Move"
-msgstr "Movimiento de desajuste"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_paidinvoice0
msgid "Invoice's state is Done"
-msgstr "El estado de la factura es Realizada"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_report_account_sales
msgid "Report of the Sales by Account"
-msgstr "Informe de las ventas por cuenta"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account
msgid "Accounts Fiscal Position"
-msgstr "Contabilidad. Posición fiscal"
+msgstr ""
#. module: account
#: report:account.invoice:0
@@ -9880,127 +9882,127 @@ msgstr "Contabilidad. Posición fiscal"
#: model:process.process,name:account.process_process_supplierinvoiceprocess0
#: selection:report.invoice.created,type:0
msgid "Supplier Invoice"
-msgstr "Factura de proveedor"
+msgstr ""
#. module: account
#: field:account.account,debit:0
#: report:account.account.balance:0
-#: report:account.account.balance.landscape:0
#: report:account.analytic.account.balance:0
#: report:account.analytic.account.cost_ledger:0
#: report:account.analytic.account.inverted.balance:0
#: report:account.central.journal:0
#: field:account.entries.report,debit:0
+#: report:account.financial.report:0
#: report:account.general.journal:0
#: report:account.general.ledger:0
#: report:account.general.ledger_landscape:0
#: report:account.journal.period.print:0
+#: report:account.journal.period.print.sale.purchase:0
#: field:account.model.line,debit:0
#: field:account.move.line,debit:0
-#: report:account.move.voucher:0
#: report:account.partner.balance:0
-#: report:account.tax.code.entries:0
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
+#: field:account.treasury.report,debit:0
#: report:account.vat.declaration:0
#: field:report.account.receivable,debit:0
msgid "Debit"
-msgstr "Debe"
+msgstr ""
+
+#. module: account
+#: selection:account.financial.report,style_overwrite:0
+msgid "Title 3 (bold, smaller)"
+msgstr ""
#. module: account
#: field:account.invoice,invoice_line:0
msgid "Invoice Lines"
-msgstr "Líneas de factura"
+msgstr ""
#. module: account
#: constraint:account.account.template:0
msgid "Error ! You can not create recursive account templates."
-msgstr "¡Error! No puede crear plantillas de cuentas recursivas."
+msgstr ""
#. module: account
-#: constraint:account.account.template:0
-msgid ""
-"You cannot create an account template! \n"
-"Make sure if the account template has parent then it should be type "
-"\"View\"! "
+#: selection:account.print.journal,sort_selection:0
+#: code:addons/account/report/account_journal.py:197
+#, python-format
+msgid "Journal Entry Number"
msgstr ""
-"¡No puede crear una plantilla de cuenta!\n"
-"¡Asegúrese de que si la plantilla de cuenta tiene un padre, que sea de tipo "
-"\"Vista\"! "
#. module: account
#: view:account.subscription:0
msgid "Recurring"
-msgstr "Recurrente"
+msgstr ""
#. module: account
-#: code:addons/account/account_move_line.py:805
+#: code:addons/account/account.py:642
+#, python-format
+msgid ""
+"You cannot change the type of account from 'Closed' to any other type which "
+"contains journal items!"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:843
#, python-format
msgid "Entry is already reconciled"
-msgstr "El asiento ya está conciliado"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_report_account_receivable
msgid "Receivable accounts"
-msgstr "Cuentas a cobrar"
+msgstr ""
#. module: account
#: selection:account.model.line,date_maturity:0
msgid "Partner Payment Term"
-msgstr "Plazo de pago de la empresa"
+msgstr ""
#. module: account
#: field:temp.range,name:0
msgid "Range"
-msgstr "Intervalo"
-
-#. module: account
-#: code:addons/account/account_move_line.py:1246
-#, python-format
-msgid ""
-"Can not create an automatic sequence for this piece !\n"
-"\n"
-"Put a sequence in the journal definition for automatic numbering or create a "
-"sequence manually for this piece."
msgstr ""
-"¡No se puede crear una secuencia automática para este asiento!\n"
-"\n"
-"Indique una secuencia en la definición de diario para la numeración "
-"automática o cree manualmente una secuencia para este asiento."
#. module: account
-#: selection:account.balance.report,display_account:0
-#: selection:account.bs.report,display_account:0
-#: selection:account.common.account.report,display_account:0
-#: selection:account.pl.report,display_account:0
-#: selection:account.report.general.ledger,display_account:0
+#: view:account.analytic.line:0
+msgid "Analytic Journal Items related to a purchase journal."
+msgstr ""
+
+#. module: account
+#: help:account.account,type:0
+msgid ""
+"The 'Internal Type' is used for features available on different types of "
+"accounts: view can not have journal items, consolidation are accounts that "
+"can have children accounts for multi-company consolidations, "
+"payable/receivable are for partners accounts (for debit/credit "
+"computations), closed for depreciated accounts."
+msgstr ""
+
+#. module: account
#: report:account.account.balance:0
-#: report:account.partner.balance:0
-#: report:account.third_party_ledger:0
-#: report:account.third_party_ledger_other:0
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-#: report:account.general.ledger:0
+#: selection:account.balance.report,display_account:0
+#: selection:account.common.account.report,display_account:0
#: report:account.general.ledger_landscape:0
-#: report:pl.account:0
-#: report:pl.account.horizontal:0
+#: selection:account.report.general.ledger,display_account:0
msgid "With movements"
-msgstr "Con movimientos"
+msgstr ""
#. module: account
#: view:account.analytic.account:0
msgid "Account Data"
-msgstr "Datos de la cuenta"
+msgstr ""
#. module: account
#: view:account.tax.code.template:0
msgid "Account Tax Code Template"
-msgstr "Plantilla códigos impuestos contables"
+msgstr ""
#. module: account
#: model:process.node,name:account.process_node_manually0
msgid "Manually"
-msgstr "Manualmente"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -10009,58 +10011,62 @@ msgstr "Manualmente"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "December"
-msgstr "Diciembre"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
#: model:ir.ui.menu,name:account.account_analytic_journal_print
msgid "Print Analytic Journals"
-msgstr "Imprimir diarios analíticos"
+msgstr ""
+
+#. module: account
+#: view:account.invoice.report:0
+msgid "Group by month of Invoice Date"
+msgstr ""
#. module: account
#: view:account.analytic.line:0
msgid "Fin.Account"
-msgstr "Cuenta fin."
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_aged_receivable_graph
#: view:report.aged.receivable:0
msgid "Aged Receivable"
-msgstr "A cobrar vencido"
+msgstr ""
#. module: account
#: field:account.tax,applicable_type:0
msgid "Applicability"
-msgstr "Aplicación"
+msgstr ""
#. module: account
#: code:addons/account/wizard/account_move_journal.py:165
#, python-format
msgid "This period is already closed !"
-msgstr "¡Este período ya está cerrado!"
+msgstr ""
#. module: account
#: help:account.move.line,currency_id:0
msgid "The optional other currency if it is a multi-currency entry."
-msgstr "La otra divisa opcional si es un asiento multi-divisa."
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_invoiceimport0
msgid ""
"Import of the statement in the system from a supplier or customer invoice"
msgstr ""
-"Importación del extracto en el sistema desde una factura de proveedor o "
-"cliente"
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
msgid "Billing"
-msgstr "Facturación"
+msgstr ""
#. module: account
#: view:account.account:0
+#: view:account.analytic.account:0
msgid "Parent Account"
-msgstr "Cuenta padre"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -10072,46 +10078,59 @@ msgid ""
"may keep several types of specialized journals such as a cash journal, "
"purchase journal, sales journal..."
msgstr ""
-"Cree y gestione los periodos de su compañía desde este menú. Se utiliza un "
-"diario para registrar transacciones de todos los datos contables relativos "
-"al día a día del negocio de su compañía utilizando el sistema contable de "
-"doble entrada. Dependiendo de la naturaleza de sus actividades y el número "
-"de transacciones diarias, una compañía puede mantener diversos tipos de "
-"diarios especializados como un diario de caja, un diario de compra, un "
-"diario de venta, ..."
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Description on Invoices"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_analytic_chart
msgid "Account Analytic Chart"
-msgstr "Contabilidad. Plan analítico"
+msgstr ""
#. module: account
#: help:account.invoice,residual:0
msgid "Remaining amount due."
-msgstr "Importe debido restante."
+msgstr ""
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement
msgid "Statistic Reports"
-msgstr "Informes estadísticos"
+msgstr ""
#. module: account
-#: field:account.installer,progress:0
-#: field:account.installer.modules,progress:0
-#: field:wizard.multi.charts.accounts,progress:0
-msgid "Configuration Progress"
-msgstr "Progreso de la configuración"
+#: code:addons/account/account_move_line.py:1170
+#: code:addons/account/account_move_line.py:1253
+#, python-format
+msgid "Bad account!"
+msgstr ""
+
+#. module: account
+#: field:account.print.journal,sort_selection:0
+msgid "Entries Sorted by"
+msgstr ""
+
+#. module: account
+#: help:account.move,state:0
+msgid ""
+"All manually created new journal entries are usually in the state "
+"'Unposted', but you can set the option to skip that state on the related "
+"journal. In that case, they will be behave as journal entries automatically "
+"created by the system on document validation (invoices, bank statements...) "
+"and will be created in 'Posted' state."
+msgstr ""
#. module: account
#: view:account.fiscal.position.template:0
msgid "Accounts Mapping"
-msgstr "Mapeo de cuentas"
+msgstr ""
#. module: account
-#: code:addons/account/invoice.py:346
+#: code:addons/account/account_invoice.py:373
#, python-format
msgid "Invoice '%s' is waiting for validation."
-msgstr "La factura '%s' está esperando para validación."
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -10120,60 +10139,126 @@ msgstr "La factura '%s' está esperando para validación."
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "November"
-msgstr "Noviembre"
+msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_installer_modules
-msgid "account.installer.modules"
-msgstr "cuenta.instalador.módulos"
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: refund invoice, reconcile and create a new draft invoice"
+msgstr ""
#. module: account
#: help:account.invoice.line,account_id:0
msgid "The income or expense account related to the selected product."
msgstr ""
-"La cuenta de ingresos o gastos relacionada con el producto seleccionado."
-
-#. module: account
-#: code:addons/account/account_move_line.py:1117
-#, python-format
-msgid "The date of your Journal Entry is not in the defined period!"
-msgstr "¡La fecha de su asiento no está en el periodo definido!"
#. module: account
#: field:account.subscription,period_total:0
msgid "Number of Periods"
-msgstr "Número de periodos"
+msgstr ""
#. module: account
#: report:account.general.journal:0
#: model:ir.actions.report.xml,name:account.account_general_journal
msgid "General Journal"
-msgstr "Diario general"
+msgstr ""
#. module: account
#: view:account.invoice:0
msgid "Search Invoice"
-msgstr "Buscar factura"
+msgstr ""
#. module: account
#: report:account.invoice:0
#: view:account.invoice:0
#: view:account.invoice.refund:0
-#: selection:account.invoice.refund,filter_refund:0
#: view:account.invoice.report:0
#: model:ir.actions.act_window,name:account.action_account_invoice_refund
msgid "Refund"
-msgstr "Factura rectificativa"
+msgstr ""
#. module: account
-#: field:wizard.multi.charts.accounts,bank_accounts_id:0
+#: model:email.template,body_text:account.email_template_edi_invoice
+msgid ""
+"\n"
+"Hello${object.address_invoice_id.name and ' ' or "
+"''}${object.address_invoice_id.name or ''},\n"
+"\n"
+"A new invoice is available for ${object.partner_id.name}:\n"
+" | Invoice number: *${object.number}*\n"
+" | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n"
+" | Invoice date: ${object.date_invoice}\n"
+" % if object.origin:\n"
+" | Order reference: ${object.origin}\n"
+" % endif\n"
+" | Your contact: ${object.user_id.name} ${object.user_id.user_email "
+"and '<%s>'%(object.user_id.user_email) or ''}\n"
+"\n"
+"You can view the invoice document, download it and pay online using the "
+"following link:\n"
+" ${ctx.get('edi_web_url_view') or 'n/a'}\n"
+"\n"
+"% if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"<% \n"
+"comp_name = quote(object.company_id.name)\n"
+"inv_number = quote(object.number)\n"
+"paypal_account = quote(object.company_id.paypal_account)\n"
+"inv_amount = quote(str(object.amount_total))\n"
+"cur_name = quote(object.currency_id.name)\n"
+"paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n"
+" "
+"\"&invoice=%s&amount=%s¤cy_code=%s&button_subtype=services&no_note=1&bn"
+"=OpenERP_Invoice_PayNow_%s\" % \\\n"
+" "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"%>\n"
+"It is also possible to directly pay with Paypal:\n"
+" ${paypal_url}\n"
+"% endif\n"
+"\n"
+"If you have any question, do not hesitate to contact us.\n"
+"\n"
+"\n"
+"Thank you for choosing ${object.company_id.name}!\n"
+"\n"
+"\n"
+"--\n"
+"${object.user_id.name} ${object.user_id.user_email and "
+"'<%s>'%(object.user_id.user_email) or ''}\n"
+"${object.company_id.name}\n"
+"% if object.company_id.street:\n"
+"${object.company_id.street or ''}\n"
+"% endif\n"
+"% if object.company_id.street2:\n"
+"${object.company_id.street2}\n"
+"% endif\n"
+"% if object.company_id.city or object.company_id.zip:\n"
+"${object.company_id.zip or ''} ${object.company_id.city or ''}\n"
+"% endif\n"
+"% if object.company_id.country_id:\n"
+"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) "
+"or ''} ${object.company_id.country_id.name or ''}\n"
+"% endif\n"
+"% if object.company_id.phone:\n"
+"Phone: ${object.company_id.phone}\n"
+"% endif\n"
+"% if object.company_id.website:\n"
+"${object.company_id.website or ''}\n"
+"% endif\n"
+" "
+msgstr ""
+
+#. module: account
+#: model:ir.model,name:account.model_res_partner_bank
msgid "Bank Accounts"
-msgstr "Cuentas de banco"
+msgstr ""
#. module: account
#: field:res.partner,credit:0
msgid "Total Receivable"
-msgstr "Total a cobrar"
+msgstr ""
#. module: account
#: view:account.account:0
@@ -10181,58 +10266,58 @@ msgstr "Total a cobrar"
#: view:account.journal:0
#: view:account.move.line:0
msgid "General Information"
-msgstr "Información general"
+msgstr ""
#. module: account
#: view:account.move:0
#: view:account.move.line:0
msgid "Accounting Documents"
-msgstr "Documentos contables"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_validate_account_move_lines
msgid "Validate Account Move Lines"
-msgstr "Contabilidad. Validar líneas movimiento"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
#: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
msgid "Cost Ledger (Only quantities)"
-msgstr "Costo contable (sólo cantidades)"
+msgstr ""
#. module: account
#: model:process.node,note:account.process_node_supplierpaidinvoice0
msgid "Invoice's state is Done."
-msgstr "El estado de la factura es Realizada."
+msgstr ""
#. module: account
#: model:process.transition,note:account.process_transition_reconcilepaid0
msgid "As soon as the reconciliation is done, the invoice can be paid."
msgstr ""
-"Tan pronto como la conciliación se realice, la factura estará pagada."
#. module: account
#: view:account.account.template:0
msgid "Search Account Templates"
-msgstr "Buscar plantillas cuentas"
+msgstr ""
#. module: account
#: view:account.invoice.tax:0
msgid "Manual Invoice Taxes"
-msgstr "Impuestos factura manual"
+msgstr ""
#. module: account
#: field:account.account,parent_right:0
msgid "Parent Right"
-msgstr "Padre derecho"
+msgstr ""
#. module: account
#: model:ir.model,name:account.model_account_addtmpl_wizard
msgid "account.addtmpl.wizard"
-msgstr "account.añadirplantilla.asistente"
+msgstr ""
#. module: account
#: field:account.aged.trial.balance,result_selection:0
+#: report:account.aged_trial_balance:0
#: field:account.common.partner.report,result_selection:0
#: report:account.partner.balance:0
#: field:account.partner.balance,result_selection:0
@@ -10240,14 +10325,14 @@ msgstr "account.añadirplantilla.asistente"
#: report:account.third_party_ledger:0
#: report:account.third_party_ledger_other:0
msgid "Partner's"
-msgstr "De empresas"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
#: view:ir.sequence:0
#: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
msgid "Fiscal Years"
-msgstr "Ejercicios fiscales"
+msgstr ""
#. module: account
#: help:account.analytic.journal,active:0
@@ -10255,19 +10340,17 @@ msgid ""
"If the active field is set to False, it will allow you to hide the analytic "
"journal without removing it."
msgstr ""
-"Si el campo activo se desmarca, permite ocultar el diario analítico sin "
-"eliminarlo."
#. module: account
#: field:account.analytic.line,ref:0
msgid "Ref."
-msgstr "Ref."
+msgstr ""
#. module: account
#: field:account.use.model,model:0
#: model:ir.model,name:account.model_account_model
msgid "Account Model"
-msgstr "Modelo de asiento"
+msgstr ""
#. module: account
#: selection:account.entries.report,month:0
@@ -10276,7 +10359,15 @@ msgstr "Modelo de asiento"
#: selection:report.account.sales,month:0
#: selection:report.account_type.sales,month:0
msgid "February"
-msgstr "Febrero"
+msgstr ""
+
+#. module: account
+#: help:account.bank.statement,name:0
+msgid ""
+"if you give the Name other then /, its created Accounting Entries Move will "
+"be with same name as statement name. This allows the statement entries to "
+"have the same references than the statement itself"
+msgstr ""
#. module: account
#: field:account.bank.accounts.wizard,bank_account_id:0
@@ -10285,28 +10376,30 @@ msgstr "Febrero"
#: field:account.invoice,partner_bank_id:0
#: field:account.invoice.report,partner_bank_id:0
msgid "Bank Account"
-msgstr "Cuenta bancaria"
+msgstr ""
#. module: account
#: model:ir.actions.act_window,name:account.action_account_central_journal
#: model:ir.model,name:account.model_account_central_journal
msgid "Account Central Journal"
-msgstr "Diario central contable"
+msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Maturity"
-msgstr "Vencimiento"
+msgstr ""
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
+#: code:addons/account/report/account_aged_partner_balance.py:383
+#, python-format
msgid "Future"
-msgstr "Futuro"
+msgstr ""
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
-msgstr "Buscar líneas asientos"
+msgstr ""
#. module: account
#: help:account.tax,base_sign:0
@@ -10318,35 +10411,32 @@ msgstr "Buscar líneas asientos"
#: help:account.tax.template,ref_tax_sign:0
#: help:account.tax.template,tax_sign:0
msgid "Usually 1 or -1."
-msgstr "Normalmente 1 o -1."
+msgstr ""
#. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Template Account Fiscal Mapping"
-msgstr "Mapeo fiscal de modelo de cuenta"
+#: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
+#: model:ir.actions.act_window,name:account.action_account_analytic_chart
+#: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
+msgid "Chart of Analytic Accounts"
+msgstr ""
#. module: account
#: field:account.chart.template,property_account_expense:0
msgid "Expense Account on Product Template"
-msgstr "Cuenta de gastos en plantilla producto"
+msgstr ""
#. module: account
-#: field:account.analytic.line,amount_currency:0
-msgid "Amount currency"
-msgstr "Moneda del importe"
+#: help:accounting.report,label_filter:0
+msgid ""
+"This label will be displayed on report to show the balance computed for the "
+"given comparison filter."
+msgstr ""
#. module: account
-#: code:addons/account/wizard/account_report_aged_partner_balance.py:55
+#: code:addons/account/wizard/account_report_aged_partner_balance.py:56
#, python-format
msgid "You must enter a period length that cannot be 0 or below !"
msgstr ""
-"¡Debe introducir una duración del período que no puede ser 0 o inferior!"
-
-#. module: account
-#: code:addons/account/account.py:501
-#, python-format
-msgid "You cannot remove an account which has account entries!. "
-msgstr "¡No puede eliminar una cuenta que contiene asientos contables! "
#. module: account
#: model:ir.actions.act_window,help:account.action_account_form
@@ -10359,13 +10449,6 @@ msgid ""
"certain amount of information. They have to be certified by an external "
"auditor annually."
msgstr ""
-"Cree y gestione las cuentas que necesite para codificar asientos en los "
-"diarios. Una cuenta es parte de un plan de cuentas que permite a su compañía "
-"registrar todo tipo de transacciones de crédito y débito. Las compañías "
-"presentan sus cuentas anuales en dos partes principales: El balance y la "
-"cuenta de pérdidas y ganancias. Las cuentas anuales de una compañía son "
-"requeridas por ley para que contengan cierta cantidad de información. Tienen "
-"que ser certificadas por un auditor externo anualmente."
#. module: account
#: help:account.move.line,amount_residual_currency:0
@@ -10373,1405 +10456,3 @@ msgid ""
"The residual amount on a receivable or payable of a journal entry expressed "
"in its currency (maybe different of the company currency)."
msgstr ""
-"El importe residual de un apunte a cobrar o a pagar expresado en su moneda "
-"(puede ser diferente de la moneda de la compañía)."
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-msgid "Assets"
-msgstr "Activo"
-
-#. module: account
-#: report:account.balancesheet:0
-#: report:account.balancesheet.horizontal:0
-msgid "Liabilities"
-msgstr "Pasivos"
-
-#, python-format
-#~ msgid "The statement balance is incorrect !\n"
-#~ msgstr "¡El balance del extracto bancario es incorrecto!\n"
-
-#, python-format
-#~ msgid ""
-#~ "You can specify year, month and date in the name of the model using the "
-#~ "following labels:\n"
-#~ "\n"
-#~ "%(year)s : To Specify Year \n"
-#~ "%(month)s : To Specify Month \n"
-#~ "%(date)s : Current Date\n"
-#~ "\n"
-#~ "e.g. My model on %(date)s"
-#~ msgstr ""
-#~ "Puede indicar año, mes y fecha en el nombre del modelo utilizando las "
-#~ "etiquetas siguientes:\n"
-#~ "\n"
-#~ "%(year)s: Indica año\n"
-#~ "%(month)s: Indica mes\n"
-#~ "%(date)s: Fecha actual\n"
-#~ "\n"
-#~ "por ej. Mi modelo de %(date)s"
-
-#~ msgid "Unpaid Supplier Invoices"
-#~ msgstr "Facturas de proveedor sin pagar"
-
-#~ msgid "Confirm statement from draft"
-#~ msgstr "Confirmar extracto desde borrador"
-
-#~ msgid "Asset"
-#~ msgstr "Activo"
-
-#~ msgid "Select Message"
-#~ msgstr "Seleccionar mensaje"
-
-#~ msgid "Unreconciled entries"
-#~ msgstr "Asientos no conciliados"
-
-#~ msgid "Print Taxes Report"
-#~ msgstr "Imprimir informe de impuestos"
-
-#~ msgid "Unreconcile entries"
-#~ msgstr "Romper conciliación de los asientos"
-
-#~ msgid "Confirm draft invoices"
-#~ msgstr "Confirmar facturas borrador"
-
-#~ msgid "Charts of Account"
-#~ msgstr "Planes contables"
-
-#~ msgid "Move line select"
-#~ msgstr "Seleccionar línea movimineto"
-
-#~ msgid "Entry label"
-#~ msgstr "Ref. asiento"
-
-#~ msgid "Aged Trial Balance"
-#~ msgstr "Balance de comprobación anterior"
-
-#~ msgid "Recurrent Entries"
-#~ msgstr "Asientos recurrentes"
-
-#~ msgid ""
-#~ "Gives the view used when writing or browsing entries in this journal. The "
-#~ "view tell Open ERP which fields should be visible, required or readonly and "
-#~ "in which order. You can create your own view for a faster encoding in each "
-#~ "journal."
-#~ msgstr ""
-#~ "Indica la vista utilizada para introducir o mostrar asientos en este diario. "
-#~ "La vista indica a OpenERP que campos deberían ser visibles, requeridos o "
-#~ "sólo lectura y en qué orden. Puede crear su propia vista para codificar más "
-#~ "rápido en cada diario."
-
-#~ msgid "Account Num."
-#~ msgstr "Núm. cuenta"
-
-#~ msgid "Delta Debit"
-#~ msgstr "Diferencia debe"
-
-#, python-format
-#~ msgid "No analytic journal !"
-#~ msgstr "¡No diario analítico!"
-
-#~ msgid "Debit Trans."
-#~ msgstr "Trans. debe"
-
-#~ msgid "Total entries"
-#~ msgstr "Total asientos"
-
-#~ msgid "Payment Reconcilation"
-#~ msgstr "Conciliación del pago"
-
-#~ msgid "Contra"
-#~ msgstr "Contra"
-
-#~ msgid "Confirm statement with/without reconciliation from draft statement"
-#~ msgstr ""
-#~ "Confirmar extracto bancario con/sin conciliación a partir del extracto "
-#~ "borrador"
-
-#~ msgid "Supplier invoice"
-#~ msgstr "Factura de proveedor"
-
-#~ msgid "Reconcile Paid"
-#~ msgstr "Pago conciliado"
-
-#~ msgid "Printing Date"
-#~ msgstr "Fecha de impresión"
-
-#~ msgid "Mvt"
-#~ msgstr "Mov."
-
-#~ msgid "Fiscal Position Accounts Mapping"
-#~ msgstr "Mapeo cuentas posición fiscal"
-
-#~ msgid "Contact"
-#~ msgstr "Contacto"
-
-#~ msgid "Account Entry Reconcile"
-#~ msgstr "Conciliación asiento contable"
-
-#~ msgid "Keep empty if the fiscal year belongs to several companies."
-#~ msgstr "Dejarlo vacío si el ejercicio fiscal pertenece a varias compañías"
-
-#~ msgid "Analytic Invoice"
-#~ msgstr "Factura analítica"
-
-#~ msgid "Sign for parent"
-#~ msgstr "Signo para el padre"
-
-#~ msgid "Can be draft or validated"
-#~ msgstr "Puede ser borrador o válido"
-
-#~ msgid "Partial Payment"
-#~ msgstr "Pago parcial"
-
-#~ msgid "Move Lines Created."
-#~ msgstr "Movimientos creados."
-
-#~ msgid "Status"
-#~ msgstr "Estado"
-
-#~ msgid "Partner account"
-#~ msgstr "Cuenta de la empresa"
-
-#~ msgid "(Keep empty for all open fiscal years)"
-#~ msgstr "(dejarlo vacío para todos los ejercicios fiscales abiertos)"
-
-#~ msgid "Move Lines"
-#~ msgstr "Líneas movimiento"
-
-#, python-format
-#~ msgid "The opening journal must not have any entry in the new fiscal year !"
-#~ msgstr ""
-#~ "¡El diario de apertura no debe tener ningún asiento en el nuevo ejercicio "
-#~ "fiscal!"
-
-#~ msgid "account.config.wizard"
-#~ msgstr "account.config.asistente"
-
-#~ msgid "Account cost and revenue by journal"
-#~ msgstr "Costo y retorno de la cuenta por diario"
-
-#~ msgid "Bank Reconciliation"
-#~ msgstr "Conciliación bancaria"
-
-#~ msgid "Print Journal"
-#~ msgstr "Imprimir diario"
-
-#~ msgid "Cancel Invoice"
-#~ msgstr "Cancelar factura"
-
-#~ msgid "Select Chart of Accounts"
-#~ msgstr "Seleccionar plan contable"
-
-#~ msgid "Printing Date :"
-#~ msgstr "Fecha de impresión :"
-
-#~ msgid "End date"
-#~ msgstr "Fecha final"
-
-#~ msgid "Entries by Statements"
-#~ msgstr "Asientos por extractos bancarios"
-
-#~ msgid "analytic Invoice"
-#~ msgstr "Factura analítica"
-
-#~ msgid "Grand total"
-#~ msgstr "Suma total"
-
-#~ msgid "Fiscal Position Taxes Mapping"
-#~ msgstr "Mapeo de impuestos posición fiscal"
-
-#~ msgid "New Supplier Invoice"
-#~ msgstr "Nueva factura de proveedor"
-
-#~ msgid "Amount paid"
-#~ msgstr "Importe pagado"
-
-#~ msgid "Voucher Nb"
-#~ msgstr "Núm. de bono"
-
-#~ msgid "Total write-off"
-#~ msgstr "Desajuste total"
-
-#~ msgid "New Analytic Account"
-#~ msgstr "Nueva cuenta analítica"
-
-#~ msgid "Standard entry"
-#~ msgstr "Asiento estándar"
-
-#~ msgid "Tax Report"
-#~ msgstr "Informe impuestos"
-
-#~ msgid "Are you sure you want to close the fiscal year ?"
-#~ msgstr "¿Está seguro que desea cerrar el ejercicio fiscal?"
-
-#~ msgid "Bank Receipt"
-#~ msgstr "Recibo bancario"
-
-#~ msgid "Invoice import"
-#~ msgstr "Importe factura"
-
-#, python-format
-#~ msgid ""
-#~ "The expected balance (%.2f) is different than the computed one. (%.2f)"
-#~ msgstr "El balance previsto (%.2f) es diferente del calculado. (%.2f)"
-
-#~ msgid "Ending Balance"
-#~ msgstr "Saldo final"
-
-#~ msgid "Analytic Credit"
-#~ msgstr "Haber analítico"
-
-#~ msgid "Continue"
-#~ msgstr "Continuar"
-
-#~ msgid "Value"
-#~ msgstr "Valor"
-
-#~ msgid "Select invoices you want to pay and manages advances"
-#~ msgstr "Seleccionar facturas que desea pagar y gestionar anticipos"
-
-#~ msgid "Compute Entry Dates"
-#~ msgstr "Calcular fechas asiento"
-
-#~ msgid "Display History"
-#~ msgstr "Mostrar historial"
-
-#~ msgid " Start date"
-#~ msgstr " Fecha inicial"
-
-#~ msgid "Display accounts "
-#~ msgstr "Mostrar cuentas "
-
-#~ msgid "Statement reconcile line"
-#~ msgstr "Línea de conciliación de extracto"
-
-#~ msgid "Close states"
-#~ msgstr "Cerrar estados"
-
-#~ msgid "Income"
-#~ msgstr "Ingreso"
-
-#~ msgid "Print General Journal"
-#~ msgstr "Imprimir diario general"
-
-#~ msgid "Invoice Movement"
-#~ msgstr "Asiento factura"
-
-#~ msgid "Legal Statements"
-#~ msgstr "Declaraciones oficiales"
-
-#~ msgid "Open for reconciliation"
-#~ msgstr "Abrir para la conciliación"
-
-#~ msgid "VAT"
-#~ msgstr "IVA"
-
-#~ msgid "Account to reconcile"
-#~ msgstr "Cuenta a conciliar"
-
-#~ msgid "Partner Ref."
-#~ msgstr "Ref. empresa"
-
-#~ msgid "Total quantity"
-#~ msgstr "Cantidad total"
-
-#~ msgid "Third party"
-#~ msgstr "Terceros"
-
-#~ msgid "Costs & Revenues"
-#~ msgstr "Costos e Ingresos"
-
-#~ msgid "Account Number"
-#~ msgstr "Número de cuenta"
-
-#~ msgid "Skip"
-#~ msgstr "Saltar"
-
-#~ msgid "Gives the sequence order when displaying a list of account types."
-#~ msgstr ""
-#~ "Proporciona el orden de secuencia al mostrar una lista de tipos de cuenta."
-
-#~ msgid "Include in base amount"
-#~ msgstr "Incluir en importe base"
-
-#~ msgid "Delta Credit"
-#~ msgstr "Diferencia haber"
-
-#~ msgid "Pre-generated invoice from control"
-#~ msgstr "Factura pre-generada de control"
-
-#~ msgid "Valid Entries"
-#~ msgstr "Asientos válidos"
-
-#~ msgid "Cost Legder for period"
-#~ msgstr "Coste contable por período"
-
-#~ msgid "New Statement"
-#~ msgstr "Nuevo extracto bancario"
-
-#~ msgid "Reconciliation of entries from invoice(s) and payment(s)"
-#~ msgstr "Conciliación de asientos de factura(s) y pago(s)"
-
-#~ msgid "Print Central Journal"
-#~ msgstr "Imprimir diario central"
-
-#~ msgid "Next"
-#~ msgstr "Siguiente"
-
-#~ msgid ""
-#~ "The fiscal position will determine taxes and the accounts used for the the "
-#~ "partner."
-#~ msgstr ""
-#~ "La posición fiscal determinará los impuestos y las cuentas utilizadas para "
-#~ "la empresa."
-
-#~ msgid "Account Manager"
-#~ msgstr "Gestor contable"
-
-#~ msgid "Start date"
-#~ msgstr "Fecha inicial"
-
-#~ msgid "Untaxed amount"
-#~ msgstr "Base imponible"
-
-#~ msgid "Pay invoice"
-#~ msgstr "Pagar factura"
-
-#~ msgid "Draft Customer Invoices"
-#~ msgstr "Facturas de cliente en borrador"
-
-#~ msgid "Sort by:"
-#~ msgstr "Ordenar por:"
-
-#~ msgid "To Be Verified"
-#~ msgstr "Para ser verificado"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid " Start date"
-#~ msgstr " Fecha inicial"
-
-#~ msgid "Analytic Journal Report"
-#~ msgstr "Informe analítico de diario"
-
-#, python-format
-#~ msgid "No sequence defined in the journal !"
-#~ msgstr "¡No se ha definido una secuencia en el diario!"
-
-#~ msgid "Expense"
-#~ msgstr "Gasto"
-
-#~ msgid "Options"
-#~ msgstr "Opciones"
-
-#~ msgid "Customer Invoice Process"
-#~ msgstr "Proceso de factura de cliente"
-
-#~ msgid "Validate Account Moves"
-#~ msgstr "Validar asientos contables"
-
-#~ msgid "Unpaid invoices"
-#~ msgstr "Facturas sin pagar"
-
-#~ msgid "Payment Reconcile"
-#~ msgstr "Conciliación pago"
-
-#~ msgid "Statements reconciliation"
-#~ msgstr "Conciliación de extractos bancarios"
-
-#~ msgid "Validated accounting entries."
-#~ msgstr "Asientos contables validados."
-
-#~ msgid "Draft Supplier Invoices"
-#~ msgstr "Facturas de proveedor en borrador"
-
-#~ msgid ""
-#~ "Exception made of a mistake of our side, it seems that the following bills "
-#~ "stay unpaid. Please, take appropriate measures in order to carry out this "
-#~ "payment in the next 8 days."
-#~ msgstr ""
-#~ "A no ser que hubiera un error por nuestra parte, las facturas siguientes nos "
-#~ "constan como impagadas. Por favor, tome las medidas apropiadas para realizar "
-#~ "el pago de las mismas en los próximos 8 días."
-
-#~ msgid "x Checks Journal"
-#~ msgstr "x Diario de cheques"
-
-#, python-format
-#~ msgid "Your journal must have a default credit and debit account."
-#~ msgstr "El diario debe tener una cuenta haber y debe por defecto."
-
-#~ msgid "Create subscription entries"
-#~ msgstr "Crear asientos periódicos"
-
-#~ msgid "Create a Fiscal Year"
-#~ msgstr "Crear un ejercicio fiscal"
-
-#~ msgid "Date Invoiced"
-#~ msgstr "Fecha factura"
-
-#~ msgid "Liability"
-#~ msgstr "Pasivo"
-
-#~ msgid "Statement Entries"
-#~ msgstr "Asientos de extractos"
-
-#~ msgid "Automatic reconciliation"
-#~ msgstr "Conciliación automática"
-
-#~ msgid "Import Invoice"
-#~ msgstr "Importar factura"
-
-#~ msgid "Account No."
-#~ msgstr "Núm. cuenta"
-
-#~ msgid "Date End"
-#~ msgstr "Fecha final"
-
-#~ msgid "Entries Encoding by Line"
-#~ msgstr "Codificación de asientos por línea"
-
-#~ msgid "Entries Reconcile"
-#~ msgstr "Asientos conciliados"
-
-#~ msgid "From analytic accounts, Create invoice."
-#~ msgstr "Desde cuentas analíticas, crear factura."
-
-#~ msgid "Taxes Reports"
-#~ msgstr "Informes de impuestos"
-
-#, python-format
-#~ msgid "Already Reconciled"
-#~ msgstr "Ya conciliado"
-
-#~ msgid "Equity"
-#~ msgstr "Patrimonio"
-
-#~ msgid "Generic Reports"
-#~ msgstr "Informes genéricos"
-
-#~ msgid "Account Analytic Lines Analysis"
-#~ msgstr "Análisis líneas analíticas contables"
-
-#~ msgid "Analytic Chart of Accounts"
-#~ msgstr "Plan de cuentas analíticas"
-
-#~ msgid "Select Period and Journal for Validation"
-#~ msgstr "Selecione período y diario para la validación"
-
-#~ msgid "O_k"
-#~ msgstr "_Aceptar"
-
-#~ msgid "_Go"
-#~ msgstr "_Ir"
-
-#~ msgid "New Customer Invoice"
-#~ msgstr "Nueva factura de cliente"
-
-#~ msgid "Analytic account costs and revenues"
-#~ msgstr "Cuenta analítica costes y retornos"
-
-#~ msgid "Are you sure you want to refund this invoice ?"
-#~ msgstr "¿Está seguro que quiere reintegrar esta factura?"
-
-#~ msgid "Open State"
-#~ msgstr "Estado abierto"
-
-#~ msgid "From statement, create entries"
-#~ msgstr "A partir de extractos, crear asientos"
-
-#~ msgid "1cm 27.7cm 20cm 27.7cm"
-#~ msgstr "1cm 27.7cm 20cm 27.7cm"
-
-#~ msgid "Accounting Statement"
-#~ msgstr "Extracto contable"
-
-#, python-format
-#~ msgid "Unable to reconcile entry \"%s\": %.2f"
-#~ msgstr "No es posible conciliar el asiento \"%s\": %.2f"
-
-#, python-format
-#~ msgid "Please set an analytic journal on this financial journal !"
-#~ msgstr "¡Por favor indique un diario analítico en este diario financiero!"
-
-#~ msgid "Reconcilation of entries from payment order."
-#~ msgstr "Conciliación de asientos de órdenes de pago."
-
-#~ msgid "Analytic Journal -"
-#~ msgstr "Diario analítico -"
-
-#~ msgid "Analytic Debit"
-#~ msgstr "Debe analítico"
-
-#~ msgid ""
-#~ "The maturity date of the generated entries for this model. You can chosse "
-#~ "between the date of the creation action or the the date of the creation of "
-#~ "the entries plus the partner payment terms."
-#~ msgstr ""
-#~ "La fecha de vencimiento de los asientos generados para este modelo. Puede "
-#~ "escoger entre la fecha de la acción de creación o la fecha de la creación de "
-#~ "los asientos más los plazos de pago de la empresa."
-
-#~ msgid "Document"
-#~ msgstr "Documento"
-
-#~ msgid "Cancel selected invoices"
-#~ msgstr "Cancelar las facturas seleccionadas"
-
-#~ msgid "Reconcilate the entries from payment"
-#~ msgstr "Conciliar los asientos desde pago"
-
-#~ msgid "Proposed invoice to be checked, validated and printed"
-#~ msgstr "Factura propuesta para ser comprobada, validada e impresa"
-
-#~ msgid ""
-#~ "The account moves of the invoice have been reconciled with account moves of "
-#~ "the payment(s)."
-#~ msgstr ""
-#~ "Los asientos de la factura han sido conciliados con los asientos del pago(s)."
-
-#~ msgid "Close Fiscal Year with new entries"
-#~ msgstr "Cerrar ejercicio fiscal con nuevos asientos"
-
-#~ msgid "Statement encoding produces payment entries"
-#~ msgstr "Codificación de extractos crea asientos de pago"
-
-#~ msgid "Additionnal Information"
-#~ msgstr "Información adicional"
-
-#~ msgid "Third Party Ledger"
-#~ msgstr "Libro mayor de terceros"
-
-#~ msgid "Partner Accounts"
-#~ msgstr "Cuentas de empresa"
-
-#~ msgid ""
-#~ "If a default tax if given in the partner it only override taxes from account "
-#~ "(or product) of the same group."
-#~ msgstr ""
-#~ "Si a la empresa se le ha asignado un impuesto por defecto, éste sólo anulará "
-#~ "impuestos de la cuenta (o producto) del mismo grupo."
-
-#~ msgid "Real Entries"
-#~ msgstr "Asientos reales"
-
-#~ msgid "Import invoice"
-#~ msgstr "Importar factura"
-
-#~ msgid "Invoice line"
-#~ msgstr "Línea de factura"
-
-#~ msgid ""
-#~ "All draft account entries in this journal and period will be validated. It "
-#~ "means you won't be able to modify their accouting fields."
-#~ msgstr ""
-#~ "Todos los asientos contables borrador de este diario y período serán "
-#~ "validados. Esto significa que no podrá modificar sus campos contables."
-
-#~ msgid "Pay and reconcile"
-#~ msgstr "Pagar y conciliar"
-
-#~ msgid "Entry Model"
-#~ msgstr "Modelo de asiento"
-
-#~ msgid "Journal code"
-#~ msgstr "Código del diario"
-
-#~ msgid "Entry encoding"
-#~ msgstr "Codificación asiento"
-
-#~ msgid "Define Fiscal Years and Select Charts of Account"
-#~ msgstr "Definir ejercicios fiscales y seleccionar plan contable"
-
-#~ msgid ""
-#~ "Check this box if you want to print all entries when printing the General "
-#~ "Ledger, otherwise it will only print its balance."
-#~ msgstr ""
-#~ "Marque esta opción si quiere imprimir todas los asientos al imprimir el "
-#~ "libro mayor general, de lo contrario imprimirá solamente su balance."
-
-#~ msgid "By date"
-#~ msgstr "Por fecha"
-
-#~ msgid "Account Configure Wizard "
-#~ msgstr "Asistente de configuración contabilidad "
-
-#~ msgid "Select Chart"
-#~ msgstr "Seleccionar plan contable"
-
-#, python-format
-#~ msgid "The journal must have centralised counterpart"
-#~ msgstr "El diario debe tener un homólogo centralizado"
-
-#~ msgid "Payment Entries"
-#~ msgstr "Asientos de pago"
-
-#~ msgid ""
-#~ "If no account is specified, the reconciliation will be made using every "
-#~ "accounts that can be reconcilied"
-#~ msgstr ""
-#~ "Si no se especifica ninguna cuenta, la conciliación se hará utilizando cada "
-#~ "cuenta que pueda ser conciliada"
-
-#~ msgid "Other"
-#~ msgstr "Otro"
-
-#~ msgid "Movement"
-#~ msgstr "Movimiento"
-
-#~ msgid "Encode manually the statement"
-#~ msgstr "Codificar manualmente el extracto"
-
-#~ msgid "Financial Journals"
-#~ msgstr "Diarios financieros"
-
-#~ msgid ""
-#~ "Gives the type of the analytic journal. When a document (eg: an invoice) "
-#~ "needs to create analytic entries, Open ERP will look for a matching journal "
-#~ "of the same type."
-#~ msgstr ""
-#~ "Indica el tipo del diario analítico. Cuando un documento (por ej.: una "
-#~ "factura) necesita crear asientos analíticos, OpenERP buscará un diario que "
-#~ "corresponda del mismo tipo."
-
-#~ msgid "Import from your bank statements"
-#~ msgstr "Importar desde los extractos bancarios"
-
-#~ msgid "Select entries"
-#~ msgstr "Seleccionar los asientos"
-
-#~ msgid "Base on"
-#~ msgstr "Basado en"
-
-#~ msgid "Cash Payment"
-#~ msgstr "Pago de caja"
-
-#~ msgid ""
-#~ "Indicate if the tax computation is based on the value computed for the "
-#~ "computation of child taxes or based on the total amount."
-#~ msgstr ""
-#~ "Indica si el cálculo del impuesto está basado en el valor calculado por el "
-#~ "cómputo de impuestos hijos o basado en el importe total."
-
-#~ msgid "Account Move"
-#~ msgstr "Asiento"
-
-#~ msgid "Taxed Amount"
-#~ msgstr "Importe impuestos"
-
-#~ msgid "Subtotal w/o tax"
-#~ msgstr "Subtotal sin imp."
-
-#~ msgid "Invoice Ref"
-#~ msgstr "Ref. factura"
-
-#~ msgid " Include Reconciled Entries"
-#~ msgstr " Incluir asientos conciliados"
-
-#~ msgid "Credit Trans."
-#~ msgstr "Trans. haber"
-
-#~ msgid "Search Entries"
-#~ msgstr "Buscar asientos"
-
-#~ msgid "Analytic costs to reinvoice purchases, timesheets, ..."
-#~ msgstr "Costes analíticos para refacturar compras, hojas de servicios, ..."
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "Name of the fiscal year as displayed in reports."
-#~ msgstr "Nombre del ejercicio fiscal que se muestra en informes."
-
-#~ msgid "Third party (Country)"
-#~ msgstr "Terceros (país)"
-
-#~ msgid "The sequence gives the display order for a list of journals"
-#~ msgstr "La secuencia indica el orden a mostrar en una lista de diarios"
-
-#~ msgid "Payment date"
-#~ msgstr "Fecha de pago"
-
-#~ msgid "Unpaid Customer Invoices"
-#~ msgstr "Facturas de cliente sin pagar"
-
-#~ msgid "Journal/Payment Mode"
-#~ msgstr "Diario/Modo de pago"
-
-#~ msgid "Canceled Invoice"
-#~ msgstr "Factura cancelada"
-
-#~ msgid "Import file from your bank statement"
-#~ msgstr "Importar archivo desde extracto bancario"
-
-#~ msgid "Bank Payment"
-#~ msgstr "Pago bancario"
-
-#~ msgid "Manually statement"
-#~ msgstr "Extracto manual"
-
-#~ msgid "End of Year Treatments"
-#~ msgstr "Tratamientos de fin de año"
-
-#~ msgid "File statement"
-#~ msgstr "Archivo de extractos"
-
-#~ msgid "Entry Model Line"
-#~ msgstr "Línea del modelo de asiento"
-
-#~ msgid "Set starting and ending balance for control"
-#~ msgstr "Indicar balance inicial y final para control"
-
-#~ msgid "JNRL"
-#~ msgstr "JNRL"
-
-#~ msgid "General Ledger -"
-#~ msgstr "Libro mayor -"
-
-#~ msgid "Quantities"
-#~ msgstr "Cantidades"
-
-#~ msgid "Date Start"
-#~ msgstr "Fecha inicial"
-
-#~ msgid "Number of entries are generated"
-#~ msgstr "Número de asientos que se han generado"
-
-#~ msgid "By Date"
-#~ msgstr "Por fecha"
-
-#~ msgid "The date of the generated entries"
-#~ msgstr "La fecha en que se generaron los asientos"
-
-#~ msgid "Modify Invoice"
-#~ msgstr "Modificar factura"
-
-#~ msgid "Entries Encoding by Move"
-#~ msgstr "Asientos codificados por apunte"
-
-#~ msgid "Filter on Partners"
-#~ msgstr "Filtrar por empresas"
-
-#~ msgid "Analytic Entries by Journal"
-#~ msgstr "Asientos analíticos por diario"
-
-#~ msgid "Valid entries from invoice"
-#~ msgstr "Asientos válidos desde factura"
-
-#~ msgid "Crebit"
-#~ msgstr "Haber"
-
-#~ msgid ""
-#~ "Indicate if the amount of tax must be included in the base amount for the "
-#~ "computation of the next taxes"
-#~ msgstr ""
-#~ "Indique si el importe del impuesto debe ser incluido en el importe base para "
-#~ "el cálculo de otros impuestos"
-
-#~ msgid "Journal name"
-#~ msgstr "Nombre del diario"
-
-#~ msgid "Import invoice from statement"
-#~ msgstr "Importar archivo desde extracto"
-
-#~ msgid "Import from invoices or payments"
-#~ msgstr "Importar desde facturas o pagos"
-
-#~ msgid "Reconcile entries"
-#~ msgstr "Conciliar los asientos"
-
-#~ msgid "Journal - Period"
-#~ msgstr "Diario - Período"
-
-#~ msgid "Print Aged Trial Balance"
-#~ msgstr "Imprimir balance de comprobación anterior"
-
-#~ msgid "General Credit"
-#~ msgstr "Haber general"
-
-#~ msgid "Date payment"
-#~ msgstr "Fecha de pago"
-
-#~ msgid "A/c No."
-#~ msgstr "Nº cuenta"
-
-#~ msgid "Account cost and revenue by journal (This Month)"
-#~ msgstr "Costo y retorno de la cuenta por diario (este mes)"
-
-#~ msgid "Open for unreconciliation"
-#~ msgstr "Abrir para romper conciliación"
-
-#~ msgid "OK"
-#~ msgstr "Aceptar"
-
-#~ msgid "Control Invoice"
-#~ msgstr "Controlar factura"
-
-#~ msgid "Account Balance"
-#~ msgstr "Saldo cuenta"
-
-#~ msgid "Analytic Check"
-#~ msgstr "Comprobación analítica"
-
-#~ msgid "account.analytic.journal"
-#~ msgstr "account.analytic.journal"
-
-#~ msgid "Select parent account"
-#~ msgstr "Seleccionar cuenta padre"
-
-#~ msgid "Payment amount"
-#~ msgstr "Importe a pagar"
-
-#~ msgid "All Months"
-#~ msgstr "Todos los meses"
-
-#~ msgid "Link to the automatically generated account moves."
-#~ msgstr "Enlace al asiento contable generado automáticamente."
-
-#~ msgid "Have a number and entries are generated"
-#~ msgstr "Obtener un número y los asientos son generados"
-
-#~ msgid "Analytic Check -"
-#~ msgstr "Comprobación analítica -"
-
-#~ msgid "Group invoice lines"
-#~ msgstr "Agrupar líneas de factura"
-
-#~ msgid "Total amount"
-#~ msgstr "Importe total"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Cancelar"
-
-#~ msgid "Tax Group"
-#~ msgstr "Grupo de Impuestos"
-
-#~ msgid "Import invoices"
-#~ msgstr "Importar facturas"
-
-#~ msgid "Maintains Invoice sequences with Fiscal Year"
-#~ msgstr "Mantiene secuencias de factura con ejercicio fiscal"
-
-#~ msgid "Subscription Periods"
-#~ msgstr "Repetición de los asientos periódicos"
-
-#~ msgid "Write-Off journal"
-#~ msgstr "Diario de desajuste"
-
-#~ msgid "Full Payment"
-#~ msgstr "Pago completo"
-
-#~ msgid "Journal Purchase"
-#~ msgstr "Diario de compras"
-
-#~ msgid "Cash Receipt"
-#~ msgstr "Recibo de caja"
-
-#~ msgid "Encode manually statement comes into the draft statement"
-#~ msgstr "Codificar el extracto manualmente lo convierte en extracto borrador"
-
-#~ msgid "Accounting entries at statement's confirmation"
-#~ msgstr "Asientos contables en la confirmación del extracto"
-
-#, python-format
-#~ msgid ""
-#~ "Selected Move lines does not have any account move enties in draft state"
-#~ msgstr ""
-#~ "Ha seleccionado apuntes que no tienen ningún asiento contable en estado "
-#~ "borrador"
-
-#~ msgid "Date Filter"
-#~ msgstr "Filtrado por fecha"
-
-#~ msgid "Choose Journal and Payment Date"
-#~ msgstr "Seleccionar diario y fecha de pago"
-
-#~ msgid "Supplier Invoice Process"
-#~ msgstr "Proceso factura de proveedor"
-
-#~ msgid "Page"
-#~ msgstr "Página"
-
-#~ msgid "Receivable and Payable"
-#~ msgstr "A cobrar y pagar"
-
-#~ msgid "Amount reconciled"
-#~ msgstr "Importe conciliado"
-
-#~ msgid "Subscription Entries"
-#~ msgstr "Asientos periódicos"
-
-#, python-format
-#~ msgid "Closing of fiscal year cancelled, please check the box !"
-#~ msgstr "¡Cierre del ejercicio fiscal cancelado, por favor marque la caja!"
-
-#~ msgid "PRO-FORMA Customer Invoices"
-#~ msgstr "Facturas de cliente PRO-FORMA"
-
-#~ msgid "Analytic Journal Definition"
-#~ msgstr "Definición de diario analítico"
-
-#~ msgid ""
-#~ "This field allow you to choose the accounting journals you want for "
-#~ "filtering the invoices. If you left this field empty, it will search on all "
-#~ "sale, purchase and cash journals."
-#~ msgstr ""
-#~ "Este campo le permite seleccionar los diarios contables que desea para "
-#~ "filtrar las facturas. Si deja este campo vacío, buscará en todos los diarios "
-#~ "de venta, compra y de caja."
-
-#~ msgid "List of Accounts"
-#~ msgstr "Listado de cuentas"
-
-#, python-format
-#~ msgid "Closing of states cancelled, please check the box !"
-#~ msgstr "¡Cierre de estados cancelado, por favor marque la caja!"
-
-#~ msgid "Validate Account Entries"
-#~ msgstr "Validar asientos contables"
-
-#~ msgid "Entries of Open Analytic Journals"
-#~ msgstr "Asientos de diarios analíticos abiertos"
-
-#~ msgid "Current Date"
-#~ msgstr "Fecha actual"
-
-#~ msgid "Journal Sale"
-#~ msgstr "Diario de ventas"
-
-#~ msgid "Print VAT Decl."
-#~ msgstr "Imprimir declaración IVA"
-
-#~ msgid "Financial Accounts"
-#~ msgstr "Cuentas generales"
-
-#~ msgid "Account Configure"
-#~ msgstr "Configurar cuenta"
-
-#~ msgid "Print Journal -"
-#~ msgstr "Impresión diario -"
-
-#~ msgid "Models Definition"
-#~ msgstr "Definición de modelos de asientos"
-
-#~ msgid "Reconcile Entries."
-#~ msgstr "Asientos conciliados."
-
-#~ msgid "Paid invoice when reconciled."
-#~ msgstr "Pagar factura cuando se concilie."
-
-#~ msgid "General Debit"
-#~ msgstr "Debe general"
-
-#~ msgid "Name of the fiscal year as displayed on screens."
-#~ msgstr "Nombre del ejercicio fiscal que se muestra en pantalla."
-
-#~ msgid "Statement Process"
-#~ msgstr "Proceso de extracto"
-
-#~ msgid "Statement reconcile"
-#~ msgstr "Conciliación extracto"
-
-#~ msgid ""
-#~ "The optional quantity expressed by this line, eg: number of product sold. "
-#~ "The quantity is not a legal requirement but is very usefull for some reports."
-#~ msgstr ""
-#~ "La cantidad opcional expresada por esta línea, por ej.: cantidad de producto "
-#~ "vendido. La cantidad no es un requisito legal pero es muy útil para algunos "
-#~ "informes."
-
-#, python-format
-#~ msgid "No Data Available"
-#~ msgstr "No hay datos disponibles"
-
-#~ msgid "J.C. or Move name"
-#~ msgstr "Cód. diario o asiento"
-
-#~ msgid "Journal de vente"
-#~ msgstr "Diario de ventas"
-
-#~ msgid "Parent Analytic Account"
-#~ msgstr "Cuenta analítica padre"
-
-#~ msgid "Date or Code"
-#~ msgstr "Fecha o código"
-
-#~ msgid "Journal d'ouverture"
-#~ msgstr "Diario de apertura"
-
-#~ msgid "Import Invoices in Statement"
-#~ msgstr "Importar facturas en extracto"
-
-#, python-format
-#~ msgid "Date to must be set between %s and %s"
-#~ msgstr "La fecha debe estar entre %s y %s"
-
-#, python-format
-#~ msgid "No records found for your selection!"
-#~ msgstr "¡No se han encontrado registros en su selección!"
-
-#~ msgid "Maximum Quantity"
-#~ msgstr "Cantidad máxima"
-
-#, python-format
-#~ msgid "Date not in a defined fiscal year"
-#~ msgstr "La fecha no está en un ejercicio fiscal definido"
-
-#, python-format
-#~ msgid "Can not pay draft/proforma/cancel invoice."
-#~ msgstr "No se puede pagar una factura borrador/proforma/cancelada."
-
-#~ msgid "Accounting and financial management"
-#~ msgstr "Gestión contable y financiera"
-
-#~ msgid "The sequence used for invoice numbers in this journal."
-#~ msgstr "La secuencia utilizada para los números de factura en este diario."
-
-#~ msgid "Error ! The duration of the Fiscal Year is invalid. "
-#~ msgstr "¡Error! La duración del ejercicio fiscal no es correcta. "
-
-#~ msgid "Account Code"
-#~ msgstr "Código cuenta"
-
-#, python-format
-#~ msgid "No journal for ending writing has been defined for the fiscal year"
-#~ msgstr ""
-#~ "No se ha definido un diario para el asiento de cierre para el ejercicio "
-#~ "fiscal"
-
-#~ msgid "Journal de frais"
-#~ msgstr "Diario de gastos"
-
-#~ msgid ""
-#~ "Check this box if you don't want new account moves to pass through the "
-#~ "'draft' state and instead goes directly to the 'posted state' without any "
-#~ "manual validation."
-#~ msgstr ""
-#~ "Marque esta opción si no desea que nuevos asientos contables pasen por el "
-#~ "estado 'Borrador' y, por el contrario, pasen directamente al estado "
-#~ "\"Fijado\" sin ningún tipo de validación manual."
-
-#~ msgid ""
-#~ "If a default tax is given in the partner it only overrides taxes from "
-#~ "accounts (or products) in the same group."
-#~ msgstr ""
-#~ "Si se indica en la empresa un impuesto por defecto sólo anula los impuestos "
-#~ "de las cuentas (o productos) en el mismo grupo."
-
-#~ msgid "Fiscal Position Template Account Mapping"
-#~ msgstr "Mapeo cuentas plantilla posición fiscal"
-
-#~ msgid "Journal d'extourne"
-#~ msgstr "Diario de inversión"
-
-#~ msgid "Journal de Banque CHF"
-#~ msgstr "Diario de banco"
-
-#~ msgid ""
-#~ "Financial and accounting module that covers:\n"
-#~ " General accounting\n"
-#~ " Cost / Analytic accounting\n"
-#~ " Third party accounting\n"
-#~ " Taxes management\n"
-#~ " Budgets\n"
-#~ " Customer and Supplier Invoices\n"
-#~ " Bank statements\n"
-#~ " "
-#~ msgstr ""
-#~ "Módulo de contabilidad financiera y analítica que cubre:\n"
-#~ " Contabilidad general\n"
-#~ " Costes / contabilidad analítica\n"
-#~ " Contabilidad de terceros\n"
-#~ " Gestión de impuestos\n"
-#~ " Presupuestos\n"
-#~ " Facturas de clientes y proveedores\n"
-#~ " Extractos de cuentas bancarias\n"
-#~ " "
-
-#~ msgid ""
-#~ "This account will be used instead of the default one to value outgoing stock "
-#~ "for the current product"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en lugar de la cuenta por defecto para valorar el "
-#~ "stock saliente para el producto actual."
-
-#~ msgid ""
-#~ "This account will be used to value outgoing stock for the current product "
-#~ "category"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará para valorar el stock saliente para la categoría de "
-#~ "producto actual."
-
-#~ msgid ""
-#~ "This account will be used instead of the default one to value incoming stock "
-#~ "for the current product"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará en lugar de la cuenta por defecto para valorar el "
-#~ "stock entrante para el producto actual."
-
-#~ msgid "By Date and Period"
-#~ msgstr "Por fecha y período"
-
-#, python-format
-#~ msgid ""
-#~ "No period defined for this date !\n"
-#~ "Please create a fiscal year."
-#~ msgstr ""
-#~ "¡No se ha definido un período para esta fecha!\n"
-#~ "Por favor, cree un ejercicio fiscal."
-
-#~ msgid " Close states of Fiscal year and periods"
-#~ msgstr " Cerrar estados de ejercicio fiscal y períodos"
-
-#~ msgid "By Period"
-#~ msgstr "Por período"
-
-#~ msgid "Filter on Periods"
-#~ msgstr "Filtrar por períodos"
-
-#~ msgid "Select Date-Period"
-#~ msgstr "Seleccionar fecha-período"
-
-#~ msgid "Force all moves for this account to have this secondary currency."
-#~ msgstr ""
-#~ "Fuerza a todos los movimientos de esta cuenta que tengan esta divisa "
-#~ "secundaria."
-
-#~ msgid "The currency of the journal"
-#~ msgstr "La divisa del diario"
-
-#~ msgid "Skip 'Draft' State for Created Entries"
-#~ msgstr "Omitir estado 'Borrador ' al crear asientos"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#~ msgid ""
-#~ "If the Tax account is tax code account, this field will contain the taxed "
-#~ "amount.If the tax account is base tax code, this field "
-#~ "will contain the basic amount(without tax)."
-#~ msgstr ""
-#~ "Si la cuenta de impuestos es una cuenta código de impuestos, este campo "
-#~ "contendrá el importe con impuestos. Si la cuenta de impuestos es el código "
-#~ "de impuestos base, este campo contendrá el importe base (sin impuestos)."
-
-#~ msgid "The Account can either be a base tax code or tax code account."
-#~ msgstr ""
-#~ "La cuenta puede ser un código de impuestos base o una cuenta código de "
-#~ "impuestos."
-
-#~ msgid ""
-#~ "This type is used to differenciate types with special effects in Open ERP: "
-#~ "view can not have entries, consolidation are accounts that can have children "
-#~ "accounts for multi-company consolidations, payable/receivable are for "
-#~ "partners accounts (for debit/credit computations), closed for deprecated "
-#~ "accounts."
-#~ msgstr ""
-#~ "Este tipo sirve para diferenciar los tipos de cuenta con características "
-#~ "especiales en OpenERP: Vista no puede tener asientos, consolidación son "
-#~ "cuentas que pueden tener cuentas hijas para consolidaciones multi-compañía, "
-#~ "a cobrar/a pagar son cuentas para las empresas (para cálculos de débito / "
-#~ "crédito), cerrado para cuentas obsoletas."
-
-#~ msgid ""
-#~ "These types are defined according to your country. The type contain more "
-#~ "information about the account and it's specificities."
-#~ msgstr ""
-#~ "Estos tipos se definen de acuerdo a su país. El tipo contiene más "
-#~ "información acerca de la cuenta y sus especificidades."
-
-#~ msgid "Error: Invalid Bvr Number (wrong checksum)."
-#~ msgstr "Error: Número BVR inválido (checksum erróneo)."
-
-#~ msgid "Full Account Name"
-#~ msgstr "Nombre completo de la cuenta"
-
-#~ msgid "Error: BVR reference is required."
-#~ msgstr "Error: La referencia BVR es necesaria."
-
-#~ msgid "Fiscal Position Template Tax Mapping"
-#~ msgstr "Mapeo de impuestos en plantilla posiciones fiscales"
-
-#~ msgid "Draft Supplier Refunds"
-#~ msgstr "Facturas rectificativas (abono) de proveedor en borrador"
-
-#~ msgid "Unpaid Supplier Refunds"
-#~ msgstr "Facturas rectificativas (abono) de proveedor sin pagar"
-
-#~ msgid "Credit Note"
-#~ msgstr "Factura rectificativa (abono)"
-
-#~ msgid "Draft Customer Refunds"
-#~ msgstr "Facturas rectificativas (abono) de cliente en borrador"
-
-#~ msgid "New Supplier Refund"
-#~ msgstr "Nueva factura rectificativa (abono) de proveedor"
-
-#~ msgid "x Expenses Credit Notes Journal"
-#~ msgstr "x Diario facturas rectificativas (abono) de gastos"
-
-#~ msgid "Unpaid Customer Refunds"
-#~ msgstr "Facturas rectificativas (abono) de cliente sin pagar"
-
-#~ msgid "New Customer Refund"
-#~ msgstr "Nueva factura rectificativa (abono) de cliente"
-
-#~ msgid "Journal Voucher"
-#~ msgstr "Diario de comprobantes"
-
-#~ msgid ""
-#~ "This account will be used to value incoming stock for the current product "
-#~ "category"
-#~ msgstr ""
-#~ "Esta cuenta se utilizará para valuar el stock entrante para la categoría "
-#~ "actual de producto"
-
-#~ msgid "to :"
-#~ msgstr "a :"
-
-#~ msgid "Message"
-#~ msgstr "Mensaje"
-
-#~ msgid "Period from :"
-#~ msgstr "Periodo desde :"
-
-#~ msgid "Overdue Payment Report Message"
-#~ msgstr "Mensaje para reporte de pagos vencidos"
-
-#~ msgid "Overdue Payment Message"
-#~ msgstr "Mensaje pagos vencidos"
-
-#~ msgid "Entries Encoding"
-#~ msgstr "Codificación de asientos"
-
-#~ msgid "Specify The Message for the Overdue Payment Report."
-#~ msgstr "Especificar el mensaje para el informe de pagos vencidos"
-
-#~ msgid "Financial Management"
-#~ msgstr "Contabilidad y finanzas"
-
-#~ msgid "wizard.company.setup"
-#~ msgstr "wizard.company.setup"
-
-#~ msgid "asgfas"
-#~ msgstr "asgfas"
-
-#~ msgid "Partner Other Ledger"
-#~ msgstr "Asociar Otro Libro Mayor"
-
-#~ msgid "3 Months"
-#~ msgstr "Trimestral"
-
-#~ msgid "The amount in the currency of the journal"
-#~ msgstr "El importe en la divisa del diario."
-
-#~ msgid "All periods if empty"
-#~ msgstr "Todos los períodos si está vacío."
-
-#~ msgid "Date/Period Filter"
-#~ msgstr "Filtrar por fecha/período"
-
-#~ msgid "Entry Name"
-#~ msgstr "Descripción"
-
-#~ msgid "Generate entries before:"
-#~ msgstr "Generar asientos hasta:"
-
-#~ msgid "Account Entry Line"
-#~ msgstr "Apunte"
-
-#~ msgid "Header"
-#~ msgstr "Encabezado"
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "COL 2"
-#~ msgstr "COL 2"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "TITLE COMPANY"
-#~ msgstr "TÍTULO COMPAÑÍA"
-
-#~ msgid "logo"
-#~ msgstr "logo"
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid "COL 1"
-#~ msgstr "COL 1"
-
-#~ msgid ""
-#~ msgstr ""
-
-#, python-format
-#~ msgid "UnknownError"
-#~ msgstr "Error desconocido"
-
-#~ msgid ""
-#~ msgstr ""
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid ""
-#~ "Example: 14 days 2%, 30 days net\n"
-#~ "1. Line 1: percent 0.02 14 days\n"
-#~ "2. Line 2: balance 30 days"
-#~ msgstr ""
-#~ "Ejemplo: 14 días 2%, 30 días el resto\n"
-#~ "1. Línea 1: Porcentaje 0.02 14 días\n"
-#~ "2. Línea 2: Saldo 30 días"
-
-#~ msgid "Balance Brought Forward"
-#~ msgstr "Saldo inicial"
-
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de la acción."
-
-#, python-format
-#~ msgid "Account move line \"%s\" is not valid"
-#~ msgstr "El apunte \"%s\" no es válido."
-
-#~ msgid ""
-#~ "This field is used for payable and receivable entries. You can put the limit "
-#~ "date for the payment of this entry line."
-#~ msgstr ""
-#~ "Este campo es usado en asientos a pagar y a cobrar. Puede definir la fecha "
-#~ "límite de pago para este apunte."
-
-#~ msgid ""
-#~ "You can check this box to mark the entry line as a litigation with the "
-#~ "associated partner"
-#~ msgstr ""
-#~ "Marque esta opción para señalar el apunte en desacuerdo con la empresa "
-#~ "asociada"
-
-#~ msgid "Account Entry Lines"
-#~ msgstr "Apuntes contables"
-
-#~ msgid "Invoice Sequence"
-#~ msgstr "Secuencia de facturas"
-
-#, python-format
-#~ msgid "Invoice "
-#~ msgstr "Factura "
-
-#, python-format
-#~ msgid "is validated."
-#~ msgstr "está validada."
-
-#~ msgid "Chart of Account"
-#~ msgstr "Plan contable"
-
-#~ msgid "Balance:"
-#~ msgstr "Balance:"
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 5f417825032..4d64af3e154 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -14,8 +14,8 @@
-
-
+
+
diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index 0c488eac400..1754988f7d6 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.rml
@@ -163,7 +163,7 @@
[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]
- [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]
+ [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]
[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]]
@@ -187,7 +187,7 @@
[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]]
- [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]
+ [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]
[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]]
@@ -211,7 +211,7 @@
[[ formatLang(move_g['credit']) ]]
- [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]
+ [[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]]
[[ formatLang(move_g['quantity']) ]]
diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index 7500b655ab3..1099a8b8b4e 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -224,7 +224,7 @@
[[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]]
- [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]
@@ -245,7 +245,7 @@
[[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]]
- [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]]
+ [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]]
@@ -266,7 +266,7 @@
[[ formatLang( move_g['credit']) ]]
- [[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]]
@@ -290,7 +290,7 @@
[[ formatLang( move_a['credit']) ]]
- [[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]]
+ [[ formatLang( move_a['balance'], currency_obj = company.currency_id)]]
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index f112ec8fbd3..54b6878c407 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -164,7 +164,7 @@
[[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]]
- [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]]
+ [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]]
[[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]]
@@ -188,7 +188,7 @@
[[formatLang(move_g['credit'])]]
- [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]]
+ [[ formatLang(move_g['balance'], currency_obj = company.currency_id)]]
[[formatLang(move_g['quantity']) ]]
@@ -212,7 +212,7 @@
[[ formatLang(move_a['credit']) ]]
- [[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]]
+ [[ formatLang(move_a['balance'], currency_obj = company.currency_id)]]
[[ formatLang(move_a['quantity']) ]]
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index 8148a016927..3d6bf0f5447 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -63,8 +63,12 @@ class account_analytic_journal_report(osv.osv_memory):
if context is None:
context = {}
res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context)
+ if not context.has_key('active_ids'):
+ journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context)
+ else:
+ journal_ids = context.get('active_ids')
if 'analytic_account_journal_id' in fields:
- res.update({'analytic_account_journal_id': context.get('active_ids',[])})
+ res.update({'analytic_account_journal_id': journal_ids})
return res
account_analytic_journal_report()
diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml
index 8963ba97376..8a421e3cb36 100644
--- a/addons/account/report/account_analytic_entries_report_view.xml
+++ b/addons/account/report/account_analytic_entries_report_view.xml
@@ -5,7 +5,7 @@
analytic.entries.report.tree
analytic.entries.report
-
+
diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml
index 667c61ab78f..551265252cc 100644
--- a/addons/account/report/account_entries_report_view.xml
+++ b/addons/account/report/account_entries_report_view.xml
@@ -5,7 +5,7 @@
account.entries.report.tree
account.entries.report
-
+
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index d4362484588..00d5e520c42 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -20,6 +20,7 @@
##############################################################################
import tools
+import decimal_precision as dp
from osv import fields,osv
class account_invoice_report(osv.osv):
@@ -27,6 +28,31 @@ class account_invoice_report(osv.osv):
_description = "Invoices Statistics"
_auto = False
_rec_name = 'date'
+
+ def _compute_amounts_in_user_currency(self, cr, uid, ids, field_names, args, context=None):
+ """Compute the amounts in the currency of the user
+ """
+ if context is None:
+ context={}
+ currency_obj = self.pool.get('res.currency')
+ currency_rate_obj = self.pool.get('res.currency.rate')
+ user_currency_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id.id
+ currency_rate_id = currency_rate_obj.search(cr, uid, [('rate', '=', 1)], limit=1, context=context)[0]
+ base_currency_id = currency_rate_obj.browse(cr, uid, currency_rate_id, context=context).currency_id.id
+ res = {}
+ ctx = context.copy()
+ for item in self.browse(cr, uid, ids, context=context):
+ ctx['date'] = item.date
+ price_total = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_total, context=ctx)
+ price_average = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.price_average, context=ctx)
+ residual = currency_obj.compute(cr, uid, base_currency_id, user_currency_id, item.residual, context=ctx)
+ res[item.id] = {
+ 'user_currency_price_total': price_total,
+ 'user_currency_price_average': price_average,
+ 'user_currency_residual': residual,
+ }
+ return res
+
_columns = {
'date': fields.date('Date', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
@@ -47,7 +73,9 @@ class account_invoice_report(osv.osv):
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'user_id': fields.many2one('res.users', 'Salesperson', readonly=True),
'price_total': fields.float('Total Without Tax', readonly=True),
+ 'user_currency_price_total': fields.function(_compute_amounts_in_user_currency, string="Total Without Tax", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
'price_average': fields.float('Average Price', readonly=True, group_operator="avg"),
+ 'user_currency_price_average': fields.function(_compute_amounts_in_user_currency, string="Average Price", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
'currency_rate': fields.float('Currency Rate', readonly=True),
'nbr':fields.integer('# of Lines', readonly=True),
'type': fields.selection([
@@ -69,6 +97,7 @@ class account_invoice_report(osv.osv):
'account_line_id': fields.many2one('account.account', 'Account Line',readonly=True),
'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account',readonly=True),
'residual': fields.float('Total Residual', readonly=True),
+ 'user_currency_residual': fields.function(_compute_amounts_in_user_currency, string="Total Residual", type='float', digits_compute=dp.get_precision('Account'), multi="_compute_amounts"),
'delay_to_pay': fields.float('Avg. Delay To Pay', readonly=True, group_operator="avg"),
'due_delay': fields.float('Avg. Due Delay', readonly=True, group_operator="avg"),
}
@@ -161,7 +190,7 @@ class account_invoice_report(osv.osv):
left join product_uom u on (u.id=ail.uos_id),
res_currency_rate cr
where cr.id in (select id from res_currency_rate cr2 where (cr2.currency_id = ai.currency_id)
- and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) limit 1)
+ and ((ai.date_invoice is not null and cr.name <= ai.date_invoice) or (ai.date_invoice is null and cr.name <= NOW())) order by name desc limit 1)
group by ail.product_id,
ai.date_invoice,
ai.id,
diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml
index c22d5d55f45..e352a33d850 100644
--- a/addons/account/report/account_invoice_report_view.xml
+++ b/addons/account/report/account_invoice_report_view.xml
@@ -5,7 +5,7 @@
account.invoice.report.tree
account.invoice.report
-
+
@@ -28,8 +28,8 @@
-
-
+
+
@@ -42,7 +42,7 @@
-
+
diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py
index 1b617e9afa4..4ddedc102f5 100644
--- a/addons/account/report/account_print_overdue.py
+++ b/addons/account/report/account_print_overdue.py
@@ -29,34 +29,11 @@ class Overdue(report_sxw.rml_parse):
super(Overdue, self).__init__(cr, uid, name, context=context)
self.localcontext.update( {
'time': time,
- 'adr_get': self._adr_get,
'getLines': self._lines_get,
'tel_get': self._tel_get,
'message': self._message,
})
self.context = context
- def _adr_get(self, partner, type):
- res = []
- res_partner = pooler.get_pool(self.cr.dbname).get('res.partner')
- addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type])
- adr_id = addresses and addresses[type] or False
- result = {
- 'name': False,
- 'street': False,
- 'street2': False,
- 'city': False,
- 'zip': False,
- 'state_id':False,
- 'country_id': False,
- }
- if adr_id:
- result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy())
- result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False
- result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False
- return result
-
- res.append(result)
- return res
def _tel_get(self,partner):
if not partner:
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 2d4238823da..8b8238030fe 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -126,15 +126,10 @@
- [[ repeatIn(adr_get(o, 'invoice'),'addr') ]]
[[ o.title.name or '' ]] [[ o.name ]]
- [[ addr['street'] ]]
- [[ addr['street2'] or removeParentNode('para') ]]
- [[ addr['zip'] ]] [[ addr['city'] ]]
- [[ addr['state_id'] or removeParentNode('para')]]
- [[ addr['country_id'] ]]
+ [[ display_address(o.partner_id) ]]
@@ -216,7 +211,7 @@
[[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]]
- [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]]
+ [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]]
[[ line['blocked'] and 'X' or '' ]]
@@ -241,7 +236,7 @@
[[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]]
- [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]]
@@ -261,7 +256,7 @@
Balance :
- [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]]
diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml
index ee21b9e5ec6..be6ae0dfdc9 100644
--- a/addons/account/report/account_treasury_report_view.xml
+++ b/addons/account/report/account_treasury_report_view.xml
@@ -5,7 +5,7 @@
account.treasury.report.tree
account.treasury.report
-
+
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 0e4b1fa64c4..728eefe8078 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -121,7 +121,7 @@
-
+
diff --git a/addons/account/static/src/js/account_move_reconciliation.js b/addons/account/static/src/js/account_move_reconciliation.js
index 6b007e2f097..89ceb5be6fa 100644
--- a/addons/account/static/src/js/account_move_reconciliation.js
+++ b/addons/account/static/src/js/account_move_reconciliation.js
@@ -5,7 +5,7 @@ openerp.account = function (instance) {
instance.web.account = {};
- instance.web.views.add('account_reconciliation_list', 'instance.web.account.ReconciliationListView');
+ instance.web.views.add('tree_account_reconciliation', 'instance.web.account.ReconciliationListView');
instance.web.account.ReconciliationListView = instance.web.ListView.extend({
init: function() {
this._super.apply(this, arguments);
@@ -101,7 +101,7 @@ openerp.account = function (instance) {
return self.rpc("/web/action/load", {
action_id: result[1],
context: additional_context
- }, function (result) {
+ }).then(function (result) {
result = result.result;
result.context = _.extend(result.context || {}, additional_context);
result.flags = result.flags || {};
diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po
index 557aa2e66f5..8b863f51679 100644
--- a/addons/account_analytic_default/i18n/hu.po
+++ b/addons/account_analytic_default/i18n/hu.po
@@ -7,15 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2011-02-01 18:11+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"
\n"
+"PO-Revision-Date: 2012-10-09 13:58+0000\n"
+"Last-Translator: krnkris \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:22+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
#. module: account_analytic_default
#: help:account.analytic.default,partner_id:0
@@ -134,12 +133,14 @@ msgstr "Gyűjtőkód alapértelmezések"
#. module: account_analytic_default
#: sql_constraint:stock.picking:0
msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "Minden vállalkozáshoz egyedi hivatkozás kell!"
#. module: account_analytic_default
#: view:account.analytic.default:0
msgid "Analytical defaults whose end date is greater than today or None"
msgstr ""
+"A mai napnál későbbi lejáratú vagy nem létező dátumú elemzések "
+"alapértelmezései"
#. module: account_analytic_default
#: help:account.analytic.default,product_id:0
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index a2ecd5177dd..cff2c65a081 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-02-08 08:45+0000\n"
+"PO-Revision-Date: 2012-10-12 23:19+0000\n"
"Last-Translator: Ferdinand @ Camptocamp \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:19+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
+"X-Generator: Launchpad (build 16137)\n"
#. module: account_analytic_plans
#: view:analytic.plan.create.model:0
@@ -471,7 +471,7 @@ msgstr "Analyt. Verrechnungsvorlage"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance,code:0
msgid "Distribution Code"
-msgstr "Kurzbezeichnung"
+msgstr "Verteilungs-Schlüssel"
#. module: account_analytic_plans
#: report:account.analytic.account.crossovered.analytic:0
@@ -526,6 +526,8 @@ msgid ""
"analytic accounts for each plan set. Then, you must attach a plan set to "
"your account journals."
msgstr ""
+"Für jede Kostenrechnung muss ein Stammkonto definiert werden. Dann muss ein "
+"Plan definiert werden"
#. module: account_analytic_plans
#: constraint:account.move.line:0
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 3fab306863c..520ee733e73 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -106,27 +106,27 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml
index bc598011086..4865196c4a8 100644
--- a/addons/account_asset/report/account_asset_report_view.xml
+++ b/addons/account_asset/report/account_asset_report_view.xml
@@ -6,7 +6,7 @@
asset.asset.report.tree
asset.asset.report
-
+
diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
index 1c076426752..9164c00373f 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml
+++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml
@@ -154,7 +154,7 @@
-
+
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index 7868755d143..fdc358f5c98 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -1,13 +1,8 @@
-
-
- Budgets
- account.budget.post
- tree
-
-
+
+
-
- res.company.form.inherit
-
- res.company
+
+
+ account.config.settings.inherit
+
+ account.config.settings
+ 20
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml
index 923e900887a..9f0f2e1f07e 100644
--- a/addons/account_voucher/report/account_voucher_print.rml
+++ b/addons/account_voucher/report/account_voucher_print.rml
@@ -219,7 +219,7 @@
[[ p['pname'] ]]
- [[ p['amount'] ]] [[ voucher.currency_id.symbol ]]
+ [[ formatLang(p['amount'], currency_obj=voucher.currency_id) ]]
@@ -323,7 +323,7 @@
- [[ voucher.amount ]] [[ voucher.currency_id.symbol ]]
+ [[ formatLang(voucher.amount, currency_obj=voucher.currency_id) ]]
diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index 15b2433ec25..fbd40ee17ba 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -6,7 +6,7 @@
sale.receipt.report.tree
sale.receipt.report
-
+
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 78b76e5c9b7..e1a48c6c535 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -136,11 +136,8 @@
-
-
-
-
-
+
+
-
+
-
-
-
-
-
+
+
-
+
-
+
-
-
-
-
-
-
+
+
-
+
-
+
-
+
diff --git a/addons/audittrail/audittrail_view.xml b/addons/audittrail/audittrail_view.xml
index b041329f6bd..c26e1b5b570 100644
--- a/addons/audittrail/audittrail_view.xml
+++ b/addons/audittrail/audittrail_view.xml
@@ -145,7 +145,7 @@
audittrail.log.tree
audittrail.log
-
+
diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index ae01df5f6f7..26016f3f0a1 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -4,28 +4,25 @@ import simplejson
import werkzeug.urls
import werkzeug.utils
-import openerp.modules.registry
-import openerp.addons.web.controllers.main
-import openerp.addons.web.common.http as openerpweb
-from openerp import SUPERUSER_ID
+import openerp
_logger = logging.getLogger(__name__)
-class OAuthController(openerpweb.Controller):
+class OAuthController(openerp.addons.web.http.Controller):
_cp_path = '/auth_oauth'
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def list_providers(self, req, dbname):
try:
registry = openerp.modules.registry.RegistryManager.get(dbname)
with registry.cursor() as cr:
providers = registry.get('auth.oauth.provider')
- l = providers.read(cr, SUPERUSER_ID, providers.search(cr, SUPERUSER_ID, [('enabled','=',True)]))
+ l = providers.read(cr, openerp.SUPERUSER_ID, providers.search(cr, openerp.SUPERUSER_ID, [('enabled','=',True)]))
except Exception:
l = []
return l
- @openerpweb.httprequest
+ @openerp.addons.web.http.httprequest
def signin(self, req, **kw):
state = simplejson.loads(kw['state'])
dbname = state['d']
@@ -34,7 +31,7 @@ class OAuthController(openerpweb.Controller):
with registry.cursor() as cr:
try:
u = registry.get('res.users')
- credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw)
+ credentials = u.auth_oauth(cr, openerp.SUPERUSER_ID, provider, kw)
cr.commit()
return openerp.addons.web.controllers.main.login_and_redirect(req, *credentials)
except AttributeError:
@@ -43,7 +40,7 @@ class OAuthController(openerpweb.Controller):
url = "/#action=login&oauth_error=1"
except Exception,e:
# signup error
- _logger.exception('oops')
+ _logger.exception("OAuth2: %s" % str(e))
url = "/#action=login&oauth_error=2"
return openerp.addons.web.controllers.main.set_cookie_and_redirect(req, url)
diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py
index fd26e89c2e3..115e3136f00 100644
--- a/addons/auth_oauth/res_users.py
+++ b/addons/auth_oauth/res_users.py
@@ -15,13 +15,17 @@ class res_users(osv.Model):
_inherit = 'res.users'
_columns = {
- 'oauth_provider_id': fields.many2one('auth.oauth.provider','OAuth Provider'),
+ 'oauth_provider_id': fields.many2one('auth.oauth.provider', 'OAuth Provider'),
'oauth_uid': fields.char('OAuth User ID', help="Oauth Provider user_id"),
- 'oauth_access_token': fields.char('OAuth Token', readonly=True),
+ 'oauth_access_token': fields.char('OAuth Access Token', readonly=True),
}
+ _sql_constraints = [
+ ('uniq_users_oauth_provider_oauth_uid', 'unique(oauth_provider_id, oauth_uid)', 'OAuth UID must be unique per provider'),
+ ]
+
def auth_oauth_rpc(self, cr, uid, endpoint, access_token, context=None):
- params = urllib.urlencode({ 'access_token': access_token })
+ params = urllib.urlencode({'access_token': access_token})
if urlparse.urlparse(endpoint)[4]:
url = endpoint + '&' + params
else:
@@ -41,22 +45,26 @@ class res_users(osv.Model):
validation = self.auth_oauth_rpc(cr, uid, p.validation_endpoint, access_token)
if validation.get("error"):
- raise openerp.exceptions.AccessDenied
+ raise Exception(validation['error'])
if p.data_endpoint:
data = self.auth_oauth_rpc(cr, uid, p.data_endpoint, access_token)
validation.update(data)
# required
oauth_uid = validation['user_id']
if not oauth_uid:
- raise openerp.exceptions.AccessDenied
+ raise openerp.exceptions.AccessDenied()
email = validation.get('email', 'provider_%d_user_%d' % (p.id, oauth_uid))
# optional
name = validation.get('name', email)
- res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid)])
+ res = self.search(cr, uid, [("oauth_uid", "=", oauth_uid), ('oauth_provider_id', '=', provider)])
if res:
- self.write(cr, uid, res[0], { 'oauth_access_token': access_token })
+ assert len(res) == 1
+ self.write(cr, uid, res[0], {'oauth_access_token': access_token})
else:
- # New user
+ # New user if signup module available
+ if not hasattr(self, '_signup_create_user'):
+ raise openerp.exceptions.AccessDenied()
+
new_user = {
'name': name,
'login': email,
@@ -66,7 +74,9 @@ class res_users(osv.Model):
'oauth_access_token': access_token,
'active': True,
}
- self.auth_signup_create(cr, uid, new_user)
+ # TODO pass signup token to allow attach new user to right partner
+ self._signup_create_user(cr, uid, new_user)
+
credentials = (cr.dbname, email, access_token)
return credentials
@@ -74,7 +84,7 @@ class res_users(osv.Model):
try:
return super(res_users, self).check_credentials(cr, uid, password)
except openerp.exceptions.AccessDenied:
- res = self.search(cr, SUPERUSER_ID, [('id','=',uid),('oauth_access_token','=',password)])
+ res = self.search(cr, SUPERUSER_ID, [('id', '=', uid), ('oauth_access_token', '=', password)])
if not res:
raise
diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py
index ebcaab4bf25..7ee562d4d29 100644
--- a/addons/auth_openid/controllers/main.py
+++ b/addons/auth_openid/controllers/main.py
@@ -23,24 +23,21 @@ import logging
import os
import tempfile
import urllib
-from openerp import SUPERUSER_ID
import werkzeug.urls
import werkzeug.exceptions
-from openerp.modules.registry import RegistryManager
-from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
-try:
- import openerp.addons.web.common.http as openerpweb
-except ImportError:
- import web.common.http as openerpweb # noqa
-
from openid import oidutil
from openid.store import filestore
from openid.consumer import consumer
from openid.cryptutil import randomString
from openid.extensions import ax, sreg
+import openerp
+from openerp import SUPERUSER_ID
+from openerp.modules.registry import RegistryManager
+from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect
+
from .. import utils
_logger = logging.getLogger(__name__)
@@ -70,7 +67,7 @@ class GoogleAppsAwareConsumer(consumer.GenericConsumer):
return super(GoogleAppsAwareConsumer, self).complete(message, endpoint, return_to)
-class OpenIDController(openerpweb.Controller):
+class OpenIDController(openerp.addons.web.http.Controller):
_cp_path = '/auth_openid/login'
_store = filestore.FileOpenIDStore(_storedir)
@@ -118,7 +115,7 @@ class OpenIDController(openerpweb.Controller):
def _get_realm(self, req):
return req.httprequest.host_url
- @openerpweb.httprequest
+ @openerp.addons.web.http.httprequest
def verify_direct(self, req, db, url):
result = self._verify(req, db, url)
if 'error' in result:
@@ -127,7 +124,7 @@ class OpenIDController(openerpweb.Controller):
return werkzeug.utils.redirect(result['value'])
return result['value']
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def verify(self, req, db, url):
return self._verify(req, db, url)
@@ -157,7 +154,7 @@ class OpenIDController(openerpweb.Controller):
form_html = request.htmlMarkup(realm, redirect_to)
return {'action': 'post', 'value': form_html, 'session_id': req.session_id}
- @openerpweb.httprequest
+ @openerp.addons.web.http.httprequest
def process(self, req, **kw):
session = getattr(req.session, 'openid_session', None)
if not session:
@@ -225,7 +222,7 @@ class OpenIDController(openerpweb.Controller):
return set_cookie_and_redirect(req, '/#action=login&loginerror=1')
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def status(self, req):
session = getattr(req.session, 'openid_session', {})
return {'status': session.get('status'), 'message': session.get('message')}
diff --git a/addons/auth_openid/static/src/js/auth_openid.js b/addons/auth_openid/static/src/js/auth_openid.js
index 70739e056ed..56ec5b57d3f 100644
--- a/addons/auth_openid/static/src/js/auth_openid.js
+++ b/addons/auth_openid/static/src/js/auth_openid.js
@@ -69,7 +69,7 @@ instance.web.Login = instance.web.Login.extend({
_check_error: function() {
var self = this;
if (this.params.loginerror !== undefined) {
- this.rpc('/auth_openid/login/status', {}, function(result) {
+ this.rpc('/auth_openid/login/status', {}).then(function(result) {
if (_.contains(['success', 'failure'], result.status) && result.message) {
self.do_warn('Invalid OpenID Login', result.message);
}
@@ -106,7 +106,7 @@ instance.web.Login = instance.web.Login.extend({
do_openid_login: function(db, openid_url) {
var self = this;
- this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}, function(result) {
+ this.rpc('/auth_openid/login/verify', {'db': db, 'url': openid_url}).then(function(result) {
if (result.error) {
self.do_warn(result.title, result.error);
return;
diff --git a/addons/auth_reset_password/controllers/main.py b/addons/auth_reset_password/controllers/main.py
index 5185a65c3ce..639945cfc09 100644
--- a/addons/auth_reset_password/controllers/main.py
+++ b/addons/auth_reset_password/controllers/main.py
@@ -18,20 +18,20 @@
# along with this program. If not, see
#
##############################################################################
-
-from openerp import SUPERUSER_ID
-from openerp.modules.registry import RegistryManager
-import openerp.addons.web.common.http as openerpweb
+import logging
import werkzeug
-import logging
+import openerp
+from openerp import SUPERUSER_ID
+from openerp.modules.registry import RegistryManager
+
_logger = logging.getLogger(__name__)
-class Controller(openerpweb.Controller):
+class Controller(openerp.addons.web.http.Controller):
_cp_path = '/auth_reset_password'
- @openerpweb.httprequest
+ @openerp.addons.web.http.httprequest
def reset_password(self, req, dbname, login):
""" retrieve user, and perform reset password """
url = '/'
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index 56e5e910212..54dcc5b4362 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -18,32 +18,31 @@
# along with this program. If not, see
#
##############################################################################
-
-from openerp import SUPERUSER_ID
-from openerp.modules.registry import RegistryManager
-from openerp.addons.web.controllers.main import login_and_redirect
-import openerp.addons.web.common.http as openerpweb
+import logging
import werkzeug
-import logging
+import openerp
+from openerp.modules.registry import RegistryManager
+from openerp.addons.web.controllers.main import login_and_redirect
+
_logger = logging.getLogger(__name__)
-class Controller(openerpweb.Controller):
+class Controller(openerp.addons.web.http.Controller):
_cp_path = '/auth_signup'
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def retrieve(self, req, dbname, token):
""" retrieve the user info (name, login or email) corresponding to a signup token """
registry = RegistryManager.get(dbname)
user_info = None
with registry.cursor() as cr:
res_partner = registry.get('res.partner')
- user_info = res_partner.signup_retrieve_info(cr, SUPERUSER_ID, token)
+ user_info = res_partner.signup_retrieve_info(cr, openerp.SUPERUSER_ID, token)
return user_info
- @openerpweb.httprequest
- def signup(self, req, dbname, token, name, login, password):
+ @openerp.addons.web.http.httprequest
+ def signup(self, req, dbname, token, name, login, password, state=''):
""" sign up a user (new or existing), and log it in """
url = '/'
registry = RegistryManager.get(dbname)
@@ -51,9 +50,9 @@ class Controller(openerpweb.Controller):
try:
res_users = registry.get('res.users')
values = {'name': name, 'login': login, 'password': password}
- credentials = res_users.signup(cr, SUPERUSER_ID, values, token)
+ credentials = res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
cr.commit()
- return login_and_redirect(req, *credentials)
+ return login_and_redirect(req, *credentials, redirect_url='/#%s'%state)
except Exception as e:
# signup error
_logger.exception('error when signup')
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 7b663bd0e33..59196c4da87 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -18,6 +18,10 @@
# along with this program. If not, see
#
##############################################################################
+import random
+import time
+import urllib
+import urlparse
import openerp
from openerp.osv import osv, fields
@@ -25,11 +29,6 @@ from openerp import SUPERUSER_ID
from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
from openerp.tools.safe_eval import safe_eval
-import time
-import random
-import urllib
-import urlparse
-
def random_token():
# the token has an entropy of about 120 bits (6 bits/char * 20 chars)
chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'
@@ -38,7 +37,6 @@ def random_token():
def now():
return time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-
class res_partner(osv.Model):
_inherit = 'res.partner'
@@ -132,8 +130,6 @@ class res_partner(osv.Model):
res['email'] = partner.email or ''
return res
-
-
class res_users(osv.Model):
_inherit = 'res.users'
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js
index 509fafa35cc..0974b73292d 100644
--- a/addons/auth_signup/static/src/js/auth_signup.js
+++ b/addons/auth_signup/static/src/js/auth_signup.js
@@ -90,6 +90,7 @@ openerp.auth_signup = function(instance) {
name: name,
login: login,
password: password,
+ state: $.param(this.params)
};
var url = "/auth_signup/signup?" + $.param(params);
window.location = url;
diff --git a/addons/base_import/__openerp__.py b/addons/base_import/__openerp__.py
index eff20bc90ab..f5a707650d8 100644
--- a/addons/base_import/__openerp__.py
+++ b/addons/base_import/__openerp__.py
@@ -26,13 +26,14 @@ Re-implement openerp's file import system:
'author': 'OpenERP SA',
'depends': ['base'],
'installable': True,
- 'auto_install': False, # set to true and allow uninstall?
+ 'auto_install': True,
'css': [
'static/lib/select2/select2.css',
'static/src/css/import.css',
],
'js': [
'static/lib/select2/select2.js',
+ 'static/lib/javascript-state-machine/state-machine.js',
'static/src/js/import.js',
],
'qweb': ['static/src/xml/import.xml'],
diff --git a/addons/base_import/controllers.py b/addons/base_import/controllers.py
index 85ff993e92e..c831ffd229d 100644
--- a/addons/base_import/controllers.py
+++ b/addons/base_import/controllers.py
@@ -1,15 +1,12 @@
# -*- coding: utf-8 -*-
import simplejson
-try:
- import openerp.addons.web.common.http as openerpweb
-except ImportError:
- import web.common.http as openerpweb
+import openerp
-class ImportController(openerpweb.Controller):
+class ImportController(openerp.addons.web.http.Controller):
_cp_path = '/base_import'
- @openerpweb.httprequest
+ @openerp.addons.web.http.httprequest
def set_file(self, req, file, import_id, jsonp='callback'):
import_id = int(import_id)
diff --git a/addons/base_import/models.py b/addons/base_import/models.py
index 1e5ad002b84..996dbf7964d 100644
--- a/addons/base_import/models.py
+++ b/addons/base_import/models.py
@@ -83,6 +83,10 @@ class ir_import(orm.TransientModel):
}]
fields_got = self.pool[model].fields_get(cr, uid, context=context)
for name, field in fields_got.iteritems():
+ # an empty string means the field is deprecated, @deprecated must
+ # be absent or False to mean not-deprecated
+ if field.get('deprecated', False) is not False:
+ continue
if field.get('readonly'):
states = field.get('states')
if not states:
@@ -97,7 +101,7 @@ class ir_import(orm.TransientModel):
'id': name,
'name': name,
'string': field['string'],
- # Y U NO ALWAYS HAVE REQUIRED
+ # Y U NO ALWAYS HAS REQUIRED
'required': bool(field.get('required')),
'fields': [],
}
@@ -124,8 +128,8 @@ class ir_import(orm.TransientModel):
"""
csv_iterator = csv.reader(
StringIO(record.file),
- quotechar=options['quoting'],
- delimiter=options['separator'])
+ quotechar=str(options['quoting']),
+ delimiter=str(options['separator']))
csv_nonempty = itertools.ifilter(None, csv_iterator)
# TODO: guess encoding with chardet? Or https://github.com/aadsm/jschardet
encoding = options.get('encoding', 'utf-8')
@@ -307,22 +311,14 @@ class ir_import(orm.TransientModel):
except ValueError, e:
return [{
'type': 'error',
- 'message': str(e),
+ 'message': unicode(e),
'record': False,
}]
- try:
- _logger.info('importing %d rows...', len(data))
- (code, record, message, _wat) = self.pool[record.res_model].import_data(
- cr, uid, import_fields, data, context=context)
- _logger.info('done')
-
- except Exception, e:
- _logger.exception("Import failed")
- # TODO: remove when exceptions stop being an "expected"
- # behavior of import_data on some (most) invalid
- # input.
- code, record, message = -1, None, str(e)
+ _logger.info('importing %d rows...', len(data))
+ import_result = self.pool[record.res_model].load(
+ cr, uid, import_fields, data, context=context)
+ _logger.info('done')
# If transaction aborted, RELEASE SAVEPOINT is going to raise
# an InternalError (ROLLBACK should work, maybe). Ignore that.
@@ -339,14 +335,4 @@ class ir_import(orm.TransientModel):
except psycopg2.InternalError:
pass
- if code != -1:
- return []
-
- # TODO: add key for error location?
- # TODO: error not within normal preview, how to display? Re-preview
- # with higher ``count``?
- return [{
- 'type': 'error',
- 'message': message,
- 'record': record or False
- }]
+ return import_result['messages']
diff --git a/addons/base_import/static/lib/javascript-state-machine/LICENSE b/addons/base_import/static/lib/javascript-state-machine/LICENSE
new file mode 100644
index 00000000000..8ad703ca4ef
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Jake Gordon and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
diff --git a/addons/base_import/static/lib/javascript-state-machine/README.md b/addons/base_import/static/lib/javascript-state-machine/README.md
new file mode 100644
index 00000000000..64c045e69d7
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/README.md
@@ -0,0 +1,327 @@
+Javascript Finite State Machine (v2.1.0)
+========================================
+
+This standalone javascript micro-framework provides a finite state machine for your pleasure.
+
+ * You can find the [code here](https://github.com/jakesgordon/javascript-state-machine)
+ * You can find a [description here](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/)
+ * You can find a [working demo here](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/example/)
+
+Download
+========
+
+You can download [state-machine.js](https://github.com/jakesgordon/javascript-state-machine/raw/master/state-machine.js),
+or the [minified version](https://github.com/jakesgordon/javascript-state-machine/raw/master/state-machine.min.js)
+
+Alternatively:
+
+ git clone git@github.com:jakesgordon/javascript-state-machine
+
+
+ * All code is in state-machine.js
+ * Minified version provided in state-machine.min.js
+ * No 3rd party library is required
+ * Demo can be found in /index.html
+ * QUnit tests can be found in /test/index.html
+
+Usage
+=====
+
+Include `state-machine.min.js` in your application.
+
+In its simplest form, create a standalone state machine using:
+
+ var fsm = StateMachine.create({
+ initial: 'green',
+ events: [
+ { name: 'warn', from: 'green', to: 'yellow' },
+ { name: 'panic', from: 'yellow', to: 'red' },
+ { name: 'calm', from: 'red', to: 'yellow' },
+ { name: 'clear', from: 'yellow', to: 'green' }
+ ]});
+
+... will create an object with a method for each event:
+
+ * fsm.warn() - transition from 'green' to 'yellow'
+ * fsm.panic() - transition from 'yellow' to 'red'
+ * fsm.calm() - transition from 'red' to 'yellow'
+ * fsm.clear() - transition from 'yellow' to 'green'
+
+along with the following members:
+
+ * fsm.current - contains the current state
+ * fsm.is(s) - return true if state `s` is the current state
+ * fsm.can(e) - return true if event `e` can be fired in the current state
+ * fsm.cannot(e) - return true if event `e` cannot be fired in the current state
+
+Multiple 'from' and 'to' states for a single event
+==================================================
+
+If an event is allowed **from** multiple states, and always transitions to the same
+state, then simply provide an array of states in the `from` attribute of an event. However,
+if an event is allowed from multiple states, but should transition **to** a different
+state depending on the current state, then provide multiple event entries with
+the same name:
+
+ var fsm = StateMachine.create({
+ initial: 'hungry',
+ events: [
+ { name: 'eat', from: 'hungry', to: 'satisfied' },
+ { name: 'eat', from: 'satisfied', to: 'full' },
+ { name: 'eat', from: 'full', to: 'sick' },
+ { name: 'rest', from: ['hungry', 'satisfied', 'full', 'sick'], to: 'hungry' },
+ ]});
+
+This example will create an object with 2 event methods:
+
+ * fsm.eat()
+ * fsm.rest()
+
+The `rest` event will always transition to the `hungry` state, while the `eat` event
+will transition to a state that is dependent on the current state.
+
+>> NOTE: The `rest` event could use a wildcard '*' for the 'from' state if it should be
+allowed from any current state.
+
+>> NOTE: The `rest` event in the above example can also be specified as multiple events with
+the same name if you prefer the verbose approach.
+
+Callbacks
+=========
+
+4 callbacks are available if your state machine has methods using the following naming conventions:
+
+ * onbefore**event** - fired before the event
+ * onleave**state** - fired when leaving the old state
+ * onenter**state** - fired when entering the new state
+ * onafter**event** - fired after the event
+
+You can affect the event in 3 ways:
+
+ * return `false` from an `onbeforeevent` handler to cancel the event.
+ * return `false` from an `onleavestate` handler to cancel the event.
+ * return `ASYNC` from an `onleavestate` handler to perform an asynchronous state transition (see next section)
+
+For convenience, the 2 most useful callbacks can be shortened:
+
+ * on**event** - convenience shorthand for onafter**event**
+ * on**state** - convenience shorthand for onenter**state**
+
+In addition, a generic `onchangestate()` callback can be used to call a single function for _all_ state changes:
+
+All callbacks will be passed the same arguments:
+
+ * **event** name
+ * **from** state
+ * **to** state
+ * _(followed by any arguments you passed into the original event method)_
+
+Callbacks can be specified when the state machine is first created:
+
+ var fsm = StateMachine.create({
+ initial: 'green',
+ events: [
+ { name: 'warn', from: 'green', to: 'yellow' },
+ { name: 'panic', from: 'yellow', to: 'red' },
+ { name: 'calm', from: 'red', to: 'yellow' },
+ { name: 'clear', from: 'yellow', to: 'green' }
+ ],
+ callbacks: {
+ onpanic: function(event, from, to, msg) { alert('panic! ' + msg); },
+ onclear: function(event, from, to, msg) { alert('thanks to ' + msg); },
+ ongreen: function(event, from, to) { document.body.className = 'green'; },
+ onyellow: function(event, from, to) { document.body.className = 'yellow'; },
+ onred: function(event, from, to) { document.body.className = 'red'; },
+ }
+ });
+
+ fsm.panic('killer bees');
+ fsm.clear('sedatives in the honey pots');
+ ...
+
+Additionally, they can be added and removed from the state machine at any time:
+
+ fsm.ongreen = null;
+ fsm.onyellow = null;
+ fsm.onred = null;
+ fsm.onchangestate = function(event, from, to) { document.body.className = to; };
+
+Asynchronous State Transitions
+==============================
+
+Sometimes, you need to execute some asynchronous code during a state transition and ensure the
+new state is not entered until your code has completed.
+
+A good example of this is when you transition out of a `menu` state, perhaps you want to gradually
+fade the menu away, or slide it off the screen and don't want to transition to your `game` state
+until after that animation has been performed.
+
+You can now return `StateMachine.ASYNC` from your `onleavestate` handler and the state machine
+will be _'put on hold'_ until you are ready to trigger the transition using the new `transition()`
+method.
+
+For example, using jQuery effects:
+
+ var fsm = StateMachine.create({
+
+ initial: 'menu',
+
+ events: [
+ { name: 'play', from: 'menu', to: 'game' },
+ { name: 'quit', from: 'game', to: 'menu' }
+ ],
+
+ callbacks: {
+
+ onentermenu: function() { $('#menu').show(); },
+ onentergame: function() { $('#game').show(); },
+
+ onleavemenu: function() {
+ $('#menu').fadeOut('fast', function() {
+ fsm.transition();
+ });
+ return StateMachine.ASYNC; // tell StateMachine to defer next state until we call transition (in fadeOut callback above)
+ },
+
+ onleavegame: function() {
+ $('#game').slideDown('slow', function() {
+ fsm.transition();
+ };
+ return StateMachine.ASYNC; // tell StateMachine to defer next state until we call transition (in slideDown callback above)
+ }
+
+ }
+ });
+
+
+State Machine Classes
+=====================
+
+You can also turn all instances of a _class_ into an FSM by applying
+the state machine functionality to the prototype, including your callbacks
+in your prototype, and providing a `startup` event for use when constructing
+instances:
+
+ MyFSM = function() { // my constructor function
+ this.startup();
+ };
+
+ MyFSM.prototype = {
+
+ onpanic: function(event, from, to) { alert('panic'); },
+ onclear: function(event, from, to) { alert('all is clear'); },
+
+ // my other prototype methods
+
+ };
+
+ StateMachine.create({
+ target: MyFSM.prototype,
+ events: [
+ { name: 'startup', from: 'none', to: 'green' },
+ { name: 'warn', from: 'green', to: 'yellow' },
+ { name: 'panic', from: 'yellow', to: 'red' },
+ { name: 'calm', from: 'red', to: 'yellow' },
+ { name: 'clear', from: 'yellow', to: 'green' }
+ ]});
+
+
+This should be easy to adjust to fit your appropriate mechanism for object construction.
+
+Initialization Options
+======================
+
+How the state machine should initialize can depend on your application requirements, so
+the library provides a number of simple options.
+
+By default, if you dont specify any initial state, the state machine will be in the `'none'`
+state and you would need to provide an event to take it out of this state:
+
+ var fsm = StateMachine.create({
+ events: [
+ { name: 'startup', from: 'none', to: 'green' },
+ { name: 'panic', from: 'green', to: 'red' },
+ { name: 'calm', from: 'red', to: 'green' },
+ ]});
+ alert(fsm.current); // "none"
+ fsm.startup();
+ alert(fsm.current); // "green"
+
+If you specify the name of your initial event (as in all the earlier examples), then an
+implicit `startup` event will be created for you and fired when the state machine is constructed.
+
+ var fsm = StateMachine.create({
+ initial: 'green',
+ events: [
+ { name: 'panic', from: 'green', to: 'red' },
+ { name: 'calm', from: 'red', to: 'green' },
+ ]});
+ alert(fsm.current); // "green"
+
+If your object already has a `startup` method you can use a different name for the initial event
+
+ var fsm = StateMachine.create({
+ initial: { state: 'green', event: 'init' },
+ events: [
+ { name: 'panic', from: 'green', to: 'red' },
+ { name: 'calm', from: 'red', to: 'green' },
+ ]});
+ alert(fsm.current); // "green"
+
+Finally, if you want to wait to call the initial state transition event until a later date you
+can `defer` it:
+
+ var fsm = StateMachine.create({
+ initial: { state: 'green', event: 'init', defer: true },
+ events: [
+ { name: 'panic', from: 'green', to: 'red' },
+ { name: 'calm', from: 'red', to: 'green' },
+ ]});
+ alert(fsm.current); // "none"
+ fsm.init();
+ alert(fsm.current); // "green"
+
+Of course, we have now come full circle, this last example is pretty much functionally the
+same as the first example in this section where you simply define your own startup event.
+
+So you have a number of choices available to you when initializing your state machine.
+
+Handling Failures
+======================
+
+By default, if you try to call an event method that is not allowed in the current state, the
+state machine will throw an exception. If you prefer to handle the problem yourself, you can
+define a custom `error` handler:
+
+ var fsm = StateMachine.create({
+ initial: 'green',
+ error: function(eventName, from, to, args, errorCode, errorMessage) {
+ return 'event ' + eventName + ' was naughty :- ' + errorMessage;
+ },
+ events: [
+ { name: 'panic', from: 'green', to: 'red' },
+ { name: 'calm', from: 'red', to: 'green' },
+ ]});
+ alert(fsm.calm()); // "event calm was naughty :- event not allowed in current state green"
+
+Release Notes
+=============
+
+See [RELEASE NOTES](https://github.com/jakesgordon/javascript-state-machine/blob/master/RELEASE_NOTES.md) file.
+
+License
+=======
+
+See [LICENSE](https://github.com/jakesgordon/javascript-state-machine/blob/master/LICENSE) file.
+
+Contact
+=======
+
+If you have any ideas, feedback, requests or bug reports, you can reach me at
+[jake@codeincomplete.com](mailto:jake@codeincomplete.com), or via
+my website: [Code inComplete](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/)
+
+
+
+
+
diff --git a/addons/base_import/static/lib/javascript-state-machine/RELEASE_NOTES.md b/addons/base_import/static/lib/javascript-state-machine/RELEASE_NOTES.md
new file mode 100644
index 00000000000..06abf402d38
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/RELEASE_NOTES.md
@@ -0,0 +1,32 @@
+Version 2.1.0 (January 7th 2012)
+--------------------------------
+
+ * Wrapped in self executing function to be more easily used with loaders like `require.js` or `curl.js` (issue #15)
+ * Allow event to be cancelled by returning `false` from `onleavestate` handler (issue #13) - WARNING: this breaks backward compatibility for async transitions (you now need to return `StateMachine.ASYNC` instead of `false`)
+ * Added explicit return values for event methods (issue #12)
+ * Added support for wildcard events that can be fired 'from' any state (issue #11)
+ * Added support for no-op events that transition 'to' the same state (issue #5)
+ * extended custom error callback to handle any exceptions caused by caller provided callbacks
+ * added custom error callback to override exception when an illegal state transition is attempted (thanks to cboone)
+ * fixed typos (thanks to cboone)
+ * fixed issue #4 - ensure before/after event hooks are called even if the event doesn't result in a state change
+
+Version 2.0.0 (August 19th 2011)
+--------------------------------
+
+ * adding support for asynchronous state transitions (see README) - with lots of qunit tests (see test/async.js).
+ * consistent arguments for ALL callbacks, first 3 args are ALWAYS event name, from state and to state, followed by whatever arguments the user passed to the original event method.
+ * added a generic `onchangestate(event,from,to)` callback to detect all state changes with a single function.
+ * allow callbacks to be declared at creation time (instead of having to attach them afterwards)
+ * renamed 'hooks' => 'callbacks'
+ * [read more...](http://codeincomplete.com/posts/2011/8/19/javascript_state_machine_v2/)
+
+Version 1.2.0 (June 21st 2011)
+------------------------------
+ * allows the same event to transition to different states, depending on the current state (see 'Multiple...' section in README.md)
+ * [read more...](http://codeincomplete.com/posts/2011/6/21/javascript_state_machine_v1_2_0/)
+
+Version 1.0.0 (June 1st 2011)
+-----------------------------
+ * initial version
+ * [read more...](http://codeincomplete.com/posts/2011/6/1/javascript_state_machine/)
diff --git a/addons/base_import/static/lib/javascript-state-machine/Rakefile b/addons/base_import/static/lib/javascript-state-machine/Rakefile
new file mode 100644
index 00000000000..beb8702a7f0
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/Rakefile
@@ -0,0 +1,8 @@
+
+desc "create minified version of state-machine.js"
+task :minify do
+ require File.expand_path(File.join(File.dirname(__FILE__), 'minifier/minifier'))
+ Minifier.enabled = true
+ Minifier.minify('state-machine.js')
+end
+
diff --git a/addons/base_import/static/lib/javascript-state-machine/index.html b/addons/base_import/static/lib/javascript-state-machine/index.html
new file mode 100644
index 00000000000..2d6cb62617b
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/index.html
@@ -0,0 +1,39 @@
+
+
+
+ Javascript Finite State Machine
+
+
+
+
+
+
+
+
+
Finite State Machine
+
+
+ clear
+ calm
+ warn
+ panic!
+
+
+
+
+
+
+ dashed lines are asynchronous state transitions (3 seconds)
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/base_import/static/lib/javascript-state-machine/state-machine.js b/addons/base_import/static/lib/javascript-state-machine/state-machine.js
new file mode 100644
index 00000000000..0d503ee7bdb
--- /dev/null
+++ b/addons/base_import/static/lib/javascript-state-machine/state-machine.js
@@ -0,0 +1,155 @@
+(function (window) {
+
+ StateMachine = {
+
+ //---------------------------------------------------------------------------
+
+ VERSION: "2.1.0",
+
+ //---------------------------------------------------------------------------
+
+ Result: {
+ SUCCEEDED: 1, // the event transitioned successfully from one state to another
+ NOTRANSITION: 2, // the event was successfull but no state transition was necessary
+ CANCELLED: 3, // the event was cancelled by the caller in a beforeEvent callback
+ ASYNC: 4, // the event is asynchronous and the caller is in control of when the transition occurs
+ },
+
+ Error: {
+ INVALID_TRANSITION: 100, // caller tried to fire an event that was innapropriate in the current state
+ PENDING_TRANSITION: 200, // caller tried to fire an event while an async transition was still pending
+ INVALID_CALLBACK: 300, // caller provided callback function threw an exception
+ },
+
+ WILDCARD: '*',
+ ASYNC: 'async',
+
+ //---------------------------------------------------------------------------
+
+ create: function(cfg, target) {
+
+ var initial = (typeof cfg.initial == 'string') ? { state: cfg.initial } : cfg.initial; // allow for a simple string, or an object with { state: 'foo', event: 'setup', defer: true|false }
+ var fsm = target || cfg.target || {};
+ var events = cfg.events || [];
+ var callbacks = cfg.callbacks || {};
+ var map = {};
+
+ var add = function(e) {
+ var from = (e.from instanceof Array) ? e.from : (e.from ? [e.from] : [StateMachine.WILDCARD]); // allow 'wildcard' transition if 'from' is not specified
+ map[e.name] = map[e.name] || {};
+ for (var n = 0 ; n < from.length ; n++)
+ map[e.name][from[n]] = e.to || from[n]; // allow no-op transition if 'to' is not specified
+ };
+
+ if (initial) {
+ initial.event = initial.event || 'startup';
+ add({ name: initial.event, from: 'none', to: initial.state });
+ }
+
+ for(var n = 0 ; n < events.length ; n++)
+ add(events[n]);
+
+ for(var name in map) {
+ if (map.hasOwnProperty(name))
+ fsm[name] = StateMachine.buildEvent(name, map[name]);
+ }
+
+ for(var name in callbacks) {
+ if (callbacks.hasOwnProperty(name))
+ fsm[name] = callbacks[name]
+ }
+
+ fsm.current = 'none';
+ fsm.is = function(state) { return this.current == state; };
+ fsm.can = function(event) { return !this.transition && (map[event].hasOwnProperty(this.current) || map[event].hasOwnProperty(StateMachine.WILDCARD)); }
+ fsm.cannot = function(event) { return !this.can(event); };
+ fsm.error = cfg.error || function(name, from, to, args, error, msg) { throw msg; }; // default behavior when something unexpected happens is to throw an exception, but caller can override this behavior if desired (see github issue #3)
+
+ if (initial && !initial.defer)
+ fsm[initial.event]();
+
+ return fsm;
+
+ },
+
+ //===========================================================================
+
+ doCallback: function(fsm, func, name, from, to, args) {
+ if (func) {
+ try {
+ return func.apply(fsm, [name, from, to].concat(args));
+ }
+ catch(e) {
+ return fsm.error(name, from, to, args, StateMachine.Error.INVALID_CALLBACK, "an exception occurred in a caller-provided callback function");
+ }
+ }
+ },
+
+ beforeEvent: function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onbefore' + name], name, from, to, args); },
+ afterEvent: function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onafter' + name] || fsm['on' + name], name, from, to, args); },
+ leaveState: function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onleave' + from], name, from, to, args); },
+ enterState: function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onenter' + to] || fsm['on' + to], name, from, to, args); },
+ changeState: function(fsm, name, from, to, args) { return StateMachine.doCallback(fsm, fsm['onchangestate'], name, from, to, args); },
+
+
+ buildEvent: function(name, map) {
+ return function() {
+
+ var from = this.current;
+ var to = map[from] || map[StateMachine.WILDCARD] || from;
+ var args = Array.prototype.slice.call(arguments); // turn arguments into pure array
+
+ if (this.transition)
+ return this.error(name, from, to, args, StateMachine.Error.PENDING_TRANSITION, "event " + name + " inappropriate because previous transition did not complete");
+
+ if (this.cannot(name))
+ return this.error(name, from, to, args, StateMachine.Error.INVALID_TRANSITION, "event " + name + " inappropriate in current state " + this.current);
+
+ if (false === StateMachine.beforeEvent(this, name, from, to, args))
+ return StateMachine.CANCELLED;
+
+ if (from === to) {
+ StateMachine.afterEvent(this, name, from, to, args);
+ return StateMachine.NOTRANSITION;
+ }
+
+ // prepare a transition method for use EITHER lower down, or by caller if they want an async transition (indicated by an ASYNC return value from leaveState)
+ var fsm = this;
+ this.transition = function() {
+ fsm.transition = null; // this method should only ever be called once
+ fsm.current = to;
+ StateMachine.enterState( fsm, name, from, to, args);
+ StateMachine.changeState(fsm, name, from, to, args);
+ StateMachine.afterEvent( fsm, name, from, to, args);
+ };
+
+ var leave = StateMachine.leaveState(this, name, from, to, args);
+ if (false === leave) {
+ this.transition = null;
+ return StateMachine.CANCELLED;
+ }
+ else if ("async" === leave) {
+ return StateMachine.ASYNC;
+ }
+ else {
+ if (this.transition)
+ this.transition(); // in case user manually called transition() but forgot to return ASYNC
+ return StateMachine.SUCCEEDED;
+ }
+
+ };
+ }
+
+ }; // StateMachine
+
+ //===========================================================================
+
+ if ("function" === typeof define) {
+ define("statemachine", [], function() { return StateMachine; });
+ }
+ else {
+ window.StateMachine = StateMachine;
+ }
+
+}(this));
+
diff --git a/addons/base_import/static/src/css/import.css b/addons/base_import/static/src/css/import.css
index f6258f5aa50..21e598ff707 100644
--- a/addons/base_import/static/src/css/import.css
+++ b/addons/base_import/static/src/css/import.css
@@ -10,7 +10,8 @@
.oe_import .oe_import_grid,
.oe_import .oe_import_error_report,
.oe_import .oe_import_with_file,
-.oe_import .oe_import_noheaders {
+.oe_import .oe_import_noheaders,
+.oe_import .oe_import_report_more {
display: none;
}
@@ -19,7 +20,8 @@
}
.oe_import.oe_import_error .oe_import_error_report,
.oe_import.oe_import_with_file .oe_import_with_file,
-.oe_import.oe_import_noheaders .oe_import_noheaders {
+.oe_import.oe_import_noheaders .oe_import_noheaders,
+.oe_import .oe_import_report_showmore .oe_import_report_more {
display: block;
}
@@ -29,6 +31,9 @@
.oe_import .oe_import_error_report ul .oe_import_report_warning {
background-color: #FEFFD9;
}
+.oe_import .oe_import_error_report ul .oe_import_report_info {
+ background-color: #d3ffd3;
+}
.oe_import .oe_import_noheaders {
color: #888;
@@ -47,7 +52,7 @@
}
.oe_import .oe_import_options label {
display: inline-block;
- width: 10em;
+ width: 8em;
text-align: right;
}
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index c2deb660ff2..33c86e88b2c 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -47,31 +47,35 @@ openerp.base_import = function (instance) {
this._super.apply(this, arguments);
if(add_button) {
this.$buttons.on('click', '.oe_list_button_import', function() {
- new instance.web.DataImport(self, self.dataset).open();
+ self.do_action({
+ type: 'ir.actions.client',
+ tag: 'import',
+ params: {
+ model: self.dataset.model
+ }
+ }, void 0, void 0, function () {
+ self.reload();
+ });
return false;
});
}
}
});
- instance.web.DataImport = instance.web.Dialog.extend({
+ instance.web.client_actions.add(
+ 'import', 'instance.web.DataImport');
+ instance.web.DataImport = instance.web.Widget.extend({
template: 'ImportView',
- dialog_title: _lt("Import Data"),
opts: [
{name: 'encoding', label: _lt("Encoding:"), value: 'utf-8'},
{name: 'separator', label: _lt("Separator:"), value: ','},
{name: 'quoting', label: _lt("Quoting:"), value: '"'}
],
events: {
- 'change .oe_import_grid input': 'import_dryrun',
- 'change input.oe_import_file': 'file_update',
- 'change input.oe_import_has_header, .oe_import_options input': 'settings_updated',
- 'click a.oe_import_csv': function (e) {
- e.preventDefault();
- },
- 'click a.oe_import_export': function (e) {
- e.preventDefault();
- },
+ // 'change .oe_import_grid input': 'import_dryrun',
+ 'change .oe_import_file': 'loaded_file',
+ 'click .oe_import_file_reload': 'loaded_file',
+ 'change input.oe_import_has_header, .oe_import_options input': 'settings_changed',
'click a.oe_import_toggle': function (e) {
e.preventDefault();
var $el = $(e.target);
@@ -79,30 +83,84 @@ openerp.base_import = function (instance) {
? $el.next()
: $el.parent().next())
.toggle();
+ },
+ 'click .oe_import_report a.oe_import_report_count': function (e) {
+ e.preventDefault();
+ $(e.target).parent().toggleClass('oe_import_report_showmore');
+ },
+ 'click .oe_import_moreinfo_action a': function (e) {
+ e.preventDefault();
+ // #data will parse the attribute on its own, we don't like
+ // that sort of things
+ var action = JSON.parse($(e.target).attr('data-action'));
+ // FIXME: when JS-side clean_action
+ action.views = _(action.views).map(function (view) {
+ var id = view[0], type = view[1];
+ return [
+ id,
+ type !== 'tree' ? type
+ : action.view_type === 'form' ? 'list'
+ : 'tree'
+ ];
+ });
+ this.do_action(_.extend(action, {
+ target: 'new',
+ flags: {
+ search_view: true,
+ display_title: true,
+ pager: true,
+ list: {selectable: false}
+ }
+ }));
+ },
+ // buttons
+ 'click .oe_import_validate': 'validate',
+ 'click .oe_import_import': 'import',
+ 'click .oe_import_cancel': function (e) {
+ e.preventDefault();
+ this.exit();
}
},
- init: function (parent, dataset) {
+ init: function (parent, params) {
var self = this;
- this._super(parent, {
- buttons: [
- {text: _t("Import File"), click: function () {
- self.do_import();
- }, 'class': 'oe_import_dialog_button'}
- ]
- });
- this.res_model = parent.model;
+ this._super.apply(this, arguments);
+ this.res_model = params.model;
// import object id
this.id = null;
this.Import = new instance.web.Model('base_import.import');
},
start: function () {
var self = this;
- return this.Import.call('create', [{
- 'res_model': this.res_model
- }]).then(function (id) {
- self.id = id;
- self.$('input[name=import_id]').val(id);
- });
+ this.setup_encoding_picker();
+
+ return $.when(
+ this._super(),
+ this.Import.call('create', [{
+ 'res_model': this.res_model
+ }]).then(function (id) {
+ self.id = id;
+ self.$('input[name=import_id]').val(id);
+ })
+ )
+ },
+ setup_encoding_picker: function () {
+ this.$('input.oe_import_encoding').select2({
+ width: '160px',
+ query: function (q) {
+ var make = function (term) { return {id: term, text: term}; };
+ var suggestions = _.map(
+ ('utf-8 utf-16 windows-1252 latin1 latin2 big5 ' +
+ 'gb18030 shift_jis windows-1251 koir8_r').split(/\s+/),
+ make);
+ if (q.term) {
+ suggestions.unshift(make(q.term));
+ }
+ q.callback({results: suggestions});
+ },
+ initSelection: function (e, c) {
+ return c({id: 'utf-8', text: 'utf-8'});
+ }
+ }).select2('val', 'utf-8');
},
import_options: function () {
@@ -118,34 +176,52 @@ openerp.base_import = function (instance) {
},
//- File & settings change section
- file_update: function (e) {
+ onfile_loaded: function () {
+ this.$('.oe_import_button').prop('disabled', true);
if (!this.$('input.oe_import_file').val()) { return; }
this.$el.removeClass('oe_import_preview oe_import_error');
jsonp(this.$el, {
url: '/base_import/set_file'
- }, this.proxy('settings_updated'));
+ }, this.proxy('settings_changed'));
},
- settings_updated: function () {
+ onpreviewing: function () {
+ var self = this;
+ this.$('.oe_import_button').prop('disabled', true);
this.$el.addClass('oe_import_with_file');
// TODO: test that write // succeeded?
- this.Import.call(
- 'parse_preview', [this.id, this.import_options()])
- .then(this.proxy('preview'));
- },
- preview: function (result) {
+ this.$el.removeClass('oe_import_preview_error oe_import_error');
this.$el.toggleClass(
'oe_import_noheaders',
!this.$('input.oe_import_has_header').prop('checked'));
- if (result.error) {
- this.$el.addClass('oe_import_error');
- this.$('.oe_import_error_report').html(
+ this.Import.call(
+ 'parse_preview', [this.id, this.import_options()])
+ .then(function (result) {
+ var signal = result.error ? 'preview_failed' : 'preview_succeeded';
+ self[signal](result);
+ });
+ },
+ onpreview_error: function (event, from, to, result) {
+ this.$('.oe_import_options').show();
+ this.$el.addClass('oe_import_preview_error oe_import_error');
+ this.$('.oe_import_error_report').html(
QWeb.render('ImportView.preview.error', result));
- return;
- }
+ },
+ onpreview_success: function (event, from, to, result) {
+ this.$('.oe_import_import').removeClass('oe_highlight');
+ this.$('.oe_import_validate').addClass('oe_highlight');
+ this.$('.oe_import_button').prop('disabled', false);
this.$el.addClass('oe_import_preview');
this.$('table').html(QWeb.render('ImportView.preview', result));
+ if (result.headers.length === 1) {
+ this.$('.oe_import_options').show();
+ this.onresults(null, null, null, [{
+ type: 'warning',
+ message: _t("A single column was found in the file, this often means the file separator is incorrect")
+ }]);
+ }
+
var $fields = this.$('.oe_import_fields input');
this.render_fields_matches(result, $fields);
var data = this.generate_fields_completion(result);
@@ -180,7 +256,6 @@ openerp.base_import = function (instance) {
width: 'resolve',
dropdownCssClass: 'oe_import_selector'
});
- this.import_dryrun();
},
generate_fields_completion: function (root) {
var basic = [];
@@ -252,40 +327,116 @@ openerp.base_import = function (instance) {
//- import itself
call_import: function (options) {
- var self = this;
var fields = this.$('.oe_import_fields input.oe_import_match_field').map(function (index, el) {
return $(el).select2('val') || false;
}).get();
return this.Import.call(
'do', [this.id, fields, this.import_options()], options);
},
- import_dryrun: function () {
-// this.call_import({ dryrun: true })
-// .then(this.proxy('render_import_errors'));
+ onvalidate: function () {
+ return this.call_import({ dryrun: true })
+ .then(this.proxy('validated'));
},
- do_import: function () {
+ onimport: function () {
var self = this;
- this.call_import({ dryrun: false }).then(function (errors) {
- if (_.isEmpty(errors)) {
- if (self.getParent().reload_content) {
- self.getParent().reload_content();
- }
- self.close();
+ return this.call_import({ dryrun: false }).then(function (message) {
+ if (!_.any(message, function (message) {
+ return message.type === 'error' })) {
+ self['import_succeeded']();
return;
}
- self.render_import_errors(errors);
+ self['import_failed'](message);
});
},
- render_import_errors: function (errors) {
- if (_.isEmpty(errors)) {
- this.$el.removeClass('oe_import_error');
- return;
+ onimported: function () {
+ this.exit();
+ },
+ exit: function () {
+ this.do_action({
+ type: 'ir.actions.client',
+ tag: 'history_back'
+ });
+ },
+ onresults: function (event, from, to, message) {
+ var no_messages = _.isEmpty(message);
+ this.$('.oe_import_import').toggleClass('oe_highlight', no_messages);
+ this.$('.oe_import_validate').toggleClass('oe_highlight', !no_messages);
+ if (no_messages) {
+ message.push({
+ type: 'info',
+ message: _t("Everything seems valid.")
+ });
}
- // import failed (or maybe just warnings, if we ever get
- // warnings?)
+ // row indexes come back 0-indexed, spreadsheets
+ // display 1-indexed.
+ var offset = 1;
+ // offset more if header
+ if (this.import_options().headers) { offset += 1; }
+
this.$el.addClass('oe_import_error');
this.$('.oe_import_error_report').html(
- QWeb.render('ImportView.error', {errors: errors}));
+ QWeb.render('ImportView.error', {
+ errors: _(message).groupBy('message'),
+ at: function (rows) {
+ var from = rows.from + offset;
+ var to = rows.to + offset;
+ if (from === to) {
+ return _.str.sprintf(_t("at row %d"), from);
+ }
+ return _.str.sprintf(_t("between rows %d and %d"),
+ from, to);
+ },
+ more: function (n) {
+ return _.str.sprintf(_t("(%d more)"), n);
+ },
+ info: function (msg) {
+ if (typeof msg === 'string') {
+ return _.str.sprintf(
+ '%s
',
+ _.str.escapeHTML(msg));
+ }
+ if (msg instanceof Array) {
+ return _.str.sprintf(
+ '',
+ _.str.escapeHTML(_t("Here are the possible values:")),
+ _(msg).map(function (msg) {
+ return ''
+ + _.str.escapeHTML(msg)
+ + ' ';
+ }).join(''));
+ }
+ // Final should be object, action descriptor
+ return [
+ ''
+ ].join('')
+ },
+ }));
},
});
+ // FSM-ize DataImport
+ StateMachine.create({
+ target: instance.web.DataImport.prototype,
+ events: [
+ { name: 'loaded_file',
+ from: ['none', 'file_loaded', 'preview_error', 'preview_success', 'results'],
+ to: 'file_loaded' },
+ { name: 'settings_changed',
+ from: ['file_loaded', 'preview_error', 'preview_success', 'results'],
+ to: 'previewing' },
+ { name: 'preview_failed', from: 'previewing', to: 'preview_error' },
+ { name: 'preview_succeeded', from: 'previewing', to: 'preview_success' },
+ { name: 'validate', from: 'preview_success', to: 'validating' },
+ { name: 'validate', from: 'results', to: 'validating' },
+ { name: 'validated', from: 'validating', to: 'results' },
+ { name: 'import', from: ['preview_success', 'results'], to: 'importing' },
+ { name: 'import_succeeded', from: 'importing', to: 'imported'},
+ { name: 'import_failed', from: 'importing', to: 'results' }
+ ]
+ })
};
diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml
index 386348bea4b..1c57c40c9db 100644
--- a/addons/base_import/static/src/xml/import.xml
+++ b/addons/base_import/static/src/xml/import.xml
@@ -2,17 +2,45 @@
,
-
+
@@ -477,10 +477,10 @@
-
+
-
+
@@ -488,7 +488,7 @@
-
+
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 1da78e50843..ba46cc023ab 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -105,7 +105,23 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 35ed9411215..a17633d0ef6 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -8,7 +8,7 @@
crm.lead.report.tree
crm.lead.report
-
+
@@ -130,7 +130,7 @@
crm.lead.report.tree
crm.lead.report
-
+
diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml
index ec7ea5e6bdb..a2120aef6ab 100644
--- a/addons/crm/report/crm_phonecall_report_view.xml
+++ b/addons/crm/report/crm_phonecall_report_view.xml
@@ -8,7 +8,7 @@
crm.phonecall.report.tree
crm.phonecall.report
-
+
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b04853d9f6a..6f431b90cba 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -32,6 +32,13 @@ class crm_configuration(osv.osv_memory):
'group_fund_raising': fields.boolean("Manage Fund Raising",
implied_group='crm.group_fund_raising',
help="""Allows you to trace and manage your activities for fund raising."""),
+ 'module_crm_claim':fields.boolean("Manage Customer Claims",
+ help="""Allows you to track your customers/suppliers claims and grievances.
+ This installs the module crm_claim."""),
+ 'module_crm_helpdesk':fields.boolean("Manage Helpdesk and Support",
+ help="""Allows you to communicate with Customer, process Customer query, and provide better help and support. This installs the module crm_helpdesk."""),
+
+
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index 6330d7a0500..9534c8620ee 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -7,6 +7,22 @@
sale.config.settings
+
diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py
index f5ab836401b..dfc549412d4 100644
--- a/addons/crm_claim/__openerp__.py
+++ b/addons/crm_claim/__openerp__.py
@@ -25,8 +25,10 @@
'version': '1.0',
'category': 'Customer Relationship Management',
'description': """
-This modules allows you to track your customers/suppliers claims and grievances.
+
+Manage Customer Claims.
================================================================================
+This application allows you to track your customers/suppliers claims and grievances.
It is fully integrated with the email gateway so that you can create
automatically new claims based on incoming emails.
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index cbf3ec9f13a..c88b2fe26af 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -26,6 +26,7 @@ from osv import fields, osv
import time
import tools
from tools.translate import _
+from tools import html2plaintext
CRM_CLAIM_PENDING_STATES = (
crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -192,9 +193,10 @@ class crm_claim(base_stage, osv.osv):
This override updates the document according to the email.
"""
if custom_values is None: custom_values = {}
+ desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
custom_values.update({
'name': msg.get('subject') or _("No Subject"),
- 'description': msg.get('body'),
+ 'description': desc,
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
})
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 5a3a3d92a09..a61490c6086 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -8,7 +8,7 @@
crm.claim.report.tree
crm.claim.report
-
+
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index f36a3b72640..ceffd282aa8 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -25,6 +25,7 @@ from crm import crm
from osv import fields, osv
import tools
from tools.translate import _
+from tools import html2plaintext
CRM_HELPDESK_STATES = (
crm.AVAILABLE_STATES[2][0], # Cancelled
@@ -104,9 +105,10 @@ class crm_helpdesk(base_state, base_stage, osv.osv):
This override updates the document according to the email.
"""
if custom_values is None: custom_values = {}
+ desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
custom_values.update({
'name': msg.get('subject') or _("No Subject"),
- 'description': msg.get('body'),
+ 'description': desc,
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
'user_id': False,
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
index 4750fa3344d..05f502656d2 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
@@ -8,7 +8,7 @@
crm.helpdesk.report.tree
crm.helpdesk.report
-
+
diff --git a/addons/crm_partner_assign/report/crm_lead_report_view.xml b/addons/crm_partner_assign/report/crm_lead_report_view.xml
index 662a7c3dce0..ee9266a0235 100644
--- a/addons/crm_partner_assign/report/crm_lead_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml
@@ -65,7 +65,7 @@
crm.lead.assign.report.tree
crm.lead.report.assign
-
+
diff --git a/addons/crm_partner_assign/report/crm_partner_report_view.xml b/addons/crm_partner_assign/report/crm_partner_report_view.xml
index 107328ac4e0..eb2c86874c4 100644
--- a/addons/crm_partner_assign/report/crm_partner_report_view.xml
+++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml
@@ -41,7 +41,7 @@
crm.partner.assign.report.tree
crm.partner.report.assign
-
+
diff --git a/addons/crm_partner_assign/res_partner_view.xml b/addons/crm_partner_assign/res_partner_view.xml
index f5a1e9aad25..3b55c70f4c7 100644
--- a/addons/crm_partner_assign/res_partner_view.xml
+++ b/addons/crm_partner_assign/res_partner_view.xml
@@ -170,7 +170,7 @@
res.partner
-
+
diff --git a/addons/document/document.py b/addons/document/document.py
index 3ae783f49e7..37a0219d143 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -36,8 +36,7 @@ DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['roo
class document_file(osv.osv):
_inherit = 'ir.attachment'
- _rec_name = 'datas_fname'
-
+ _rec_name = 'name'
def _attach_parent_id(self, cr, uid, ids=None, context=None):
"""Migrate ir.attachments to the document module.
@@ -149,29 +148,12 @@ class document_file(osv.osv):
_sql_constraints = [
# filename_uniq is not possible in pure SQL
]
- def _check_duplication(self, cr, uid, vals, ids=None, op='create'):
- name = vals.get('name', False)
- parent_id = vals.get('parent_id', False)
- res_model = vals.get('res_model', False)
- res_id = vals.get('res_id', 0)
- if op == 'write':
- for file in self.browse(cr, uid, ids): # FIXME fields_only
- if not name:
- name = file.name
- if not parent_id:
- parent_id = file.parent_id and file.parent_id.id or False
- if not res_model:
- res_model = file.res_model and file.res_model or False
- if not res_id:
- res_id = file.res_id and file.res_id or 0
- res = self.search(cr, uid, [('id', '<>', file.id), ('name', '=', name), ('parent_id', '=', parent_id), ('res_model', '=', res_model), ('res_id', '=', res_id)])
- if len(res):
- return False
- if op == 'create':
- res = self.search(cr, uid, [('name', '=', name), ('parent_id', '=', parent_id), ('res_id', '=', res_id), ('res_model', '=', res_model)])
- if len(res):
- return False
- return True
+
+ def onchange_file(self, cr, uid, ids, datas_fname=False, context=None):
+ res = {'value':{}}
+ if datas_fname:
+ res['value'].update({'name': datas_fname})
+ return res
def check(self, cr, uid, ids, mode, context=None, values=None):
"""Check access wrt. res_model, relax the rule of ir.attachment parent
@@ -219,8 +201,6 @@ class document_file(osv.osv):
res = self.search(cr, uid, [('id', 'in', ids)])
if not len(res):
return False
- if not self._check_duplication(cr, uid, vals, ids, 'write'):
- raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
# if nodes call this write(), they must skip the code below
from_node = context and context.get('__from_node', False)
@@ -286,22 +266,8 @@ class document_file(osv.osv):
else:
if vals.get('file_size'):
del vals['file_size']
- result = self._check_duplication(cr, uid, vals)
- if not result:
- domain = [
- ('res_id', '=', vals['res_id']),
- ('res_model', '=', vals['res_model']),
- ('datas_fname', '=', vals['datas_fname']),
- ]
- attach_ids = self.search(cr, uid, domain, context=context)
- super(document_file, self).write(cr, uid, attach_ids,
- {'datas' : vals['datas']},
- context=context)
- result = attach_ids[0]
- else:
- #raise osv.except_osv(_('ValidateError'), _('File name must be unique!'))
- result = super(document_file, self).create(cr, uid, vals, context)
- return result
+
+ return super(document_file, self).create(cr, uid, vals, context)
def __get_partner_id(self, cr, uid, res_model, res_id, context=None):
""" A helper to retrieve the associated partner from any res_model+id
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index b631583fb27..54776c4d36e 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -228,6 +228,9 @@
+
+
+
@@ -338,15 +341,6 @@
-
- ir.attachment.view.inherit
- ir.attachment
-
-
-
-
-
-
process.node.form
diff --git a/addons/document_page/document_page_view.xml b/addons/document_page/document_page_view.xml
index 63f208c08a7..d8daaada967 100644
--- a/addons/document_page/document_page_view.xml
+++ b/addons/document_page/document_page_view.xml
@@ -55,7 +55,7 @@
-
+
diff --git a/addons/document_page/wizard/document_page_show_diff_view.xml b/addons/document_page/wizard/document_page_show_diff_view.xml
index b1dfb536853..e2d5ef1af4b 100644
--- a/addons/document_page/wizard/document_page_show_diff_view.xml
+++ b/addons/document_page/wizard/document_page_show_diff_view.xml
@@ -8,7 +8,7 @@
wizard.document.page.history.show_diff
diff --git a/addons/email_template/wizard/mail_compose_message_view.xml b/addons/email_template/wizard/mail_compose_message_view.xml
index 8d5bc26b213..655f5b9d0c2 100644
--- a/addons/email_template/wizard/mail_compose_message_view.xml
+++ b/addons/email_template/wizard/mail_compose_message_view.xml
@@ -39,7 +39,7 @@
attrs="{'invisible':[('use_template','=',False)]}"
on_change="onchange_template_id(use_template, template_id, composition_mode, model, res_id, context)"/>
-
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
@@ -284,13 +282,13 @@
-
+
Subscribe
-
+
Subscribed
Unsubscribe
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 060b1ef7556..042676d0c32 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -23,16 +23,16 @@ from osv import fields, osv
import tools
class report_event_registration(osv.osv):
-
_name = "report.event.registration"
_description = "Events Analysis"
_auto = False
_columns = {
'event_date': fields.char('Event Start Date', size=64, readonly=True),
'year': fields.char('Year', size=4, readonly=True),
- 'month': fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
- ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
- ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+ 'month': fields.selection([
+ ('01','January'), ('02','February'), ('03','March'), ('04','April'),
+ ('05','May'), ('06','June'), ('07','July'), ('08','August'),
+ ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'event_id': fields.many2one('event.event', 'Event', required=True),
'draft_state': fields.integer(' # No of Draft Registrations', size=20),
'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
@@ -48,17 +48,18 @@ class report_event_registration(osv.osv):
'company_id': fields.many2one('res.company', 'Company', readonly=True),
}
_order = 'event_date desc'
+
def init(self, cr):
"""
- initialize the sql view for the event registration
- cr -- the cursor
+ Initialize the sql view for the event registration
"""
tools.drop_view_if_exists(cr, 'report_event_registration')
- cr.execute("""
- CREATE OR REPLACE view report_event_registration AS (
- SELECT
- event_id,
- r.id,
+
+ # TOFIX this request won't select events that have no registration
+ cr.execute(""" CREATE VIEW report_event_registration AS (
+ SELECT
+ e.id::char || '/' || coalesce(r.id::char,'') AS id,
+ e.id AS event_id,
e.user_id AS user_id,
r.user_id AS user_id_registration,
r.name AS name_registration,
@@ -72,23 +73,21 @@ class report_event_registration(osv.osv):
CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
e.type AS event_type,
e.register_max AS register_max,
- e.state AS event_state,
- r.state AS registration_state
- FROM
+ e.state AS event_state,
+ r.state AS registration_state
+ FROM
event_event e
+ LEFT JOIN event_registration r ON (e.id=r.event_id)
- LEFT JOIN
- event_registration r ON (e.id=r.event_id)
-
- GROUP BY
+ GROUP BY
event_id,
user_id_registration,
- e.id,
r.id,
registration_state,
r.nb_register,
- event_type, e.id, e.date_begin, e.main_speaker_id,
- e.register_max,event_id, e.user_id,e.company_id,
+ event_type,
+ e.id,
+ e.date_begin,
e.user_id,
event_state,
e.company_id,
@@ -97,9 +96,8 @@ class report_event_registration(osv.osv):
month,
e.register_max,
name_registration
-
- )
- """)
+ )
+ """)
report_event_registration()
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index f39b6aecfe7..249757efbd3 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -1,13 +1,13 @@
-
+
-
+
report.event.registration.tree
report.event.registration
-
+
@@ -28,7 +28,6 @@
-
report.event.registration.graph
report.event.registration
@@ -42,8 +41,7 @@
-
-
+
report.event.registration.search
report.event.registration
@@ -82,28 +80,28 @@
-
+
Events Analysis
report.event.registration
form
tree,graph
- {"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, 'group_by_no_leaf':1, 'group_by':[]}
+ {"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, "group_by_no_leaf":1, "group_by":[]}
-
+
tree
-
+
-
+
graph
-
+
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 8602ea24d53..f49f5474fa6 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -42,4 +42,10 @@
width:256px;
border: 1px solid #eeeeee;
}
+.oe_unsubscribe, .oe_unsubscribe_button:hover span {
+ display: none;
+ }
+.oe_unsubscribe_button:hover .oe_unsubscribe {
+ display: inline;
+ }
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 52f935a0760..ab7568d704e 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -6,10 +6,10 @@
product.product
-
+
-
+
diff --git a/addons/google_docs/__openerp__.py b/addons/google_docs/__openerp__.py
index b02f2e912fc..8b9a4123aa9 100644
--- a/addons/google_docs/__openerp__.py
+++ b/addons/google_docs/__openerp__.py
@@ -27,7 +27,6 @@
'category': 'Tools',
'installable': True,
'auto_install': False,
- 'web': True,
'js': ['static/src/js/gdocs.js'],
'data': [
'security/ir.model.access.csv',
diff --git a/addons/google_docs/google_docs.py b/addons/google_docs/google_docs.py
index f1477f9c7f2..5ff80530c94 100644
--- a/addons/google_docs/google_docs.py
+++ b/addons/google_docs/google_docs.py
@@ -26,8 +26,11 @@ try:
from gdata.client import RequestError
from gdata.docs.service import DOCUMENT_LABEL
import gdata.auth
+ from gdata.docs.data import Resource
except ImportError:
- raise osv.except_osv(_('Google Docs Error!'), _('Please install gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list.'))
+ import logging
+ _logger = logging.getLogger(__name__)
+ _logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list")
class google_docs_ir_attachment(osv.osv):
_inherit = 'ir.attachment'
diff --git a/addons/google_docs/res_config_user_view.xml b/addons/google_docs/res_config_user_view.xml
index 4aabba3ac5a..e6c4223735f 100644
--- a/addons/google_docs/res_config_user_view.xml
+++ b/addons/google_docs/res_config_user_view.xml
@@ -8,9 +8,10 @@
google_docs.config.tree
google.docs.config
-
+
-
+
+
@@ -18,11 +19,25 @@
google_docs.config.form
google.docs.config
-
-
-
-
-
+
diff --git a/addons/google_docs/static/src/js/gdocs.js b/addons/google_docs/static/src/js/gdocs.js
index bcfd24f8c0d..2aafdd3de4b 100644
--- a/addons/google_docs/static/src/js/gdocs.js
+++ b/addons/google_docs/static/src/js/gdocs.js
@@ -22,7 +22,7 @@ var _t = instance.web._t;
var form = self.getParent();
form.sidebar_context().then(function (context) {
var ds = new instance.web.DataSet(this, 'ir.attachment', context);
- ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context], function(r) {
+ ds.call('google_doc_get', [form.dataset.model, [form.datarecord.id], context]).then(function(r) {
if (r == 'False') {
var params = {
error: response,
@@ -35,7 +35,7 @@ var _t = instance.web._t;
}
form.reload();
});
- })
+ });
}
- })
-}
+ });
+};
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 89c327f4d13..cab93c6c14a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -36,20 +36,21 @@
+
+
-
+
-
@@ -57,14 +58,14 @@
-
+
-
+
@@ -334,13 +335,10 @@
-
-
-
-
-
-
-
+
+
+
+
@@ -349,7 +347,7 @@
-
+
diff --git a/addons/hr_contract/i18n/mk.po b/addons/hr_contract/i18n/mk.po
new file mode 100644
index 00000000000..2a4011c9e0d
--- /dev/null
+++ b/addons/hr_contract/i18n/mk.po
@@ -0,0 +1,271 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-10-09 08:00+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#. module: hr_contract
+#: field:hr.contract,wage:0
+msgid "Wage"
+msgstr "Плата"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Information"
+msgstr "Информации"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Trial Period"
+msgstr "Пробен Период"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_start:0
+msgid "Trial Start Date"
+msgstr "Пробен Почетен Датум"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Medical Examination"
+msgstr "Систематски Преглед"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle:0
+msgid "Company Vehicle"
+msgstr "Службено Возило"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Miscellaneous"
+msgstr "Разно"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Current"
+msgstr "Тековен"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_contract
+#: field:hr.contract,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Overpassed"
+msgstr "Изминат"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,employee_id:0
+#: model:ir.model,name:hr_contract.model_hr_employee
+msgid "Employee"
+msgstr "Вработен"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Search Contract"
+msgstr "Пребарај Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts in progress"
+msgstr "Договори во тек"
+
+#. module: hr_contract
+#: field:hr.employee,vehicle_distance:0
+msgid "Home-Work Distance"
+msgstr "Дома-Работа Одалеченост"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_ids:0
+#: model:ir.actions.act_window,name:hr_contract.act_hr_employee_2_hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract
+msgid "Contracts"
+msgstr "Договори"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Personal Info"
+msgstr "Лични информации"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Contracts whose end date already passed"
+msgstr "Договори чии што краен рок е веќе поминат"
+
+#. module: hr_contract
+#: help:hr.employee,contract_id:0
+msgid "Latest contract of the employee"
+msgstr "Последен договор на вработениот"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Job"
+msgstr "Работно Место"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,advantages:0
+msgid "Advantages"
+msgstr "Придобивки"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Valid for"
+msgstr "Валиден за"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Work Permit"
+msgstr "Дозвола за Работа"
+
+#. module: hr_contract
+#: field:hr.employee,children:0
+msgid "Number of Children"
+msgstr "Број на Деца"
+
+#. module: hr_contract
+#: model:ir.actions.act_window,name:hr_contract.action_hr_contract_type
+#: model:ir.ui.menu,name:hr_contract.hr_menu_contract_type
+msgid "Contract Types"
+msgstr "Типови на Договор"
+
+#. module: hr_contract
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr "Грешка! Не можете да креирате рекурзивна хиерархија на вработените."
+
+#. module: hr_contract
+#: field:hr.contract,date_end:0
+msgid "End Date"
+msgstr "Краен датум"
+
+#. module: hr_contract
+#: help:hr.contract,wage:0
+msgid "Basic Salary of the employee"
+msgstr "Основна Плата на вработениот"
+
+#. module: hr_contract
+#: field:hr.contract,name:0
+msgid "Contract Reference"
+msgstr "Референца"
+
+#. module: hr_contract
+#: help:hr.employee,vehicle_distance:0
+msgid "In kilometers"
+msgstr "во километри"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,notes:0
+msgid "Notes"
+msgstr "Забелешки"
+
+#. module: hr_contract
+#: field:hr.contract,permit_no:0
+msgid "Work Permit No"
+msgstr "Број на Дозвола за Работа"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.employee,contract_id:0
+#: model:ir.model,name:hr_contract.model_hr_contract
+#: model:ir.ui.menu,name:hr_contract.next_id_56
+msgid "Contract"
+msgstr "Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,type_id:0
+#: view:hr.contract.type:0
+#: field:hr.contract.type,name:0
+#: model:ir.model,name:hr_contract.model_hr_contract_type
+msgid "Contract Type"
+msgstr "Тип на Договор"
+
+#. module: hr_contract
+#: view:hr.contract:0
+#: field:hr.contract,working_hours:0
+msgid "Working Schedule"
+msgstr "Распоред за Работа"
+
+#. module: hr_contract
+#: view:hr.employee:0
+msgid "Job Info"
+msgstr "Информации за Работата"
+
+#. module: hr_contract
+#: field:hr.contract,visa_expire:0
+msgid "Visa Expire Date"
+msgstr "Виза Датум на Истекување"
+
+#. module: hr_contract
+#: field:hr.contract,job_id:0
+msgid "Job Title"
+msgstr "Звање"
+
+#. module: hr_contract
+#: field:hr.employee,manager:0
+msgid "Is a Manager"
+msgstr "Менаџер"
+
+#. module: hr_contract
+#: field:hr.contract,date_start:0
+msgid "Start Date"
+msgstr "Почетен датум"
+
+#. module: hr_contract
+#: constraint:hr.contract:0
+msgid "Error! contract start-date must be lower then contract end-date."
+msgstr ""
+"Грешка! Почетниот датум на договорот мора да биде помал од крајниот датум."
+
+#. module: hr_contract
+#: field:hr.contract,visa_no:0
+msgid "Visa No"
+msgstr "Број на Виза"
+
+#. module: hr_contract
+#: field:hr.employee,place_of_birth:0
+msgid "Place of Birth"
+msgstr "Место на раѓање"
+
+#. module: hr_contract
+#: view:hr.contract:0
+msgid "Duration"
+msgstr "Траење"
+
+#. module: hr_contract
+#: field:hr.employee,medic_exam:0
+msgid "Medical Examination Date"
+msgstr "Датум за Систематски Преглед"
+
+#. module: hr_contract
+#: field:hr.contract,trial_date_end:0
+msgid "Trial End Date"
+msgstr "Пробен Краен Датум"
+
+#. module: hr_contract
+#: view:hr.contract.type:0
+msgid "Search Contract Type"
+msgstr "Пребарај Тип на Договор"
diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index fb1186ae401..d4907c90f11 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -6,7 +6,7 @@
hr.evaluation.report.tree
hr.evaluation.report
-
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 91dc44fed61..487e4f58782 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -243,7 +243,7 @@ class product_product(osv.osv):
data_obj = self.pool.get('ir.model.data')
cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense')
categ_id = data_obj.browse(cr, uid, cat_id).res_id
- res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }}
+ res = {'value' : {'type':'service','sale_ok' :False,'categ_id':categ_id }}
return res
product_product()
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 67d629eee6a..76393d9e030 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -124,7 +124,7 @@
@@ -196,10 +196,10 @@
product.product
-
+
-
+
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index bf456cfc4d6..3e07516c01b 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -231,7 +231,7 @@
[[ formatLang(line.unit_quantity) ]]
- [[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(line.total_amount, currency_obj=o.currency_id) ]]
@@ -277,7 +277,7 @@
Total:
- [[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]]
+ [[ formatLang(o.amount, currency_obj=o.currency_id) ]]
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1cd1e10c5ed..9f94c264c5e 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -6,7 +6,7 @@
hr.expense.report.tree
hr.expense.report
-
+
diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv
index 0455302319e..092424ef7e6 100644
--- a/addons/hr_expense/security/ir.model.access.csv
+++ b/addons/hr_expense/security/ir.model.access.csv
@@ -9,6 +9,7 @@ access_product_template_hr_expense_user,product.template.hr.expense.user,product
access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1
access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1
access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1
+access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,0,0,0
access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1
access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1
access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index ae85b03fcaf..6e3c9b2d083 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -353,6 +353,32 @@
+
+ Allocation Requests to Approve
+ hr.holidays
+ form
+ {'default_type': 'add', 'search_default_approve':1}
+ [('type','=','add')]
+
+
+
+
+
+
+ tree
+
+
+
+
+
+
+ form
+
+
+
+
+
+
Leaves Summary
hr.holidays
diff --git a/addons/hr_holidays/i18n/mk.po b/addons/hr_holidays/i18n/mk.po
new file mode 100644
index 00000000000..2694317ebe9
--- /dev/null
+++ b/addons/hr_holidays/i18n/mk.po
@@ -0,0 +1,864 @@
+# Macedonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-09 08:43+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Macedonian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-10 04:44+0000\n"
+"X-Generator: Launchpad (build 16112)\n"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Blue"
+msgstr "Сина"
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_type:0
+msgid "Allocation Type"
+msgstr "Тип на Алокација"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Second Approval"
+msgstr "Се чека на второ одобрување"
+
+#. module: hr_holidays
+#: help:hr.holidays.status,remaining_leaves:0
+msgid "Maximum Leaves Allowed - Leaves Already Taken"
+msgstr "Мкасимален број на дозволени отсуства - Отсуствата се веќе земени"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Leaves Management"
+msgstr "Менаџирање на Отсуства"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Group By..."
+msgstr "Групирај По..."
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Allocation Mode"
+msgstr "Мод на Алокација"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,department_id:0
+msgid "Department"
+msgstr "Сектор"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.request_approve_holidays
+msgid "Requests Approve"
+msgstr "Одобри Барања"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Refused"
+msgstr "Одбиени"
+
+#. module: hr_holidays
+#: help:hr.holidays,category_id:0
+msgid "Category of Employee"
+msgstr "Категорија на Вработен"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid " Month-1"
+msgstr " Месец-1"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Brown"
+msgstr "Кафена"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Remaining Days"
+msgstr "Останати Денови"
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee"
+msgstr "По Вработен"
+
+#. module: hr_holidays
+#: help:hr.holidays,employee_id:0
+msgid ""
+"Leave Manager can let this field empty if this leave request/allocation is "
+"for every employee"
+msgstr ""
+"Менаџерот за отсуства може да го остави ова поле празно ако барањето за "
+"отсуство/преместување е за секој вработен"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Set to Draft"
+msgstr "Подеси на нацрт"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Cyan"
+msgstr "Светла Цијан"
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Green"
+msgstr "Светло зелено"
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_id:0
+msgid "Current Leave Type"
+msgstr "Тековен Тип на Отсуство"
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.open_ask_holidays
+msgid ""
+"Leave requests can be recorded by employees and validated by their managers. "
+"Once a leave request is validated, it appears automatically in the agenda of "
+"the employee. You can define several allowance types (paid holidays, "
+"sickness, etc.) and manage allowances per type."
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
+msgid "Summary Of Leaves"
+msgstr "Збир на Отсуства"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: view:hr.holidays:0
+#: selection:hr.holidays,state:0
+msgid "Approved"
+msgstr "Одобрено"
+
+#. module: hr_holidays
+#: field:hr.employee,last_login:0
+msgid "Latest Connection"
+msgstr "Последна Конекција"
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Refuse"
+msgstr "Одбиј"
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid ""
+"You cannot validate leaves for employee %s: too few remaining days (%s)."
+msgstr ""
+"Не можете да валидирате отсуства за вработениот %s: премалку преостанати "
+"денови (%s)."
+
+#. module: hr_holidays
+#: help:hr.holidays,state:0
+msgid ""
+"The state is set to 'Draft', when a holiday request is created. \n"
+"The state is 'Waiting Approval', when holiday request is confirmed by user. "
+" \n"
+"The state is 'Refused', when holiday request is refused by manager. "
+" \n"
+"The state is 'Approved', when holiday request is approved by manager."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_reporting_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
+msgid "Leaves"
+msgstr "Отсуства"
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays
+msgid "Leave"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_request_approve_holidays
+msgid "Leave Requests to Approve"
+msgstr "Барања за отсуства за одобрување"
+
+#. module: hr_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_account_central_journal
+msgid "Leaves by Department"
+msgstr "Отсуства по Сектор"
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Cancelled"
+msgstr "Откажано"
+
+#. module: hr_holidays
+#: help:hr.holidays,type:0
+msgid ""
+"Choose 'Leave Request' if someone wants to take an off-day. \n"
+"Choose 'Allocation Request' if you want to increase the number of leaves "
+"available for someone"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.employee,remaining_leaves:0
+msgid ""
+"Total number of legal leaves allocated to this employee, change this value "
+"to create allocation/leave requests."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,color_name:0
+msgid "Color in Report"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
+msgid "HR Holidays Summary Report By Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id:0
+msgid "This area is automatically filled by the user who validate the leave"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,holiday_status_id:0
+#: field:hr.holidays.remaining.leaves.user,leave_type:0
+#: view:hr.holidays.status:0
+#: field:hr.holidays.status,name:0
+#: field:hr.holidays.summary.dept,holiday_type:0
+#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
+#: model:ir.model,name:hr_holidays.model_hr_holidays_status
+#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
+msgid "Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#: code:addons/hr_holidays/hr_holidays.py:344
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Magenta"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "You have to select at least 1 Department. And try again"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,date_from:0
+#: field:hr.holidays.summary.employee,date_from:0
+msgid "From"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:384
+#, python-format
+msgid "Leave Request for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,remaining_leaves:0
+msgid "Remaining Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
+msgid "Total holidays by type"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: view:hr.holidays:0
+#: field:hr.holidays,employee_id:0
+#: field:hr.holidays.remaining.leaves.user,name:0
+#: model:ir.model,name:hr_holidays.model_hr_employee
+msgid "Employee"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Red"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.remaining.leaves.user:0
+msgid "Leaves by Type"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Salmon"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Wheat"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:resource.calendar.leaves:0
+msgid "Error! leave start-date must be lower then leave end-date."
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:382
+#, python-format
+msgid "Allocation for %s"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,number_of_days:0
+#: field:hr.holidays,number_of_days_temp:0
+msgid "Number of Days"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:377
+#, python-format
+msgid ""
+"The feature behind the field 'Remaining Legal Leaves' can only be used when "
+"there is only one leave type with the option 'Allow to Override Limit' "
+"unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot "
+"decide on which leave type the update has to be done. \n"
+"You may prefer to use the classic menus 'Leave Requests' and 'Allocation "
+"Requests' located in 'Human Resources \\ Leaves' to manage the leave days of "
+"the employees if the configuration does not allow to use this field."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Search Leave Type"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "You have to select an employee or a category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,double_validation:0
+msgid ""
+"When selected, the Allocation/Leave Requests for this type require a second "
+"validation to be approved."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.employee,current_leave_state:0
+#: selection:hr.holidays,state:0
+msgid "Waiting Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,emp:0
+msgid "Employee(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,categ_id:0
+msgid ""
+"If you set a meeting type, OpenERP will create a meeting in the calendar "
+"once a leave is validated."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,linked_request_ids:0
+msgid "Linked Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,parent_id:0
+msgid "Parent"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Lavender"
+msgstr ""
+
+#. module: hr_holidays
+#: xsl:holidays.summary:0
+#: view:hr.holidays:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
+msgid "Leave Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,limit:0
+msgid "Allow to Override Limit"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.employee:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
+msgid "Employee's Holidays"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,max_leaves:0
+msgid ""
+"This value is given by the sum of all holidays requests with a positive "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: view:board.board:0
+msgid "All Employee Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Coral"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
+msgid "Holidays by Department"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Black"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.hr_holidays_leaves_assign_legal
+msgid "Allocate Leaves for Employees"
+msgstr ""
+
+#. module: hr_holidays
+#: field:resource.calendar.leaves,holiday_id:0
+msgid "Holiday"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,case_id:0
+#: field:hr.holidays.status,categ_id:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Ivory"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Both Validated and Confirmed"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,leaves_taken:0
+msgid "Leaves Already Taken"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,user_id:0
+#: field:hr.holidays.remaining.leaves.user,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The start date must be before the end date !"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_holidays
+#: constraint:hr.employee:0
+msgid "Error ! You cannot create recursive Hierarchy of Employees."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+#: field:hr.employee,remaining_leaves:0
+msgid "Remaining Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id:0
+msgid "First Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_unpaid
+msgid "Unpaid"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_company_allocation
+#: model:ir.ui.menu,name:hr_holidays.menu_open_company_allocation
+msgid "Leaves Summary"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Holidays during last month"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:44
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.employee:0
+msgid "Assign Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Blue"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "My Department Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.employee,current_leave_state:0
+msgid "Current Leave Status"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,type:0
+msgid "Request Type"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the leave "
+"type without removing it."
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Misc"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "General"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_comp
+msgid "Compensatory Days"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,notes:0
+msgid "Reasons"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
+#: model:ir.ui.menu,name:hr_holidays.menu_hr_available_holidays_report_tree
+msgid "Leaves Analysis"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,color_name:0
+msgid ""
+"This color will be used in the leaves summary located in Reporting\\Leaves "
+"by Departement"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays.summary.dept,holiday_type:0
+#: selection:hr.holidays.summary.employee,holiday_type:0
+msgid "Validated"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Allocation Request"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_resource_calendar_leaves
+msgid "Leave Detail"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,double_validation:0
+#: field:hr.holidays.status,double_validation:0
+msgid "Apply Double Validation"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.summary.dept:0
+#: view:hr.holidays.summary.employee:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays.status:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_leaves_by_month
+msgid "My Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays,holiday_type:0
+msgid "By Employee Category"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: selection:hr.holidays,type:0
+msgid "Leave Request"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,name:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_cl
+msgid "Legal Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: sql_constraint:hr.holidays:0
+msgid "The number of days must be greater than 0 !"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,holiday_type:0
+msgid ""
+"By Employee: Allocation/Request for individual Employee, By Employee "
+"Category: Allocation/Request for group of employees in category"
+msgstr ""
+
+#. module: hr_holidays
+#: code:addons/hr_holidays/hr_holidays.py:199
+#, python-format
+msgid "You cannot delete a leave which is not in draft state !"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Search Leave"
+msgstr "Пребарај Отсуство"
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.employee,holiday_type:0
+msgid "Select Holiday Type"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.remaining.leaves.user,no_of_leaves:0
+msgid "Remaining leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.summary.dept,depts:0
+msgid "Department(s)"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,manager_id2:0
+msgid "Second Approval"
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays,date_to:0
+msgid "End Date"
+msgstr ""
+
+#. module: hr_holidays
+#: model:hr.holidays.status,name:hr_holidays.holiday_status_sl
+msgid "Sick Leaves"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,limit:0
+msgid ""
+"If you select this checkbox, the system allows the employees to take more "
+"leaves than the available ones for this type."
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays.status,leaves_taken:0
+msgid ""
+"This value is given by the sum of all holidays requests with a negative "
+"value."
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Violet"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.actions.act_window,help:hr_holidays.hr_holidays_leaves_assign_legal
+msgid ""
+"You can assign remaining Legal Leaves for each employee, OpenERP will "
+"automatically create and validate allocation requests."
+msgstr ""
+
+#. module: hr_holidays
+#: field:hr.holidays.status,max_leaves:0
+msgid "Maximum Allowed"
+msgstr ""
+
+#. module: hr_holidays
+#: help:hr.holidays,manager_id2:0
+msgid ""
+"This area is automaticly filled by the user who validate the leave with "
+"second level (If Leave type need second validation)"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Mode"
+msgstr ""
+
+#. module: hr_holidays
+#: model:ir.model,name:hr_holidays.model_hr_holidays_summary_dept
+msgid "HR Holidays Summary Report By Department"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Approve"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: field:hr.holidays,date_from:0
+msgid "Start Date"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+#: model:ir.actions.act_window,name:hr_holidays.open_allocation_holidays
+#: model:ir.ui.menu,name:hr_holidays.menu_open_allocation_holidays
+msgid "Allocation Requests"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Yellow"
+msgstr ""
+
+#. module: hr_holidays
+#: selection:hr.holidays.status,color_name:0
+msgid "Light Pink"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Manager"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Confirm"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_holidays
+#: view:hr.holidays:0
+msgid "To Approve"
+msgstr ""
diff --git a/addons/hr_payroll/i18n/es_MX.po b/addons/hr_payroll/i18n/es_MX.po
index a0f4837d947..24b8d615a63 100644
--- a/addons/hr_payroll/i18n/es_MX.po
+++ b/addons/hr_payroll/i18n/es_MX.po
@@ -1,1759 +1,1119 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Spanish (Mexico) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2010.
+# FIRST AUTHOR , 2012.
#
msgid ""
msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-18 11:08+0000\n"
-"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
-"\n"
-"Language-Team: Spanish \n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-10-10 21:29+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Spanish (Mexico) \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-09-05 05:46+0000\n"
-"X-Generator: Launchpad (build 13830)\n"
+"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n"
+"X-Generator: Launchpad (build 16118)\n"
#. module: hr_payroll
-#: report:employees.salary:0
-msgid "E-mail Address"
-msgstr "Dirección de correo electrónico"
+#: field:hr.payslip.line,condition_select:0
+#: field:hr.salary.rule,condition_select:0
+msgid "Condition Based on"
+msgstr ""
#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Based"
-msgstr "Basado"
+#: selection:hr.contract,schedule_pay:0
+msgid "Monthly"
+msgstr ""
#. module: hr_payroll
-#: field:hr.contract,net:0
-#: field:hr.employee,net:0
-#: field:hr.payroll.register,net:0
-#: field:hr.payslip,net:0
-#: report:salary.structure:0
-msgid "Net Salary"
-msgstr "Salario neto"
+#: view:hr.payslip:0 field:hr.payslip,line_ids:0
+#: model:ir.actions.act_window,name:hr_payroll.act_contribution_reg_payslip_lines
+msgid "Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule_category
+#: report:paylip.details:0
+msgid "Salary Rule Category"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule.category,parent_id:0
+msgid ""
+"Linking a salary category to its parent is used only for the reporting "
+"purpose."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.line:0 view:hr.salary.rule:0
+msgid "Group By..."
+msgstr ""
#. module: hr_payroll
#: view:hr.payslip:0
-msgid "Recompute Sheet"
-msgstr "Recalcular plantilla"
+msgid "States"
+msgstr ""
#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employees Salary Details"
-msgstr "Detalles salario de los empleados"
+#: field:hr.payslip.line,input_ids:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,input_ids:0
+msgid "Inputs"
+msgstr ""
#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Allowances with Basic:"
-msgstr "Primas con base:"
+#: field:hr.payslip.line,parent_rule_id:0
+#: field:hr.salary.rule,parent_rule_id:0
+msgid "Parent Salary Rule"
+msgstr ""
#. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Department"
-msgstr "Departamento"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Deductions:"
-msgstr "Deducciones:"
-
-#. module: hr_payroll
-#: field:company.contribution,gratuity:0
-msgid "Use for Gratuity ?"
-msgstr "¿Uso de propina?"
-
-#. module: hr_payroll
-#: field:hr.contract,working_days_per_week:0
-#: field:hr.payslip,working_days:0
-#: report:payslip.pdf:0
-msgid "Working Days"
-msgstr "Días de trabajo"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan"
-msgstr "Préstamo"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Salary Payment Register"
-msgstr "Registro de pago de nómina"
-
-#. module: hr_payroll
-#: field:hr.employee,slip_ids:0
-#: view:hr.payroll.register:0
-#: field:hr.payroll.register,line_ids:0
+#: field:hr.employee,slip_ids:0 view:hr.payslip:0 view:hr.payslip.run:0
+#: field:hr.payslip.run,slip_ids:0
#: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list
msgid "Payslips"
-msgstr "Nóminas"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_salary_report
-msgid "Year Salary Report"
-msgstr "Informe anual de salarios"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Paid Salary"
-msgstr "Nómina pagada"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "("
-msgstr "("
-
-#. module: hr_payroll
-#: field:company.contribution,company_id:0
-#: field:hr.allounce.deduction.categoty,company_id:0
-#: field:hr.contibution.register,company_id:0
-#: field:hr.holidays.status,company_id:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.register,company_id:0
-#: field:hr.payroll.structure,company_id:0
-#: field:hr.payslip,company_id:0
-msgid "Company"
-msgstr "Compañía"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr "El responsable"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr "Detalles de la carta"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payslip.pdf:0
-msgid ","
-msgstr ","
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Set to Draft"
-msgstr "Cambiar a borrador"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
-#, python-format
-msgid "Variable Error: %s "
-msgstr "Error variable: %s "
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Expire"
-msgstr "Vencimiento"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Half-Pay Holiday"
-msgstr "Vacaciones con media paga"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,other_pay:0
-msgid "Others"
-msgstr "Otros"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,slip_id:0
-#: model:ir.model,name:hr_payroll.model_hr_payslip
-#: report:payslip.pdf:0
-msgid "Pay Slip"
-msgstr "Nómina"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Contract Detail:"
-msgstr "Detalles del contrato:"
-
-#. module: hr_payroll
-#: field:hr.payslip,igross:0
-#: field:hr.payslip,inet:0
-msgid "Calculaton Field"
-msgstr "Campo de cálculo"
-
-#. module: hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-#: help:hr.payroll.register,bank_id:0
-msgid "Select the Bank Address from whcih the salary is going to be paid"
-msgstr "Seleccione la dirección del banco de donde se pagará la nómina."
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-msgid "Bank Advice"
-msgstr "Aviso bancario"
-
-#. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Reject"
-msgstr "Rechazado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Leaves"
-msgstr "Ausencias"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,register_id:0
-#: view:hr.payslip:0
-#: field:hr.payslip,register_id:0
-#: report:payslip.pdf:0
-msgid "Register"
-msgstr "Registro"
-
-#. module: hr_payroll
-#: constraint:hr.employee:0
-msgid ""
-"Error ! You cannot select a department for which the employee is the manager."
msgstr ""
-"¡Error! No puede seleccionar un departamento que tenga el empleado como "
-"responsable."
#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Deductions"
-msgstr "Total deducciones"
+#: field:hr.payroll.structure,parent_id:0
+#: field:hr.salary.rule.category,parent_id:0
+msgid "Parent"
+msgstr ""
#. module: hr_payroll
-#: field:company.contribution.line,value:0
-#: field:hr.payslip.line.line,value:0
-msgid "Value"
-msgstr "Valor"
+#: report:paylip.details:0 report:payslip:0
+msgid "("
+msgstr ""
#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employee"
-msgstr "Nombre del empleado"
+#: field:hr.contribution.register,company_id:0
+#: field:hr.payroll.structure,company_id:0 field:hr.payslip,company_id:0
+#: field:hr.payslip.line,company_id:0 field:hr.salary.rule,company_id:0
+#: field:hr.salary.rule.category,company_id:0
+msgid "Company"
+msgstr ""
#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Register Lines"
-msgstr "Líneas de registro"
+#: view:hr.payslip:0
+msgid "Done Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid ","
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.payslip.run:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_salary_rule
+msgid "hr.salary.rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,payslip_run_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_run
+msgid "Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid ""
+"This wizard will generate payslips for all selected employee(s) based on the "
+"dates and credit note specified on Payslips Run."
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Quantity/Rate"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.input,payslip_id:0 field:hr.payslip.line,slip_id:0
+#: field:hr.payslip.worked_days,payslip_id:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip report:payslip:0
+msgid "Pay Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Generate"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,amount_percentage_base:0
+#: help:hr.salary.rule,amount_percentage_base:0
+msgid "result will be affected to a variable"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "Total:"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules
+msgid "All Children Rules"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule:0
+msgid "Input Data"
+msgstr ""
+
+#. module: hr_payroll
+#: constraint:hr.payslip:0
+msgid "Payslip 'Date From' must be before 'Date To'."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 view:hr.salary.rule.category:0
+msgid "Notes"
+msgstr ""
#. module: hr_payroll
#: view:hr.payslip:0
msgid "Salary Computation"
-msgstr "Cálculo de la nómina"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,amount:0
-#: report:payroll.advice:0
-#: report:salary.structure:0
-msgid "Amount"
-msgstr "Importe"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Please check configuration of %s, payroll head is missing"
msgstr ""
-"Por favor, compruebe la configuración de %s, falta la cabecera de la nómina"
#. module: hr_payroll
-#: selection:company.contribution,amount_type:0
-msgid "Percentage"
-msgstr "Porcentaje"
+#: report:contribution.register.lines:0 field:hr.payslip.input,amount:0
+#: field:hr.payslip.line,amount:0 report:paylip.details:0 report:payslip:0
+msgid "Amount"
+msgstr ""
#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-msgid "Other Information"
-msgstr "Otra información"
-
-#. module: hr_payroll
-#: field:hr.passport,country_id:0
-msgid "Country of Issue"
-msgstr "País de emisión"
-
-#. module: hr_payroll
-#: field:hr.contibution.register.line,emp_deduction:0
-msgid "Employee Deduction"
-msgstr "Deducción del empleado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Deduction"
-msgstr "Otras deducciones"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Paid Holiday"
-msgstr "Vacaciones pagada"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.passport:0
-#: view:hr.payslip:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: hr_payroll
-#: field:hr.passport,date_expire:0
-msgid "Passport Expire Date"
-msgstr "Fecha expiración pasaporte"
-
-#. module: hr_payroll
-#: selection:hr.holidays.status,type:0
-msgid "Un-Paid Holiday"
-msgstr "Vacaciones no pagadas"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Valid From"
-msgstr "Válido desde"
-
-#. module: hr_payroll
-#: help:hr.payslip,igross:0
-#: help:hr.payslip,inet:0
-msgid ""
-"Calculation field used for internal calculation, do not place this on form"
-msgstr "Campo usado en cálculos internos, no lo coloque en un formulario."
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Amount (in words) :"
-msgstr "Importe (en palabras):"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,type:0
-msgid "Payment"
-msgstr "Pago"
-
-#. module: hr_payroll
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: field:hr.payslip,line_ids:0
-#: view:hr.payslip.line:0
+#: view:hr.payslip:0 view:hr.payslip.line:0
#: model:ir.model,name:hr_payroll.model_hr_payslip_line
msgid "Payslip Line"
-msgstr "Línea de nómina"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Identification No"
-msgstr "Nº identificación"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,base:0
-msgid "Based on"
-msgstr "Basado en"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for Verification"
-msgstr "Esperando verificación"
-
-#. module: hr_payroll
-#: model:ir.module.module,shortdesc:hr_payroll.module_meta_information
-msgid "Human Resource Payroll"
-msgstr "Nóminas de recursos humanos"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Total:"
-msgstr "Total:"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Posted"
-msgstr "Fijado"
-
-#. module: hr_payroll
-#: model:ir.module.module,description:hr_payroll.module_meta_information
-msgid ""
-"Generic Payroll system\n"
-" * Employee Details\n"
-" * Employee Contracts\n"
-" * Passport based Contract\n"
-" * Allowances / Deductions\n"
-" * Allow to configure Basic / Grows / Net Salary\n"
-" * Employee Payslip\n"
-" * Monthly Payroll Register\n"
-" * Integrated with Holiday Management\n"
-" "
msgstr ""
-"Sistema de nóminas genérico\n"
-" * Detalles de empleado\n"
-" * Contratos de empleado\n"
-" * Contratos basados en pasaportes\n"
-" * Complementos/deducciones\n"
-" * Permite configurar salario base/bruto/neto\n"
-" * Nómina de empleado\n"
-" * Registro mensual de nóminas\n"
-" * Integrado con la gestión de vacaciones\n"
-" "
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_holidays_status
-msgid "Leave Type"
-msgstr "Tipo de ausencia"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Date :"
-msgstr "Fecha :"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,total:0
-msgid "Sub Total"
-msgstr "Subtotal"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Payments -"
-msgstr "Pagos -"
-
-#. module: hr_payroll
-#: field:hr.contract,visa_no:0
-msgid "Visa No"
-msgstr "Número de Visa"
-
-#. module: hr_payroll
-#: field:company.contribution.line,from_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,from_val:0
-#: report:year.salary:0
-msgid "From"
-msgstr "Desde"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr "Por salario"
-
-#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_to:0
-#: field:hr.payroll.year.salary,date_to:0
-#: report:salary.structure:0
-msgid "End Date"
-msgstr "Fecha final"
-
-#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.salary_payslip
-msgid "Employee PaySlip"
-msgstr "Nómina del empleado"
-
-#. module: hr_payroll
-#: field:hr.payslip,leaves:0
-msgid "Leave Deductions"
-msgstr "Deducciones por ausencia"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "Authorised Signature"
-msgstr "Firma autorizada"
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Function Value"
-msgstr "Valor de función"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register_line
-msgid "Contribution Register Line"
-msgstr "Línea de registro de contribución"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Notes:"
-msgstr "Notas:"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:hr.payroll.register,state:0
-#: field:hr.payslip,state:0
-msgid "State"
-msgstr "Estado"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Paymeny Lines"
-msgstr "Líneas de pago"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Other Lines"
-msgstr "Otras líneas"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-msgid "Function Arguments"
-msgstr "Argumentos de la función"
+msgid "Other Information"
+msgstr ""
#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_company_contribution_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_company_contribution_tree
-msgid "Company Contributions"
-msgstr "Contribuciones de la compañía"
+#: help:hr.payslip.line,amount_select:0 help:hr.salary.rule,amount_select:0
+msgid "The computation method for the rule amount."
+msgstr ""
#. module: hr_payroll
-#: field:hr.contibution.register.line,employee_id:0
-#: field:hr.passport,employee_id:0
-#: field:hr.payroll.advice.line,employee_id:0
-#: field:hr.payslip,employee_id:0
-#: field:hr.payslip.line,employee_id:0
+#: view:payslip.lines.contribution.register:0
+msgid "Contribution Register's Payslip Lines"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Details by Salary Rule Category:"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Note"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payroll.structure,code:0 field:hr.payslip,number:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Draft Slip"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:422
+#, python-format
+msgid "Normal Working Days paid at 100%"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_max:0
+#: field:hr.salary.rule,condition_range_max:0
+msgid "Maximum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0 report:payslip:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,struct_id:0
+msgid "Structure"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.employee,total_wage:0
+msgid "Sum of all current contract's wage of employee."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Total Working Days"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,code:0 help:hr.salary.rule,code:0
+msgid ""
+"The code of salary rules can be used as reference in computation of other "
+"rules. In that case, it is case sensitive."
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Weekly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,rate:0
+msgid "Rate (%)"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0
+msgid "Confirm"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_report
+msgid "Employee PaySlip"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_range_max:0
+#: help:hr.salary.rule,condition_range_max:0
+msgid "The maximum amount, applied for this rule."
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,condition_python:0
+#: help:hr.salary.rule,condition_python:0
+msgid ""
+"Applied this rule for calculation if condition is true. You can specify "
+"condition like basic > 1000."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.employees:0
+msgid "Payslips by Employees"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Quarterly"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,state:0 field:hr.payslip.run,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.salary.rule,quantity:0
+msgid ""
+"It is used in computation for percentage and fixed amount.For e.g. A rule "
+"for Meal Voucher having fixed amount of 1€ per worked day can have its "
+"quantity defined in expression like worked_days.WORK100.number_of_days."
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Search Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip,employee_id:0 field:hr.payslip.line,employee_id:0
#: model:ir.model,name:hr_payroll.model_hr_employee
msgid "Employee"
-msgstr "Empleado"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payslip.line,base:0
-msgid "Formula"
-msgstr "Fórmula"
+#: selection:hr.contract,schedule_pay:0
+msgid "Semi-annually"
+msgstr ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr "Líneas de notificación bancaria"
+#: view:hr.salary.rule:0
+msgid "Children Definition"
+msgstr ""
#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,type:0
-#: field:hr.payslip.line,type:0
-#: report:salary.structure:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0 report:payslip:0
msgid "Email"
-msgstr "Correo electrónico"
+msgstr ""
#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "#"
-msgstr "#"
+#: view:hr.payslip.run:0
+msgid "Search Payslip Batches"
+msgstr ""
#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
-#: code:addons/hr_payroll/hr_payroll.py:1225
-#, python-format
-msgid "Error !"
-msgstr "¡ Error !"
+#: field:hr.payslip.line,amount_percentage_base:0
+#: field:hr.salary.rule,amount_percentage_base:0
+msgid "Percentage based on"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Verify Sheet"
-msgstr "Comprobar hoja"
+#: help:hr.payslip.line,amount_percentage:0
+#: help:hr.salary.rule,amount_percentage:0
+msgid "For example, enter 50.0 to apply a percentage of 50%"
+msgstr ""
#. module: hr_payroll
-#: help:hr.contract,working_days_per_week:0
-msgid "No of Working days / week for an employee"
-msgstr "Número de días/semanas trabajados para un empleado."
+#: field:hr.payslip,paid:0
+msgid "Made Payment Order ? "
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Lines by Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,state:0
+msgid ""
+"* When the payslip is created the state is 'Draft'. \n"
+"* If the payslip is under verification, the state is 'Waiting'. "
+"\n"
+"* If the payslip is confirmed then state is set to 'Done'. \n"
+"* When user cancel payslip the state is 'Rejected'."
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.worked_days,number_of_days:0
+msgid "Number of Days"
+msgstr ""
#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
#: selection:hr.payslip,state:0
-msgid "New Slip"
-msgstr "Nuevo justificante"
+msgid "Rejected"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payslip,basic:0
-msgid "Net Basic"
-msgstr "Base neta"
+#: view:hr.payroll.structure:0 field:hr.payroll.structure,rule_ids:0
+#: view:hr.salary.rule:0
+#: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form
+msgid "Salary Rules"
+msgstr ""
#. module: hr_payroll
-#: field:hr.contract,gross:0
-#: field:hr.employee,gross:0
-#: field:hr.payroll.register,grows:0
-#: field:hr.payslip,grows:0
-#: report:salary.structure:0
-msgid "Gross Salary"
-msgstr "Salario bruto"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Total Earnings"
-msgstr "Ingresos totales"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_employees_detail
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_employees_detail
-msgid "Employee Salary Statement"
-msgstr "Declaración salario del empleado"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Other Payment"
-msgstr "Otros pagos"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_net:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Deductions"
-msgstr "Deducciones"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr "C/D"
-
-#. module: hr_payroll
-#: field:hr.contract,permit_no:0
-msgid "Work Permit No"
-msgstr "Nº permiso trabajo"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr "Salario empleado"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-msgid "Chaque Nos"
-msgstr "Cada uno de nuestros"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_emp:0
-msgid "Total By Employee"
-msgstr "Total por empleado"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-#: selection:company.contribution.line,amount_type:0
-#: selection:hr.payslip.line,amount_type:0
-#: selection:hr.payslip.line.line,amount_type:0
-msgid "Fixed Amount"
-msgstr "Importe fijo"
-
-#. module: hr_payroll
-#: field:company.contribution.line,to_val:0
-#: report:employees.salary:0
-#: field:hr.payslip.line.line,to_val:0
-#: report:year.salary:0
-msgid "To"
-msgstr "Para"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:180
-#: code:addons/hr_payroll/hr_payroll.py:195
-#: code:addons/hr_payroll/hr_payroll.py:285
-#: code:addons/hr_payroll/hr_payroll.py:835
-#: code:addons/hr_payroll/hr_payroll.py:1111
-#: code:addons/hr_payroll/hr_payroll.py:1126
-#: code:addons/hr_payroll/hr_payroll.py:1410
+#: code:addons/hr_payroll/hr_payroll.py:337
#, python-format
-msgid "Variable Error !"
-msgstr "¡Error de variable!"
+msgid "Refund: "
+msgstr ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_employees_detail
-msgid "hr.payroll.employees.detail"
-msgstr "rrhh.nomina.empleados.detalle"
+#: model:ir.model,name:hr_payroll.model_payslip_lines_contribution_register
+msgid "PaySlip Lines by Contribution Registers"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+msgid "Done"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,appears_on_payslip:0
+#: field:hr.salary.rule,appears_on_payslip:0
+msgid "Appears on Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_fix:0
+#: selection:hr.payslip.line,amount_select:0 field:hr.salary.rule,amount_fix:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Fixed Amount"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,active:0 help:hr.salary.rule,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the salary "
+"rule without removing it."
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.register:0
#: view:hr.payslip:0
-msgid "Pay Salary"
-msgstr "Pagar nómina"
+msgid "Worked Days & Inputs"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payroll.advice.line,name:0
-msgid "Bank Account A/C"
-msgstr "Cuenta bancaria"
+#: field:hr.payslip,details_by_salary_rule_category:0
+msgid "Details by Salary Rule Category"
+msgstr ""
#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Contribution Lines"
-msgstr "Líneas de contribución"
+#: model:ir.actions.act_window,name:hr_payroll.action_payslip_lines_contribution_register
+msgid "PaySlip Lines"
+msgstr ""
#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "For the month of"
-msgstr "Para el mes de"
+#: help:hr.payslip.line,register_id:0 help:hr.salary.rule,register_id:0
+msgid "Eventual third party involved in the salary payment of the employees."
+msgstr ""
#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,deduction:0
-#: report:hr.payroll.register.sheet:0
-#: field:hr.payslip,deduction:0
-#: selection:hr.payslip.line,type:0
-msgid "Deduction"
-msgstr "Deducción"
+#: field:hr.payslip.worked_days,number_of_hours:0
+msgid "Number of Hours"
+msgstr ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice Note"
-msgstr "Observación aviso bancario"
+#: view:hr.payslip:0
+msgid "PaySlip Batch"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range_min:0
+#: field:hr.salary.rule,condition_range_min:0
+msgid "Minimum Range"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,child_ids:0 field:hr.salary.rule,child_ids:0
+msgid "Child Salary Rule"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_to:0
+#: field:hr.payslip.run,date_end:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_to:0
+msgid "Date To"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Range"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_tree
+msgid "Salary Structures Hierarchy"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.register:0
#: view:hr.payslip:0
msgid "Payslip"
-msgstr "Nómina"
+msgstr ""
#. module: hr_payroll
#: constraint:hr.contract:0
msgid "Error! contract start-date must be lower then contract end-date."
msgstr ""
-"¡Error! La fecha de inicio de contrato debe ser menor que la fecha de "
-"finalización."
#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Loan Installment"
-msgstr "Entrega anticipo"
+#: view:hr.contract:0
+msgid "Payslip Info"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Complete HR Checking"
-msgstr "Comprobación RH completa"
+#: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines
+msgid "Payslip Computation Details"
+msgstr ""
#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr "Atentamente"
+#: code:addons/hr_payroll/hr_payroll.py:872
+#, python-format
+msgid "Wrong python code defined for salary rule %s (%s) "
+msgstr ""
#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr "Nº SS"
+#: model:ir.model,name:hr_payroll.model_hr_payslip_input
+msgid "Payslip Input"
+msgstr ""
#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Net Amount"
-msgstr "Importe neto"
+#: view:hr.salary.rule.category:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category
+msgid "Salary Rule Categories"
+msgstr ""
#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary Structure:"
-msgstr "Estructura salarial:"
+#: help:hr.payslip.input,contract_id:0
+#: help:hr.payslip.worked_days,contract_id:0
+msgid "The contract for which applied this input"
+msgstr ""
#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_employees_detail
-msgid "Employees Salary Detail"
-msgstr "Detalle salario empleado"
+#: view:hr.salary.rule:0
+msgid "Computation"
+msgstr ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payslip_line_line
-msgid "Function Line"
-msgstr "Línea de función"
+#: help:hr.payslip.input,amount:0
+msgid ""
+"It is used in computation. For e.g. A rule for sales having 1% commission of "
+"basic salary for per product can defined in expression like result = "
+"inputs.SALEURO.amount * contract.wage*0.01."
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Confirm Sheet"
-msgstr "Hoja de confirmación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Others:"
-msgstr "Otros:"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: selection:company.contribution,amount_type:0
-msgid "Function Calculation"
-msgstr "Función de cálculo"
-
-#. module: hr_payroll
-#: field:hr.payslip,worked_days:0
-#: report:payslip.pdf:0
-msgid "Worked Day"
-msgstr "Días trabajados"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,monthly_total_by_comp:0
-msgid "Total By Company"
-msgstr "Total por compañía"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice.line,flag:0
-msgid "D/C"
-msgstr "D/C"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country & Address"
-msgstr "País y Dirección"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Employee Code"
-msgstr "Código de empleado"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary – Leaves"
-msgstr "Salario base - Ausencias"
-
-#. module: hr_payroll
-#: field:company.contribution,amount_type:0
-#: field:company.contribution.line,amount_type:0
-#: field:hr.payslip.line,amount_type:0
-#: field:hr.payslip.line.line,amount_type:0
-#: report:salary.structure:0
+#: view:hr.payslip.line:0 field:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_select:0
msgid "Amount Type"
-msgstr "Tipo de importe"
+msgstr ""
#. module: hr_payroll
-#: view:company.contribution:0
-#: field:hr.payslip.line,category_id:0
+#: field:hr.payslip.line,category_id:0 view:hr.salary.rule:0
+#: field:hr.salary.rule,category_id:0
msgid "Category"
-msgstr "Categoría"
+msgstr ""
#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.payslip.line,company_contrib:0
-#: model:ir.model,name:hr_payroll.model_company_contribution
-msgid "Company Contribution"
-msgstr "Contribución compañía"
+#: help:hr.payslip.run,credit_note:0
+msgid ""
+"If its checked, indicates that all payslips generated from here are refund "
+"payslips."
+msgstr ""
#. module: hr_payroll
-#: field:company.contribution,category_id:0
-msgid "Heads"
-msgstr "Cabeceras"
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_structure_list_form
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_structure_view
+msgid "Salary Structures"
+msgstr ""
#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.year_payroll_register
-msgid "Print Statement"
-msgstr "Imprimir declaración"
+#: view:hr.payslip.run:0
+msgid "Draft Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip:0 selection:hr.payslip,state:0 view:hr.payslip.run:0
+#: selection:hr.payslip.run,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip,date_from:0
+#: field:hr.payslip.run,date_start:0 report:paylip.details:0 report:payslip:0
+#: field:payslip.lines.contribution.register,date_from:0
+msgid "Date From"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+msgid "Done Payslip Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Payslip Lines by Contribution Register:"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
+msgid "Conditions"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,amount_percentage:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_percentage:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Percentage (%)"
+msgstr ""
#. module: hr_payroll
#: view:hr.payslip:0
-msgid "Draft"
-msgstr "Borrador"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Earnings"
-msgstr "Ingresos"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Basic"
-msgstr "Básico"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_passport_tree
-msgid "All Passports"
-msgstr "Todos los pasaportes"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_hr_payroll_year_salary
-#: model:ir.ui.menu,name:hr_payroll.menu_wizard_print_year_salary
-msgid "Salary Register"
-msgstr "Registro salarial"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: report:hr.payroll.register.sheet:0
-msgid "Employee Name"
-msgstr "Nombre del empleado"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_passport
-msgid "Passport Detail"
-msgstr "Detalle pasaporte"
-
-#. module: hr_payroll
-#: selection:hr.payslip.line,amount_type:0
-msgid "Percentage (%)"
-msgstr "Porcentaje (%)"
-
-#. module: hr_payroll
-#: field:hr.payroll.advice,register_id:0
-#: view:hr.payroll.register:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payroll_register_form
-#: model:ir.model,name:hr_payroll.model_hr_payroll_register
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payroll_register
-msgid "Payroll Register"
-msgstr "Registro de nóminas"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-#: report:payroll.advice:0
-msgid "For"
-msgstr "Para"
-
-#. module: hr_payroll
-#: field:hr.passport,contracts_ids:0
-msgid "Contracts"
-msgstr "Contratos"
+msgid "Worked Day"
+msgstr ""
#. module: hr_payroll
#: view:hr.payroll.structure:0
msgid "Employee Function"
-msgstr "Función del empleado"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Paid"
-msgstr "Pagado"
-
-#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Approve Sheet"
-msgstr "Aprobar hoja"
-
-#. module: hr_payroll
-#: field:hr.payslip,paid:0
-msgid "Paid ? "
-msgstr "¿Pagado? "
-
-#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Validation"
-msgstr "Validación"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-msgid "Title"
-msgstr "Título"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-msgid "Search Company Contribution"
-msgstr "Buscar contribución de la compañía"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,user_id:0
-msgid "User"
-msgstr "Usuario"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr "Líneas de pago"
+#: field:hr.payslip,credit_note:0 field:hr.payslip.run,credit_note:0
+msgid "Credit Note"
+msgstr ""
#. module: hr_payroll
#: view:hr.payslip:0
msgid "Compute Sheet"
-msgstr "Calcular hoja"
+msgstr ""
#. module: hr_payroll
-#: field:company.contribution,active:0
-#: field:hr.payroll.register,active:0
+#: field:hr.payslip.line,active:0 field:hr.salary.rule,active:0
msgid "Active"
-msgstr "Activo"
+msgstr ""
#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,condition:0
-msgid "Applied this head for calculation if condition is true"
-msgstr "Aplicar este encabezado en el cálculo si la condición es verdadera"
-
-#. module: hr_payroll
-#: report:year.salary:0
-msgid "Yearly Salary Details"
-msgstr "Detalles del salario anual"
+#: view:hr.salary.rule:0
+msgid "Child Rules"
+msgstr ""
#. module: hr_payroll
#: constraint:hr.employee:0
msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "¡Error! No se puede crear una jerarquía recursiva de empleados."
+msgstr ""
#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,condition:0
-msgid "Condition"
-msgstr "Condición"
+#: model:ir.actions.report.xml,name:hr_payroll.payslip_details_report
+msgid "PaySlip Details"
+msgstr ""
#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
-#: selection:hr.payslip,state:0
-msgid "Wating for HR Verification"
-msgstr "Esperando verificación de RRHH"
+#: help:hr.payslip.line,condition_range_min:0
+#: help:hr.salary.rule,condition_range_min:0
+msgid "The minimum amount, applied for this rule."
+msgstr ""
#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice:"
-msgstr "Aviso de pago:"
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Python Expression"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Compute"
-msgstr "Calcular"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payslip,deg_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:paylip.details:0 report:payslip:0
msgid "Designation"
-msgstr "Designación"
+msgstr ""
#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "HR Manager"
-msgstr "Responsable de RRHH"
+#: code:addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.py:52
+#, python-format
+msgid "You must select employee(s) to generate payslip(s)"
+msgstr ""
#. module: hr_payroll
-#: field:hr.contract,basic:0
-#: field:hr.employee,basic:0
-#: field:hr.payslip,basic_before_leaves:0
-#: report:payslip.pdf:0
-msgid "Basic Salary"
-msgstr "Salario base"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,code:0
-msgid "Category Code"
-msgstr "Código categoría"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Salary Information"
-msgstr "Información del salario"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty_line
-msgid "Allowance Deduction Categoty"
-msgstr "Categoría prima/deducción"
+#: code:addons/hr_payroll/hr_payroll.py:861
+#, python-format
+msgid "Wrong quantity defined for salary rule %s (%s)"
+msgstr ""
#. module: hr_payroll
#: view:hr.payslip:0
msgid "Companies"
-msgstr "Compañías"
+msgstr ""
#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0 report:payslip:0
msgid "Authorized Signature"
-msgstr "Firma autorizada"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payslip,contract_id:0
+#: field:hr.payslip,contract_id:0 field:hr.payslip.input,contract_id:0
+#: field:hr.payslip.line,contract_id:0
+#: field:hr.payslip.worked_days,contract_id:0
#: model:ir.model,name:hr_payroll.model_hr_contract
msgid "Contract"
-msgstr "Contrato"
+msgstr ""
#. module: hr_payroll
-#: selection:hr.payroll.advice,state:0
-msgid "Draft Sheet"
-msgstr "Hoja borrador"
+#: report:paylip.details:0 report:payslip:0
+msgid "Credit"
+msgstr ""
#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Next Month Date"
-msgstr "Fecha próximo mes"
+#: field:hr.contract,schedule_pay:0
+msgid "Scheduled Pay"
+msgstr ""
#. module: hr_payroll
-#: field:hr.contibution.register.line,date:0
-#: field:hr.payroll.advice,date:0
-#: field:hr.payroll.register,date:0
-#: field:hr.payslip,date:0
-msgid "Date"
-msgstr "Fecha"
+#: code:addons/hr_payroll/hr_payroll.py:861
+#: code:addons/hr_payroll/hr_payroll.py:866
+#: code:addons/hr_payroll/hr_payroll.py:872
+#: code:addons/hr_payroll/hr_payroll.py:889
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Error"
+msgstr ""
#. module: hr_payroll
-#: field:hr.contract,visa_expire:0
-msgid "Visa Expire Date"
-msgstr "Fecha expiración visado"
+#: field:hr.payslip.line,condition_python:0
+#: field:hr.salary.rule,condition_python:0
+msgid "Python Condition"
+msgstr ""
#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Search Passport"
-msgstr "Buscar pasaporte"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Phone No."
-msgstr "Nº Teléfono"
-
-#. module: hr_payroll
-#: field:company.contribution,contribute_per:0
-#: field:company.contribution.line,contribution_id:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.contibution.register:0
-#: view:hr.contibution.register.line:0
+#: view:hr.contribution.register:0
msgid "Contribution"
-msgstr "Contribución"
+msgstr ""
#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,state:0
-msgid "Label"
-msgstr "Etiqueta"
+#: code:addons/hr_payroll/hr_payroll.py:347
+#, python-format
+msgid "Refund Payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.rule.input,input_id:0
+#: model:ir.model,name:hr_payroll.model_hr_rule_input
+msgid "Salary Rule Input"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:895
+#, python-format
+msgid "Wrong python condition defined for salary rule %s (%s)"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.payslip.line,quantity:0 field:hr.salary.rule,quantity:0
+msgid "Quantity"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.structure:0
#: view:hr.payslip:0
-#: view:hr.payslip.line:0
+msgid "Refund"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.salary.rule:0
msgid "Company Contribution"
-msgstr "Contribución compañía"
+msgstr ""
#. module: hr_payroll
-#: report:employees.salary:0
-#: report:salary.structure:0
-msgid "Other No."
-msgstr "Otro Nº"
-
-#. module: hr_payroll
-#: field:company.contribution,code:0
-#: field:hr.contibution.register.line,code:0
-#: field:hr.holidays.status,code:0
-#: field:hr.payroll.structure,code:0
-#: field:hr.payslip.line,code:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
+#: report:contribution.register.lines:0 field:hr.payslip.input,code:0
+#: field:hr.payslip.line,code:0 field:hr.payslip.worked_days,code:0
+#: field:hr.rule.input,code:0 field:hr.salary.rule,code:0
+#: field:hr.salary.rule.category,code:0 report:paylip.details:0
+#: report:payslip:0
msgid "Code"
-msgstr "Código"
-
-#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:hr_payroll.hr_menu_payment_advice
-msgid "Payment Advice"
-msgstr "Aviso de pago"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Number :"
-msgstr "Número :"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,base:0
-msgid ""
-"This will use to computer the % fields values, in general its on basic, but "
-"You can use all heads code field in small letter as a variable name i.e. "
-"hra, ma, lta, etc...., also you can use, static varible basic"
msgstr ""
-"Esto se utiliza para calcular los valores de los campos %, en general en su "
-"base, pero puede utilizar todas las cabeceras de los campos de código en "
-"letra pequeña como un nombre de variable, por ejemplo hra, ma, lta, etc., "
-"también puede utilizar variable estática básica."
#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Computation Overview"
-msgstr "Resumen del cálculo"
+#: field:hr.payslip.line,amount_python_compute:0
+#: selection:hr.payslip.line,amount_select:0
+#: field:hr.salary.rule,amount_python_compute:0
+#: selection:hr.salary.rule,amount_select:0
+msgid "Python Code"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payroll.year.salary,salary_on:0
-msgid "Salary On"
-msgstr "Salario sobre"
+#: field:hr.payslip.input,sequence:0 field:hr.payslip.line,sequence:0
+#: field:hr.payslip.worked_days,sequence:0 field:hr.salary.rule,sequence:0
+msgid "Sequence"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payroll.advice,number:0
-#: field:hr.payroll.register,number:0
-#: field:hr.payslip,number:0
-msgid "Number"
-msgstr "Número"
+#: report:contribution.register.lines:0 report:paylip.details:0
+msgid "Register Name"
+msgstr ""
#. module: hr_payroll
-#: field:hr.contract,struct_id:0
-#: field:hr.employee,line_ids:0
-#: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,line_ids:0
-#: view:hr.payslip:0
+#: view:hr.salary.rule:0
+msgid "General"
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:664
+#, python-format
+msgid "Salary Slip of %s for %s"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.model,name:hr_payroll.model_hr_payslip_employees
+msgid "Generate payslips for all selected employees"
+msgstr ""
+
+#. module: hr_payroll
+#: field:hr.contract,struct_id:0 view:hr.payroll.structure:0 view:hr.payslip:0
#: view:hr.payslip.line:0
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_employee_grade_form
-#: model:ir.actions.report.xml,name:hr_payroll.salary_structure_register
#: model:ir.model,name:hr_payroll.model_hr_payroll_structure
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_employee_function
msgid "Salary Structure"
-msgstr "Estructura salarial"
-
-#. module: hr_payroll
-#: field:hr.contibution.register,register_line_ids:0
-msgid "Register Line"
-msgstr "Línea registro"
-
-#. module: hr_payroll
-#: view:hr.payroll.register:0
-#: view:hr.payslip:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: hr_payroll
-#: field:hr.payslip.line,amount:0
-msgid "Amount / Percentage"
-msgstr "Importe / Porcentaje"
-
-#. module: hr_payroll
-#: field:hr.employee,advantages_gross:0
-#: report:hr.payroll.register.sheet:0
-#: report:salary.structure:0
-msgid "Allowances"
-msgstr "Primas"
-
-#. module: hr_payroll
-#: selection:hr.payroll.year.salary,salary_on:0
-msgid "Current Month Date"
-msgstr "Fecha mes actual"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Salary"
-msgstr "Salario"
-
-#. module: hr_payroll
-#: field:hr.contract,passport_id:0
-#: field:hr.passport,name:0
-msgid "Passport No"
-msgstr "Número de pasaporte"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Passport"
-msgstr "Pasaporte"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Total Salary"
-msgstr "Salario total"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "for period"
-msgstr "por periodo"
-
-#. module: hr_payroll
-#: field:hr.holidays.status,head_id:0
-msgid "Payroll Head"
-msgstr "Cabecera nómina"
-
-#. module: hr_payroll
-#: field:company.contribution,register_id:0
-#: model:ir.actions.act_window,name:hr_payroll.action_contibution_register_form
-#: model:ir.model,name:hr_payroll.model_hr_contibution_register
-#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contibution_register_form
-msgid "Contribution Register"
-msgstr "Registro de contribución"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "E-mail"
-msgstr "Correo electrónico"
-
-#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: model:ir.actions.act_window,name:hr_payroll.hr_allounce_deduction_tree
-#: model:ir.ui.menu,name:hr_payroll.menu_hr_allounce_deduction_tree
-msgid "Salary Heads"
-msgstr "Cabeceras salario"
-
-#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Print Report"
-msgstr "Imprimir informe"
-
-#. module: hr_payroll
-#: field:company.contribution,line_ids:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,line_ids:0
-msgid "Calculations"
-msgstr "Cálculos"
-
-#. module: hr_payroll
-#: help:company.contribution,contribute_per:0
-msgid ""
-"Define Company contribution ratio 1.00=100% contribution, If Employee "
-"Contribute 5% then company will and here 0.50 defined then company will "
-"contribute 50% on employee 5% contribution"
msgstr ""
-"Define el ratio de contribución de la compañía 1,00=100% de la contribución. "
-"Si el empleado contribuye con el 5%, entonces si aquí la compañía tiene un "
-"ratio de 0.50, la compañía contribuirá con el 50% del 5% de la contribución "
-"del empleado."
#. module: hr_payroll
-#: view:hr.payslip:0
-msgid "Other Informations"
-msgstr "Otra información"
+#: field:hr.contribution.register,register_line_ids:0
+msgid "Register Line"
+msgstr ""
#. module: hr_payroll
-#: view:hr.contibution.register:0
-msgid "Month"
-msgstr "Mes"
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: view:payslip.lines.contribution.register:0
+msgid "Cancel"
+msgstr ""
#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Issue"
-msgstr "Incidencia"
+#: view:hr.payslip.run:0 selection:hr.payslip.run,state:0
+msgid "Close"
+msgstr ""
#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-msgid "Dynamic Computation"
-msgstr "Cálculo Dinámico"
+#: help:hr.payslip,struct_id:0
+msgid ""
+"Defines the rules that have to be applied to this payslip, accordingly to "
+"the contract chosen. If you let empty the field contract, this field isn't "
+"mandatory anymore and thus the rules applied will be all the rules set on "
+"the structure of all contracts of the employee valid for the chosen period"
+msgstr ""
#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Basic Salary without Leave:"
-msgstr "Salario base sin ausencias:"
+#: field:hr.payroll.structure,children_ids:0
+#: field:hr.salary.rule.category,children_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip,credit_note:0
+msgid "Indicates this payslip has a refund of another"
+msgstr ""
+
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-monthly"
+msgstr ""
+
+#. module: hr_payroll
+#: report:paylip.details:0
+msgid "Pay Slip Details"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
+#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
+msgid "Employee Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0 field:hr.payslip.line,register_id:0
+#: field:hr.salary.rule,register_id:0
+#: model:ir.model,name:hr_payroll.model_hr_contribution_register
+msgid "Contribution Register"
+msgstr ""
+
+#. module: hr_payroll
+#: view:payslip.lines.contribution.register:0
+msgid "Print"
+msgstr ""
+
+#. module: hr_payroll
+#: model:ir.actions.act_window,help:hr_payroll.action_contribution_register_form
+msgid ""
+"A contribution register is a third party involved in the salary payment of "
+"the employees. It can be the social security, the estate or anyone that "
+"collect or inject money on payslips."
+msgstr ""
+
+#. module: hr_payroll
+#: code:addons/hr_payroll/hr_payroll.py:889
+#, python-format
+msgid "Wrong range condition defined for salary rule %s (%s)"
+msgstr ""
#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: view:hr.payroll.structure:0
-#: view:hr.payslip:0
#: view:hr.payslip.line:0
-#: field:hr.payslip.line,function_id:0
-msgid "Function"
-msgstr "Función"
+msgid "Calculations"
+msgstr ""
#. module: hr_payroll
#: view:hr.payslip:0
-msgid "States"
-msgstr "Estados"
+msgid "Worked Days"
+msgstr ""
#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Apreciado Sr./Sra.,"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_allounce_deduction_categoty
-msgid "Allowance Deduction Heads"
-msgstr "Cabeceras prima/deducción"
-
-#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Gross Sal."
-msgstr "Sal. bruto"
-
-#. module: hr_payroll
-#: view:company.contribution:0
-#: field:company.contribution,note:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,note:0
-#: view:hr.contibution.register:0
-#: field:hr.contibution.register,note:0
-#: view:hr.passport:0
-#: field:hr.passport,note:0
-#: field:hr.payroll.advice,note:0
-#: field:hr.payroll.register,note:0
-#: view:hr.payroll.structure:0
-#: field:hr.payroll.structure,note:0
#: view:hr.payslip:0
-#: field:hr.payslip,note:0
-#: view:hr.payslip.line:0
-#: field:hr.payslip.line,note:0
+msgid "Search Payslips"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_run_tree
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_payslip_run
+msgid "Payslips Batches"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.contribution.register:0 field:hr.contribution.register,note:0
+#: field:hr.payroll.structure,note:0 field:hr.payslip,name:0
+#: field:hr.payslip,note:0 field:hr.payslip.input,name:0
+#: view:hr.payslip.line:0 field:hr.payslip.line,note:0
+#: field:hr.payslip.worked_days,name:0 field:hr.rule.input,name:0
+#: view:hr.salary.rule:0 field:hr.salary.rule,note:0
+#: field:hr.salary.rule.category,note:0
msgid "Description"
-msgstr "Descripción"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payroll.employees.detail,date_from:0
-#: field:hr.payroll.year.salary,date_from:0
-#: report:salary.structure:0
-msgid "Start Date"
-msgstr "Fecha inicio"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Deduction -"
-msgstr "Deducción -"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
+#: report:paylip.details:0 report:payslip:0
msgid ")"
-msgstr ")"
+msgstr ""
#. module: hr_payroll
-#: view:hr.contibution.register:0
+#: view:hr.contribution.register:0
+#: model:ir.actions.act_window,name:hr_payroll.action_contribution_register_form
+#: model:ir.ui.menu,name:hr_payroll.menu_action_hr_contribution_register_form
msgid "Contribution Registers"
-msgstr "Registros de contribución"
+msgstr ""
#. module: hr_payroll
#: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_reporting
#: model:ir.ui.menu,name:hr_payroll.menu_hr_root_payroll
#: model:ir.ui.menu,name:hr_payroll.payroll_configure
msgid "Payroll"
-msgstr "Nómina"
+msgstr ""
#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_contract_wage_type
-msgid "Wage Type"
-msgstr "Tipo de salario"
+#: model:ir.actions.report.xml,name:hr_payroll.contribution_register
+msgid "PaySlip Lines By Conribution Register"
+msgstr ""
#. module: hr_payroll
-#: report:hr.payroll.register.sheet:0
-msgid "Net Sal."
-msgstr "Sal. neto"
-
-#. module: hr_payroll
-#: sql_constraint:hr.passport:0
-msgid "The Passport No must be unique !"
-msgstr "¡El número de pasaporte debe ser único!"
-
-#. module: hr_payroll
-#: field:hr.allounce.deduction.categoty,name:0
-msgid "Category Name"
-msgstr "Nombre categoría"
-
-#. module: hr_payroll
-#: model:ir.model,name:hr_payroll.model_hr_payroll_year_salary
-msgid "hr.payroll.year.salary"
-msgstr "hr.nómina.año.salario"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.passport,address_id:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-msgid "Address"
-msgstr "Dirección"
-
-#. module: hr_payroll
-#: field:hr.payslip.line.line,slipline_id:0
-msgid "Slip Line"
-msgstr "Línea justificante"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Number of Leaves"
-msgstr "Número de hojas"
-
-#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.payroll.advice,bank_id:0
-#: field:hr.payroll.register,bank_id:0
-#: report:salary.structure:0
-msgid "Bank"
-msgstr "Banco"
-
-#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Cancel Sheet"
-msgstr "Cancelar hoja"
-
-#. module: hr_payroll
-#: selection:hr.allounce.deduction.categoty,type:0
-#: selection:hr.payslip.line,type:0
-msgid "Advance"
-msgstr "Adelanto"
-
-#. module: hr_payroll
-#: report:salary.structure:0
-msgid "Special Allowances and Deductions For Employee:"
-msgstr "Primas y deducciones especiales por empleado:"
-
-#. module: hr_payroll
-#: field:company.contribution,name:0
-#: field:company.contribution.line,name:0
-#: field:hr.contibution.register,name:0
-#: field:hr.contibution.register.line,name:0
-#: field:hr.payroll.advice,name:0
-#: field:hr.payroll.register,name:0
-#: field:hr.payroll.structure,name:0
-#: field:hr.payslip,name:0
-#: field:hr.payslip.line,name:0
-#: field:hr.payslip.line.line,name:0
-#: report:payslip.pdf:0
-#: report:salary.structure:0
-#: report:year.salary:0
-msgid "Name"
-msgstr "Nombre"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leaved Deduction"
-msgstr "Hojas de deducción"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-msgid "Country"
-msgstr "País"
-
-#. module: hr_payroll
-#: view:hr.passport:0
-#: view:hr.payroll.employees.detail:0
-#: field:hr.payroll.employees.detail,employee_ids:0
-#: view:hr.payroll.year.salary:0
-#: field:hr.payroll.year.salary,employee_ids:0
-#: view:hr.payslip:0
-msgid "Employees"
-msgstr "Empleados"
-
-#. module: hr_payroll
-#: report:payroll.advice:0
-msgid "Bank Account"
-msgstr "Cuenta bancaria"
-
-#. module: hr_payroll
-#: help:company.contribution,register_id:0
-msgid "Contribution register based on company"
-msgstr "Registro de contribución basado en la empresa"
-
-#. module: hr_payroll
-#: help:hr.allounce.deduction.categoty,sequence:0
-msgid "Use to arrange calculation sequence"
-msgstr "Se utiliza para organizar la secuencia de cálculo"
-
-#. module: hr_payroll
-#: field:hr.payslip,total_pay:0
-msgid "Total Payment"
-msgstr "Pago total"
-
-#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Leave Deductions Line:"
-msgstr "Línea de deducciones por ausencias:"
-
-#. module: hr_payroll
-#: selection:hr.payroll.register,state:0
#: selection:hr.payslip,state:0
-msgid "Wating for Account Verification"
-msgstr "Esperando por verificación de la cuenta"
+msgid "Waiting"
+msgstr ""
#. module: hr_payroll
-#: field:hr.contibution.register.line,comp_deduction:0
-msgid "Company Deduction"
-msgstr "Deducción de la Compañía"
+#: report:paylip.details:0 report:payslip:0
+msgid "Address"
+msgstr ""
#. module: hr_payroll
-#: view:hr.holidays.status:0
-msgid "Payroll Configurtion"
-msgstr "Configuración nómina"
-
-#. module: hr_payroll
-#: code:addons/hr_payroll/hr_payroll.py:469
+#: code:addons/hr_payroll/hr_payroll.py:866
#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr "Por favor, defina la cuenta bancaria para el empleado %s"
+msgid "Wrong percentage base or quantity defined for salary rule %s (%s)"
+msgstr ""
#. module: hr_payroll
-#: field:hr.passport,date_issue:0
-msgid "Passport Issue Date"
-msgstr "Fecha de emisión del pasaporte"
+#: field:hr.payslip,worked_days_line_ids:0
+#: model:ir.model,name:hr_payroll.model_hr_payslip_worked_days
+msgid "Payslip Worked Days"
+msgstr ""
#. module: hr_payroll
-#: view:hr.allounce.deduction.categoty:0
-#: selection:hr.allounce.deduction.categoty,type:0
-#: field:hr.payroll.register,allounce:0
-#: field:hr.payslip,allounce:0
-#: selection:hr.payslip.line,type:0
-msgid "Allowance"
-msgstr "Prima"
+#: view:hr.salary.rule.category:0
+msgid "Salary Categories"
+msgstr ""
#. module: hr_payroll
-#: field:hr.payslip,holiday_days:0
-msgid "No of Leaves"
-msgstr "N º de hojas"
+#: report:contribution.register.lines:0 field:hr.contribution.register,name:0
+#: field:hr.payroll.structure,name:0 field:hr.payslip.line,name:0
+#: field:hr.payslip.run,name:0 field:hr.salary.rule,name:0
+#: field:hr.salary.rule.category,name:0 report:paylip.details:0
+#: report:payslip:0
+msgid "Name"
+msgstr ""
#. module: hr_payroll
-#: field:hr.employee,otherid:0
-msgid "Other Id"
-msgstr "Otro id"
+#: view:hr.payroll.structure:0
+msgid "Payroll Structures"
+msgstr ""
#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Bank Details"
-msgstr "Detalles bancarios"
+#: view:hr.payslip:0 view:hr.payslip.employees:0
+#: field:hr.payslip.employees,employee_ids:0 view:hr.payslip.line:0
+msgid "Employees"
+msgstr ""
#. module: hr_payroll
-#: report:payslip.pdf:0
-msgid "Slip ID"
-msgstr "ID justificante"
+#: report:paylip.details:0 report:payslip:0
+msgid "Bank Account"
+msgstr ""
#. module: hr_payroll
-#: field:company.contribution.line,sequence:0
-#: field:hr.allounce.deduction.categoty,sequence:0
-#: field:hr.payslip.line,sequence:0
-#: field:hr.payslip.line.line,sequence:0
-msgid "Sequence"
-msgstr "Secuencia"
+#: help:hr.payslip.line,sequence:0 help:hr.salary.rule,sequence:0
+msgid "Use to arrange calculation sequence"
+msgstr ""
#. module: hr_payroll
-#: model:ir.actions.act_window,name:hr_payroll.action_view_hr_payslip_form
-#: model:ir.ui.menu,name:hr_payroll.menu_department_tree
-msgid "Employee Payslip"
-msgstr "Nómina de los empleados"
+#: help:hr.payslip.line,condition_range:0
+#: help:hr.salary.rule,condition_range:0
+msgid ""
+"This will be used to compute the % fields values; in general it is on basic, "
+"but you can also use categories code fields in lowercase as a variable names "
+"(hra, ma, lta, etc.) and the variable basic."
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Content"
-msgstr "Contenido carta"
+#: selection:hr.contract,schedule_pay:0
+msgid "Annually"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.employees.detail:0
-#: view:hr.payroll.year.salary:0
-msgid "Year Salary"
-msgstr "Salario anual"
+#: field:hr.payslip,input_line_ids:0
+msgid "Payslip Inputs"
+msgstr ""
#. module: hr_payroll
-#: view:hr.payroll.register:0
-msgid "Allowance / Deduction"
-msgstr "Prima / Deducción"
+#: field:hr.payslip.line,salary_rule_id:0
+msgid "Rule"
+msgstr ""
#. module: hr_payroll
-#: model:ir.actions.report.xml,name:hr_payroll.payroll_advice
-msgid "Bank Payment Advice"
-msgstr "Aviso de pago del banco"
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category_tree_view
+#: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category_tree_view
+msgid "Salary Rule Categories Hierarchy"
+msgstr ""
+
+#. module: hr_payroll
+#: report:contribution.register.lines:0 field:hr.payslip.line,total:0
+#: report:paylip.details:0 report:payslip:0
+msgid "Total"
+msgstr ""
+
+#. module: hr_payroll
+#: help:hr.payslip.line,appears_on_payslip:0
+#: help:hr.salary.rule,appears_on_payslip:0
+msgid "Used for the display of rule on payslip"
+msgstr ""
+
+#. module: hr_payroll
+#: view:hr.payslip.line:0
+msgid "Search Payslip Lines"
+msgstr ""
#. module: hr_payroll
#: view:hr.payslip:0
-msgid "Search Payslips"
-msgstr "Buscar nóminas"
+msgid "Details By Salary Rule Category"
+msgstr ""
#. module: hr_payroll
-#: report:employees.salary:0
-#: field:hr.contibution.register.line,total:0
-#: report:year.salary:0
-msgid "Total"
-msgstr "Total"
+#: help:hr.payslip.input,code:0 help:hr.payslip.worked_days,code:0
+#: help:hr.rule.input,code:0
+msgid "The code that can be used in the salary rules"
+msgstr ""
#. module: hr_payroll
-#: view:company.contribution:0
-#: view:hr.allounce.deduction.categoty:0
-#: field:hr.allounce.deduction.categoty,contribute_ids:0
-msgid "Contributions"
-msgstr "Contribuciones"
+#: view:hr.payslip.run:0
+#: model:ir.actions.act_window,name:hr_payroll.action_hr_payslip_by_employees
+msgid "Generate Payslips"
+msgstr ""
-#~ msgid "Categoty Code"
-#~ msgstr "Código de categoría"
+#. module: hr_payroll
+#: selection:hr.contract,schedule_pay:0
+msgid "Bi-weekly"
+msgstr ""
-#~ msgid "Categoty Name"
-#~ msgstr "Nombre categoría"
+#. module: hr_payroll
+#: field:hr.employee,total_wage:0
+msgid "Total Basic Salary"
+msgstr ""
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre del modelo inválido en la definición de acción."
+#. module: hr_payroll
+#: selection:hr.payslip.line,condition_select:0
+#: selection:hr.salary.rule,condition_select:0
+msgid "Always True"
+msgstr ""
-#~ msgid "Analytic Account for Salary Analysis"
-#~ msgstr "Cuenta analítica para análisis de nóminas"
+#. module: hr_payroll
+#: report:contribution.register.lines:0
+msgid "PaySlip Name"
+msgstr ""
-#~ msgid "Employee No"
-#~ msgstr "Núm. trabajador"
-
-#~ msgid "Employee Payable Account"
-#~ msgstr "Cuenta a pagar del trabajador"
-
-#~ msgid "Account"
-#~ msgstr "Cuenta"
-
-#, python-format
-#~ msgid "Warning !"
-#~ msgstr "¡ Aviso !"
-
-#~ msgid "Payment From"
-#~ msgstr "Pago desde"
-
-#~ msgid "Keep empty to use the period of the validation(Payslip) date."
-#~ msgstr ""
-#~ "Deje en blanco para usar el período de la fecha de validación de la nómina"
-
-#~ msgid "Analytic Account"
-#~ msgstr "Cuenta analítica"
-
-#~ msgid "Force Period"
-#~ msgstr "Forzar período"
-
-#~ msgid "Accounting Information"
-#~ msgstr "Información contable"
-
-#, python-format
-#~ msgid "Integrity Error !"
-#~ msgstr "¡Error de integridad!"
-
-#~ msgid "Miscelleanous"
-#~ msgstr "Misceláneos"
-
-#~ msgid "Error! You can not create recursive analytic accounts."
-#~ msgstr "¡Error! No puede crear cuentas analíticas recursivas."
-
-#~ msgid "Account Lines"
-#~ msgstr "Movimientos"
-
-#~ msgid "Accounting Informations"
-#~ msgstr "Información contable"
-
-#~ msgid "Print"
-#~ msgstr "Imprimir"
-
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
-
-#~ msgid "Accounting Lines"
-#~ msgstr "Movimientos contables"
-
-#~ msgid "Bank Journal"
-#~ msgstr "Diario bancario"
-
-#~ msgid "Expense"
-#~ msgstr "Gastos"
-
-#~ msgid "Payment Entries"
-#~ msgstr "Asientos de pago"
-
-#~ msgid "Salary Account"
-#~ msgstr "Cuenta de nómina"
-
-#~ msgid "Employee Contract"
-#~ msgstr "Contrato de trabajador"
-
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
-
-#~ msgid "General Account"
-#~ msgstr "Cuenta general"
-
-#~ msgid "Process"
-#~ msgstr "Proceso"
-
-#~ msgid "Employee Account"
-#~ msgstr "Cuenta trabajador"
-
-#~ msgid "General Information"
-#~ msgstr "Información general"
-
-#~ msgid "Accounting Details"
-#~ msgstr "Detalles de contabilidad"
-
-#~ msgid "Account Information"
-#~ msgstr "Información de la cuenta"
-
-#~ msgid "Generalities"
-#~ msgstr "Generalidades"
-
-#~ msgid "Contract Duration"
-#~ msgstr "Duración del contrato"
-
-#~ msgid "Notes"
-#~ msgstr "Notas"
-
-#~ msgid "Fiscal Year"
-#~ msgstr "Ejercicio fiscal"
+#. module: hr_payroll
+#: field:hr.payslip.line,condition_range:0
+#: field:hr.salary.rule,condition_range:0
+msgid "Range Based on"
+msgstr ""
diff --git a/addons/hr_payroll/report/report_contribution_register.rml b/addons/hr_payroll/report/report_contribution_register.rml
index b3a5de9753d..8a5897c6091 100644
--- a/addons/hr_payroll/report/report_contribution_register.rml
+++ b/addons/hr_payroll/report/report_contribution_register.rml
@@ -206,7 +206,7 @@
[[ formatLang(r['amount']) ]]
- [[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]
@@ -222,7 +222,7 @@
Total:
- [[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]
diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml
index 4d96e4b5ef7..990419ee5f1 100644
--- a/addons/hr_payroll/report/report_payslip.rml
+++ b/addons/hr_payroll/report/report_payslip.rml
@@ -197,7 +197,8 @@
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+ [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -293,7 +294,7 @@
[[ formatLang(p.amount) ]]
- [[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']]
+ [[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]
diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml
index fe6a10dd1f5..4ace0ad2f82 100644
--- a/addons/hr_payroll/report/report_payslip_details.rml
+++ b/addons/hr_payroll/report/report_payslip_details.rml
@@ -234,7 +234,8 @@
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]]
+ [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -334,7 +335,7 @@
[[ '..'*h['level'] ]] [[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]
- [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
+ [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
@@ -391,7 +392,7 @@
[[ formatLang(r['amount']) ]]
- [[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
+ [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py
index 184f9a06867..94df47f6e44 100644
--- a/addons/hr_payroll_account/hr_payroll_account.py
+++ b/addons/hr_payroll_account/hr_payroll_account.py
@@ -36,7 +36,7 @@ class hr_payslip(osv.osv):
_columns = {
'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."),
- 'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
+ 'journal_id': fields.many2one('account.journal', 'Salary Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True),
'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True),
}
@@ -215,7 +215,7 @@ class hr_payslip_run(osv.osv):
_inherit = 'hr.payslip.run'
_description = 'Payslip Run'
_columns = {
- 'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
+ 'journal_id': fields.many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True),
}
def _get_default_journal(self, cr, uid, context=None):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 31959d7e9c7..56c517620e0 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -26,6 +26,7 @@ from base_status.base_stage import base_stage
from datetime import datetime
from osv import fields, osv
from tools.translate import _
+from tools import html2plaintext
AVAILABLE_STATES = [
('draft', 'New'),
@@ -296,7 +297,6 @@ class hr_applicant(base_stage, osv.Model):
res['context'] = {
'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False,
'default_user_id': uid,
- 'default_state': 'open',
'default_name': applicant.name,
'default_categ_ids': category and [category.id] or False,
}
@@ -327,9 +327,10 @@ class hr_applicant(base_stage, osv.Model):
This override updates the document according to the email.
"""
if custom_values is None: custom_values = {}
+ desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
custom_values.update({
'name': msg.get('subject') or _("No Subject"),
- 'description': msg.get('body'),
+ 'description': desc,
'email_from': msg.get('from'),
'email_cc': msg.get('cc'),
'user_id': False,
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index d48086f5663..d6d04c1b969 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -289,7 +289,8 @@
-
+
+
Mobile:
@@ -342,8 +343,8 @@
attrs="{'invisible':[('survey_id','=',False)]}"/>
-
-
+
+
@
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 1b0b8bfa7c5..b33b2eaa053 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -5,7 +5,7 @@
hr.recruitment.report.tree
hr.recruitment.report
-
+
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
index b9574b553d1..ab76f2b0f64 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py
@@ -135,6 +135,8 @@ class account_analytic_line(osv.osv):
def _default_general_account(self, cr, uid, context=None):
proxy = self.pool.get('hr.employee')
record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context)
+ if not record_ids:
+ raise osv.except_osv(_('Error!'), _('Please create an employee associated to this user.'))
employee = proxy.browse(cr, uid, record_ids[0], context=context)
if employee.product_id and employee.product_id.property_account_income:
return employee.product_id.property_account_income.id
diff --git a/addons/hr_timesheet_invoice/i18n/de.po b/addons/hr_timesheet_invoice/i18n/de.po
index 66e115f78ff..676e28fbc1d 100644
--- a/addons/hr_timesheet_invoice/i18n/de.po
+++ b/addons/hr_timesheet_invoice/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:36+0000\n"
-"PO-Revision-Date: 2012-05-10 18:04+0000\n"
-"Last-Translator: Ferdinand-camptocamp \n"
+"PO-Revision-Date: 2012-10-12 23:22+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-28 06:20+0000\n"
-"X-Generator: Launchpad (build 15864)\n"
+"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
+"X-Generator: Launchpad (build 16137)\n"
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
@@ -769,7 +769,7 @@ msgstr "Menge"
#. module: hr_timesheet_invoice
#: report:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Date/Code"
-msgstr "Datum/Kurzbez."
+msgstr "Dat/Kurzb."
#. module: hr_timesheet_invoice
#: field:report.timesheet.line,general_account_id:0
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 7dd2b9a1b88..b247805d50d 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -55,11 +55,11 @@
-
- From to
-
+
+ to
+
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 37c40f60f6d..50a99673e73 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -15,7 +15,7 @@
hr.timesheet.report.tree
hr.timesheet.report
-
+
diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
index 3bd495036d5..2af8792472e 100644
--- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
+++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py
@@ -35,7 +35,7 @@ class hr_timesheet_current_open(osv.osv_memory):
user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context)
if not len(user_ids):
- raise osv.except_osv(_('Error!'), _('Please define employee for your user!'))
+ raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.'))
ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context)
if len(ids) > 1:
diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
index 415f3a08f1f..ff1a2c2064d 100644
--- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
+++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml
@@ -108,7 +108,7 @@
[[ l['code'] (l['intra_code']) ]]
- [[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(l['amount'], currency_obj=company.currency_id) ]]
@@ -129,7 +129,7 @@
Total:
- [[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]]
diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml
index b04031d42ce..bd848642a97 100644
--- a/addons/l10n_ch/sterchi_chart/account.xml
+++ b/addons/l10n_ch/sterchi_chart/account.xml
@@ -11807,7 +11807,6 @@
-
diff --git a/addons/l10n_cn/account_chart.xml b/addons/l10n_cn/account_chart.xml
index e51a9d70654..afcb3e04b0c 100644
--- a/addons/l10n_cn/account_chart.xml
+++ b/addons/l10n_cn/account_chart.xml
@@ -957,7 +957,6 @@
-
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
index b44d04439f0..78b34f2d696 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -441,7 +441,6 @@
-
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
index 5221b00c462..76c6eb9dedf 100644
--- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
@@ -290,9 +290,7 @@
[[o.employee_id.name or '_']]
- [[o.employee_id.address_home_id.street or '_' ]]
- [[o.employee_id.address_home_id.street2 or '' ]]
- [[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]
+ [[display_address(o.employee_id.address_home_id) or '_' ]]
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/l10n_gt_base.xml
index 91561dca41b..4ba27d6a5c4 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/l10n_gt_base.xml
@@ -35,7 +35,6 @@
-
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/l10n_hn_base.xml
index 1a080e3c2dd..a12d93db034 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/l10n_hn_base.xml
@@ -21,7 +21,6 @@
-
diff --git a/addons/l10n_in/l10n_in_private_chart.xml b/addons/l10n_in/l10n_in_private_chart.xml
index 45f5edb33d9..671fdc334d9 100644
--- a/addons/l10n_in/l10n_in_private_chart.xml
+++ b/addons/l10n_in/l10n_in_private_chart.xml
@@ -514,7 +514,6 @@
-
diff --git a/addons/l10n_in/l10n_in_public_chart.xml b/addons/l10n_in/l10n_in_public_chart.xml
index 4a4098d56c9..9612afddc39 100644
--- a/addons/l10n_in/l10n_in_public_chart.xml
+++ b/addons/l10n_in/l10n_in_public_chart.xml
@@ -668,7 +668,6 @@
-
diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po
index ea9fcfd7bb3..0fd88c3813e 100644
--- a/addons/l10n_in_hr_payroll/i18n/bn.po
+++ b/addons/l10n_in_hr_payroll/i18n/bn.po
@@ -6,928 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 06:46+0000\n"
-"PO-Revision-Date: 2012-08-17 06:46+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2012-09-10 09:14+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Bengali \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n"
+"X-Generator: Launchpad (build 16118)\n"
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "E-mail Address"
-msgstr ""
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,employee_bank_no:0
-msgid "Employee Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in draft state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Title"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice from"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
-msgid "Hr Salary Employee By Category Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Allowances with Basic:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Department"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Deductions:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "A/C no."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,driver_salay:0
-msgid "Driver Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
-msgid "Yearly Salary by Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
-msgid "Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "("
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.advice.line,company_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ","
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,number_of_year:0
-msgid "Total years of work experience"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "to"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Total :"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payslip.run,available_advice:0
-msgid "Made Payment Advice?"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Advices which are paid using NEFT transfer"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,tds:0
-msgid "Amount for Tax Deduction at Source"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Month of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.payslip:0
-msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,batch_id:0
-msgid "Batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Other Information"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Details by Salary Rule Category:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage(%)"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
-#: report:paylip.details.in:0
-msgid "Reference"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,medical_insurance:0
-msgid "Medical Insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Identification No"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: field:payment.advice.report,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Confirm"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-#: field:payment.advice.report,cheque_nos:0
-msgid "Cheque Numbers"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
-msgid "Yearly Salary by Head"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#, python-format
-msgid "You can not confirm Payment advice without advice lines."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:payment.advice.report,state:0
-msgid "State"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Email"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payslip.run,available_advice:0
-msgid "If this box is checked which means that Payment Advice exists for current batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Print"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
-msgid "Payslip Batches"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,debit_credit:0
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.employee.bymonth:0
-msgid "Yearly Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
-msgid "Print Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
-#: view:payment.advice.report:0
-msgid "Advices Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc:0
-msgid "IFSC"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,tds:0
-msgid "TDS"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,join_date:0
-msgid "Join Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:res.company,dearness_allowance:0
-msgid "Dearness Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Deduction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in confirm state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Non Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "or"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
-msgid "Hr Salary Employee By Month Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,category_id:0
-msgid "Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#, python-format
-msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "To Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,number_of_year:0
-msgid "No. of Years of Service"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Note"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: view:payment.advice.report:0
-#: selection:payment.advice.report,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,voluntary_provident_fund:0
-msgid "Voluntary Provident Fund"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
-msgid "Payment Advice Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Status"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,city_type:0
-msgid "Type of City"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:res.company,dearness_allowance:0
-msgid "Check this box if your company provide Dearness Allowance to employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc_code:0
-#: field:payment.advice.report,ifsc_code:0
-#: report:payroll.advice:0
-msgid "IFSC Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,nbr:0
-msgid "# Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
-msgid "PaySlip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-#: field:payment.advice.report,date:0
-msgid "Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
-msgid "This report performs analysis on Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Designation"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "Pay Head Employee Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:payroll.advice:0
-msgid "Authorized Signature"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
-msgid "Contract"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice.line:0
-msgid "Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "To,"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid "Check this box if you provide allowance for driver"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-#: field:hr.payslip,advice_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Other No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,neft:0
-msgid "Check this box if your company use online transfer for salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,number:0
-msgid "Number"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Day of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Payslip Batches ready to be Adviced"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Pay Slip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Total Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-#: view:payment.advice.report:0
-#: field:payment.advice.report,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Compute Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "Joining date of employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Dear Sir/Madam,"
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,note:0
-msgid "Description"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ")"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Payroll"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "NEFT"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Address"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,bank_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,bank_id:0
-#: report:payroll.advice:0
-#: report:salary.detail.byyear:0
-msgid "Bank"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,end_date:0
-#: field:yearly.salary.detail,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,name:0
-#: report:paylip.details.in:0
-#: field:payment.advice.report,name:0
-#: report:salary.employee.bymonth:0
-msgid "Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: field:hr.salary.employee.month,employee_ids:0
-#: view:yearly.salary.detail:0
-#: field:yearly.salary.detail,employee_ids:0
-msgid "Employees"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employe"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,start_date:0
-#: field:yearly.salary.detail,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank from which the salary is going to be paid"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "Employee Pay Head Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Phone No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Credit"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,name:0
-#: report:payroll.advice:0
-msgid "Bank Account No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,date:0
-msgid "Advice Date is used to search Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Create Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,year:0
-msgid "Year"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,neft:0
-#: field:payment.advice.report,neft:0
-msgid "NEFT Transaction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "Total"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "form period"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Year of Payment Advices"
-msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po
index 2c321b13191..844c492e28b 100644
--- a/addons/l10n_in_hr_payroll/i18n/gu.po
+++ b/addons/l10n_in_hr_payroll/i18n/gu.po
@@ -6,928 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 06:46+0000\n"
-"PO-Revision-Date: 2012-08-17 06:46+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2012-09-10 09:14+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Gujarati \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n"
+"X-Generator: Launchpad (build 16118)\n"
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "E-mail Address"
-msgstr ""
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,employee_bank_no:0
-msgid "Employee Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in draft state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Title"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice from"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
-msgid "Hr Salary Employee By Category Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Allowances with Basic:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Department"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Deductions:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "A/C no."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,driver_salay:0
-msgid "Driver Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
-msgid "Yearly Salary by Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
-msgid "Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "("
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.advice.line,company_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ","
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,number_of_year:0
-msgid "Total years of work experience"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "to"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Total :"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payslip.run,available_advice:0
-msgid "Made Payment Advice?"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Advices which are paid using NEFT transfer"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,tds:0
-msgid "Amount for Tax Deduction at Source"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Month of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.payslip:0
-msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,batch_id:0
-msgid "Batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Other Information"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Details by Salary Rule Category:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage(%)"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
-#: report:paylip.details.in:0
-msgid "Reference"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,medical_insurance:0
-msgid "Medical Insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Identification No"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: field:payment.advice.report,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Confirm"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-#: field:payment.advice.report,cheque_nos:0
-msgid "Cheque Numbers"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
-msgid "Yearly Salary by Head"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#, python-format
-msgid "You can not confirm Payment advice without advice lines."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:payment.advice.report,state:0
-msgid "State"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Email"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payslip.run,available_advice:0
-msgid "If this box is checked which means that Payment Advice exists for current batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Print"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
-msgid "Payslip Batches"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,debit_credit:0
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.employee.bymonth:0
-msgid "Yearly Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
-msgid "Print Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
-#: view:payment.advice.report:0
-msgid "Advices Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc:0
-msgid "IFSC"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,tds:0
-msgid "TDS"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,join_date:0
-msgid "Join Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:res.company,dearness_allowance:0
-msgid "Dearness Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Deduction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in confirm state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Non Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "or"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
-msgid "Hr Salary Employee By Month Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,category_id:0
-msgid "Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#, python-format
-msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "To Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,number_of_year:0
-msgid "No. of Years of Service"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Note"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: view:payment.advice.report:0
-#: selection:payment.advice.report,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,voluntary_provident_fund:0
-msgid "Voluntary Provident Fund"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
-msgid "Payment Advice Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Status"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,city_type:0
-msgid "Type of City"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:res.company,dearness_allowance:0
-msgid "Check this box if your company provide Dearness Allowance to employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc_code:0
-#: field:payment.advice.report,ifsc_code:0
-#: report:payroll.advice:0
-msgid "IFSC Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,nbr:0
-msgid "# Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
-msgid "PaySlip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-#: field:payment.advice.report,date:0
-msgid "Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
-msgid "This report performs analysis on Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Designation"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "Pay Head Employee Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:payroll.advice:0
-msgid "Authorized Signature"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
-msgid "Contract"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice.line:0
-msgid "Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "To,"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid "Check this box if you provide allowance for driver"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-#: field:hr.payslip,advice_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Other No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,neft:0
-msgid "Check this box if your company use online transfer for salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,number:0
-msgid "Number"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Day of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Payslip Batches ready to be Adviced"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Pay Slip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Total Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-#: view:payment.advice.report:0
-#: field:payment.advice.report,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Compute Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "Joining date of employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Dear Sir/Madam,"
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,note:0
-msgid "Description"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ")"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Payroll"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "NEFT"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Address"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,bank_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,bank_id:0
-#: report:payroll.advice:0
-#: report:salary.detail.byyear:0
-msgid "Bank"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,end_date:0
-#: field:yearly.salary.detail,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,name:0
-#: report:paylip.details.in:0
-#: field:payment.advice.report,name:0
-#: report:salary.employee.bymonth:0
-msgid "Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: field:hr.salary.employee.month,employee_ids:0
-#: view:yearly.salary.detail:0
-#: field:yearly.salary.detail,employee_ids:0
-msgid "Employees"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employe"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,start_date:0
-#: field:yearly.salary.detail,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank from which the salary is going to be paid"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "Employee Pay Head Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Phone No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Credit"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,name:0
-#: report:payroll.advice:0
-msgid "Bank Account No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,date:0
-msgid "Advice Date is used to search Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Create Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,year:0
-msgid "Year"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,neft:0
-#: field:payment.advice.report,neft:0
-msgid "NEFT Transaction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "Total"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "form period"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Year of Payment Advices"
-msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po
index d7cc9dc1519..b13e24e05f9 100644
--- a/addons/l10n_in_hr_payroll/i18n/hi.po
+++ b/addons/l10n_in_hr_payroll/i18n/hi.po
@@ -6,928 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 06:46+0000\n"
-"PO-Revision-Date: 2012-08-17 06:46+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2012-09-10 09:14+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Hindi \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n"
+"X-Generator: Launchpad (build 16118)\n"
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "E-mail Address"
-msgstr ""
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,employee_bank_no:0
-msgid "Employee Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in draft state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Title"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice from"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
-msgid "Hr Salary Employee By Category Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Allowances with Basic:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Department"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Deductions:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "A/C no."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,driver_salay:0
-msgid "Driver Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
-msgid "Yearly Salary by Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
-msgid "Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "("
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.advice.line,company_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ","
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,number_of_year:0
-msgid "Total years of work experience"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "to"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Total :"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payslip.run,available_advice:0
-msgid "Made Payment Advice?"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Advices which are paid using NEFT transfer"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,tds:0
-msgid "Amount for Tax Deduction at Source"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Month of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.payslip:0
-msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,batch_id:0
-msgid "Batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Other Information"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Details by Salary Rule Category:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage(%)"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
-#: report:paylip.details.in:0
-msgid "Reference"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,medical_insurance:0
-msgid "Medical Insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Identification No"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: field:payment.advice.report,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Confirm"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-#: field:payment.advice.report,cheque_nos:0
-msgid "Cheque Numbers"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
-msgid "Yearly Salary by Head"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#, python-format
-msgid "You can not confirm Payment advice without advice lines."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:payment.advice.report,state:0
-msgid "State"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Email"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payslip.run,available_advice:0
-msgid "If this box is checked which means that Payment Advice exists for current batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Print"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
-msgid "Payslip Batches"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,debit_credit:0
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.employee.bymonth:0
-msgid "Yearly Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
-msgid "Print Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
-#: view:payment.advice.report:0
-msgid "Advices Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc:0
-msgid "IFSC"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,tds:0
-msgid "TDS"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,join_date:0
-msgid "Join Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:res.company,dearness_allowance:0
-msgid "Dearness Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Deduction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in confirm state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Non Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "or"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
-msgid "Hr Salary Employee By Month Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,category_id:0
-msgid "Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#, python-format
-msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "To Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,number_of_year:0
-msgid "No. of Years of Service"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Note"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: view:payment.advice.report:0
-#: selection:payment.advice.report,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,voluntary_provident_fund:0
-msgid "Voluntary Provident Fund"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
-msgid "Payment Advice Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Status"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,city_type:0
-msgid "Type of City"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:res.company,dearness_allowance:0
-msgid "Check this box if your company provide Dearness Allowance to employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc_code:0
-#: field:payment.advice.report,ifsc_code:0
-#: report:payroll.advice:0
-msgid "IFSC Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,nbr:0
-msgid "# Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
-msgid "PaySlip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-#: field:payment.advice.report,date:0
-msgid "Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
-msgid "This report performs analysis on Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Designation"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "Pay Head Employee Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:payroll.advice:0
-msgid "Authorized Signature"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
-msgid "Contract"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice.line:0
-msgid "Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "To,"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid "Check this box if you provide allowance for driver"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-#: field:hr.payslip,advice_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Other No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,neft:0
-msgid "Check this box if your company use online transfer for salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,number:0
-msgid "Number"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Day of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Payslip Batches ready to be Adviced"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Pay Slip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Total Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-#: view:payment.advice.report:0
-#: field:payment.advice.report,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Compute Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "Joining date of employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Dear Sir/Madam,"
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,note:0
-msgid "Description"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ")"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Payroll"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "NEFT"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Address"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,bank_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,bank_id:0
-#: report:payroll.advice:0
-#: report:salary.detail.byyear:0
-msgid "Bank"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,end_date:0
-#: field:yearly.salary.detail,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,name:0
-#: report:paylip.details.in:0
-#: field:payment.advice.report,name:0
-#: report:salary.employee.bymonth:0
-msgid "Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: field:hr.salary.employee.month,employee_ids:0
-#: view:yearly.salary.detail:0
-#: field:yearly.salary.detail,employee_ids:0
-msgid "Employees"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employe"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,start_date:0
-#: field:yearly.salary.detail,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank from which the salary is going to be paid"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "Employee Pay Head Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Phone No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Credit"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,name:0
-#: report:payroll.advice:0
-msgid "Bank Account No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,date:0
-msgid "Advice Date is used to search Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Create Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,year:0
-msgid "Year"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,neft:0
-#: field:payment.advice.report,neft:0
-msgid "NEFT Transaction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "Total"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "form period"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Year of Payment Advices"
-msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index 98d00c76a33..dbe0e244bee 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -6,928 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 06:46+0000\n"
-"PO-Revision-Date: 2012-08-17 06:46+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2012-09-10 09:14+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Tamil \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n"
+"X-Generator: Launchpad (build 16118)\n"
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "E-mail Address"
-msgstr ""
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,employee_bank_no:0
-msgid "Employee Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in draft state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Title"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice from"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
-msgid "Hr Salary Employee By Category Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Allowances with Basic:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Department"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Deductions:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "A/C no."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,driver_salay:0
-msgid "Driver Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
-msgid "Yearly Salary by Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
-msgid "Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "("
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.advice.line,company_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ","
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,number_of_year:0
-msgid "Total years of work experience"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "to"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Total :"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payslip.run,available_advice:0
-msgid "Made Payment Advice?"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Advices which are paid using NEFT transfer"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,tds:0
-msgid "Amount for Tax Deduction at Source"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Month of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.payslip:0
-msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,batch_id:0
-msgid "Batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Other Information"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Details by Salary Rule Category:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage(%)"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
-#: report:paylip.details.in:0
-msgid "Reference"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,medical_insurance:0
-msgid "Medical Insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Identification No"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: field:payment.advice.report,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Confirm"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-#: field:payment.advice.report,cheque_nos:0
-msgid "Cheque Numbers"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
-msgid "Yearly Salary by Head"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#, python-format
-msgid "You can not confirm Payment advice without advice lines."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:payment.advice.report,state:0
-msgid "State"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Email"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payslip.run,available_advice:0
-msgid "If this box is checked which means that Payment Advice exists for current batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Print"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
-msgid "Payslip Batches"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,debit_credit:0
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.employee.bymonth:0
-msgid "Yearly Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
-msgid "Print Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
-#: view:payment.advice.report:0
-msgid "Advices Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc:0
-msgid "IFSC"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,tds:0
-msgid "TDS"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,join_date:0
-msgid "Join Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:res.company,dearness_allowance:0
-msgid "Dearness Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Deduction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in confirm state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Non Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "or"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
-msgid "Hr Salary Employee By Month Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,category_id:0
-msgid "Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#, python-format
-msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "To Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,number_of_year:0
-msgid "No. of Years of Service"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Note"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: view:payment.advice.report:0
-#: selection:payment.advice.report,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,voluntary_provident_fund:0
-msgid "Voluntary Provident Fund"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
-msgid "Payment Advice Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Status"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,city_type:0
-msgid "Type of City"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:res.company,dearness_allowance:0
-msgid "Check this box if your company provide Dearness Allowance to employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc_code:0
-#: field:payment.advice.report,ifsc_code:0
-#: report:payroll.advice:0
-msgid "IFSC Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,nbr:0
-msgid "# Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
-msgid "PaySlip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-#: field:payment.advice.report,date:0
-msgid "Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
-msgid "This report performs analysis on Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Designation"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "Pay Head Employee Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:payroll.advice:0
-msgid "Authorized Signature"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
-msgid "Contract"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice.line:0
-msgid "Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "To,"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid "Check this box if you provide allowance for driver"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-#: field:hr.payslip,advice_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Other No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,neft:0
-msgid "Check this box if your company use online transfer for salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,number:0
-msgid "Number"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Day of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Payslip Batches ready to be Adviced"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Pay Slip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Total Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-#: view:payment.advice.report:0
-#: field:payment.advice.report,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Compute Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "Joining date of employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Dear Sir/Madam,"
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,note:0
-msgid "Description"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ")"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Payroll"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "NEFT"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Address"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,bank_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,bank_id:0
-#: report:payroll.advice:0
-#: report:salary.detail.byyear:0
-msgid "Bank"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,end_date:0
-#: field:yearly.salary.detail,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,name:0
-#: report:paylip.details.in:0
-#: field:payment.advice.report,name:0
-#: report:salary.employee.bymonth:0
-msgid "Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: field:hr.salary.employee.month,employee_ids:0
-#: view:yearly.salary.detail:0
-#: field:yearly.salary.detail,employee_ids:0
-msgid "Employees"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employe"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,start_date:0
-#: field:yearly.salary.detail,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank from which the salary is going to be paid"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "Employee Pay Head Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Phone No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Credit"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,name:0
-#: report:payroll.advice:0
-msgid "Bank Account No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,date:0
-msgid "Advice Date is used to search Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Create Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,year:0
-msgid "Year"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,neft:0
-#: field:payment.advice.report,neft:0
-msgid "NEFT Transaction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "Total"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "form period"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Year of Payment Advices"
-msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po
index 0c6f6127c4d..47ea35552f8 100644
--- a/addons/l10n_in_hr_payroll/i18n/te.po
+++ b/addons/l10n_in_hr_payroll/i18n/te.po
@@ -6,928 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0alpha\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-17 06:46+0000\n"
-"PO-Revision-Date: 2012-08-17 06:46+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2012-09-10 09:14+0000\n"
+"PO-Revision-Date: 2012-10-10 12:31+0000\n"
+"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Telugu \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n"
+"X-Generator: Launchpad (build 16118)\n"
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "E-mail Address"
-msgstr ""
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,employee_bank_no:0
-msgid "Employee Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in draft state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Title"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Payment Advice from"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail
-msgid "Hr Salary Employee By Category Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employees Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Allowances with Basic:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Department"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Deductions:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "A/C no."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,driver_salay:0
-msgid "Driver Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail
-msgid "Yearly Salary by Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list
-msgid "Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "("
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.advice.line,company_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "The Manager"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Letter Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ","
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,number_of_year:0
-msgid "Total years of work experience"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "to"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Total :"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payslip.run,available_advice:0
-msgid "Made Payment Advice?"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Advices which are paid using NEFT transfer"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,tds:0
-msgid "Amount for Tax Deduction at Source"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,day:0
-msgid "Day"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Month of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.payslip:0
-msgid "Payslip 'Date From' must be before 'Date To'."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,batch_id:0
-msgid "Batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Other Information"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "For"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Details by Salary Rule Category:"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,voluntary_provident_fund:0
-msgid "VPF computed as percentage(%)"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,number:0
-#: report:paylip.details.in:0
-msgid "Reference"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Group By..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,medical_insurance:0
-msgid "Medical Insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Identification No"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,bysal:0
-#: field:payment.advice.report,bysal:0
-#: report:payroll.advice:0
-msgid "By Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Confirm"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,chaque_nos:0
-#: field:payment.advice.report,cheque_nos:0
-msgid "Cheque Numbers"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:res.company:0
-msgid "Error! You can not create recursive companies."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month
-msgid "Yearly Salary by Head"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#, python-format
-msgid "You can not confirm Payment advice without advice lines."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,state:0
-#: field:payment.advice.report,state:0
-msgid "State"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Yours Sincerely"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,medical_insurance:0
-msgid "Deduction towards company provided medical insurance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line
-msgid "Bank Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Email"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payslip.run,available_advice:0
-msgid "If this box is checked which means that Payment Advice exists for current batch"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Error !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Print"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run
-msgid "Payslip Batches"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,debit_credit:0
-#: report:payroll.advice:0
-msgid "C/D"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.employee.bymonth:0
-msgid "Yearly Salary Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice
-msgid "Print Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,line_ids:0
-msgid "Employee Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "July"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice
-msgid "Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all
-#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice
-#: view:payment.advice.report:0
-msgid "Advices Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc:0
-msgid "IFSC"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,tds:0
-msgid "TDS"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,join_date:0
-msgid "Join Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.contract:0
-msgid "Error! Contract start-date must be less than contract end-date."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:res.company,dearness_allowance:0
-msgid "Dearness Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "August"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Deduction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Search Payment advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "SI. No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Payment Advices which are in confirm state"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "December"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Confirm Sheet"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,month:0
-msgid "Month"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Non Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "or"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month
-msgid "Hr Salary Employee By Month Report"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,category_id:0
-msgid "Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240
-#, python-format
-msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "To Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.employee,number_of_year:0
-msgid "No. of Years of Service"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Note"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Salary Rule Category"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: view:payment.advice.report:0
-#: selection:payment.advice.report,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Date From"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,voluntary_provident_fund:0
-msgid "Voluntary Provident Fund"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Employee Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report
-msgid "Payment Advice Analysis"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-msgid "Status"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.contract,city_type:0
-msgid "Type of City"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:res.company,dearness_allowance:0
-msgid "Check this box if your company provide Dearness Allowance to employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,ifsc_code:0
-#: field:payment.advice.report,ifsc_code:0
-#: report:payroll.advice:0
-msgid "IFSC Code"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "June"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,nbr:0
-msgid "# Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report
-msgid "PaySlip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Payment Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,date:0
-#: field:payment.advice.report,date:0
-msgid "Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Extended Filters..."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all
-msgid "This report performs analysis on Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Designation"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "January"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "Pay Head Employee Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:payroll.advice:0
-msgid "Authorized Signature"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract
-msgid "Contract"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice.line:0
-msgid "Advice Lines"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "To,"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.contract,driver_salay:0
-msgid "Check this box if you provide allowance for driver"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-#: field:hr.payslip,advice_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
-msgid "Bank Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Other No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Draft Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,neft:0
-msgid "Check this box if your company use online transfer for salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "To"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:payment.advice.report,number:0
-msgid "Number"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Cancel"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Day of Payment Advices"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: constraint:hr.employee:0
-msgid "Error! You cannot create recursive hierarchy of Employee(s)."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:yearly.salary.detail:0
-msgid "This wizard will print report which display a pay head employee breakup for a specified dates."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Payslip Batches ready to be Adviced"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Pay Slip Details"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Total Salary"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,employee_id:0
-#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee
-#: view:payment.advice.report:0
-#: field:payment.advice.report,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-msgid "Compute Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.employee,join_date:0
-msgid "Joining date of employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Dear Sir/Madam,"
-msgstr "Dear Sir/Madam,"
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,note:0
-msgid "Description"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid ")"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:res.company:0
-msgid "Payroll"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "NEFT"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-msgid "Address"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,bank_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,bank_id:0
-#: report:payroll.advice:0
-#: report:salary.detail.byyear:0
-msgid "Bank"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,end_date:0
-#: field:yearly.salary.detail,date_to:0
-msgid "End Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "February"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: sql_constraint:res.company:0
-msgid "The company name must be unique !"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,name:0
-#: report:paylip.details.in:0
-#: field:payment.advice.report,name:0
-#: report:salary.employee.bymonth:0
-msgid "Name"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:hr.contract,city_type:0
-msgid "Metro"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-#: field:hr.salary.employee.month,employee_ids:0
-#: view:yearly.salary.detail:0
-#: field:yearly.salary.detail,employee_ids:0
-msgid "Employees"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Bank Account"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "April"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "Name of the Employe"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158
-#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257
-#, python-format
-msgid "Please define bank account for the %s employee"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.salary.employee.month,start_date:0
-#: field:yearly.salary.detail,date_from:0
-msgid "Start Date"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.contract:0
-msgid "Allowance"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,bank_id:0
-msgid "Select the Bank from which the salary is going to be paid"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.salary.employee.month:0
-msgid "Employee Pay Head Breakup"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:salary.detail.byyear:0
-msgid "Phone No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-msgid "Credit"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice.line,name:0
-#: report:payroll.advice:0
-msgid "Bank Account No."
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: help:hr.payroll.advice,date:0
-msgid "Advice Date is used to search Payslips"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-msgid "May"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payslip.run:0
-msgid "Create Advice"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: field:payment.advice.report,year:0
-msgid "Year"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,neft:0
-#: field:payment.advice.report,neft:0
-msgid "NEFT Transaction"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-msgid "Total"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:payroll.advice:0
-msgid "form period"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-msgid "Year of Payment Advices"
-msgstr ""
\ No newline at end of file
diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
index 4d7dbe91ee1..38f1272718b 100644
--- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml
@@ -6,7 +6,7 @@
payment.advice.report.tree
payment.advice.report
-
+
diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
index 92eaf3ec4a9..d71cb283336 100644
--- a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
+++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml
@@ -6,7 +6,7 @@
payslip.report.tree
payslip.report
-
+
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
index 8f2a57d2018..6368a644f4b 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml
@@ -234,7 +234,7 @@
- [[ formatLang(e[13]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(e[13],currency_obj= company.currency_id)]]
@@ -248,43 +248,43 @@
Total
- [[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]]
- [[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ]
- [[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]]
+ [[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]]
- [[ formatLang(get_total()) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_total(), currency_obj = company.currency_id)]]
diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
index 7fa127b0bd3..502eaa7b0ff 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
@@ -478,7 +478,7 @@
- [[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e1[13],currency_obj= company.currency_id) ]]
@@ -571,7 +571,7 @@
- [[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(e2[13],currency_obj= company.currency_id) ]]
diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
index 8ca1bae5ba5..879314a24d9 100644
--- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml
@@ -247,7 +247,7 @@
[[ line['acc_no'] ]]
- [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[formatLang(line['bysal'], currency_obj = company.currency_id) ]]
[[ line['debit_credit'] ]]
@@ -296,7 +296,7 @@
[[ line['ifsc_code'] ]]
- [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[formatLang(line['bysal'], currency_obj = company.currency_id) ]]
[[ line['debit_credit'] ]]
@@ -321,7 +321,7 @@
- [[ o.line_ids==[] and removeParentNode('para') ]] [[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ o.line_ids==[] and removeParentNode('para') ]] [[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]
@@ -347,7 +347,7 @@
- [[ o.line_ids==[] and removeParentNode('para') ]] [[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
+ [[ o.line_ids==[] and removeParentNode('para') ]] [[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]]
diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
index a7ab3db3185..c4ce55bfa41 100644
--- a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
+++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml
@@ -234,7 +234,7 @@
- [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]]
+ [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
@@ -334,7 +334,7 @@
[[ '..'*h['level'] ]] [[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]]
- [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
+ [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml
index 48cf78f382b..96100d9a442 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/account_chart_netherlands.xml
@@ -4102,7 +4102,6 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ p
+
+
+ /web/binary/upload_attachment
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Upload in progress...
+
+
+
+
+
+
+
+
+
+
+
+
+ x
+
+
+
+
+
+
+
+
+
+
+ This email is private.
+ I wrote for contacts and all my followers.
+
+
+
+
+
+
+ Post to:
+
All Followers
+
and
+
+
+
+
+ , others...
+ <<<
+
+
+
+
-
+
-
+
+ You have no messages
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /web/binary/upload_attachment
-
-
-
-
-
-
-
-
+
@@ -145,7 +224,6 @@
-
+
@@ -171,7 +249,7 @@
-
+
-
-
-
-
-
@@ -215,7 +276,7 @@
Agree
- Unagree
+ Undo
diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml
index a6df1f0fe8c..f78c91c6305 100644
--- a/addons/mail/static/src/xml/mail_followers.xml
+++ b/addons/mail/static/src/xml/mail_followers.xml
@@ -13,9 +13,9 @@
Unfollow
Following
-
+
+
diff --git a/addons/mail/tests/test_mail.py b/addons/mail/tests/test_mail.py
index 1fc44ed81af..a94c4fc2c8a 100644
--- a/addons/mail/tests/test_mail.py
+++ b/addons/mail/tests/test_mail.py
@@ -529,109 +529,6 @@ class test_mail(TestMailMockups):
self.assertEqual(message2.subject, _subject, 'mail.message subject incorrect')
self.assertEqual(message2.body, group_bird.description, 'mail.message body incorrect')
- # FP Note: to be reviewed to be more generic, not depending on the algorythm of
- # message_read
- #def test_30_message_read(self):
- # """ Tests designed for message_read. """
- # # TDE NOTE: this test is not finished, as the message_read method is not fully specified.
- # # It will be updated as soon as we have fixed specs !
- # cr, uid = self.cr, self.uid
- # group_pigs = self.mail_group.browse(cr, uid, self.group_pigs_id)
-
- # def _compare_structures(struct1, struct2, n=0):
- # # print '%scompare structure' % ('\t' * n)
- # # self.assertEqual(len(struct1), len(struct2), 'message_read structure number of childs incorrect')
-
- # for x in range(len(struct1)):
- # if struct1[x].get('type') == 'expandable':
- # continue
- # # print '%s' % ('\t' * n), struct1[x]['id'], struct1[x]['child_nbr'], struct2[x]['id'], struct2[x].get('child_nbr', 'XX'), struct1[x].get('subject') or ''
- # self.assertEqual(struct1[x]['id'], struct2[x]['id'], 'message_read failure %s' % struct1[x].get('subject'))
- # _compare_structures(struct1[x]['child_ids'], struct2[x]['child_ids'], n + 1)
- # # print '%send compare' % ('\t' * n)
-
- # # ----------------------------------------
- # # CASE1: Flattening test
- # # ----------------------------------------
-
- # # Create dummy message structure
- # import copy
- # tree = [{'id': 2, 'child_nbr': 1, 'child_ids': [
- # {'id': 6, 'child_nbr': 1, 'child_ids': [
- # {'id': 8, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # ]},
- # {'id': 1, 'child_nbr': 3, 'child_ids':[
- # {'id': 7, 'child_nbr': 1, 'child_ids': [
- # {'id': 9, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # {'id': 4, 'child_nbr': 2, 'child_ids': [
- # {'id': 10, 'child_nbr': 0, 'child_ids': []},
- # {'id': 5, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # {'id': 3, 'child_nbr': 0, 'child_ids': []},
- # ]},
- # ]
- # # Test: completely flat
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 0, limit=15, add_expandable=False)
- # _compare_structures(new_tree, new_tree)
- # self.assertEqual(len(new_tree), 10, 'message_read_tree_flatten wrong in flat')
- # # Test: 1 thread level
- # tree_test = [{'id': 2, 'child_ids': [
- # {'id': 8, 'child_ids': []}, {'id': 6, 'child_ids': []},
- # ]},
- # {'id': 1, 'child_ids': [
- # {'id': 10, 'child_ids': []}, {'id': 9, 'child_ids': []},
- # {'id': 7, 'child_ids': []}, {'id': 5, 'child_ids': []},
- # {'id': 4, 'child_ids': []}, {'id': 3, 'child_ids': []},
- # ]},
- # ]
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 1, limit=15, add_expandable=False)
- # _compare_structures(new_tree, tree_test)
- # # Test: 2 thread levels
- # new_tree = self.mail_message.message_read_tree_flatten(cr, uid, None, copy.deepcopy(tree), [('type', 'in', 'borderlands')], 2, limit=15, add_expandable=False)
- # _compare_structures(new_tree, tree)
-
- # # ----------------------------------------
- # # CASE2: message_read test
- # # ----------------------------------------
-
- # # 1. Add a few messages to pigs group
- # msgid1 = group_pigs.message_post(body='1', subject='1', parent_id=False)
- # msgid2 = group_pigs.message_post(body='2', subject='1-1', parent_id=msgid1)
- # msgid3 = group_pigs.message_post(body='3', subject='1-2', parent_id=msgid1)
- # msgid4 = group_pigs.message_post(body='4', subject='2', parent_id=False)
- # msgid5 = group_pigs.message_post(body='5', subject='1-1-1', parent_id=msgid2)
- # msgid6 = group_pigs.message_post(body='6', subject='2-1', parent_id=msgid4)
-
- # # Test: read all messages flat
- # tree_test = [{'id': msgid6, 'child_ids': []}, {'id': msgid5, 'child_ids': []},
- # {'id': msgid4, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': []}, {'id': msgid1, 'child_ids': []}]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=0, limit=15)
- # _compare_structures(tree, tree_test)
- # # Test: read with 1 level of thread
- # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
- # {'id': msgid1, 'child_ids': [
- # {'id': msgid5, 'child_ids': []}, {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': []},
- # ]},
- # ]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=1, limit=15)
- # _compare_structures(tree, tree_test)
- # # Test: read with 2 levels of thread
- # tree_test = [{'id': msgid4, 'child_ids': [{'id': msgid6, 'child_ids': []}, ]},
- # {'id': msgid1, 'child_ids': [
- # {'id': msgid3, 'child_ids': []},
- # {'id': msgid2, 'child_ids': [{'id': msgid5, 'child_ids': []}, ]},
- # ]},
- # ]
- # tree = self.mail_message.message_read(cr, uid, ids=False, domain=[('model', '=', 'mail.group'), ('res_id', '=', self.group_pigs_id)], level=2, limit=15)
- # _compare_structures(tree, tree_test)
-
- # # 2. Test expandables
- # # TDE FIXME: add those tests when expandables are specified and implemented
-
def test_40_needaction(self):
""" Tests for mail.message needaction. """
cr, uid = self.cr, self.uid
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index fbadf76f2fb..7d75c67b942 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -81,7 +81,11 @@ class mail_compose_message(osv.TransientModel):
elif composition_mode == 'comment' and model and res_id:
vals = self.get_record_data(cr, uid, model, res_id, context=context)
elif composition_mode == 'mass_mail' and model and active_ids:
- vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
+ if context.get('default_template_id'):
+ vals = self.pool.get('email.template').generate_email(cr, uid, context.get('default_template_id'), res_id, context=context)
+ vals.update({'content_subtype': 'html'})
+ else:
+ vals = {'model': model, 'res_id': res_id, 'content_subtype': 'html'}
else:
vals = {'model': model, 'res_id': res_id}
if composition_mode:
@@ -219,7 +223,6 @@ class mail_compose_message(osv.TransientModel):
email(s), rendering any template patterns on the fly if needed. """
if context is None:
context = {}
- print '**', context
active_ids = context.get('active_ids')
for wizard in self.browse(cr, uid, ids, context=context):
diff --git a/addons/mail/wizard/mail_compose_message_view.xml b/addons/mail/wizard/mail_compose_message_view.xml
index 0f384dc5a0d..7329992f8ed 100644
--- a/addons/mail/wizard/mail_compose_message_view.xml
+++ b/addons/mail/wizard/mail_compose_message_view.xml
@@ -16,13 +16,11 @@
+
-
-
+
@@ -32,10 +30,10 @@
or
-
+
@@ -68,6 +66,7 @@
context="{'force_email':True}"
on_change="onchange_partner_ids(partner_ids)"
class="oe_mail_compose_message_partner_ids"/>
+
diff --git a/addons/marketing_campaign/report/campaign_analysis_view.xml b/addons/marketing_campaign/report/campaign_analysis_view.xml
index db79ce44132..d3693497408 100644
--- a/addons/marketing_campaign/report/campaign_analysis_view.xml
+++ b/addons/marketing_campaign/report/campaign_analysis_view.xml
@@ -5,7 +5,7 @@
campaign.analysis.tree
campaign.analysis
-
+
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index 81e1a3db97c..99dcc73ceba 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -8,7 +8,7 @@
report.membership.tree
report.membership
-
+
diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 73564f2b460..66806c4f350 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -29,7 +29,7 @@
'sequence': 18,
'summary': 'Manufacturing Orders, Bill of Materials, Routing',
'images': ['images/bill_of_materials.jpeg', 'images/manufacturing_order.jpeg', 'images/planning_manufacturing_order.jpeg', 'images/production_analysis.jpeg', 'images/production_dashboard.jpeg','images/routings.jpeg','images/work_centers.jpeg'],
- 'depends': ['procurement', 'stock', 'resource', 'purchase', 'product','process'],
+ 'depends': ['product','procurement', 'stock', 'resource', 'purchase','process'],
'description': """
Manage the Manufacturing process in OpenERP
===========================================
diff --git a/addons/mrp/i18n/de.po b/addons/mrp/i18n/de.po
index 8c4a422fd10..aed215fe6e7 100644
--- a/addons/mrp/i18n/de.po
+++ b/addons/mrp/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:49+0000\n"
-"PO-Revision-Date: 2012-02-22 07:45+0000\n"
+"PO-Revision-Date: 2012-10-12 23:20+0000\n"
"Last-Translator: Ferdinand @ Camptocamp \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-13 04:38+0000\n"
-"X-Generator: Launchpad (build 15944)\n"
+"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n"
+"X-Generator: Launchpad (build 16137)\n"
#. module: mrp
#: view:mrp.routing.workcenter:0
@@ -956,7 +956,7 @@ msgstr "Bezeichnung Arbeitsplatz"
#. module: mrp
#: field:mrp.routing,code:0
msgid "Code"
-msgstr "Kurzbezeichnung"
+msgstr "Kurzbez."
#. module: mrp
#: report:mrp.production.order:0
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index ecac11f856a..3ae27bf2c41 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -274,6 +274,17 @@ class mrp_bom(osv.osv):
return {'value': {'name': prod.name, 'product_uom': prod.uom_id.id}}
return {}
+ def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+ res = {'value':{}}
+ if not product_uom or not product_id:
+ return res
+ product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+ uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+ if uom.category_id.id != product.uom_id.category_id.id:
+ res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
+ res['value'].update({'product_uom': product.uom_id.id})
+ return res
+
def _bom_find(self, cr, uid, product_id, product_uom, properties=None):
""" Finds BoM for particular product and product uom.
@param product_id: Selected product.
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index abf0f823e5c..9d1ae9eae8a 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -351,7 +351,7 @@
-
+
@@ -382,7 +382,7 @@
-
+
@@ -952,6 +952,7 @@
+
@@ -961,21 +962,21 @@
-
+
product.normal.form.mrp.inherit
product.product
-
+
False
-
+
When you sell this product, OpenERP will trigger a manufacturing
order using the bill of materials assigned to this product.
The delivery order will be ready once the production is done.
-
+
@@ -1037,6 +1038,7 @@
{'default_product_id': active_id, 'search_default_product_id': active_id}
Bill of Materials
+ [('bom_id','=',False)]
mrp.bom
@@ -1050,7 +1052,5 @@
-
-
diff --git a/addons/mrp/procurement.py b/addons/mrp/procurement.py
index 795ac5453fb..19f8a48b6fe 100644
--- a/addons/mrp/procurement.py
+++ b/addons/mrp/procurement.py
@@ -31,6 +31,7 @@ class procurement_order(osv.osv):
_columns = {
'bom_id': fields.many2one('mrp.bom', 'BoM', ondelete='cascade', select=True),
'property_ids': fields.many2many('mrp.property', 'procurement_property_rel', 'procurement_id','property_id', 'Properties'),
+ 'production_id': fields.many2one('mrp.production', 'Manufacturing Order'),
}
def check_produce_product(self, cr, uid, procurement, context=None):
@@ -95,16 +96,22 @@ class procurement_order(osv.osv):
'move_prod_id': res_id,
'company_id': procurement.company_id.id,
})
+
res[procurement.id] = produce_id
- self.write(cr, uid, [procurement.id], {'state': 'running'})
- self.running_send_note(cr, uid, ids, context=context)
+ self.write(cr, uid, [procurement.id], {'state': 'running', 'production_id': produce_id})
bom_result = production_obj.action_compute(cr, uid,
[produce_id], properties=[x.id for x in procurement.property_ids])
wf_service.trg_validate(uid, 'mrp.production', produce_id, 'button_confirm', cr)
if res_id:
move_obj.write(cr, uid, [res_id],
{'location_id': procurement.location_id.id})
+ self.production_order_create_note(cr, uid, ids, context=context)
return res
+
+ def production_order_create_note(self, cr, uid, ids, context=None):
+ for procurement in self.browse(cr, uid, ids, context=context):
+ body = _("Manufacturing Order created.")
+ self.message_post(cr, uid, [procurement.id], body=body, context=context)
procurement_order()
diff --git a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
index cca9a7e3b24..de486face78 100644
--- a/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
+++ b/addons/mrp_operations/report/mrp_workorder_analysis_view.xml
@@ -9,7 +9,7 @@
mrp.workorder.tree
mrp.workorder
-
+
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index be5737d4b85..202ed6e4684 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -312,7 +312,7 @@
[[ formatLang(line.price_unit) ]]
- [[ formatLang(line.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(line.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]
@@ -337,7 +337,7 @@
[[ formatLang(fees.price_unit) ]]
- [[ formatLang(fees.price_subtotal) ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(fees.price_subtotal, currency_obj = o.pricelist_id.currency_id) ]]
@@ -353,7 +353,7 @@
Net Total :
- [[ formatLang(o.amount_untaxed, dp='Sale Price')]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_untaxed, dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]
@@ -367,7 +367,7 @@
Taxes:
- [[ formatLang(o.amount_tax, dp='Account')]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, dp='Account', currency_obj=o.pricelist_id.currency_id) ]]
@@ -380,7 +380,7 @@
Total :
- [[ formatLang(total(o), dp='Sale Price') ]] [[ o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(total(o), dp='Sale Price', currency_obj=o.pricelist_id.currency_id) ]]
diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py
index bacdeb2c675..1475ed091e7 100644
--- a/addons/mrp_subproduct/mrp_subproduct.py
+++ b/addons/mrp_subproduct/mrp_subproduct.py
@@ -22,6 +22,7 @@
from osv import fields
from osv import osv
import decimal_precision as dp
+from tools.translate import _
class mrp_subproduct(osv.osv):
_name = 'mrp.subproduct'
@@ -51,6 +52,17 @@ class mrp_subproduct(osv.osv):
return {'value': v}
return {}
+ def onchange_uom(self, cr, uid, ids, product_id, product_uom, context=None):
+ res = {'value':{}}
+ if not product_uom or not product_id:
+ return res
+ product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
+ uom = self.pool.get('product.uom').browse(cr, uid, product_uom, context=context)
+ if uom.category_id.id != product.uom_id.category_id.id:
+ res['warning'] = {'title': _('Warning'), 'message': _('The Product Unit of Measure you chose has a different category than in the product form.')}
+ res['value'].update({'product_uom': product.uom_id.id})
+ return res
+
mrp_subproduct()
class mrp_bom(osv.osv):
diff --git a/addons/mrp_subproduct/mrp_subproduct_view.xml b/addons/mrp_subproduct/mrp_subproduct_view.xml
index 94da87ef0de..b9e8fcc41ed 100644
--- a/addons/mrp_subproduct/mrp_subproduct_view.xml
+++ b/addons/mrp_subproduct/mrp_subproduct_view.xml
@@ -11,13 +11,13 @@
-
+
diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js
index 1e45b535867..cba2086b772 100644
--- a/addons/pad/static/src/js/pad.js
+++ b/addons/pad/static/src/js/pad.js
@@ -4,16 +4,13 @@ openerp.pad = function(instance) {
template: 'FieldPad',
configured: false,
content: "",
- set_value: function(val) {
+ render_value: function() {
var self = this;
- var _super = self._super;
- _super.apply(self,[val]);
-
- if (val === false || val === "") {
- self.field_manager.dataset.call('pad_generate_url',{context:{
- model: self.field_manager.model,
+ if (this.get("value") === false || this.get("value") === "") {
+ self.view.dataset.call('pad_generate_url',{context:{
+ model: self.view.model,
field_name: self.name,
- object_id: self.field_manager.datarecord.id
+ object_id: self.view.datarecord.id
}}).then(function(data) {
if(data&&data.url){
_super.apply(self,[data.url]);
diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py
index 3d80fd53e24..b189c8f204a 100644
--- a/addons/point_of_sale/controllers/main.py
+++ b/addons/point_of_sale/controllers/main.py
@@ -4,16 +4,12 @@ import simplejson
import os
import openerp
-try:
- import openerp.addons.web.common.http as openerpweb
- from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
-except ImportError:
- import web.common.http as openerpweb
+from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template
-class PointOfSaleController(openerpweb.Controller):
+class PointOfSaleController(openerp.addons.web.http.Controller):
_cp_path = '/pos'
- @openerpweb.httprequest
+ @openerp.addons.web.http.httprequest
def app(self, req, s_action=None, **kw):
js = "\n ".join('' % i for i in manifest_list(req, None, 'js'))
css = "\n ".join(' ' % i for i in manifest_list(req, None, 'css'))
@@ -29,7 +25,7 @@ class PointOfSaleController(openerpweb.Controller):
}
return r
- @openerpweb.httprequest
+ @openerp.addons.web.http.httprequest
def manifest(self, req, **kwargs):
""" This generates a HTML5 cache manifest files that preloads the categories and products thumbnails
and other ressources necessary for the point of sale to work offline """
@@ -66,12 +62,12 @@ class PointOfSaleController(openerpweb.Controller):
return m
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def dispatch(self, request, iface, **kwargs):
method = 'iface_%s' % iface
return getattr(self, method)(request, **kwargs)
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def scan_item_success(self, request, ean):
"""
A product has been scanned with success
@@ -79,7 +75,7 @@ class PointOfSaleController(openerpweb.Controller):
print 'scan_item_success: ' + str(ean)
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def scan_item_error_unrecognized(self, request, ean):
"""
A product has been scanned without success
@@ -87,7 +83,7 @@ class PointOfSaleController(openerpweb.Controller):
print 'scan_item_error_unrecognized: ' + str(ean)
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def help_needed(self, request):
"""
The user wants an help (ex: light is on)
@@ -95,7 +91,7 @@ class PointOfSaleController(openerpweb.Controller):
print "help_needed"
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def help_canceled(self, request):
"""
The user stops the help request
@@ -103,22 +99,22 @@ class PointOfSaleController(openerpweb.Controller):
print "help_canceled"
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def weighting_start(self, request):
print "weighting_start"
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def weighting_read_kg(self, request):
print "weighting_read_kg"
return 0.0
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def weighting_end(self, request):
print "weighting_end"
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def payment_request(self, request, price):
"""
The PoS will activate the method payment
@@ -126,47 +122,47 @@ class PointOfSaleController(openerpweb.Controller):
print "payment_request: price:"+str(price)
return 'ok'
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def payment_status(self, request):
print "payment_status"
return { 'status':'waiting' }
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def payment_cancel(self, request):
print "payment_cancel"
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def transaction_start(self, request):
print 'transaction_start'
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def transaction_end(self, request):
print 'transaction_end'
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def cashier_mode_activated(self, request):
print 'cashier_mode_activated'
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def cashier_mode_deactivated(self, request):
print 'cashier_mode_deactivated'
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def open_cashbox(self, request):
print 'open_cashbox'
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def print_receipt(self, request, receipt):
print 'print_receipt' + str(receipt)
return
- @openerpweb.jsonrequest
+ @openerp.addons.web.http.jsonrequest
def print_pdf_invoice(self, request, pdfinvoice):
print 'print_pdf_invoice' + str(pdfinvoice)
return
diff --git a/addons/point_of_sale/point_of_sale.py b/addons/point_of_sale/point_of_sale.py
index dfd0d73ad55..788c301a04f 100644
--- a/addons/point_of_sale/point_of_sale.py
+++ b/addons/point_of_sale/point_of_sale.py
@@ -1300,7 +1300,7 @@ class product_product(osv.osv):
'expense_pdt': fields.boolean('Point of Sale Cash Out', help="This is a product you can use to take cash from a statement for the point of sale backend, exemple: money lost, transfer to bank, etc."),
'pos_categ_id': fields.many2one('pos.category','Point of Sale Category',
help="If you want to sell this product through the point of sale, select the category it belongs to."),
- 'to_weight' : fields.boolean('To Weight', help="This category contains products that should be weighted, mainly used for the self-checkout interface"),
+ 'to_weight' : fields.boolean('To Weigh', help="This category contains products that should to be weighed, mainly used for the self-checkout interface"),
}
def _default_pos_categ_id(self, cr, uid, context=None):
diff --git a/addons/point_of_sale/report/account_statement.rml b/addons/point_of_sale/report/account_statement.rml
index dc6e6c5e64c..0b633f3f7c4 100644
--- a/addons/point_of_sale/report/account_statement.rml
+++ b/addons/point_of_sale/report/account_statement.rml
@@ -214,10 +214,10 @@
[[ formatLang(statement.closing_date,date_time=True)]]
- [[ formatLang(statement.balance_start, dp='Account') ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_start, dp='Account', currency_obj = company.currency_id) ]]
- [[ formatLang(statement.balance_end_real, dp='Account') ]][[ company.currency_id.symbol ]]
+ [[ formatLang(statement.balance_end_real, dp='Account', currency_obj = company.currency_id) ]]
@@ -250,7 +250,7 @@
[[ line_ids.partner_id.name ]]
- [[ formatLang(line_ids.amount, dp='Account') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids.amount, dp='Account', currency_obj=company.currency_id) ]]
@@ -267,7 +267,7 @@
Total :
- [[ formatLang(get_total(statement.line_ids), dp='Account') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement.line_ids), dp='Account', currency_obj = company.currency_id) ]]
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
index 0e75e7f7ae1..dc3b432728f 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.py
@@ -73,7 +73,7 @@ class all_closed_cashbox_of_the_day(report_sxw.rml_parse):
if res:
return res[0]['bal']
else:
- return False
+ return 0
def _get_sub_total(self, user, data, date):
res={}
diff --git a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
index bb58c5e823d..4f16031c8b3 100644
--- a/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
+++ b/addons/point_of_sale/report/all_closed_cashbox_of_the_day.rml
@@ -183,10 +183,10 @@
- [[ formatLang(get_net_total_starting(user)[1]) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_net_total_starting(user)[1], currency_obj = company.currency_id)]]
- [[ formatLang(get_net_total(user)) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_net_total(user), currency_obj = company.currency_id)]]
@@ -207,10 +207,10 @@
[[ statement['closing_date'] ]]
- [[ (get_bal(statement)) or '0.00' ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_bal(statement), currency_obj = company.currency_id)]]
- [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date'])) ]] [[company.currency_id.symbol]]
+ [[ formatLang(get_sub_total(user,statement['journal_id'],statement['date']), currency_obj = company.currency_id )]]
@@ -236,7 +236,7 @@
- [[ formatLang(line_ids['amount']) ]] [[company.currency_id.symbol]]
+ [[ formatLang(line_ids['amount'], currency_obj = company.currency_id)]]
diff --git a/addons/point_of_sale/report/pos_details.rml b/addons/point_of_sale/report/pos_details.rml
index b0019133009..e7c4c756e64 100644
--- a/addons/point_of_sale/report/pos_details.rml
+++ b/addons/point_of_sale/report/pos_details.rml
@@ -252,7 +252,7 @@
[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]
- [[ formatLang(line_ids['price_unit'], dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['price_unit'], dp='Sale Price', currency_obj = company.currency_id) ]]
[[ formatLang(line_ids['qty']) ]] [[ line_ids['uom'] ]]
@@ -289,7 +289,7 @@
[[ p['name'] or removeParentNode('para') ]]
- [[ formatLang(p['amount']) or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(p['amount'], currency_obj = company.currency_id) or removeParentNode('tr') ]]
@@ -320,7 +320,7 @@
[[ p['name'] or removeParentNode('para') ]]
- [[ formatLang(p['sum'], dp='Account') or removeParentNode('tr') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(p['sum'], dp='Account', currency_obj = company.currency_id) or removeParentNode('tr') ]]
@@ -349,7 +349,7 @@
Sales total(Revenue)
- [[ formatLang(getsalestotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsalestotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -365,7 +365,7 @@
Total invoiced
- [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice2(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -373,7 +373,7 @@
Total discount
- [[ formatLang(getsumdisc(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -381,7 +381,7 @@
Total paid
- [[ formatLang(getpaidtotal2(), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal2(), dp='Sale Price', currency_obj = company.currency_id) ]]
@@ -389,7 +389,7 @@
Total of the day
- [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price') ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(data['form']), dp='Sale Price', currency_obj = company.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_details_summary.rml b/addons/point_of_sale/report/pos_details_summary.rml
index d12cdec2598..b1c71db7d40 100644
--- a/addons/point_of_sale/report/pos_details_summary.rml
+++ b/addons/point_of_sale/report/pos_details_summary.rml
@@ -204,7 +204,7 @@
[[ p[0] ]]
- [[ p[1] ]] [[company.currency_id.symbol]]
+ [[ formatLang(p[1], currency_obj=company.currency_id) ]]
@@ -235,7 +235,7 @@
[[ t[0] ]]
- [[ '%.2f' % (t[1],) ]] [[company.currency_id.symbol]]
+ [[ formatLang(t[1], currency_obj=company.currency_id) ]]
@@ -280,7 +280,7 @@
Total invoiced
- [[ '%.2f' % getsuminvoice(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsuminvoice(objects), currency_obj=company.currency_id) ]]
@@ -288,7 +288,7 @@
Total discount
- [[ '%.2f' % getsumdisc(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getsumdisc(objects), currency_obj=company.currency_id) ]]
@@ -296,7 +296,7 @@
Total paid
- [[ '%.2f' % getpaidtotal(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(getpaidtotal(objects), currency_obj=company.currency_id) ]]
@@ -304,7 +304,7 @@
Total of the day
- [[ '%.2f' % gettotalofthaday(objects) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(gettotalofthaday(objects), currency_obj=company.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index be394ed4f16..1ed8e33eede 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -186,7 +186,7 @@
[[ formatLang(l.discount) ]]
- [[ formatLang(l.price_subtotal) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(l.price_subtotal, currency_obj=o.pricelist_id.currency_id) ]]
@@ -202,7 +202,7 @@
Net Total :
- [[ formatLang(o.amount_total) ]] [[o.pricelist_id.currency_id.symbol ]]
+ [[ formatLang(o.amount_total, currency_obj=o.pricelist_id.currency_id) ]]
@@ -215,7 +215,7 @@
Taxes :
- [[ formatLang(o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]
@@ -228,7 +228,7 @@
Total:
- [[ formatLang(o.amount_total + o.amount_tax) ]] [[o.pricelist_id.currency_id. symbol ]]
+ [[ formatLang(o.amount_total + o.amount_tax, currency_obj=o.pricelist_id.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml
index fee47312610..8d7bf84171a 100644
--- a/addons/point_of_sale/report/pos_order_report_view.xml
+++ b/addons/point_of_sale/report/pos_order_report_view.xml
@@ -5,7 +5,7 @@
report.pos.order.tree
report.pos.order
-
+
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 757de687ee0..bcc4b9ec261 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -183,7 +183,7 @@
[[ formatLang(line_ids['price_unit']) ]]
- [[ formatLang(line_ids['total']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['total'], currency_obj = company.currency_id) ]]
@@ -201,7 +201,7 @@
Net Total:
- [[ formatLang(pos_payment_total(o)) or removeParentNode('blockTable')]] [[ company.currency_id.symbol ]]
+ [[ formatLang(pos_payment_total(o), currency_obj = company.currency_id) or removeParentNode('blockTable')]]
diff --git a/addons/point_of_sale/report/pos_payment_report_user.rml b/addons/point_of_sale/report/pos_payment_report_user.rml
index 3105441aa0c..1d89d28c5f9 100644
--- a/addons/point_of_sale/report/pos_payment_report_user.rml
+++ b/addons/point_of_sale/report/pos_payment_report_user.rml
@@ -168,7 +168,7 @@
[[ formatLang(line_ids['price_unit']) ]]
- [[ formatLang(line_ids['total']) ]] [[company.currency_id.symbol]]
+ [[ formatLang(line_ids['total'], currency_obj = company.currency_id)]]
@@ -194,7 +194,7 @@
Total:
- [[ formatLang(pos_payment_user_total(data['form'])) or removeParentNode('blockTable')]] [[company.currency_id.symbol]]
+ [[ formatLang(pos_payment_user_total(data['form'], currency_obj = company.currency_id)) or removeParentNode('blockTable')]]
diff --git a/addons/point_of_sale/report/pos_receipt.rml b/addons/point_of_sale/report/pos_receipt.rml
index 55873887210..d7b8b08ad29 100644
--- a/addons/point_of_sale/report/pos_receipt.rml
+++ b/addons/point_of_sale/report/pos_receipt.rml
@@ -72,8 +72,7 @@
[[ repeatIn(objects,'o') ]]
[[o.user_id.company_id.name]]
- [[ address and address.street ]], [[ address and address.zip ]] [[ address and address.city ]]
- [[ address and address.country_id.name ]]
+ [[ address and display_address(address)]]
Tel : [[ address and address.phone ]]
User : [[ o.user_id.name ]]
Shop : [[ o.shop_id.name ]]
@@ -109,7 +108,7 @@
[[o.state=='cancel' and o.statement_ids and '-' or '']][['%.f' % line.qty ]]
- [[o.state=='cancel' and o.statement_ids and '-' or '']][[ '%.2f' % net(line.id) ]] [[company.currency_id.symbol]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ '%.2f' % line.discount ]]%) [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[ formatLang(net(line.id), currency_obj=company.currency_id) ]] [[ line and line.discount == 0.0 and removeParentNode('font') ]] ([[ formatLang(line.discount, currency_obj=company.currency_id) ]])
@@ -119,7 +118,7 @@
Taxes :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_tax]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_tax, currency_obj=company.currency_id)]]
@@ -129,7 +128,7 @@
Total :
- [[o.state=='cancel' and o.statement_ids and '-' or '']][['%.2f' % o.amount_total]] [[company.currency_id.symbol]]
+ [[o.state=='cancel' and o.statement_ids and '-' or '']][[formatLang(o.amount_total, currency_obj=company.currency_id)]]
@@ -158,7 +157,7 @@
- [[ '%.2f' %(d['amt'] or 0) ]] [[company.currency_id.symbol]]
+ [[ formatLang(d['amt'] or 0, currency_obj=company.currency_id) ]]
diff --git a/addons/point_of_sale/report/pos_users_product.rml b/addons/point_of_sale/report/pos_users_product.rml
index f3a8cfd77e8..9758e924ada 100644
--- a/addons/point_of_sale/report/pos_users_product.rml
+++ b/addons/point_of_sale/report/pos_users_product.rml
@@ -191,7 +191,7 @@
[[ formatLang(line_ids['qty']) ]] [[line_ids['uom'] ]]
- [[ formatLang(line_ids['amt']) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(line_ids['amt'], currency_obj = company.currency_id) ]]
@@ -208,7 +208,7 @@
Total :
- [[ formatLang(get_total(statement)) ]] [[ company.currency_id.symbol ]]
+ [[ formatLang(get_total(statement), currency_obj = company.currency_id) ]]
diff --git a/addons/point_of_sale/res_users_view.xml b/addons/point_of_sale/res_users_view.xml
index 2a510b1d575..89daeaa29a1 100644
--- a/addons/point_of_sale/res_users_view.xml
+++ b/addons/point_of_sale/res_users_view.xml
@@ -19,7 +19,7 @@
-
+
diff --git a/addons/point_of_sale/static/src/js/devices.js b/addons/point_of_sale/static/src/js/devices.js
index 142d35bd340..c96aff3d9c1 100644
--- a/addons/point_of_sale/static/src/js/devices.js
+++ b/addons/point_of_sale/static/src/js/devices.js
@@ -37,8 +37,7 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
callbacks[i](params);
}
- this.connection.rpc('/pos/'+name, params || {},
- function(result){
+ this.connection.rpc('/pos/'+name, params || {}).then(function(result){
ret.resolve(result);
},
function(error){
diff --git a/addons/portal/tests/test_portal.py b/addons/portal/tests/test_portal.py
index fe26f3280a2..83b10b39c28 100644
--- a/addons/portal/tests/test_portal.py
+++ b/addons/portal/tests/test_portal.py
@@ -50,6 +50,9 @@ class test_portal(test_mail.TestMailMockups):
user_chell = self.res_users.browse(cr, uid, self.user_chell_id)
self.partner_chell_id = user_chell.partner_id.id
+ # Set an email address for the user running the tests, used as Sender for outgoing mails
+ self.res_users.write(cr, uid, uid, {'email': 'test@localhost'})
+
def test_00_access_rights(self):
""" Test basic mail_message and mail_group access rights for portal users. """
cr, uid = self.cr, self.uid
diff --git a/addons/portal_crm/wizard/contact_view.xml b/addons/portal_crm/wizard/contact_view.xml
index 1776632d7ab..778e7f9562e 100644
--- a/addons/portal_crm/wizard/contact_view.xml
+++ b/addons/portal_crm/wizard/contact_view.xml
@@ -35,8 +35,8 @@
-
-
+
+
diff --git a/addons/process/static/src/js/process.js b/addons/process/static/src/js/process.js
index c593c1569fc..c214dbb0fdf 100644
--- a/addons/process/static/src/js/process.js
+++ b/addons/process/static/src/js/process.js
@@ -216,13 +216,12 @@ instance.web.ViewManager.include({
var dataset = new instance.web.DataSet(this, 'ir.values', this.session.user_context);
var action_manager = new instance.web.ActionManager(self);
dataset.call('get',
- ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context],
- function(res) {
+ ['action', 'tree_but_open',[['ir.ui.menu', id]], dataset.context]).then(function(res) {
var action = res[0][res[0].length - 1];
self.rpc("/web/action/load", {
action_id: action.id,
context: dataset.context
- }, function(result) {
+ }).then(function(result) {
action_manager.replace(self.$el);
action_manager.do_action(result.result);
})
@@ -239,7 +238,7 @@ instance.web.ViewManager.include({
title: _t('Process')
});
var form_controller = pop.view_form;
- pop.on('on_write_complete', self, self.initialize_process_view);
+ pop.on('write_completed', self, self.initialize_process_view);
}
});
};
diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py
index a1aed1dfba8..48569fa76c4 100644
--- a/addons/procurement/__openerp__.py
+++ b/addons/procurement/__openerp__.py
@@ -57,7 +57,7 @@ depending on the product's configuration.
'company_view.xml',
'board_mrp_procurement_view.xml',
],
- 'demo': ['stock_orderpoint.xml'],
+ 'demo': ['stock_orderpoint.xml','procurement_demo.xml'],
'test': ['test/procurement.yml'],
'installable': True,
'auto_install': True,
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 5d81bcbb9ba..b21cef30773 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -102,7 +102,6 @@ class procurement_order(osv.osv):
'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', states={'draft':[('readonly',False)], 'confirmed':[('readonly',False)]},
readonly=True, required=True, help="If you encode manually a Procurement, you probably want to use" \
" a make to order method."),
-
'note': fields.text('Note'),
'message': fields.char('Latest error', size=124, help="Exception occurred while computing procurement orders."),
'state': fields.selection([
@@ -362,11 +361,10 @@ class procurement_order(osv.osv):
""" Changes procurement state to Running and writes message.
@return: True
"""
- message = _('From stock: products assigned.')
+ message = _('Products reserved from stock.')
self.write(cr, uid, ids, {'state': 'running',
'message': message}, context=context)
self.message_post(cr, uid, ids, body=message, context=context)
- self.running_send_note(cr, uid, ids, context=context)
return True
def _check_make_to_stock_service(self, cr, uid, procurement, context=None):
@@ -390,8 +388,6 @@ class procurement_order(osv.osv):
order_point_id = self.pool.get('stock.warehouse.orderpoint').search(cr, uid, [('product_id', '=', procurement.product_id.id)], context=context)
if not order_point_id and not ok:
message = _("Not enough stock and no minimum orderpoint rule defined.")
- elif not order_point_id:
- message = _("No minimum orderpoint rule defined.")
elif not ok:
message = _("Not enough stock.")
@@ -407,7 +403,6 @@ class procurement_order(osv.osv):
"""
for procurement in self.browse(cr, uid, ids, context=context):
self.write(cr, uid, [procurement.id], {'state': 'running'})
- self.running_send_note(cr, uid, ids, context=None)
return True
def action_produce_assign_product(self, cr, uid, ids, context=None):
@@ -469,7 +464,6 @@ class procurement_order(osv.osv):
@return: True
"""
res = self.write(cr, uid, ids, {'state': 'ready'})
- self.ready_send_note(cr, uid, ids, context=None)
return res
def action_done(self, cr, uid, ids):
@@ -503,12 +497,6 @@ class procurement_order(osv.osv):
def confirm_send_note(self, cr, uid, ids, context=None):
self.message_post(cr, uid, ids, body=_("Procurement confirmed ."), context=context)
- def running_send_note(self, cr, uid, ids, context=None):
- self.message_post(cr, uid, ids, body=_("Procurement set to running ."), context=context)
-
- def ready_send_note(self, cr, uid, ids, context=None):
- self.message_post(cr, uid, ids, body=_("Procurement set to ready ."), context=context)
-
def cancel_send_note(self, cr, uid, ids, context=None):
self.message_post(cr, uid, ids, body=_("Procurement cancelled ."), context=context)
@@ -641,7 +629,18 @@ class stock_warehouse_orderpoint(osv.osv):
})
return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context)
-stock_warehouse_orderpoint()
+class product_template(osv.osv):
+ _inherit="product.template"
+
+ _columns = {
+ 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
+ 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
+ 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
+ }
+ _defaults = {
+ 'procure_method': 'make_to_stock',
+ 'supply_method': 'buy',
+ }
class product_product(osv.osv):
_inherit="product.product"
@@ -649,6 +648,6 @@ class product_product(osv.osv):
'orderpoint_ids': fields.one2many('stock.warehouse.orderpoint', 'product_id', 'Minimum Stock Rules'),
}
-product_product()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml
new file mode 100644
index 00000000000..608eb56f3ba
--- /dev/null
+++ b/addons/procurement/procurement_demo.xml
@@ -0,0 +1,204 @@
+
+
+
+
+
+ make_to_order
+ produce
+
+
+
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+ make_to_order
+
+
+
+ product
+
+
+
+ product
+
+
+
+ make_to_order
+ produce
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+ product
+
+
+
+
+
\ No newline at end of file
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index bf73b383216..973a09477fc 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -294,6 +294,29 @@
stock.warehouse.orderpoint
+
+ product.template.procurement
+ product.template
+
+
+
+
+
+
+
+
+
+
+ product.search.procurment.form
+ product.product
+
+
+
+
+
+
+
+
product.product.procurement
product.product
@@ -303,6 +326,33 @@
+
+
+
+
+
+
+
+ When you sell this service, nothing special will be triggered
+ to deliver the customer, as you set the procurement method as
+ 'Make to Stock'.
+
+
+ When you sell this product, OpenERP will use the available
+ inventory for the delivery order.
+
+ If there are not enough quantities available, the delivery order
+ will wait for new products. To fulfill the inventory, you should
+ create others rules like orderpoints.
+
+
+ When you sell this product, a delivery order will be created.
+ OpenERP will consider that the required quantities are always
+ available as it's a consumable (as a result of this, the quantity
+ on hand may become negative).
+
+
+
diff --git a/addons/product/product.py b/addons/product/product.py
index d5acee0333b..6c6c5f2650c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -109,8 +109,8 @@ class product_uom(osv.osv):
_order = "name"
_columns = {
- 'name': fields.char('Name', size=64, required=True, translate=True),
- 'category_id': fields.many2one('product.uom.categ', 'Unit of Measure Category', required=True, ondelete='cascade',
+ 'name': fields.char('Unit of Measure', size=64, required=True, translate=True),
+ 'category_id': fields.many2one('product.uom.categ', 'Category', required=True, ondelete='cascade',
help="Quantity conversions may happen automatically between Units of Measure in the same category, according to their respective ratios."),
'factor': fields.float('Ratio', required=True,digits=(12, 12),
help='How many times this Unit of Measure is smaller than the reference Unit of Measure in this category:\n'\
@@ -126,7 +126,7 @@ class product_uom(osv.osv):
'active': fields.boolean('Active', help="By unchecking the active field you can disable a unit of measure without deleting it."),
'uom_type': fields.selection([('bigger','Bigger than the reference Unit of Measure'),
('reference','Reference Unit of Measure for this category'),
- ('smaller','Smaller than the reference Unit of Measure')],'Unit of Measure Type', required=1),
+ ('smaller','Smaller than the reference Unit of Measure')],'Type', required=1),
}
_defaults = {
@@ -280,11 +280,8 @@ class product_template(osv.osv):
'description': fields.text('Description',translate=True),
'description_purchase': fields.text('Purchase Description',translate=True),
'description_sale': fields.text('Sale Description',translate=True),
- 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."),
- 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."),
- 'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."),
+ 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),
'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."),
- 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."),
'rental': fields.boolean('Can be Rent'),
'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
'list_price': fields.float('Sale Price', digits_compute=dp.get_precision('Product Price'), help="Base price for computing the customer price. Sometimes called the catalog price."),
@@ -296,7 +293,6 @@ class product_template(osv.osv):
help="Standard Price: the cost price is fixed and recomputed periodically (usually at the end of the year), Average Price: the cost price is recomputed at each reception of products."),
'warranty': fields.float('Warranty'),
'sale_ok': fields.boolean('Can be Sold', help="Determines if the product can be visible in the list of product within a selection from a sale order line."),
- 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."),
'state': fields.selection([('',''),
('draft', 'In Development'),
('sellable','Normal'),
@@ -309,11 +305,8 @@ class product_template(osv.osv):
'uos_coeff': fields.float('Unit of Measure -> UOS Coeff', digits_compute= dp.get_precision('Product UoS'),
help='Coefficient to convert Unit of Measure to UOS\n'
' uos = uom * coeff'),
- 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type', required=True),
+ 'mes_type': fields.selection((('fixed', 'Fixed'), ('variable', 'Variable')), 'Measure Type'),
'seller_ids': fields.one2many('product.supplierinfo', 'product_id', 'Partners'),
- 'loc_rack': fields.char('Rack', size=16),
- 'loc_row': fields.char('Row', size=16),
- 'loc_case': fields.char('Case', size=16),
'company_id': fields.many2one('res.company', 'Company', select=1),
}
@@ -351,21 +344,17 @@ class product_template(osv.osv):
_defaults = {
'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c),
- 'list_price': lambda *a: 1,
- 'cost_method': lambda *a: 'standard',
- 'supply_method': lambda *a: 'buy',
- 'standard_price': lambda *a: 0.0,
- 'sale_ok': lambda *a: 1,
- 'sale_delay': lambda *a: 7,
- 'produce_delay': lambda *a: 1,
- 'purchase_ok': lambda *a: 1,
- 'procure_method': lambda *a: 'make_to_stock',
+ 'list_price': 1,
+ 'cost_method': 'standard',
+ 'standard_price': 0.0,
+ 'sale_ok': 1,
+ 'produce_delay': 1,
'uom_id': _get_uom_id,
'uom_po_id': _get_uom_id,
- 'uos_coeff' : lambda *a: 1.0,
- 'mes_type' : lambda *a: 'fixed',
+ 'uos_coeff' : 1.0,
+ 'mes_type' : 'fixed',
'categ_id' : _default_category,
- 'type' : lambda *a: 'consu',
+ 'type' : 'consu',
}
def _check_uom(self, cursor, user, ids, context=None):
diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml
index 1974acc6df2..8e5280d036a 100644
--- a/addons/product/product_data.xml
+++ b/addons/product/product_data.xml
@@ -197,7 +197,6 @@ parameter) will see those record just disappear.
Service
service
-
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 66b86fc7b63..14477d2401a 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -70,8 +70,6 @@
20.5
30.75
service
- make_to_order
- produce
This type of service include basic monitoring of products.
@@ -84,8 +82,6 @@
25.5
38.25
service
- make_to_order
- produce
This type of service include assistance for security questions, system configuration requirements, implementation or special needs.
@@ -97,9 +93,7 @@
450.0
300.0
- product
- make_to_order
- produce
+ consu
4.0
@@ -115,9 +109,8 @@ HDD SH-1
500.0
750.0
- product
- make_to_order
- produce
+ consu
+
4.0
@@ -133,9 +126,7 @@ HDD SH-1
600.0
900.0
- product
- make_to_order
- produce
+ consu
7.0
@@ -148,7 +139,7 @@ HDD SH-1
800.0
1200.0
- product
+ consu
@@ -158,7 +149,7 @@ HDD SH-1
880.0
1350.0
- product
+ consu
@@ -168,7 +159,7 @@ HDD SH-1
10.0
13.0
- product
+ consu
@@ -178,8 +169,7 @@ HDD SH-1
10.0
13.0
- product
- make_to_order
+ consu
@@ -189,7 +179,7 @@ HDD SH-1
12.50
14
- product
+ consu
@@ -199,7 +189,7 @@ HDD SH-1
14
16.50
- product
+ consu
@@ -209,8 +199,7 @@ HDD SH-1
18
12.50
- product
- make_to_order
+ consu
@@ -220,7 +209,7 @@ HDD SH-1
78.0
85.0
- product
+ consu
@@ -230,7 +219,7 @@ HDD SH-1
87.0
95.0
- product
+ consu
@@ -240,7 +229,7 @@ HDD SH-1
80.0
85.0
- product
+ consu
@@ -250,9 +239,7 @@ HDD SH-1
20.0
25.0
- product
- make_to_order
- produce
+ consu
@@ -262,7 +249,7 @@ HDD SH-1
860.0
975.0
- product
+ consu
@@ -272,9 +259,7 @@ HDD SH-1
1020.0
1150.0
- product
- make_to_order
- produce
+ consu
@@ -284,9 +269,7 @@ HDD SH-1
1100.0
1250.0
- product
- make_to_order
- produce
+ consu
On demand hard-disk having capacity based on requirement.
@@ -297,7 +280,7 @@ HDD SH-1
1700.0
1950.0
- product
+ consu
@@ -307,7 +290,7 @@ HDD SH-1
1790.0
2000.0
- product
+ consu
@@ -317,7 +300,7 @@ HDD SH-1
2010.0
2100.0
- product
+ consu
@@ -327,7 +310,7 @@ HDD SH-1
1910.0
1980.0
- product
+ consu
@@ -337,7 +320,7 @@ HDD SH-1
876.0
885.0
- product
+ consu
@@ -347,7 +330,7 @@ HDD SH-1
2870.0
2950.0
- product
+ consu
17" Monitor
@@ -361,7 +344,7 @@ QWERTY keyboard
3000.0
3245.0
- product
+ consu
17" Monitor
@@ -375,9 +358,7 @@ QWERTY keyboard
3300.0
3645.0
- product
- make_to_order
- produce
+ consu
Custom Laptop based on customer's requirement.
@@ -388,7 +369,7 @@ QWERTY keyboard
390.0
405.0
- product
+ consu
@@ -399,7 +380,7 @@ QWERTY keyboard
90.0
100.0
- product
+ consu
@@ -410,7 +391,7 @@ QWERTY keyboard
126.0
145.0
- product
+ consu
@@ -420,7 +401,7 @@ QWERTY keyboard
134.0
150.0
- product
+ consu
.
@@ -431,7 +412,7 @@ QWERTY keyboard
57.0
62.0
- product
+ consu
Hands free headset for laptop PC with in-line microphone and headphone plug.
@@ -442,8 +423,7 @@ QWERTY keyboard
60.0
65.0
- product
- make_to_order
+ consu
Headset for laptop PC with USB connector.
@@ -455,7 +435,7 @@ QWERTY keyboard
38.0
45.0
- product
+ consu
@@ -466,7 +446,7 @@ QWERTY keyboard
18.40
20.0
- product
+ consu
@@ -477,7 +457,7 @@ QWERTY keyboard
21.60
24.0
- product
+ consu
@@ -488,8 +468,7 @@ QWERTY keyboard
4258.0
4410.0
- product
- make_to_order
+ consu
All in one hi-speed printer with fax and scanner.
@@ -501,7 +480,7 @@ QWERTY keyboard
60.0
65.0
- product
+ consu
@@ -512,7 +491,7 @@ QWERTY keyboard
66.0
70.0
- product
+ consu
@@ -569,8 +548,6 @@ QWERTY keyboard
155.0
173.0
consu
- make_to_order
- produce
Full featured image editing software.
@@ -582,7 +559,7 @@ QWERTY keyboard
55.0
60.0
- product
+ consu
@@ -593,7 +570,7 @@ QWERTY keyboard
35.0
40.0
- product
+ consu
@@ -604,7 +581,7 @@ QWERTY keyboard
55.0
70.0
- product
+ consu
@@ -615,7 +592,7 @@ QWERTY keyboard
13.0
18.0
- product
+ consu
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 8c19aee026f..b7fbcd560f7 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -10,12 +10,10 @@
-
+
-
-
-
+
@@ -60,7 +58,7 @@