diff --git a/addons/account/account.py b/addons/account/account.py index 910f4b4c6ff..c165a7f3b42 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1652,7 +1652,7 @@ class account_move_reconcile(osv.osv): 'create_date': fields.date('Creation date', readonly=True), } _defaults = { - 'name': lambda self,cr,uid,ctx={}: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile') or '/', + 'name': lambda self,cr,uid,ctx=None: self.pool.get('ir.sequence').get(cr, uid, 'account.reconcile', context=ctx) or '/', } def reconcile_partial_check(self, cr, uid, ids, type='auto', context=None): diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index c1f787f5d80..5601179e0fc 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -341,11 +341,11 @@ class account_bank_statement(osv.osv): if not st.name == '/': st_number = st.name else: + c = {'fiscalyear_id': st.period_id.fiscalyear_id.id} if st.journal_id.sequence_id: - c = {'fiscalyear_id': st.period_id.fiscalyear_id.id} st_number = obj_seq.next_by_id(cr, uid, st.journal_id.sequence_id.id, context=c) else: - st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement') + st_number = obj_seq.next_by_code(cr, uid, 'account.bank.statement', context=c) for line in st.move_line_ids: if line.state <> 'valid': diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 2768fd83019..f19c1e1c639 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -279,11 +279,11 @@ class account_cash_statement(osv.osv): raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name))) if statement.name and statement.name == '/': + c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id} if statement.journal_id.sequence_id: - c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id} st_number = obj_seq.next_by_id(cr, uid, statement.journal_id.sequence_id.id, context=c) else: - st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement') + st_number = obj_seq.next_by_code(cr, uid, 'account.cash.statement', context=c) vals.update({ 'name': st_number }) diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml index 6c651405c92..f86d5f3a359 100644 --- a/addons/account/account_menuitem.xml +++ b/addons/account/account_menuitem.xml @@ -10,27 +10,28 @@ - + - + - + + - + - + - + - + diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index ffd2811cba7..0ec75e7b5c8 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -61,7 +61,7 @@ - + diff --git a/addons/account/ir_sequence.py b/addons/account/ir_sequence.py index 5c9039e43c3..a98b7e87d77 100644 --- a/addons/account/ir_sequence.py +++ b/addons/account/ir_sequence.py @@ -48,6 +48,8 @@ class ir_sequence(osv.osv): } def _next(self, cr, uid, seq_ids, context=None): + if context is None: + context = {} for seq in self.browse(cr, uid, seq_ids, context): for line in seq.fiscal_ids: if line.fiscalyear_id.id == context.get('fiscalyear_id'): diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 86f437ae8bd..964383246dd 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -3,7 +3,7 @@ - All Uninvoiced Entries + Time & Costs to Invoice account.analytic.line form tree,form @@ -11,7 +11,7 @@ {'search_default_to_invoice': 1} - + account.analytic.account.search @@ -81,7 +81,7 @@ - + diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 8f8a017c376..dfcdebb9cf1 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -288,7 +288,7 @@ - + , 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-03-24 03:16+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Ecuador) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-25 05:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in draft and open states" +msgstr "Activos en estado borrador y abierto" + +#. module: account_asset +#: field:account.asset.category,method_end:0 +#: field:account.asset.history,method_end:0 field:asset.modify,method_end:0 +msgid "Ending date" +msgstr "Fecha de finalización" + +#. module: account_asset +#: field:account.asset.asset,value_residual:0 +msgid "Residual Value" +msgstr "Valor residual" + +#. module: account_asset +#: field:account.asset.category,account_expense_depreciation_id:0 +msgid "Depr. Expense Account" +msgstr "Cuenta gastos amortización" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Compute Asset" +msgstr "Calcular activo" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Group By..." +msgstr "Agrupar por..." + +#. module: account_asset +#: field:asset.asset.report,gross_value:0 +msgid "Gross Amount" +msgstr "Importe bruto" + +#. module: account_asset +#: view:account.asset.asset:0 field:account.asset.asset,name:0 +#: field:account.asset.depreciation.line,asset_id:0 +#: field:account.asset.history,asset_id:0 field:account.move.line,asset_id:0 +#: view:asset.asset.report:0 field:asset.asset.report,asset_id:0 +#: model:ir.model,name:account_asset.model_account_asset_asset +msgid "Asset" +msgstr "Activo Fijo" + +#. module: account_asset +#: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0 +msgid "" +"Indicates that the first depreciation entry for this asset have to be done " +"from the purchase date instead of the first January" +msgstr "" +"Indica que el primer asiento de depreciación para este activo tiene que ser " +"hecho desde la fecha de compra en vez de desde el 1 de enero" + +#. module: account_asset +#: field:account.asset.history,name:0 +msgid "History name" +msgstr "Nombre histórico" + +#. module: account_asset +#: field:account.asset.asset,company_id:0 +#: field:account.asset.category,company_id:0 view:asset.asset.report:0 +#: field:asset.asset.report,company_id:0 +msgid "Company" +msgstr "Compañia" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Modify" +msgstr "Modificar" + +#. module: account_asset +#: selection:account.asset.asset,state:0 view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Running" +msgstr "En proceso" + +#. module: account_asset +#: field:account.asset.depreciation.line,amount:0 +msgid "Depreciation Amount" +msgstr "Importe de depreciación" + +#. module: account_asset +#: view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_asset_report +#: model:ir.model,name:account_asset.model_asset_asset_report +#: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report +msgid "Assets Analysis" +msgstr "Análisis activos" + +#. module: account_asset +#: field:asset.modify,name:0 +msgid "Reason" +msgstr "Motivo" + +#. module: account_asset +#: field:account.asset.asset,method_progress_factor:0 +#: field:account.asset.category,method_progress_factor:0 +msgid "Degressive Factor" +msgstr "Factor degresivo" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal +msgid "Asset Categories" +msgstr "Categorías de Activo Fijo" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "" +"This wizard will post the depreciation lines of running assets that belong " +"to the selected period." +msgstr "" +"Este asistente asentará las líneas de depreciación de los activos en " +"ejecución que pertenezcan al periodo seleccionado" + +#. module: account_asset +#: field:account.asset.asset,account_move_line_ids:0 +#: field:account.move.line,entry_ids:0 +#: model:ir.actions.act_window,name:account_asset.act_entries_open +msgid "Entries" +msgstr "Asientos" + +#. module: account_asset +#: view:account.asset.asset:0 +#: field:account.asset.asset,depreciation_line_ids:0 +msgid "Depreciation Lines" +msgstr "Detalle de Depreciación" + +#. module: account_asset +#: help:account.asset.asset,salvage_value:0 +msgid "It is the amount you plan to have that you cannot depreciate." +msgstr "Es el importe que prevee tener y que no puede depreciar" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciation_date:0 +#: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0 +msgid "Depreciation Date" +msgstr "Fecha de depreciación" + +#. module: account_asset +#: field:account.asset.category,account_asset_id:0 +msgid "Asset Account" +msgstr "Cuenta de Activo Fijo" + +#. module: account_asset +#: field:asset.asset.report,posted_value:0 +msgid "Posted Amount" +msgstr "Monto Contabilizado" + +#. module: account_asset +#: view:account.asset.asset:0 view:asset.asset.report:0 +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_form +#: model:ir.ui.menu,name:account_asset.menu_finance_assets +#: model:ir.ui.menu,name:account_asset.menu_finance_config_assets +msgid "Assets" +msgstr "Activos Fijos" + +#. module: account_asset +#: field:account.asset.category,account_depreciation_id:0 +msgid "Depreciation Account" +msgstr "Cuenta de Depreciación" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +#: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0 +msgid "Notes" +msgstr "Notas" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_id:0 +msgid "Depreciation Entry" +msgstr "Asiento de Depreciación" + +#. module: account_asset +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "¡Valor erróneo en el debe o en el haber del asiento contable!" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,nbr:0 +msgid "# of Depreciation Lines" +msgstr "# de líneas de depreciación" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in draft state" +msgstr "Depreciaciones en estado borrador" + +#. module: account_asset +#: field:account.asset.asset,method_end:0 +#: selection:account.asset.asset,method_time:0 +#: selection:account.asset.category,method_time:0 +#: selection:account.asset.history,method_time:0 +msgid "Ending Date" +msgstr "Fecha de Cierre" + +#. module: account_asset +#: field:account.asset.asset,code:0 +msgid "Reference" +msgstr "Ref." + +#. module: account_asset +#: constraint:account.invoice:0 +msgid "Invalid BBA Structured Communication !" +msgstr "¡Estructura de comunicación BBA no válida!" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Account Asset" +msgstr "Cuenta de activo" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard +#: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard +msgid "Compute Assets" +msgstr "Calcular Depreciación de Activos Fijos" + +#. module: account_asset +#: field:account.asset.depreciation.line,sequence:0 +msgid "Sequence of the depreciation" +msgstr "Secuencia de Depreciación" + +#. module: account_asset +#: field:account.asset.asset,method_period:0 +#: field:account.asset.category,method_period:0 +#: field:account.asset.history,method_period:0 +#: field:asset.modify,method_period:0 +msgid "Period Length" +msgstr "Tiempo a Depreciar" + +#. module: account_asset +#: selection:account.asset.asset,state:0 view:asset.asset.report:0 +#: selection:asset.asset.report,state:0 +msgid "Draft" +msgstr "Borrador" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of asset purchase" +msgstr "Fecha de compra del activo" + +#. module: account_asset +#: help:account.asset.asset,method_number:0 +msgid "Calculates Depreciation within specified interval" +msgstr "Calcula la depreciación en el período especificado" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Change Duration" +msgstr "Cambiar duración" + +#. module: account_asset +#: field:account.asset.category,account_analytic_id:0 +msgid "Analytic account" +msgstr "Cuenta Analitica" + +#. module: account_asset +#: field:account.asset.asset,method:0 field:account.asset.category,method:0 +msgid "Computation Method" +msgstr "Método de cálculo" + +#. module: account_asset +#: help:account.asset.asset,method_period:0 +msgid "State here the time during 2 depreciations, in months" +msgstr "Ponga aquí el tiempo entre 2 amortizaciones, en meses" + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "" +"Prorata temporis can be applied only for time method \"number of " +"depreciations\"." +msgstr "" +"Prorata temporis puede ser aplicado solo para método de tiempo \"numero de " +"depreciaciones\"" + +#. module: account_asset +#: help:account.asset.history,method_time:0 +msgid "" +"The method to use to compute the dates and number of depreciation lines.\n" +"Number of Depreciations: Fix the number of depreciation lines and the time " +"between 2 depreciations.\n" +"Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" +"El método usado para calcular las fechas número de líneas de depreciación\n" +"Número de depreciaciones: Ajusta el número de líneas de depreciación y el " +"tiempo entre 2 depreciaciones\n" +"Fecha de fin: Escoja un tiempo entre 2 amortizaciones y la fecha de " +"depreciación no irá más allá." + +#. module: account_asset +#: field:account.asset.asset,purchase_value:0 +msgid "Gross value " +msgstr "Valor bruto " + +#. module: account_asset +#: constraint:account.asset.asset:0 +msgid "Error ! You can not create recursive assets." +msgstr "¡Error! No puede crear activos recursivos" + +#. module: account_asset +#: help:account.asset.history,method_period:0 +msgid "Time in month between two depreciations" +msgstr "Tiempo en meses entre 2 depreciaciones" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,name:0 +msgid "Year" +msgstr "Año" + +#. module: account_asset +#: view:asset.modify:0 +#: model:ir.actions.act_window,name:account_asset.action_asset_modify +#: model:ir.model,name:account_asset.model_asset_modify +msgid "Modify Asset" +msgstr "Modificar Activo Fijo" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Other Information" +msgstr "Otra Información" + +#. module: account_asset +#: field:account.asset.asset,salvage_value:0 +msgid "Salvage Value" +msgstr "Valor de salvaguarda" + +#. module: account_asset +#: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0 +msgid "Asset Category" +msgstr "Categoría de Activo" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Close" +msgstr "Marcar cerrado" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_compute +msgid "Compute assets" +msgstr "Calcular Activos Fijos" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_modify +msgid "Modify asset" +msgstr "Modificar activo" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Assets in closed state" +msgstr "Activos en cerrados" + +#. module: account_asset +#: field:account.asset.asset,parent_id:0 +msgid "Parent Asset" +msgstr "Padre del activo" + +#. module: account_asset +#: view:account.asset.history:0 +#: model:ir.model,name:account_asset.model_account_asset_history +msgid "Asset history" +msgstr "Histórico del activo" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current year" +msgstr "Activos comprados en el año actual" + +#. module: account_asset +#: field:account.asset.asset,state:0 field:asset.asset.report,state:0 +msgid "State" +msgstr "Estado" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice_line +msgid "Invoice Line" +msgstr "Detalle de Factura" + +#. module: account_asset +#: 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 "" +"La cuenta selecionada de su diario obliga a tener una moneda secundaria. " +"Usted debería eliminar la moneda secundaria de la cuenta o asignar una vista " +"de multi-moneda al diario." + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month" +msgstr "Mes" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Depreciation Board" +msgstr "Tabla de depreciación" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_move_line +msgid "Journal Items" +msgstr "Asientos Contables" + +#. module: account_asset +#: field:asset.asset.report,unposted_value:0 +msgid "Unposted Amount" +msgstr "Importe no contabilizado" + +#. module: account_asset +#: field:account.asset.asset,method_time:0 +#: field:account.asset.category,method_time:0 +#: field:account.asset.history,method_time:0 +msgid "Time Method" +msgstr "Método de tiempo" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Analytic information" +msgstr "Información analítica" + +#. module: account_asset +#: view:asset.modify:0 +msgid "Asset durations to modify" +msgstr "Duraciones de activo para modificar" + +#. module: account_asset +#: 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 "" +"¡La fecha de su asiento no está en el periodo definido! Usted debería " +"cambiar la fecha o borrar esta restricción del diario." + +#. module: account_asset +#: field:account.asset.asset,note:0 field:account.asset.category,note:0 +#: field:account.asset.history,note:0 +msgid "Note" +msgstr "Nota" + +#. module: account_asset +#: help:account.asset.asset,method:0 help:account.asset.category,method:0 +msgid "" +"Choose the method to use to compute the amount of depreciation lines.\n" +" * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" +" * Degressive: Calculated on basis of: Remaining Value * Degressive Factor" +msgstr "" +"Escoja el método para usar en el cálculo del importe de las líneas de " +"depreciación\n" +" * Lineal: calculado en base a: valor bruto / número de depreciaciones\n" +" * Regresivo: calculado en base a: valor remanente/ factor de regresión" + +#. module: account_asset +#: help:account.asset.asset,method_time:0 +#: help:account.asset.category,method_time:0 +msgid "" +"Choose the method to use to compute the dates and number of depreciation " +"lines.\n" +" * Number of Depreciations: Fix the number of depreciation lines and the " +"time between 2 depreciations.\n" +" * Ending Date: Choose the time between 2 depreciations and the date the " +"depreciations won't go beyond." +msgstr "" +"Escoja el método utilizado para calcular las fechas y número de las líneas " +"de depreciación\n" +" * Número de depreciaciones: Establece el número de líneas de depreciación " +"y el tiempo entre dos depreciaciones.\n" +" * Fecha fin: Seleccione el tiempo entre 2 depreciaciones y la fecha de la " +"depreciación no irá más allá." + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets in running state" +msgstr "Activos en depreciación" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Closed" +msgstr "Cerrado" + +#. module: account_asset +#: field:account.asset.asset,partner_id:0 +#: field:asset.asset.report,partner_id:0 +msgid "Partner" +msgstr "Empresa" + +#. module: account_asset +#: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0 +msgid "Amount of Depreciation Lines" +msgstr "Importe de las líneas de depreciación" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Posted depreciation lines" +msgstr "Detalle de depreciación" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "Company must be the same for its related account and period." +msgstr "La compañía debe ser la misma para su cuenta y periodos relacionados" + +#. module: account_asset +#: field:account.asset.asset,child_ids:0 +msgid "Children Assets" +msgstr "Activos hijos" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Date of depreciation" +msgstr "Fecha de depreciación" + +#. module: account_asset +#: field:account.asset.history,user_id:0 +msgid "User" +msgstr "Usuario" + +#. module: account_asset +#: field:account.asset.history,date:0 +msgid "Date" +msgstr "Fecha" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in current month" +msgstr "Activos comprados en el mes actual" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create journal items on an account of type view." +msgstr "No puede crear asientos en una cuenta de tipo vista" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Extended Filters..." +msgstr "Filtros extendidos..." + +#. module: account_asset +#: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0 +msgid "Compute" +msgstr "Calcular" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Search Asset Category" +msgstr "Buscar categoría de activo" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard +msgid "asset.depreciation.confirmation.wizard" +msgstr "asset.depreciation.confirmation.wizard" + +#. module: account_asset +#: field:account.asset.asset,active:0 +msgid "Active" +msgstr "Activo" + +#. module: account_asset +#: model:ir.actions.wizard,name:account_asset.wizard_asset_close +msgid "Close asset" +msgstr "Cerrar Activo Fijo" + +#. module: account_asset +#: field:account.asset.depreciation.line,parent_state:0 +msgid "State of Asset" +msgstr "Estado del activo" + +#. module: account_asset +#: field:account.asset.depreciation.line,name:0 +msgid "Depreciation Name" +msgstr "Nombre depreciación" + +#. module: account_asset +#: view:account.asset.asset:0 field:account.asset.asset,history_ids:0 +msgid "History" +msgstr "Histórico" + +#. module: account_asset +#: sql_constraint:account.invoice:0 +msgid "Invoice Number must be unique per Company!" +msgstr "¡El número de factura debe ser único por compañía!" + +#. module: account_asset +#: field:asset.depreciation.confirmation.wizard,period_id:0 +msgid "Period" +msgstr "Período" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "General" +msgstr "General" + +#. module: account_asset +#: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0 +msgid "Prorata Temporis" +msgstr "Prorata Temporis" + +#. module: account_asset +#: view:account.asset.category:0 +msgid "Accounting information" +msgstr "Información contable" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_invoice +msgid "Invoice" +msgstr "Factura" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal +msgid "Review Asset Categories" +msgstr "Revisar categorías de activos" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0 +msgid "Cancel" +msgstr "Cancelar" + +#. module: account_asset +#: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0 +msgid "Close" +msgstr "Cerrar" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +msgid "Depreciation Method" +msgstr "Método de depreciación" + +#. module: account_asset +#: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0 +#: field:asset.asset.report,purchase_date:0 +msgid "Purchase Date" +msgstr "Fecha de compra" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Degressive" +msgstr "Disminución" + +#. module: account_asset +#: help:asset.depreciation.confirmation.wizard,period_id:0 +msgid "" +"Choose the period for which you want to automatically post the depreciation " +"lines of running assets" +msgstr "" +"Escoja el periodo para el que desea asentar automáticamente las líneas de " +"depreciación para los activos en ejecución" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Current" +msgstr "Actual" + +#. module: account_asset +#: field:account.asset.depreciation.line,remaining_value:0 +msgid "Amount to Depreciate" +msgstr "Importe a depreciar" + +#. module: account_asset +#: field:account.asset.category,open_asset:0 +msgid "Skip Draft State" +msgstr "Omitir estado borrador" + +#. module: account_asset +#: view:account.asset.asset:0 view:account.asset.category:0 +#: view:account.asset.history:0 +msgid "Depreciation Dates" +msgstr "Fechas de depreciación" + +#. module: account_asset +#: field:account.asset.asset,currency_id:0 +msgid "Currency" +msgstr "Moneda" + +#. module: account_asset +#: field:account.asset.category,journal_id:0 +msgid "Journal" +msgstr "Diario" + +#. module: account_asset +#: field:account.asset.depreciation.line,depreciated_value:0 +msgid "Amount Already Depreciated" +msgstr "importe depreciado" + +#. module: account_asset +#: field:account.asset.depreciation.line,move_check:0 +#: view:asset.asset.report:0 field:asset.asset.report,move_check:0 +msgid "Posted" +msgstr "Contabilizado" + +#. module: account_asset +#: help:account.asset.asset,state:0 +msgid "" +"When an asset is created, the state is 'Draft'.\n" +"If the asset is confirmed, the state goes in 'Running' and the depreciation " +"lines can be posted in the accounting.\n" +"You can manually close an asset when the depreciation is over. If the last " +"line of depreciation is posted, the asset automatically goes in that state." +msgstr "" +"Cuando un activo es creado, su estado es 'Borrador'.\n" +"Si el activo es confirmado, el estado pasa a 'en ejecución' y las líneas de " +"amortización pueden ser asentados en la contabilidad.\n" +"Puede cerrar manualmente un activo cuando su amortización ha finalizado. Si " +"la última línea de depreciación se asienta, el activo automáticamente pasa a " +"este estado." + +#. module: account_asset +#: field:account.asset.category,name:0 +msgid "Name" +msgstr "Nombre" + +#. module: account_asset +#: help:account.asset.category,open_asset:0 +msgid "" +"Check this if you want to automatically confirm the assets of this category " +"when created by invoices." +msgstr "" +"Valide si desea confirmar automáticamente el activo de esta categoría cuando " +"es creado desde una factura." + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Set to Draft" +msgstr "Cambiar a borrador" + +#. module: account_asset +#: selection:account.asset.asset,method:0 +#: selection:account.asset.category,method:0 +msgid "Linear" +msgstr "Lineal" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Month-1" +msgstr "Mes-1" + +#. module: account_asset +#: model:ir.model,name:account_asset.model_account_asset_depreciation_line +msgid "Asset depreciation line" +msgstr "Línea de depreciación del activo" + +#. module: account_asset +#: field:account.asset.asset,category_id:0 view:account.asset.category:0 +#: field:asset.asset.report,asset_category_id:0 +#: model:ir.model,name:account_asset.model_account_asset_category +msgid "Asset category" +msgstr "Categoría de activo" + +#. module: account_asset +#: view:asset.asset.report:0 +msgid "Assets purchased in last month" +msgstr "Activos comprados en el último mes" + +#. module: account_asset +#: code:addons/account_asset/wizard/wizard_asset_compute.py:49 +#, python-format +msgid "Created Asset Moves" +msgstr "Movimientos de activos creados" + +#. module: account_asset +#: constraint:account.move.line:0 +msgid "You can not create journal items on closed account." +msgstr "No puede crear asientos en cuentas cerradas" + +#. module: account_asset +#: model:ir.actions.act_window,help:account_asset.action_asset_asset_report +msgid "" +"From this report, you can have an overview on all depreciation. The tool " +"search can also be used to personalise your Assets reports and so, match " +"this analysis to your needs;" +msgstr "" +"Para este informe, puede tener una visión general de todas las " +"depreciaciones. La herramienta de búsqueda también puede ser utilizada para " +"personalizar sus informes de activos y por lo tanto adecuar este análisis a " +"sus necesidades;" + +#. module: account_asset +#: help:account.asset.category,method_period:0 +msgid "State here the time between 2 depreciations, in months" +msgstr "Establezca aquí el tiempo entre 2 depreciaciones, en meses" + +#. module: account_asset +#: field:account.asset.asset,method_number:0 +#: selection:account.asset.asset,method_time:0 +#: field:account.asset.category,method_number:0 +#: selection:account.asset.category,method_time:0 +#: field:account.asset.history,method_number:0 +#: selection:account.asset.history,method_time:0 +#: field:asset.modify,method_number:0 +msgid "Number of Depreciations" +msgstr "Número de depreciaciones" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Create Move" +msgstr "Crear asiento" + +#. module: account_asset +#: view:asset.depreciation.confirmation.wizard:0 +msgid "Post Depreciation Lines" +msgstr "Asentar líneas de depreciación" + +#. module: account_asset +#: view:account.asset.asset:0 +msgid "Confirm Asset" +msgstr "Confirmar activo" + +#. module: account_asset +#: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_tree +#: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_tree +msgid "Asset Hierarchy" +msgstr "Jerarquía de activos" diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 3ed173cca85..54226166508 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -903,7 +903,7 @@ class account_voucher(osv.osv): if voucher_brw.number: name = voucher_brw.number elif voucher_brw.journal_id.sequence_id: - name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id) + name = seq_obj.next_by_id(cr, uid, voucher_brw.journal_id.sequence_id.id, context=context) else: raise osv.except_osv(_('Error !'), _('Please define a sequence on the journal !')) diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml index 5f81769eb1a..9be0b6919c7 100644 --- a/addons/association/profile_association.xml +++ b/addons/association/profile_association.xml @@ -9,6 +9,6 @@ web_icon="images/association.png" web_icon_hover="images/association-hover.png"/> - + diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 995ffa78959..0d2a4dd49f8 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -770,7 +770,7 @@ - + - + - - - Addresses - - + @@ -37,7 +37,7 @@ - + diff --git a/addons/base_report_designer/base_report_designer_installer.xml b/addons/base_report_designer/base_report_designer_installer.xml index 2774767af26..d85c9531733 100644 --- a/addons/base_report_designer/base_report_designer_installer.xml +++ b/addons/base_report_designer/base_report_designer_installer.xml @@ -66,10 +66,10 @@ form form new - {'menu':True} + {'menu':True} - + diff --git a/addons/base_tools/i18n/es_EC.po b/addons/base_tools/i18n/es_EC.po new file mode 100644 index 00000000000..3e9b289b0dc --- /dev/null +++ b/addons/base_tools/i18n/es_EC.po @@ -0,0 +1,32 @@ +# Spanish (Ecuador) 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: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2012-03-24 04:09+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Ecuador) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-25 05:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#. module: base_tools +#: model:ir.module.module,shortdesc:base_tools.module_meta_information +msgid "Common base for tools modules" +msgstr "Base común para módulos herramientas" + +#. module: base_tools +#: model:ir.module.module,description:base_tools.module_meta_information +msgid "" +"\n" +" " +msgstr "" +"\n" +" " diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml index c5a51795425..8cefd04a3b7 100644 --- a/addons/board/board_data_admin.xml +++ b/addons/board/board_data_admin.xml @@ -160,8 +160,8 @@ - - + + diff --git a/addons/board/board_view.xml b/addons/board/board_view.xml index 36d75002476..9a3745df2e2 100644 --- a/addons/board/board_view.xml +++ b/addons/board/board_view.xml @@ -68,7 +68,7 @@ - + diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml index 5ea3844e896..69c4f0bfb9e 100644 --- a/addons/crm/board_crm_statistical_view.xml +++ b/addons/crm/board_crm_statistical_view.xml @@ -107,10 +107,10 @@ - + ['|', ('type','=','lead'), ('type','=',False)] - {'search_default_new':1, 'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'} + {'default_type': 'lead', 'search_default_section_id': section_id, 'stage_type': 'lead'} Leads allow you to manage and keep track of all initial contacts with a prospect or partner showing interest in your products or services. A lead is usually the first step in your sales cycle. Once qualified, a lead may be converted into a business opportunity, while creating the related partner for further detailed tracking of any linked activities. You can import a database of prospects, keep track of your business cards or integrate your website's contact form with the OpenERP Leads. Leads can be connected to the email gateway: new emails may create leads, each of them automatically gets the history of the conversation with the prospect. diff --git a/addons/crm/crm_meeting_menu.xml b/addons/crm/crm_meeting_menu.xml index af50149f693..7c0b2f6cfa4 100644 --- a/addons/crm/crm_meeting_menu.xml +++ b/addons/crm/crm_meeting_menu.xml @@ -87,12 +87,12 @@ - + + action="crm_case_categ_meet" parent="base.menu_sales" + sequence="7" /> Meeting Invitations @@ -106,10 +106,6 @@ With Meeting Invitations you can create and manage the meeting invitations sent/to be sent to your colleagues/partners. You can not only invite OpenERP users, but also external parties, such as a customer. - diff --git a/addons/crm/crm_phonecall_menu.xml b/addons/crm/crm_phonecall_menu.xml index d8d00710420..4b7174028ed 100644 --- a/addons/crm/crm_phonecall_menu.xml +++ b/addons/crm/crm_phonecall_menu.xml @@ -105,7 +105,7 @@ tree,calendar [('state','!=','done')] - + Scheduled calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team. diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index c1203d27659..e07bb8a49a7 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -2,7 +2,7 @@ - - + diff --git a/addons/crm/i18n/zh_CN.po b/addons/crm/i18n/zh_CN.po index 3410c074fe1..ca93cb53145 100644 --- a/addons/crm/i18n/zh_CN.po +++ b/addons/crm/i18n/zh_CN.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 01:37+0100\n" -"PO-Revision-Date: 2012-02-20 03:23+0000\n" -"Last-Translator: Jeff Wang \n" +"PO-Revision-Date: 2012-03-22 16:17+0000\n" +"Last-Translator: Wei \"oldrev\" Li \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-02-21 05:55+0000\n" -"X-Generator: Launchpad (build 14838)\n" +"X-Launchpad-Export-Date: 2012-03-23 04:41+0000\n" +"X-Generator: Launchpad (build 14996)\n" #. module: crm #: view:crm.lead.report:0 @@ -291,7 +291,7 @@ msgstr "状态" #: model:ir.ui.menu,name:crm.menu_crm_case_phonecall-act #: model:ir.ui.menu,name:crm.menu_crm_lead_categ msgid "Categories" -msgstr "类型" +msgstr "分类" #. module: crm #: view:crm.lead:0 @@ -419,7 +419,7 @@ msgstr "这默认百分比描述业务在这阶段的平均的成功概率" #: field:crm.phonecall.report,categ_id:0 #: field:crm.phonecall2phonecall,categ_id:0 msgid "Category" -msgstr "类型" +msgstr "分类" #. module: crm #: view:crm.lead:0 @@ -561,7 +561,7 @@ msgstr "满意度计算" #. module: crm #: view:crm.case.categ:0 msgid "Case Category" -msgstr "业务类型" +msgstr "业务分类" #. module: crm #: help:crm.segmentation,som_interval_default:0 @@ -605,7 +605,7 @@ msgstr "电话访问" msgid "" "The partner category that will be added to partners that match the " "segmentation criterions after computation." -msgstr "这业务伙伴类型将加到计算匹配业务伙伴的业务伙伴细分规则中" +msgstr "该业务伙伴分类将加到计算匹配业务伙伴的业务伙伴细分规则中" #. module: crm #: code:addons/crm/crm_meeting.py:93 @@ -870,7 +870,7 @@ msgstr "商机列表" #. module: crm #: field:crm.segmentation,categ_id:0 msgid "Partner Category" -msgstr "业务伙伴类型" +msgstr "业务伙伴分类" #. module: crm #: view:crm.add.note:0 @@ -1209,7 +1209,7 @@ msgstr "预期收益" msgid "" "Create specific phone call categories to better define the type of calls " "tracked in the system." -msgstr "在系统中创建指定的电话访问类型以方便定义电话访问跟踪类型" +msgstr "在系统中创建指定的电话访问分类以方便定义电话访问跟踪类型" #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -1403,7 +1403,7 @@ msgstr "查找" #. module: crm #: view:board.board:0 msgid "Opportunities by Categories" -msgstr "商机类型" +msgstr "商机分类" #. module: crm #: model:crm.case.section,name:crm.section_sales_marketing_department @@ -1454,7 +1454,7 @@ msgid "" "Create specific partner categories which you can assign to your partners to " "better manage your interactions with them. The segmentation tool is able to " "assign categories to partners according to criteria you set." -msgstr "创建指定的业务伙伴类型，细分规则可以根据你设定的规则去指定业务伙伴的类型，以便你可以为更好管理他们和他们互动。" +msgstr "创建指定的业务伙伴类型，细分规则可以根据你设定的规则去指定业务伙伴的分类，以便你可以为更好管理他们和他们互动。" #. module: crm #: field:crm.case.section,code:0 @@ -1529,7 +1529,7 @@ msgstr "邮件" #. module: crm #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action msgid "Phonecall Categories" -msgstr "电话访问类型" +msgstr "电话访问分类" #. module: crm #: view:crm.lead.report:0 @@ -1810,12 +1810,12 @@ msgstr "值" #. module: crm #: help:crm.lead,type:0 help:crm.lead.report,type:0 msgid "Type is used to separate Leads and Opportunities" -msgstr "类型用于区分线索和商机" +msgstr "类型用于区分销售线索和商机" #. module: crm #: view:crm.lead:0 view:crm.lead.report:0 msgid "Opportunity by Categories" -msgstr "商机类型" +msgstr "商机按分类分组" #. module: crm #: view:crm.lead:0 field:crm.lead,partner_name:0 @@ -1973,7 +1973,7 @@ msgstr "错误！" msgid "" "Create different meeting categories to better organize and classify your " "meetings." -msgstr "创建不同类型的会议以便更好组织和把会议分类" +msgstr "创建不同的会议分类以便更好组织和把会议分类" #. module: crm #: model:ir.model,name:crm.model_crm_segmentation_line @@ -2954,7 +2954,7 @@ msgstr "探查商机" #. module: crm #: field:base.action.rule,act_categ_id:0 msgid "Set Category to" -msgstr "设类型为" +msgstr "设置分类为" #. module: crm #: view:crm.meeting:0 @@ -3111,7 +3111,7 @@ msgstr "联系人列表" #. module: crm #: model:crm.case.categ,name:crm.categ_oppor1 msgid "Interest in Computer" -msgstr "计算兴趣" +msgstr "对计算机有兴趣" #. module: crm #: view:crm.meeting:0 @@ -3171,7 +3171,7 @@ msgstr "会议" #. module: crm #: model:ir.model,name:crm.model_crm_case_categ msgid "Category of Case" -msgstr "业务类型" +msgstr "业务分类" #. module: crm #: view:crm.lead:0 view:crm.phonecall:0 @@ -3205,7 +3205,7 @@ msgstr "关闭或取消状态的线索不能转为商机" #: model:ir.actions.act_window,name:crm.crm_meeting_categ_action #: model:ir.ui.menu,name:crm.menu_crm_case_meeting-act msgid "Meeting Categories" -msgstr "会议类型" +msgstr "会议分类" #. module: crm #: view:crm.phonecall2partner:0 @@ -3565,7 +3565,7 @@ msgstr "选项" #. module: crm #: model:crm.case.stage,name:crm.stage_lead4 msgid "Negotiation" -msgstr "协商" +msgstr "谈判" #. module: crm #: view:crm.lead:0 diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index 32fbe65c337..b2cb3b1bfea 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -263,10 +263,10 @@ + parent="base.next_id_64" action="action_report_crm_lead" sequence="1"/> + parent="base.next_id_64" action="action_report_crm_opportunity" sequence="5"/> diff --git a/addons/crm/report/crm_phonecall_report_view.xml b/addons/crm/report/crm_phonecall_report_view.xml index e171388d08f..f745d93e3ef 100644 --- a/addons/crm/report/crm_phonecall_report_view.xml +++ b/addons/crm/report/crm_phonecall_report_view.xml @@ -157,7 +157,7 @@ + id="menu_report_crm_phonecalls_tree" parent="base.next_id_64" sequence="15"/> diff --git a/addons/crm_caldav/crm_caldav_view.xml b/addons/crm_caldav/crm_caldav_view.xml index a610095d6a6..287e301532e 100644 --- a/addons/crm_caldav/crm_caldav_view.xml +++ b/addons/crm_caldav/crm_caldav_view.xml @@ -11,14 +11,14 @@ form new - + - - + parent="base.menu_import_crm" sequence="10"/> + + - + diff --git a/addons/crm_claim/crm_claim_menu.xml b/addons/crm_claim/crm_claim_menu.xml index f33b6f7ad31..c54f161dab3 100644 --- a/addons/crm_claim/crm_claim_menu.xml +++ b/addons/crm_claim/crm_claim_menu.xml @@ -1,10 +1,16 @@ + + parent="base.menu_main_pm" sequence="2" /> @@ -14,7 +20,7 @@ form tree,calendar,form - {'search_default_section_id': section_id, "search_default_current":1,"search_default_user_id":uid, "stage_type":'claim'} + {'search_default_section_id': section_id,"search_default_user_id":uid, "stage_type":'claim'} Record and track your customers' claims. Claims may be linked to a sales order or a lot. You can send emails with attachments and keep the full history for a claim (emails sent, intervention type and so on). Claims may automatically be linked to an email address using the mail gateway module. diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml index 4505c72237c..adf4b17c949 100644 --- a/addons/crm_claim/report/crm_claim_report_view.xml +++ b/addons/crm_claim/report/crm_claim_report_view.xml @@ -190,9 +190,13 @@ + + + action="action_report_crm_claim" parent="base.menu_project_report" sequence="15"/> diff --git a/addons/crm_fundraising/crm_fundraising_menu.xml b/addons/crm_fundraising/crm_fundraising_menu.xml index f693cd3a8dc..ba44c456028 100644 --- a/addons/crm_fundraising/crm_fundraising_menu.xml +++ b/addons/crm_fundraising/crm_fundraising_menu.xml @@ -13,7 +13,7 @@ crm.fundraising tree,form,graph - {"search_default_user_id":uid,"search_default_current":1, 'search_default_section_id': section_id} + {"search_default_user_id":uid, 'search_default_section_id': section_id} If you need to collect money for your organization or a campaign, Fund Raising allows you to track all your fund raising activities. In the search list, filter by funds description, email, history and probability of success. diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml index 19334f2fe4c..46f989629d2 100644 --- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml +++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml @@ -191,7 +191,7 @@ + id="menu_report_crm_fundraising_tree" parent="base.next_id_64" sequence="30"/> diff --git a/addons/crm_helpdesk/crm_helpdesk_menu.xml b/addons/crm_helpdesk/crm_helpdesk_menu.xml index 31ee27345b0..96d862f1603 100644 --- a/addons/crm_helpdesk/crm_helpdesk_menu.xml +++ b/addons/crm_helpdesk/crm_helpdesk_menu.xml @@ -1,8 +1,13 @@ - + + + @@ -12,7 +17,7 @@ tree,calendar,form - {"search_default_user_id":uid, "search_default_current":1, 'search_default_section_id': section_id} + {"search_default_user_id":uid, 'search_default_section_id': section_id} Helpdesk and Support allow you to track your interventions. Select a customer, add notes and categorize interventions with partners if necessary. You can also assign a priority level. Use the OpenERP Issues system to manage your support activities. Issues can be connected to the email gateway: new emails may create issues, each of them automatically gets the history of the conversation with the customer. diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml index fd6951b1260..7b5cadf1041 100644 --- a/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml +++ b/addons/crm_helpdesk/report/crm_helpdesk_report_view.xml @@ -156,9 +156,13 @@ + + + id="menu_report_crm_helpdesks_tree" parent="base.menu_project_report" sequence="20"/> 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 a0bbd62c131..9f6546aee4a 100644 --- a/addons/crm_partner_assign/report/crm_lead_report_view.xml +++ b/addons/crm_partner_assign/report/crm_lead_report_view.xml @@ -12,7 +12,7 @@ - - + graph - + + parent="base.next_id_64" action="action_report_crm_opportunity_assign" sequence="20"/> 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 528233fc183..e7581f5bab5 100644 --- a/addons/crm_partner_assign/report/crm_partner_report_view.xml +++ b/addons/crm_partner_assign/report/crm_partner_report_view.xml @@ -77,7 +77,7 @@ + parent="base.next_id_64" action="action_report_crm_partner_assign" sequence="25"/> diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml index c098f908b8a..a587463fedb 100644 --- a/addons/crm_todo/crm_todo_view.xml +++ b/addons/crm_todo/crm_todo_view.xml @@ -57,7 +57,8 @@ + action="crm_todo_action" + sequence="5"/> diff --git a/addons/crm_todo/i18n/it.po b/addons/crm_todo/i18n/it.po new file mode 100644 index 00000000000..00c702f72f6 --- /dev/null +++ b/addons/crm_todo/i18n/it.po @@ -0,0 +1,97 @@ +# Italian 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-03-23 08:30+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Italian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-24 04:54+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_project_task +msgid "Task" +msgstr "Attività" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Timebox" +msgstr "Periodo Inderogabile" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For cancelling the task" +msgstr "" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"Errore ! La data di termine del compito deve essere antecedente a quella di " +"inizio" + +#. module: crm_todo +#: model:ir.model,name:crm_todo.model_crm_lead +msgid "crm.lead" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Next" +msgstr "Successivo" + +#. module: crm_todo +#: model:ir.actions.act_window,name:crm_todo.crm_todo_action +#: model:ir.ui.menu,name:crm_todo.menu_crm_todo +msgid "My Tasks" +msgstr "Le Mie Attività" + +#. module: crm_todo +#: view:crm.lead:0 +#: field:crm.lead,task_ids:0 +msgid "Tasks" +msgstr "Attività" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Done" +msgstr "Completato" + +#. module: crm_todo +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "Errore ! Non è possibile creare attività ricorsive." + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Cancel" +msgstr "Cancella" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Extra Info" +msgstr "Altre Informazioni" + +#. module: crm_todo +#: field:project.task,lead_id:0 +msgid "Lead / Opportunity" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "For changing to done state" +msgstr "" + +#. module: crm_todo +#: view:crm.lead:0 +msgid "Previous" +msgstr "Precedente" diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index e3b1b4c9c64..ee6fc61f896 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -35,10 +35,10 @@ diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index acd1aed24de..86f136ca5b9 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -57,6 +57,8 @@ class email_template(osv.osv): :param int res_id: id of the document record this mail is related to. """ if not template: return u"" + if context is None: + context = {} try: template = tools.ustr(template) record = None diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index ef4572429a1..a4fd749979c 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -95,7 +95,7 @@ class mail_compose_message(osv.osv_memory): for fname, fcontent in attachment.iteritems(): data_attach = { 'name': fname, - 'datas': base64.b64encode(fcontent), + 'datas': fcontent, 'datas_fname': fname, 'description': fname, 'res_model' : self._name, diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml index 0a4755ab105..b9187227b1c 100644 --- a/addons/event/board_association_view.xml +++ b/addons/event/board_association_view.xml @@ -62,8 +62,10 @@ form + - + @@ -229,7 +229,8 @@ ir.actions.act_window event.event form - calendar,tree,form,graph + tree,form,calendar,graph + {"search_default_section_id": section_id} Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events. @@ -254,7 +255,8 @@ - + + event.registration.tree event.registration diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 4d5b12b8679..b6c8d832c6d 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -141,7 +141,8 @@ - + + diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index d1e23f49166..51702cf28fe 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -180,6 +180,8 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS logger.info('start checking for new emails on %s server %s', server.type, server.name) context.update({'fetchmail_server_id': server.id, 'server_type': server.type}) count = 0 + imap_server = False + pop_server = False if server.type == 'imap': try: imap_server = server.connect() diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml index 977ca710e52..555312afb6b 100644 --- a/addons/hr/hr_board.xml +++ b/addons/hr/hr_board.xml @@ -25,8 +25,8 @@ - - + + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index c2961f2ccde..132c56dca80 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -10,6 +10,7 @@ + - + Leave Requests diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml index cd7665be123..22cdca38936 100644 --- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml +++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml @@ -32,9 +32,11 @@ new + + - + diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 8b038191794..352bacd0b06 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -111,6 +111,8 @@ + + diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml index 63e493cfab7..063481f5211 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml @@ -34,7 +34,7 @@ diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml index 95b7bd3b93e..f51ccc769c4 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml @@ -37,7 +37,7 @@ diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 33de63ba347..be090dfcdbb 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -3,8 +3,8 @@ diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index 1ed51fc0a63..ee6b619ceeb 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -38,7 +38,7 @@ + parent="hr_timesheet.menu_hr_timesheet_reports" groups="base.group_extended" icon="STOCK_PRINT"/> diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml index a279b408300..e29930a63ae 100644 --- a/addons/html_view/html_view.xml +++ b/addons/html_view/html_view.xml @@ -36,6 +36,6 @@ html.view form - + \ No newline at end of file diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index 23667069b79..4ad479e763f 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -81,15 +81,6 @@ - - - @@ -384,10 +375,7 @@ - - - + @@ -398,7 +386,6 @@ - diff --git a/addons/import_base/import_base_view.xml b/addons/import_base/import_base_view.xml index 1368b50b6e4..8d4735be00a 100644 --- a/addons/import_base/import_base_view.xml +++ b/addons/import_base/import_base_view.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/addons/import_google/wizard/import_google_data_view.xml b/addons/import_google/wizard/import_google_data_view.xml index b35e97645e7..4a5096c38a4 100644 --- a/addons/import_google/wizard/import_google_data_view.xml +++ b/addons/import_google/wizard/import_google_data_view.xml @@ -78,14 +78,14 @@ + sequence="5" /> + sequence="15" /> diff --git a/addons/import_sugarcrm/i18n/nl.po b/addons/import_sugarcrm/i18n/nl.po new file mode 100644 index 00000000000..efc8c3ce436 --- /dev/null +++ b/addons/import_sugarcrm/i18n/nl.po @@ -0,0 +1,406 @@ +# Dutch 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-03-24 17:26+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-03-25 05:05+0000\n" +"X-Generator: Launchpad (build 14981)\n" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/import_sugarcrm.py:1105 +#: code:addons/import_sugarcrm/import_sugarcrm.py:1131 +#, python-format +msgid "Error !!" +msgstr "Fout!" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "" +"Use the SugarSoap API URL (read tooltip) and a full access SugarCRM login." +msgstr "" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "(Coming Soon)" +msgstr "(Komt snel)" + +#. module: import_sugarcrm +#: field:import.sugarcrm,document:0 +msgid "Documents" +msgstr "Documenten" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Import your data from SugarCRM :" +msgstr "Import uw gegevens van SugerCRM:" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "" +"Choose data you want to import. Click 'Import' to get data manually or " +"'Schedule Reccurent Imports' to get recurrently and automatically data." +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,contact:0 +msgid "Contacts" +msgstr "Contacten" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "HR" +msgstr "HR" + +#. module: import_sugarcrm +#: help:import.sugarcrm,bug:0 +msgid "Check this box to import sugarCRM Bugs into OpenERP project issues" +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,instance_name:0 +msgid "Instance's Name" +msgstr "Instantienaam" + +#. module: import_sugarcrm +#: field:import.sugarcrm,project_task:0 +msgid "Project Tasks" +msgstr "Project taken" + +#. module: import_sugarcrm +#: field:import.sugarcrm,email_from:0 +msgid "Notify End Of Import To:" +msgstr "Meld het einde van de import aan:" + +#. module: import_sugarcrm +#: help:import.sugarcrm,user:0 +msgid "" +"Check this box to import sugarCRM Users into OpenERP users, warning if a " +"user with the same login exist in OpenERP, user information will be erase by " +"sugarCRM user information" +msgstr "" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/sugarsoap_services.py:23 +#, python-format +msgid "Please install SOAP for python - ZSI-2.0-rc3.tar.gz - python-zci" +msgstr "" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "_Schedule Recurrent Imports" +msgstr "" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "" +"Do not forget the email address to be notified of the success of the import." +msgstr "" + +#. module: import_sugarcrm +#: help:import.sugarcrm,call:0 +msgid "Check this box to import sugarCRM Calls into OpenERP calls" +msgstr "" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "" +"If you make recurrent or ponctual import, data already in OpenERP will be " +"updated by SugarCRM data." +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,employee:0 +msgid "Employee" +msgstr "Werknemer" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Document" +msgstr "Document" + +#. module: import_sugarcrm +#: help:import.sugarcrm,document:0 +msgid "Check this box to import sugarCRM Documents into OpenERP documents" +msgstr "" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Import Data From SugarCRM" +msgstr "Import gegevens van SugarCRM" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "CRM" +msgstr "Relatiebeheer" + +#. module: import_sugarcrm +#: view:import.message:0 +msgid "" +"Data are importing, the process is running in the background, an email will " +"be sent to the given email address if it was defined." +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,call:0 +msgid "Calls" +msgstr "Gesprekken" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Multi Instance Management" +msgstr "" + +#. module: import_sugarcrm +#: view:import.message:0 +msgid "_Ok" +msgstr "_Ok" + +#. module: import_sugarcrm +#: help:import.sugarcrm,opportunity:0 +msgid "" +"Check this box to import sugarCRM Leads and Opportunities into OpenERP Leads " +"and Opportunities" +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,email_history:0 +msgid "Email and Note" +msgstr "E-mail en make notitie" + +#. module: import_sugarcrm +#: help:import.sugarcrm,url:0 +msgid "" +"Webservice's url where to get the data. example : " +"'http://example.com/sugarcrm/soap.php', or copy the address of your sugarcrm " +"application " +"http://trial.sugarcrm.com/qbquyj4802/index.php?module=Home&action=index" +msgstr "" + +#. module: import_sugarcrm +#: model:ir.actions.act_window,name:import_sugarcrm.action_import_sugarcrm +#: model:ir.ui.menu,name:import_sugarcrm.menu_sugarcrm_import +msgid "Import SugarCRM" +msgstr "Importeer SugarCRM" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "_Import" +msgstr "_Importeren" + +#. module: import_sugarcrm +#: field:import.sugarcrm,user:0 +msgid "User" +msgstr "Gebruiker" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/import_sugarcrm.py:1105 +#: code:addons/import_sugarcrm/import_sugarcrm.py:1131 +#, python-format +msgid "%s data required %s Module to be installed, Please install %s module" +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,claim:0 +msgid "Cases" +msgstr "Dossiers" + +#. module: import_sugarcrm +#: help:import.sugarcrm,meeting:0 +msgid "" +"Check this box to import sugarCRM Meetings and Tasks into OpenERP meetings" +msgstr "" + +#. module: import_sugarcrm +#: help:import.sugarcrm,email_history:0 +msgid "" +"Check this box to import sugarCRM Emails, Notes and Attachments into OpenERP " +"Messages and Attachments" +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,project:0 +msgid "Projects" +msgstr "Projecten" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14 +#, python-format +msgid "" +"Please install SOAP for python - ZSI-2.0-rc3.tar.gz from " +"http://pypi.python.org/pypi/ZSI/" +msgstr "" + +#. module: import_sugarcrm +#: help:import.sugarcrm,project:0 +msgid "Check this box to import sugarCRM Projects into OpenERP projects" +msgstr "" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/import_sugarcrm.py:1098 +#: code:addons/import_sugarcrm/import_sugarcrm.py:1124 +#, python-format +msgid "Select Module to Import." +msgstr "Select module om te importeren" + +#. module: import_sugarcrm +#: field:import.sugarcrm,meeting:0 +msgid "Meetings" +msgstr "Afspraken" + +#. module: import_sugarcrm +#: help:import.sugarcrm,employee:0 +msgid "Check this box to import sugarCRM Employees into OpenERP employees" +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,url:0 +msgid "SugarSoap Api url:" +msgstr "SugarSoap Api url:" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Address Book" +msgstr "Adresboek" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/sugar.py:60 +#, python-format +msgid "" +"Authentication error !\n" +"Bad Username or Password bad SugarSoap Api url !" +msgstr "" +"Authenticatie fout !\n" +"Foutieve gebruikersnaam of wachtwoord of SugarSoap Api url !" + +#. module: import_sugarcrm +#: field:import.sugarcrm,bug:0 +msgid "Bugs" +msgstr "Fouten/bugs" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Project" +msgstr "Project" + +#. module: import_sugarcrm +#: help:import.sugarcrm,project_task:0 +msgid "Check this box to import sugarCRM Project Tasks into OpenERP tasks" +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,opportunity:0 +msgid "Leads & Opp" +msgstr "Leads & Pros." + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/import_sugarcrm.py:79 +#, python-format +msgid "" +"Authentication error !\n" +"Bad Username or Password or bad SugarSoap Api url !" +msgstr "" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/import_sugarcrm.py:79 +#: code:addons/import_sugarcrm/sugar.py:60 +#, python-format +msgid "Error !" +msgstr "Fout !" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/import_sugarcrm.py:1098 +#: code:addons/import_sugarcrm/import_sugarcrm.py:1124 +#, python-format +msgid "Warning !" +msgstr "Waarschuwing !" + +#. module: import_sugarcrm +#: help:import.sugarcrm,instance_name:0 +msgid "" +"Prefix of SugarCRM id to differentiate xml_id of SugarCRM models datas come " +"from different server." +msgstr "" + +#. module: import_sugarcrm +#: help:import.sugarcrm,contact:0 +msgid "Check this box to import sugarCRM Contacts into OpenERP addresses" +msgstr "" + +#. module: import_sugarcrm +#: field:import.sugarcrm,password:0 +msgid "Password" +msgstr "Wachtwoord" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Login Information" +msgstr "Aanmeldingsinformatie" + +#. module: import_sugarcrm +#: help:import.sugarcrm,claim:0 +msgid "Check this box to import sugarCRM Cases into OpenERP claims" +msgstr "" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Email Notification When Import is finished" +msgstr "E-mail melding als de import gereed is" + +#. module: import_sugarcrm +#: field:import.sugarcrm,username:0 +msgid "User Name" +msgstr "Gebruikersnaam" + +#. module: import_sugarcrm +#: view:import.message:0 +#: model:ir.model,name:import_sugarcrm.model_import_message +msgid "Import Message" +msgstr "Import bericht" + +#. module: import_sugarcrm +#: help:import.sugarcrm,account:0 +msgid "Check this box to import sugarCRM Accounts into OpenERP partners" +msgstr "" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Online documentation:" +msgstr "Online documentatie:" + +#. module: import_sugarcrm +#: field:import.sugarcrm,account:0 +msgid "Accounts" +msgstr "Accounts" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "_Cancel" +msgstr "_Annuleren" + +#. module: import_sugarcrm +#: code:addons/import_sugarcrm/sugarsoap_services.py:23 +#: code:addons/import_sugarcrm/sugarsoap_services_types.py:14 +#, python-format +msgid "ZSI Import Error!" +msgstr "ZSI Import fout!" + +#. module: import_sugarcrm +#: model:ir.model,name:import_sugarcrm.model_import_sugarcrm +msgid "Import SugarCRM DATA" +msgstr "Importeer SugarCRM DATA" + +#. module: import_sugarcrm +#: view:import.sugarcrm:0 +msgid "Email Address to Notify" +msgstr "E-mail adres voor melding" diff --git a/addons/import_sugarcrm/import_sugarcrm_view.xml b/addons/import_sugarcrm/import_sugarcrm_view.xml index 3c1f9df60fb..f90451c69f5 100644 --- a/addons/import_sugarcrm/import_sugarcrm_view.xml +++ b/addons/import_sugarcrm/import_sugarcrm_view.xml @@ -98,7 +98,7 @@ - + diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 45553c7d784..7d9cd7255d3 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -7,9 +7,9 @@ - + @@ -266,7 +266,7 @@ - + diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv index 88482da473e..157b939e36d 100644 --- a/addons/mail/security/ir.model.access.csv +++ b/addons/mail/security/ir.model.access.csv @@ -1,5 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_mail_message,mail.message,model_mail_message,,1,0,1,0 -access_mail_thread,mail.thread,model_mail_thread,,1,0,1,0 +access_mail_message,mail.message,model_mail_message,,1,1,1,0 +access_mail_thread,mail.thread,model_mail_thread,,1,1,1,0 access_mail_subscription,mail.subscription,model_mail_subscription,,1,0,1,0 access_mail_notification,mail.notification,model_mail_notification,,1,0,1,0 diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 0300122e8ff..c7540935005 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -122,7 +122,7 @@ - + diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index c40b9611fb5..00b4947122e 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -261,17 +261,17 @@ id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form" groups="base.group_extended" sequence="2"/> - - + groups="base.group_extended"/>--> diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml index 5461bf690bd..adb05fec578 100644 --- a/addons/point_of_sale/point_of_sale_view.xml +++ b/addons/point_of_sale/point_of_sale_view.xml @@ -748,7 +748,7 @@ - + @@ -770,8 +770,10 @@ [('origin','like','POS')] + + + id="menu_pos_details" parent="menu_point_of_sale_reporting" sequence="6" /> Start Point of Sale diff --git a/addons/point_of_sale/wizard/pos_open_statement.py b/addons/point_of_sale/wizard/pos_open_statement.py index 11bc8b33558..31e35d3fa10 100644 --- a/addons/point_of_sale/wizard/pos_open_statement.py +++ b/addons/point_of_sale/wizard/pos_open_statement.py @@ -52,9 +52,9 @@ class pos_open_statement(osv.osv_memory): ids = statement_obj.search(cr, uid, [('state', '!=', 'confirm'), ('user_id', '=', uid), ('journal_id', '=', journal.id)], context=context) if journal.sequence_id: - number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id) + number = sequence_obj.next_by_id(cr, uid, journal.sequence_id.id, context=context) else: - number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement') + number = sequence_obj.next_by_code(cr, uid, 'account.cash.statement', context=context) data.update({ 'journal_id': journal.id, diff --git a/addons/product_margin/product_margin_view.xml b/addons/product_margin/product_margin_view.xml index 8b1f2d279b0..6c083bca6b0 100644 --- a/addons/product_margin/product_margin_view.xml +++ b/addons/product_margin/product_margin_view.xml @@ -88,7 +88,8 @@ - + + diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index 88424be85fa..34de37fd9a7 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -104,16 +104,17 @@ + id="menu_project_dasboard" + name="Project" + sequence="20" + parent="base.menu_dasboard" + /> tree,form,gantt - {'search_default_Current':1} + {} A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section. @@ -526,7 +526,7 @@ kanban,tree,form,calendar,gantt,graph - {"search_default_draft": 1, "search_default_open":1, "search_default_project_id": project_id} + {"search_default_project_id": project_id} A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed. @@ -541,7 +541,7 @@ - + Overpassed Tasks @@ -628,7 +628,7 @@ - + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 5af8706108f..87f563f8878 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -2,10 +2,10 @@ - - + diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 66e7a8a69e3..2907df4dfa6 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -140,7 +140,7 @@ form tree,form,calendar,gantt,graph,kanban - + diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index 827548f131e..bcb73456b88 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -79,7 +79,7 @@ menu - diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 9d88418720b..086a0c43de3 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -11,7 +11,7 @@ kanban,tree,calendar - {"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1, "search_default_project_id":project_id} + {"search_default_user_id": uid, "search_default_draft": 1,"search_default_todo": 1,"search_default_project_id":project_id} Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com) @@ -53,7 +53,7 @@ view_mode="tree,form,calendar,graph" view_type="form"/> - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 23ae8139bea..9800c209dd5 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -2,7 +2,7 @@ - + # ------------------------------------------------------ # Project User Allocation @@ -124,7 +124,7 @@
- + @@ -252,7 +252,7 @@ project.phase form gantt,tree,form,calendar - {"search_default_current": 1} + {} A project can be split into the different phases. For each phase, you can define your users allocation, describe different tasks and link your phase to previous and next phases, add date constraints for the automated scheduling. Use the long term planning in order to planify your available users, convert your phases into a series of tasks when you start working on the project. @@ -262,7 +262,7 @@ project.phase form tree,form,calendar - {"search_default_current": 1} + {} @@ -334,7 +334,7 @@ res_model="project.phase" src_model="project.project" view_mode="tree,form" - view_type="form" + view_type="form" /> # ------------------------------------------------------ diff --git a/addons/project_messages/project_messages_view.xml b/addons/project_messages/project_messages_view.xml index 85e2c02f8ff..127209c2e35 100644 --- a/addons/project_messages/project_messages_view.xml +++ b/addons/project_messages/project_messages_view.xml @@ -100,6 +100,6 @@ tree,form - +
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index 83da24292ae..3beb5ad39a9 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -214,8 +214,8 @@ With its global system to schedule all resources of a company (people and material), OpenERP allows you to encode and then automatically compute tasks and phases scheduling, track resource allocation and availability. - + @@ -292,14 +292,11 @@ - - + + parent="project.menu_project_dasboard"/> diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml index dd01832b575..7d993dd90c9 100644 --- a/addons/project_scrum/board_project_scrum_view.xml +++ b/addons/project_scrum/board_project_scrum_view.xml @@ -98,7 +98,7 @@ diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 7dc2cc1d4f0..7fb84f12213 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -4,7 +4,7 @@ + parent="base.menu_main_pm" sequence="7"/> @@ -178,7 +178,7 @@ Product Backlogs project.scrum.product.backlog form - {'search_default_current':1, 'search_default_user_id':uid,'search_default_project_id':project_id} + {'search_default_user_id':uid,'search_default_project_id':project_id} The scrum agile methodology is used in software development projects. The Product Backlog is the list of features to be implemented. A product backlog can be planified in a development sprint and may be split into several tasks. The product backlog is managed by the product owner of the project. @@ -349,7 +349,7 @@ form tree,form,calendar - {"search_default_current": 1} + {} The scrum agile methodology is used in software development projects. In this methodology, a sprint is a short period of time (e.g. one month) during which the team implements a list of product backlogs. The sprint review is organized when the team presents its work to the customer and product owner. @@ -450,7 +450,7 @@ project.scrum.meeting form tree,form,calendar - {'search_default_scrum_daily':1,'search_default_project_id':project_id} + {'search_default_project_id':project_id} The scrum agile methodology is used in software development projects. In this methodology, a daily meeting is organized by the scrum master with his team in order to detect the difficulties the team faced/will face. diff --git a/addons/project_timesheet/project_timesheet_data.xml b/addons/project_timesheet/project_timesheet_data.xml index 59a25c142b5..ed87cb8c65f 100644 --- a/addons/project_timesheet/project_timesheet_data.xml +++ b/addons/project_timesheet/project_timesheet_data.xml @@ -1,8 +1,8 @@ - - + + + diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 07873c00592..0412bdabb38 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -84,7 +84,7 @@ form tree,form [] - {'search_default_to_invoice': 1} + {} You will find here all works made on tasks that you can invoice. In order to invoice the time spent on a project, you must define the @@ -101,18 +101,18 @@ the project form. parent="base.menu_main_pm" sequence="5"/> - + - + Customer Projects account.analytic.account form tree,form,graph - {'search_default_has_partner':1, 'search_default_my_accounts':1, 'search_default_draft':1, 'search_default_pending':1, 'search_default_open':1} + {} [('type','=','normal')] You will find here the contracts related to your customer projects in order to track the invoicing progress. diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index e24f604fbe6..b1ba9b8672e 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -3,8 +3,8 @@ @@ -43,7 +43,7 @@ + help="Task hours of last month"/> @@ -58,7 +58,7 @@ - + report.timesheet.task.user.graph report.timesheet.task.user @@ -71,7 +71,7 @@ - + Task Hours Per Month report.timesheet.task.user diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml index 0bf011e5cc5..74f34a45cb6 100644 --- a/addons/purchase/board_purchase_view.xml +++ b/addons/purchase/board_purchase_view.xml @@ -4,8 +4,8 @@ + name="Purchase" + parent="base.menu_dasboard" sequence="5"/> Request for Quotations diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 7106df71d98..94a949b6911 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -5,7 +5,7 @@ groups="group_purchase_manager,group_purchase_user" web_icon="images/purchases.png" web_icon_hover="images/purchases-hover.png"/> - - - + - + purchase.order.tree purchase.order diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 095f17090da..0ac69172612 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -172,7 +172,7 @@ - @@ -185,7 +185,7 @@ {'full':'1','contact_display': 'partner','search_default_done':1, 'search_default_month':1, 'search_default_group_type':1, 'group_by': [], 'group_by_no_leaf':1,'search_default_year':1,} Reception Analysis allows you to easily check and analyse your company order receptions and the performance of your supplier's deliveries. - + diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index bd47d093df0..d6a736eea9c 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -166,7 +166,7 @@ purchase.requisition form tree,form - {"search_default_create_uid":uid,'search_default_draft': 1} + {"search_default_create_uid":uid} A purchase requisition is the step before a request for quotation. In a purchase requisition (or purchase tender), you can record the products you need to buy and trigger the creation of RfQs to suppliers. After the negotiation, once you have reviewed all the supplier's offers, you can validate some and cancel others. diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index 1e8600232bc..57eee7f184b 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -30,8 +30,8 @@ - - + + diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 5cc7c4f5ca1..4c1a85a7b86 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -128,8 +128,8 @@ This report performs analysis on your quotations and sales orders. Analysis check your sales revenues and sort it by different group criteria (salesman, partner, product, etc.) Use this report to perform analysis on sales not having invoiced yet. If you want to analyse your turnover, you should use the Invoice Analysis report in the Accounting application. - - + + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index df1fef586d5..50d486dcac9 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -4,10 +4,6 @@ id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/> - - @@ -260,8 +256,8 @@ search - - + + @@ -291,10 +287,10 @@ form tree,form,calendar,graph - {} + {"search_default_sales":1} Sales Orders help you manage quotations and orders from your customers. OpenERP suggests that you start by creating a quotation. Once it is confirmed, the quotation will be converted into a Sales Order. OpenERP can handle several types of products so that a sales order may trigger tasks, delivery orders, manufacturing orders, purchases and so on. Based on the configuration of the sales order, a draft invoice will be generated so that you just have to confirm it when you want to bill your customer. - + Sales in Exception @@ -319,15 +315,19 @@ - All Quotations + Quotations ir.actions.act_window sale.order form tree,form,calendar,graph - [('state','=','draft')] + {"search_default_draft":1} + + Old Quotations ir.actions.act_window @@ -461,7 +461,7 @@ - Lines to Invoice + Order Lines to Invoice ir.actions.act_window sale.order.line form @@ -499,7 +499,7 @@ groups="base.group_sale_salesman"/> - + diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index 38ff4a9d854..5c52c6412f3 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -68,7 +68,7 @@ - + diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 4f320ab58a9..029e514c33e 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -4,8 +4,9 @@ + name="Warehouse" + sequence="15" + parent="base.menu_reporting"/> report.stock.move.tree @@ -261,7 +262,7 @@ Inventory Analysis allows you to easily check and analyse your company stock levels. Sort and group by selection criteria in order to better analyse and manage your company activities. diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 6e53f3c3998..320ade8ec2d 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -6,8 +6,8 @@ groups="group_stock_manager,group_stock_user" sequence="5" web_icon="images/warehouse.png" web_icon_hover="images/warehouse-hover.png"/> - - + + @@ -406,7 +406,7 @@ form - {"search_default_available":1} + {} This is the list of all the production lots (serial numbers) you recorded. When you select a lot, you can get the upstream or downstream traceability of the products contained in lot. By default, the list is filtred on the serial numbers that are available in your warehouse but you can uncheck the 'Available' button to get all the lots you produced, received or delivered to customers. form tree,form,calendar [('type','=','out')] - {'default_type': 'out', 'contact_display': 'partner_address', 'search_default_confirmed': 1, 'search_default_available': 1} + {'default_type': 'out', 'contact_display': 'partner_address'} This is the list of all delivery orders that have to be prepared, according to your different sales orders and your logistics rules. @@ -1274,7 +1274,7 @@ form tree,form,calendar [('type','=','in')] - {'contact_display': 'partner_address',"search_default_available":1} + {'contact_display': 'partner_address'} The Incoming Shipments is the list of all orders you will receive from your suppliers. An incoming shipment contains a list of products to be received according to the original purchase order. You can validate the shipment totally or partially. @@ -1520,7 +1520,7 @@ form - {'search_default_ready':1} + {} This menu gives you the full traceability of inventory operations on a specific product. You can filter on the product to see all the past or future movements for the product. @@ -1735,7 +1735,7 @@ tree,form ['|','&',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','in')] - + Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line. @@ -1870,7 +1870,7 @@ tree,form ['|','&',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&',('picking_id','!=',False),('picking_id.type','=','out')] - + You will find in this list all products you have to deliver to your customers. You can process the deliveries directly from this list using the buttons on the right of each line. You can filter the products to deliver by customer, products or sale order (using the Origin field). diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 3cbee4d53d8..1dc6b88e3fc 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -184,7 +184,7 @@ + parent="base.menu_base_partner" sequence="5" groups="base.group_extended"/> stock.sale.forecast.list.select diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index 0f1a68145aa..4673bcd9846 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -8,7 +8,7 @@ - + @@ -1167,14 +1167,14 @@ - - - new - diff --git a/addons/wiki_sale_faq/wiki_sale_faq_view.xml b/addons/wiki_sale_faq/wiki_sale_faq_view.xml index 9fdaafd96b9..b43649af23a 100644 --- a/addons/wiki_sale_faq/wiki_sale_faq_view.xml +++ b/addons/wiki_sale_faq/wiki_sale_faq_view.xml @@ -27,13 +27,13 @@