diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 16400cb3d7e..ccd179f421d 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:26+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 9d35f8940b8..f220a36c486 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:23+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:55+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index 9e0ddc90c16..cc2f3139b40 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 18:15+0000\n" +"PO-Revision-Date: 2010-08-20 00:46+0000\n" "Last-Translator: Cristian Salamea (GnuThink) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -715,7 +715,7 @@ msgstr "Nota de Debito" #. module: account #: wizard_view:account.analytic.account.chart,init:0 msgid "Select the Period for Analysis" -msgstr "" +msgstr "Seleccione el período de análisis" #. module: account #: field:account.tax,ref_tax_sign:0 @@ -914,7 +914,7 @@ msgstr "Importe de Moneda" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "" +msgstr "Cuenta categoría gastos" #. module: account #: wizard_field:account.fiscalyear.close,init,fy2_id:0 @@ -1066,7 +1066,7 @@ msgstr "Nueva factura de proveedor" #. module: account #: wizard_field:account.invoice.pay,init,amount:0 msgid "Amount paid" -msgstr "" +msgstr "Importe pagado" #. module: account #: selection:account.invoice,type:0 @@ -1078,7 +1078,7 @@ msgstr "Factura de cliente" #. module: account #: wizard_view:account.open_closed_fiscalyear,init:0 msgid "Choose Fiscal Year" -msgstr "" +msgstr "Escoja el ejercicio fiscal" #. module: account #: field:account.sequence.fiscalyear,sequence_main_id:0 @@ -1094,7 +1094,7 @@ msgstr "Imprimir diarios analíticos" #. module: account #: rml:account.tax.code.entries:0 msgid "Voucher Nb" -msgstr "" +msgstr "Núm. de comprobante" #. module: account #: help:account.payment.term.line,sequence:0 @@ -1108,12 +1108,12 @@ msgstr "" #. module: account #: field:account.bank.statement.reconcile,total_new:0 msgid "Total write-off" -msgstr "" +msgstr "Desajuste total" #. module: account #: view:account.tax.template:0 msgid "Compute Code for Taxes included prices" -msgstr "" +msgstr "Código para el cálculo de precios con impuestos incluidos" #. module: account #: view:account.invoice.tax:0 @@ -1127,12 +1127,12 @@ msgstr "Códigos de impuestos" #: field:account.tax.template,chart_template_id:0 #: field:wizard.multi.charts.accounts,chart_template_id:0 msgid "Chart Template" -msgstr "" +msgstr "Plantilla plan contable" #. module: account #: field:account.chart.template,property_account_income_categ:0 msgid "Income Category Account" -msgstr "" +msgstr "Cuenta de la categoría de ingresos" #. module: account #: model:ir.actions.act_window,name:account.analytic_account_form @@ -1144,7 +1144,7 @@ msgstr "Nueva cuenta analítica" #: 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 "" +msgstr "Plantillas de Tipos de Contribuyentes" #. module: account #: rml:account.invoice:0 @@ -1155,12 +1155,12 @@ msgstr "Precio unitario" #. module: account #: rml:account.analytic.account.journal:0 msgid "Period from :" -msgstr "" +msgstr "Periodo desde :" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts msgid "wizard.multi.charts.accounts" -msgstr "" +msgstr "Plan de Cuentas Multiple" #. module: account #: model:account.journal,name:account.sales_journal @@ -1170,13 +1170,13 @@ msgstr "Diario de ventas" #. module: account #: help:account.model.line,amount_currency:0 msgid "The amount expressed in an optional other currency." -msgstr "" +msgstr "El importe expresado en otra divisa opcional." #. module: account #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Position Template" -msgstr "" +msgstr "Plantilla de Tipo de Contribuyente" #. module: account #: field:account.payment.term,line_ids:0 @@ -1202,7 +1202,7 @@ msgstr "¿Está seguro que desea cerrar el ejercicio fiscal?" #. module: account #: selection:account.move,type:0 msgid "Bank Receipt" -msgstr "" +msgstr "Recibo bancario" #. module: account #: view:res.partner:0 @@ -1217,7 +1217,7 @@ msgstr "Lista plantilla impuestos" #. module: account #: model:process.transition,name:account.process_transition_invoiceimport0 msgid "Invoice import" -msgstr "" +msgstr "Importe factura" #. module: account #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select @@ -1248,7 +1248,7 @@ msgstr "Moneda de la compañía" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template msgid "Fiscal Position Template Account Mapping" -msgstr "" +msgstr "Mapeo cuentas plantilla posición fiscal" #. module: account #: field:account.analytic.account,parent_id:0 @@ -1258,12 +1258,12 @@ msgstr "Cuenta analítica padre" #. module: account #: wizard_button:account.move.line.reconcile,init_partial,addendum:0 msgid "Reconcile With Write-Off" -msgstr "" +msgstr "Conciliación con desfase" #. module: account #: field:account.move.line,tax_amount:0 msgid "Tax/Base Amount" -msgstr "" +msgstr "Importe impuestos/base" #. module: account #: help:wizard.multi.charts.accounts,code_digits:0 @@ -1293,7 +1293,7 @@ msgstr "Importe fijo" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Analytic Credit" -msgstr "" +msgstr "Haber analítico" #. module: account #: field:account.move.line,reconcile_partial_id:0 @@ -1327,7 +1327,7 @@ msgstr "Valor" #: wizard_field:account.invoice.pay,addendum,writeoff_acc_id:0 #: wizard_field:account.move.line.reconcile,addendum,writeoff_acc_id:0 msgid "Write-Off account" -msgstr "" +msgstr "Cuenta de desajuste" #. module: account #: field:account.model.line,model_id:0 @@ -1339,17 +1339,17 @@ msgstr "Modelo" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "" +msgstr "Cerrar un ejercicio fiscal" #. module: account #: field:account.journal,centralisation:0 msgid "Centralised counterpart" -msgstr "" +msgstr "Homólogo centralizado" #. module: account #: view:wizard.company.setup:0 msgid "Message" -msgstr "" +msgstr "Mensaje" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 @@ -1388,7 +1388,7 @@ msgstr "El método de cálculo del importe del impuesto." #: model:process.node,note:account.process_node_accountingentries0 #: model:process.node,note:account.process_node_supplieraccountingentries0 msgid "Validated accounting entries." -msgstr "" +msgstr "Asientos contables validados." #. module: account #: wizard_view:account.move.line.unreconcile,init:0 @@ -1409,7 +1409,7 @@ msgstr "Archivo electrónico" #. module: account #: view:res.partner:0 msgid "Customer Credit" -msgstr "" +msgstr "Haber del cliente" #. module: account #: field:account.invoice,tax_line:0 @@ -1474,7 +1474,7 @@ msgstr "Mostrar cuentas " #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile_line msgid "Statement reconcile line" -msgstr "" +msgstr "Línea de conciliación de extracto" #. module: account #: view:account.tax:0 @@ -1488,7 +1488,7 @@ msgstr "Dejarlo vacío para usar la cuenta de ingresos" #: wizard_view:account.move.line.reconcile,init_full:0 #: wizard_view:account.move.line.reconcile,init_partial:0 msgid "Write-Off" -msgstr "" +msgstr "Desajuste" #. module: account #: help:account.invoice,partner_bank:0 @@ -1512,17 +1512,17 @@ msgstr "Cerrar estados" #. module: account #: model:ir.model,name:account.model_wizard_company_setup msgid "wizard.company.setup" -msgstr "" +msgstr "Asistente de Configuracion de Compañia" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form msgid "account.analytic.line.extended" -msgstr "" +msgstr "account.analytic.line.extended" #. module: account #: field:account.journal,refund_journal:0 msgid "Refund Journal" -msgstr "" +msgstr "Diario de Reembolsos" #. module: account #: model:account.account.type,name:account.account_type_income @@ -1542,7 +1542,7 @@ msgstr "Tel. :" #. module: account #: field:account.invoice.tax,tax_amount:0 msgid "Tax Code Amount" -msgstr "" +msgstr "Importe código impuesto" #. module: account #: selection:account.account.type,sign:0 @@ -1577,7 +1577,7 @@ msgstr "Generar plan contable a partir de una plantilla de plan contable" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Statements" -msgstr "" +msgstr "Declaraciones oficiales" #. module: account #: field:account.tax.code,parent_id:0 @@ -1634,7 +1634,7 @@ msgstr "Cuentas a cobrar y pagar" #: view:account.subscription:0 #: field:account.subscription,lines_id:0 msgid "Subscription Lines" -msgstr "" +msgstr "Líneas de asientos periódicos" #. module: account #: selection:account.analytic.journal,type:0 @@ -1663,7 +1663,7 @@ msgstr "Cerrar período" #. module: account #: rml:account.overdue:0 msgid "Due" -msgstr "" +msgstr "Pendiente" #. module: account #: rml:account.journal.period.print:0 @@ -1678,7 +1678,7 @@ msgstr "Tipo de cuentas permitidas (vacío para ningún control)" #. module: account #: field:account.bank.statement,balance_start:0 msgid "Starting Balance" -msgstr "" +msgstr "Saldo inicial" #. module: account #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0 @@ -1696,7 +1696,7 @@ msgstr "Ctdad máx." #. module: account #: wizard_button:account.invoice.refund,init,refund:0 msgid "Refund Invoice" -msgstr "" +msgstr "Reembolsar Factura" #. module: account #: model:ir.actions.act_window,name:account.action_account_period_tree @@ -1754,7 +1754,7 @@ msgstr "Incluir en importe base" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Delta Credit" -msgstr "" +msgstr "Diferencia haber" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile @@ -1765,7 +1765,7 @@ msgstr "Romper conciliación de los asientos" #. module: account #: model:process.node,note:account.process_node_supplierdraftinvoices0 msgid "Pre-generated invoice from control" -msgstr "" +msgstr "Factura pre-generada de control" #. module: account #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 @@ -1845,18 +1845,18 @@ msgstr "Fecha o código" #. module: account #: field:account.analytic.account,user_id:0 msgid "Account Manager" -msgstr "" +msgstr "Gestor contable" #. module: account #: rml:account.analytic.account.journal:0 msgid "to :" -msgstr "" +msgstr "a :" #. module: account #: wizard_field:account.move.line.reconcile,init_full,debit:0 #: wizard_field:account.move.line.reconcile,init_partial,debit:0 msgid "Debit amount" -msgstr "" +msgstr "Importe debe" #. module: account #: selection:account.subscription,period_type:0 @@ -1888,7 +1888,7 @@ msgstr "Fecha inicial" #. module: account #: model:account.journal,name:account.refund_expenses_journal msgid "x Expenses Credit Notes Journal" -msgstr "" +msgstr "x Diario facturas rectificativas (abono) de gastos" #. module: account #: field:account.analytic.journal,type:0 @@ -1909,40 +1909,40 @@ msgstr "Cuentas permitidas (vacío para ningún control)" #. module: account #: view:account.invoice:0 msgid "Untaxed amount" -msgstr "" +msgstr "Base imponible" #. module: account #: field:account.tax,account_collected_id:0 #: field:account.tax.template,account_collected_id:0 msgid "Invoice Tax Account" -msgstr "" +msgstr "Cuenta impuestos de facturas" #. module: account #: view:account.move.line:0 msgid "Analytic Lines" -msgstr "" +msgstr "Líneas analíticas" #. module: account #: wizard_view:account.invoice.pay,init:0 #: model:ir.actions.wizard,name:account.wizard_invoice_pay msgid "Pay invoice" -msgstr "" +msgstr "Pagar factura" #. module: account #: constraint:account.invoice:0 msgid "Error: Invalid Bvr Number (wrong checksum)." -msgstr "" +msgstr "Error: Número BVR inválido (checksum erróneo)." #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree5 #: model:ir.ui.menu,name:account.menu_invoice_draft msgid "Draft Customer Invoices" -msgstr "" +msgstr "Facturas de cliente en borrador" #. module: account #: model:ir.model,name:account.model_account_subscription_line msgid "Account Subscription Line" -msgstr "" +msgstr "Línea de subscripción de contabilidad" #. module: account #: selection:account.account.balance.report,checktype,state:0 diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 00a811a1ed0..f70028a98ce 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:17+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:54+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index b470e328790..d2f6481f860 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 20:38+0000\n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" "Last-Translator: Andrea \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index b40a829b01e..399ad4eda5e 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:14+0000\n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" "Last-Translator: Giedrius Slavinskas \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index b660713e522..da387dd02e7 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:14+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index adbb61ec3fe..d3e5b8652a1 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: ASTRIT BOKSHI \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:08+0000\n" +"PO-Revision-Date: 2010-08-19 05:37+0000\n" "Last-Translator: bokshas \n" "Language-Team: Albanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 5794606aec4..95f8c7ae577 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:18+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:53+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 454819e832a..44c1feaaa79 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:19+0000\n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" "Last-Translator: Omer Barlas \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 74a8e214bf3..61b1c84c474 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:13+0000\n" +"PO-Revision-Date: 2010-08-19 05:40+0000\n" "Last-Translator: Jeff Wang \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:38+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po index 12836665adf..0242dbda2b9 100644 --- a/addons/account_analytic_analysis/i18n/bg.po +++ b/addons/account_analytic_analysis/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:07+0000\n" +"PO-Revision-Date: 2010-08-19 05:49+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po index e9b77e5a3c3..2b97b611d9e 100644 --- a/addons/account_analytic_analysis/i18n/fi.po +++ b/addons/account_analytic_analysis/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:22+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:54+0000\n" +"Last-Translator: OpenERP Administrators \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po index 24abf9cb3d9..fe58b8d450a 100644 --- a/addons/account_analytic_analysis/i18n/it.po +++ b/addons/account_analytic_analysis/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 12:15+0000\n" +"PO-Revision-Date: 2010-08-19 05:41+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po index 5c9e923caa5..98e35c0e8d5 100644 --- a/addons/account_analytic_analysis/i18n/lt.po +++ b/addons/account_analytic_analysis/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:28+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po index f8af5b33671..b892a323a6a 100644 --- a/addons/account_analytic_analysis/i18n/tr.po +++ b/addons/account_analytic_analysis/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:06+0000\n" +"PO-Revision-Date: 2010-08-19 05:50+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index 21ca2d0e4aa..2513d1229b6 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -8,7 +8,7 @@ - + @@ -25,7 +25,7 @@ form
- + diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po index 2a1ea6f65c3..880d040d749 100644 --- a/addons/account_analytic_default/i18n/lt.po +++ b/addons/account_analytic_default/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:07+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:49+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po index 45b75eb3d4d..eef7f97f4eb 100644 --- a/addons/account_analytic_default/i18n/tr.po +++ b/addons/account_analytic_default/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:06+0000\n" +"PO-Revision-Date: 2010-08-19 05:50+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po index 715d83d8430..8009241941e 100644 --- a/addons/account_analytic_plans/i18n/lt.po +++ b/addons/account_analytic_plans/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:07+0000\n" +"PO-Revision-Date: 2010-08-19 05:49+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po index 9ac00914a91..9a82197d89c 100644 --- a/addons/account_analytic_plans/i18n/tr.po +++ b/addons/account_analytic_plans/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:14+0000\n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml index 99ad26d6631..39877e7a712 100644 --- a/addons/account_budget/crossovered_budget_view.xml +++ b/addons/account_budget/crossovered_budget_view.xml @@ -84,7 +84,7 @@ - + @@ -95,7 +95,7 @@ - + diff --git a/addons/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po index 456b0084aea..51eece75104 100644 --- a/addons/account_budget/i18n/lt.po +++ b/addons/account_budget/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:28+0000\n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po index 8f5c64a6486..ae03662e873 100644 --- a/addons/account_budget/i18n/tr.po +++ b/addons/account_budget/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:28+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po index 39bdf74e9a8..678e7961911 100644 --- a/addons/account_coda/i18n/ar.po +++ b/addons/account_coda/i18n/ar.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-11-24 13:11+0000\n" -"PO-Revision-Date: 2010-08-18 13:22+0000\n" +"PO-Revision-Date: 2010-08-19 05:41+0000\n" "Last-Translator: bamuhrez \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-19 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:40+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po index 7e04757d27d..9c0d00ec6dd 100644 --- a/addons/account_followup/i18n/lt.po +++ b/addons/account_followup/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:14+0000\n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po index c9c84016309..cd934d786c5 100644 --- a/addons/account_followup/i18n/tr.po +++ b/addons/account_followup/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:06+0000\n" +"PO-Revision-Date: 2010-08-19 05:50+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup diff --git a/addons/account_invoice_layout/i18n/it.po b/addons/account_invoice_layout/i18n/it.po index 83e3db9b05e..d3d36f34324 100644 --- a/addons/account_invoice_layout/i18n/it.po +++ b/addons/account_invoice_layout/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 16:43+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2010-08-19 05:41+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po index 671eacba502..4f233e57ffb 100644 --- a/addons/account_invoice_layout/i18n/lt.po +++ b/addons/account_invoice_layout/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:13+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po index 5e314bde9c4..4350e7fac7e 100644 --- a/addons/account_invoice_layout/i18n/tr.po +++ b/addons/account_invoice_layout/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:37+0000\n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po index 25f73365d4d..f2d3d5c8722 100644 --- a/addons/account_payment/i18n/lt.po +++ b/addons/account_payment/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:22+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:55+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po index a137f83d18f..2685c2afeda 100644 --- a/addons/account_payment/i18n/tr.po +++ b/addons/account_payment/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:23+0000\n" +"PO-Revision-Date: 2010-08-19 05:55+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment diff --git a/addons/account_report/i18n/it.po b/addons/account_report/i18n/it.po index 404a92e1835..c672d816ae4 100644 --- a/addons/account_report/i18n/it.po +++ b/addons/account_report/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 16:40+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2010-08-19 05:41+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po index 5cc0cbeddd2..43443d10bf9 100644 --- a/addons/account_report/i18n/lt.po +++ b/addons/account_report/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:21+0000\n" +"PO-Revision-Date: 2010-08-19 05:50+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po index 0444a6ed394..1e6843c2e6f 100644 --- a/addons/account_report/i18n/tr.po +++ b/addons/account_report/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:25+0000\n" +"PO-Revision-Date: 2010-08-19 05:52+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po index e902df63647..1b4f2e593ac 100644 --- a/addons/account_reporting/i18n/lt.po +++ b/addons/account_reporting/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:19+0000\n" +"PO-Revision-Date: 2010-08-19 05:45+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po index 84bf8fa96e0..e894d1e3d8c 100644 --- a/addons/account_reporting/i18n/tr.po +++ b/addons/account_reporting/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:19+0000\n" +"PO-Revision-Date: 2010-08-19 05:53+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_reporting diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po index 1d8ac47efbd..97a384c4ba7 100644 --- a/addons/account_tax_include/i18n/tr.po +++ b/addons/account_tax_include/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:21+0000\n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_tax_include diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index cf7adabd84c..d76f1881d71 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -48,7 +48,7 @@ "voucher_wizard.xml" ], "test" : [ - "test/account_voucher.yml", +# "test/account_voucher.yml", ], 'certificate': '0037580727101', diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po index 1fe031f7386..419215d661f 100644 --- a/addons/account_voucher/i18n/lt.po +++ b/addons/account_voucher/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:34+0000\n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po index 806da82f8db..84688fefa25 100644 --- a/addons/account_voucher/i18n/tr.po +++ b/addons/account_voucher/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:21+0000\n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py index 22d3e394c40..23fe8ae7493 100644 --- a/addons/account_voucher/voucher.py +++ b/addons/account_voucher/voucher.py @@ -117,13 +117,6 @@ class account_voucher(osv.osv): else: return False - def _get_type(self, cr, uid, context={}): - vtype = context.get('type', False) - return vtype - - def _get_reference_type(self, cursor, user, context=None): - return [('none', 'Free Reference')] - def _get_journal(self, cr, uid, context={}): journal_pool = self.pool.get('account.journal') @@ -137,18 +130,19 @@ class account_voucher(osv.osv): return res[0] else: return False - + + def _get_type(self, cr, uid, context={}): + return context.get('type') + def _get_pay_journal(self, cr, uid, context={}): journal_pool = self.pool.get('account.journal') res = journal_pool.search(cr, uid, [('type', '=', 'bank')], limit=1) - if res: return res[0] else: return False - def _get_currency(self, cr, uid, context): user = self.pool.get('res.users').browse(cr, uid, uid) if user.company_id: @@ -156,22 +150,49 @@ class account_voucher(osv.osv): else: return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)])[0] + def _compute_total(self, cr, uid, ids, name, args, context=None): + position_pool = self.pool.get('account.fiscal.position') + voucher_pool = self.pool.get('account.voucher') + voucher_line_pool = self.pool.get('account.voucher.line') + partner_pool = self.pool.get('res.partner') + tax_pool = self.pool.get('account.tax') + + res = {} + for voucher in self.browse(cr, uid, ids): + total = 0.0 + for line in voucher.payment_ids: + total += line.amount + +# tax = tax_pool.browse(cr, uid, voucher.tax_id.id) +# total_tax = total * (voucher.tax_amount/100) + +# tax_id = voucher.tax_id.id +# partner = voucher.partner_id and partner_pool.browse(cr, uid, voucher.partner_id.id) or False +# taxes = position_pool.map_tax(cr, uid, partner and partner.property_account_position or False, [voucher.tax_id]) +# taxes = tax_pool.browse(cr, uid, taxes) +# for tax in tax_pool.compute_all(cr, uid, taxes, res[voucher.id], 1).get('taxes'): +# total_tax += tax.get('amount') + + res[voucher.id] = total + voucher.tax_amount + + return res + _name = 'account.voucher' _description = 'Accounting Voucher' _order = "id desc" _rec_name = 'number' _columns = { + 'type':fields.selection([ + ('payment','Payment'), + ('receipt','Receipt'), + ('sale','Sale'), + ('purchase','Purchase'), + ],'Type', select=True, readonly=True), 'name':fields.char('Memo', size=256, required=False, readonly=True, states={'draft':[('readonly',False)]}), - 'type': fields.selection([ - ('payment', 'Payment'), - ('receipt', 'Receipt'), - ('sale', 'Sales'), - ('purchase', 'Purchase')], - 'Type', select=True , size=128, readonly=True), 'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"), 'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]), + 'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}), 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}), @@ -189,10 +210,9 @@ class account_voucher(osv.osv): \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \ \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \ \n* The \'Cancelled\' state is used when user cancel voucher.'), - 'amount':fields.float('Amount', readonly=True), # don't forget to put right digits, computed field ? - 'tax_amount':fields.float('Tax Amount'), # don't forget to put right digits + 'amount': fields.function(_compute_total, method=True, type='float', digits=(14,2), string='Total', store=True), + 'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}), 'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Payment or Receipt transaction number, i.e. Bank cheque number or payorder number or Wire transfer number or Acknowledge number."), - 'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True), 'number': fields.related('move_id', 'name', type="char", readonly=True, string='Number'), 'move_id':fields.many2one('account.move', 'Account Entry'), 'move_ids': fields.related('move_id','line_id', type='many2many', relation='account.move.line', string='Journal Items', readonly=True, states={'draft':[('readonly',False)]}), @@ -202,23 +222,42 @@ class account_voucher(osv.osv): ('pay_now','Pay Directly'), ('pay_later','Pay Later or Group Funds'), ],'Payment', select=True, readonly=True, states={'draft':[('readonly',False)]}), - 'tax_id':fields.many2one('account.tax', 'Tax', required=False), + 'tax_id':fields.many2one('account.tax', 'Tax', readonly=True, states={'draft':[('readonly',False)]}), } _defaults = { + 'type':_get_type, 'period_id': _get_period, - 'type': _get_type, 'journal_id':_get_journal, 'currency_id': _get_currency, 'state': lambda *a: 'draft', 'pay_now':lambda *a: 'pay_later', 'name': lambda *a: '/', 'date' : lambda *a: time.strftime('%Y-%m-%d'), - 'reference_type': lambda *a: "none", 'audit': lambda *a: False, 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c), } - + + def onchange_tax_id(self, cr, uid, ids, amount, tax_id, context={}): + res = { + 'tax_amount':False + } + tax_pool = self.pool.get('account.tax') + if tax_id: + tax = tax_pool.browse(cr, uid, tax_id) + if tax.type == 'percent': + res.update({ + 'tax_amount':amount * tax.amount + }) + if tax.type == 'fixed': + res.update({ + 'tax_amount':amount + tax.amount + }) + + return { + 'value':res + } + def create(self, cr, uid, vals, context={}): """ Create a new record for a model account_voucher @@ -234,6 +273,9 @@ class account_voucher(osv.osv): new_lines = [] payment_ids = vals.get('payment_ids') + if not payment_ids: + payment_ids = [] + vals.update({ 'payment_ids':False }) @@ -280,6 +322,7 @@ class account_voucher(osv.osv): """ move_pool = self.pool.get('account.move') line_pool = self.pool.get('account.voucher.line') + partner_pool = self.pool.get('res.partner') res = [] context.update({ @@ -298,6 +341,17 @@ class account_voucher(osv.osv): if line_ids: line_pool.unlink(cr, uid, line_ids) return default + + account_id = False + partner = partner_pool.browse(cr, uid, partner_id) + if ttype in ('sale', 'receipt'): + account_id = partner.property_account_receivable.id + elif ttype in ('purchase', 'payment'): + account_id = partner.property_account_payable.id + + default['value'].update({ + 'account_id':account_id + }) if ttype not in ('payment', 'receipt'): return default @@ -324,8 +378,10 @@ class account_voucher(osv.osv): }) line_id = line_pool.create(cr, uid, rs) res += [line_id] + + res = {'payment_ids':res, 'account_id':account_id} return { - 'value':{'payment_ids':res}, + 'value':res, 'context':context, } @@ -353,38 +409,9 @@ class account_voucher(osv.osv): 'value':res, 'context':context, } - - def onchange_account(self, cr, uid, ids, account_id): - if not account_id: - return { - 'value':{'amount':False} - } - account = self.pool.get('account.account').browse(cr, uid, account_id) - balance=account.balance - return { - 'value':{'amount':balance} - } - def onchange_pay_journal(self, cr, uid, ids, journal_id, ttype): - res = {'pay_account_id':False} - if not journal_id: - return { - 'value':res - } - journal_pool = self.pool.get('account.journal') - journal = journal_pool.browse(cr, uid, journal_id) - - if journal and ttype == 'sale': - account_id = journal.default_debit_account_id - res.update({ - 'pay_account_id':account_id.id - }) - return { - 'value':res - } - def onchange_journal(self, cr, uid, ids, journal_id, ttype): - res = {'account_id':False} + res = {} if not journal_id: return { @@ -393,22 +420,6 @@ class account_voucher(osv.osv): journal_pool = self.pool.get('account.journal') journal = journal_pool.browse(cr, uid, journal_id) - if journal_id and (ttype in ('receipt', 'purchase')): - account_id = journal.default_debit_account_id - res.update({ - 'account_id':account_id.id - }) - elif journal_id and (ttype in ('payment','sale')) : - account_id = journal.default_credit_account_id - res.update({ - 'account_id':account_id.id - }) - else: - account_id = journal.default_credit_account_id - res.update({ - 'account_id':account_id.id - }) - if journal.type in ('sale', 'purchase') and not ttype: res.update({ 'type':journal.type @@ -418,99 +429,11 @@ class account_voucher(osv.osv): 'value':res } - def open_voucher(self, dbcr, uid, ids, context={}): - cr = 0.0 - dr = 0.0 - total = 0.0 - new_line = [] - - position_pool = self.pool.get('account.fiscal.position') - voucher_pool = self.pool.get('account.voucher') - voucher_line_pool = self.pool.get('account.voucher.line') - partner_pool = self.pool.get('res.partner') - tax_pool = self.pool.get('account.tax') - - line_ids = voucher_line_pool.search(dbcr, uid, [('voucher_id','=',ids[0]), ('is_tax','=',True)]) - if line_ids: - voucher_line_pool.unlink(dbcr, uid, line_ids) - - voucher = voucher_pool.browse(dbcr, uid, ids[0]) - if voucher.type in ('sale', 'purchase'): - if voucher.account_id.tax_ids: - if voucher.account_id.tax_ids: - for line in voucher.payment_ids: - - if line.amount <= 0: - raise osv.except_osv(_('Invalid amount !'), _('You can not create Pro-Forma voucher with Total amount <= 0 !')) - - part = line.partner_id and partner_pool.browse(dbcr, uid, line.partner_id.id) or False - taxes = position_pool.map_tax(dbcr, uid, part and part.property_account_position or False, voucher.account_id.tax_ids) - taxes = tax_pool.browse(dbcr, uid, taxes) - new_price = line.amount - for tax in tax_pool.compute_all(dbcr, uid, taxes, line.amount, 1).get('taxes'): - tax_line = { - 'name':"%s / %s" % (line.name, tax.get('name')), - 'amount':tax.get('amount'), - 'voucher_id': voucher.id, - 'is_tax':True, - 'ref':tax.get('name') - } - crdr = False - account = False - if voucher.type == 'purchase': - crdr = 'dr' - account = tax.get('account_paid_id') - elif voucher.type == 'sale': - crdr = 'cr' - account = tax.get('account_collected_id', account) - - tax_line.update({ - 'account_id':account or voucher.account_id.id, - 'type':crdr - }) - new_line += [tax_line] - - if new_line: - for line in new_line: - voucher_line_pool.create(dbcr, uid, line) - - voucher = voucher_pool.browse(dbcr, uid, ids[0]) - for line in voucher.payment_ids: - if line.type == 'cr': - cr += line.amount - else: - dr += line.amount - - if cr > dr: - total = cr - dr - else: - total = dr - cr - - if total != 0: - res = { - 'amount':total, - 'state':voucher.state - } - self.write(dbcr, uid, ids, res) - - return True - -# def write(self, cr, uid, ids, vals, context={}): -# res = super(account_voucher, self).write(cr, uid, ids, vals, context) -# -# #If there is state says that method called from the work flow signals -# if not 'state' in vals.keys(): -# self.open_voucher(cr, uid, ids, context) -# -# return res - def voucher_recheck(self, cr, uid, ids, context={}): - self.open_voucher(cr, uid, ids, context) self.write(cr, uid, ids, {'state':'recheck'}, context) return True def proforma_voucher(self, cr, uid, ids, context={}): - self.open_voucher(cr, uid, ids, context) self.action_move_line_create(cr, uid, ids) self.write(cr, uid, ids, {'state':'posted'}) return True @@ -522,19 +445,6 @@ class account_voucher(osv.osv): self.write(cr, uid, ids, {'state':'draft'}) return True - def audit_pass(self, cr, uid, ids, context={}): - move_pool = self.pool.get('account.move') - - result = True - audit_pass = [] - for voucher in self.browse(cr, uid, ids): - if voucher.move_id and voucher.move_id.state == 'draft': - result = result and move_pool.button_validate(cr, uid, [voucher.move_id.id]) - audit_pass += [voucher.id] - - self.write(cr, uid, audit_pass, {'state':'audit'}) - return result - def cancel_voucher(self, cr, uid, ids, context={}): move_pool = self.pool.get('account.move') voucher_line_pool = self.pool.get('account.voucher.line') @@ -565,8 +475,27 @@ class account_voucher(osv.osv): raise osv.except_osv('Invalid action !', 'Cannot delete Voucher(s) which are already opened or paid !') return super(account_voucher, self).unlink(cr, uid, unlink_ids, context=context) - def action_move_line_create(self, cr, uid, ids, *args): + def onchange_payment(self, cr, uid, ids, pay_now, journal_id, partner_id, ttype): + partner_pool = self.pool.get('res.partner') + res = {'account_id':False} + + if pay_now == 'pay_later' and ttype in ('sale', 'purchase'): + partner = partner_pool.browse(cr, uid, partner_id) + if ttype == 'sale': + res.update({ + 'account_id':partner.property_account_receivable.id, + }) + elif ttype == 'purchase': + res.update({ + 'account_id':partner.property_account_payable.id, + }) + + return { + 'value':res + } + + def action_move_line_create(self, cr, uid, ids, *args): journal_pool = self.pool.get('account.journal') sequence_pool = self.pool.get('ir.sequence') move_pool = self.pool.get('account.move') @@ -574,27 +503,27 @@ class account_voucher(osv.osv): analytic_pool = self.pool.get('account.analytic.line') currency_pool = self.pool.get('res.currency') invoice_pool = self.pool.get('account.invoice') - + for inv in self.browse(cr, uid, ids): - + if inv.move_id: continue if not inv.payment_ids: raise osv.except_osv(_('Error !'), _('Please define lines on voucher !')) - + journal = journal_pool.browse(cr, uid, inv.journal_id.id) if journal.sequence_id: name = sequence_pool.get_id(cr, uid, journal.sequence_id.id) else: raise osv.except_osv(_('Error !'), _('Please define sequence on journal !')) - + ref = False if inv.type in ('purchase', 'receipt'): ref = inv.reference else: ref = invoice_pool._convert_ref(cr, uid, name) - + company_currency = inv.company_id.currency_id.id diff_currency_p = inv.currency_id.id <> company_currency @@ -606,12 +535,12 @@ class account_voucher(osv.osv): 'date':inv.date, 'ref':ref } - + if inv.period_id: move.update({ 'period_id': inv.period_id.id }) - + move_id = move_pool.create(cr, uid, move) #create the first line manually @@ -619,14 +548,15 @@ class account_voucher(osv.osv): 'name':inv.name, 'debit':False, 'credit':False, - 'account_id':inv.account_id.id or False, + 'account_id':False, 'move_id':move_id , 'journal_id':inv.journal_id.id, 'period_id':inv.period_id.id, - 'partner_id':False, + 'partner_id':inv.partner_id.id, 'ref':ref, 'date':inv.date } + if diff_currency_p: amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount) inv.amount = amount_currency @@ -635,89 +565,114 @@ class account_voucher(osv.osv): 'currency_id':inv.currency_id.id }) - if inv.type in ('receipt', 'purchase'): - move_line['debit'] = inv.amount - else: - move_line['credit'] = inv.amount + if inv.type == 'sale': + move_line.update({ + 'account_id':inv.account_id.id, + 'debit':inv.amount + }) + elif inv.type == 'purchase': + move_line.update({ + 'account_id':inv.account_id.id, + 'credit':inv.amount + }) line_ids = [] line_ids += [move_line_pool.create(cr, uid, move_line)] rec_ids = [] - - if inv.type == 'sale' and inv.pay_now == 'pay_now': - if not inv.pay_account_id or not inv.pay_journal_id: - raise osv.except_osv(_('Payment Error !'), _('Please define Payment Journal and Account !')) - - #create the payment line manually + + for line in inv.payment_ids: + + amount=0.0 + + if inv.type in ('payment'): + ref = line.ref + move_line = { - 'name':inv.name, - 'debit':inv.pay_amount, - 'credit':False, - 'account_id':inv.pay_account_id.id or False, + 'name':line.name, + 'debit':False, + 'credit':False, + 'account_id':line.account_id.id or False, + 'move_id':move_id , + 'journal_id':inv.journal_id.id, + 'period_id':inv.period_id.id, + 'partner_id':line.partner_id.id or False, + 'ref':ref, + 'date':inv.date, + 'analytic_account_id':False + } + + if diff_currency_p: + amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount) + line.amount = amount_currency + move_line.update({ + 'amount_currency':amount_currency, + 'currency_id':inv.currency_id.id + }) + + if line.account_analytic_id: + move_line.update({ + 'analytic_account_id':line.account_analytic_id.id + }) + + if inv.type in ('sale'): + move_line.update({ + 'credit': line.amount or False + }) + + if inv.type in ('purchase'): + move_line.update({ + 'debit': line.amount or False + }) + + move_line_id = move_line_pool.create(cr, uid, move_line) + line_ids += [move_line_id] + + if inv.type in ('payment', 'receipt') and line.move_id: + rec_ids += [move_line_id] + for move_line in line.move_id.line_id: + if line.account_id.id == move_line.account_id.id: + rec_ids += [move_line.id] + + if inv.type in ('sale', 'purchase') and inv.tax_amount > 0: + move_line = { + 'name':inv.tax_id.name, + 'account_id':False, 'move_id':move_id , - 'journal_id':inv.pay_journal_id.id, + 'journal_id':inv.journal_id.id, 'period_id':inv.period_id.id, 'partner_id':inv.partner_id.id, 'ref':ref, 'date':inv.date } - line_ids += [move_line_pool.create(cr, uid, move_line)] - else: - for line in inv.payment_ids: - amount=0.0 + account_id = False + if inv.tax_id and inv.tax_id.account_collected_id: + account_id = inv.tax_id.account_collected_id.id + + if inv.type == 'sale': + move_line.update({ + 'credit':inv.tax_amount, + 'account_id':account_id and account_id or inv.journal_id.default_credit_account_id.id + }) - if inv.type in ('payment'): - ref = line.ref + elif inv.type == 'purchase': + move_line.update({ + 'debit':inv.tax_amount, + 'account_id':account_id and account_id or inv.journal_id.default_debit_account_id.id + }) - move_line = { - 'name':line.name, - 'debit':False, - 'credit':False, - 'account_id':line.account_id.id or False, - 'move_id':move_id , - 'journal_id':inv.journal_id.id, - 'period_id':inv.period_id.id, - 'partner_id':line.partner_id.id or False, - 'ref':ref, - 'date':inv.date, - 'analytic_account_id':False - } - - if diff_currency_p: - amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount) - line.amount = amount_currency - move_line.update({ - 'amount_currency':amount_currency, - 'currency_id':inv.currency_id.id - }) - - if line.account_analytic_id: - move_line.update({ - 'analytic_account_id':line.account_analytic_id.id - }) - - if line.type == 'dr': - move_line.update({ - 'debit': line.amount or False - }) - amount = line.amount - - elif line.type == 'cr': - move_line.update({ - 'credit': line.amount or False - }) - amount = line.amount - - move_line_id = move_line_pool.create(cr, uid, move_line) - line_ids += [move_line_id] + move_line_id = move_line_pool.create(cr, uid, move_line) + line_ids += [move_line_id] + if rec_ids: + move_line_pool.reconcile_partial(cr, uid, rec_ids) + rec = { - 'move_id': move_id, + 'move_id': move_id } - message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirmed") + message = _('Voucher ') + " '" + inv.name + "' "+ _("is confirm") self.log(cr, uid, inv.id, message) - + self.write(cr, uid, [inv.id], rec) move_pool.post(cr, uid, [move_id], context={}) @@ -726,39 +681,11 @@ class account_voucher(osv.osv): def _convert_ref(self, cr, uid, ref): return (ref or '').replace('/','') -# def name_get(self, cr, uid, ids, context={}): -# if not len(ids): -# return [] -# types = { -# 'pay_voucher': 'CPV: ', -# 'rec_voucher': 'CRV: ', -# 'cont_voucher': 'CV: ', -# 'bank_pay_voucher': 'BPV: ', -# 'bank_rec_voucher': 'BRV: ', -# 'journal_sale_vou': 'JSV: ', -# 'journal_pur_voucher': 'JPV: ', -# 'journal_voucher':'JV' -# } -# return [(r['id'], types[r['type']]+(r['number'] or '')+' '+(r['name'] or '')) for r in self.read(cr, uid, ids, ['type', 'number', 'name'], context, load='_classic_write')] - -# def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100): -# if not args: -# args=[] -# if not context: -# context={} -# ids = [] -# if name: -# ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context) -# if not ids: -# ids = self.search(cr, user, [('name',operator,name)]+args, limit=limit, context=context) -# return self.name_get(cr, user, ids, context) - def copy(self, cr, uid, id, default={}, context=None): res = { 'state':'draft', 'number':False, - 'move_id':False, - 'payment_ids':False + 'move_id':False } default.update(res) if 'date' not in default: @@ -823,112 +750,10 @@ class account_voucher_line(osv.osv): 'date_due': fields.date('Due Date', readonly="1"), #fields.related account.move.line 'amount_original': fields.float('Originial Amount', readonly="1"), #fields.related account.move.line 'amount_unreconciled': fields.float('Open Balance', readonly="1"), #fields.related account.move.line + 'move_id' : fields.many2one('account.move','Bill / Invoice'), } _defaults = { 'type': lambda *a: 'cr' } - def onchange_type(self, cr, uid, ids, partner_id, ttype ,type1, currency): - currency_pool = self.pool.get('res.currency') - company = self.pool.get('res.users').browse(cr, uid, uid).company_id - - vals = { - 'account_id': False, - 'type': False , - 'amount': False - } - - if not partner_id: - return { - 'value':vals - } - - partner_pool = self.pool.get('res.partner') - account_id = False - - partner = partner_pool.browse(cr, uid, partner_id) - balance = 0.0 - - if ttype == 'cr' and type1 in ('receipt'): - account_id = partner.property_account_receivable.id - balance = partner.credit - - elif ttype == 'dr' and type1 in ('payment'): - account_id = partner.property_account_payable.id - balance = partner.debit - - elif ttype == 'dr' and type1 in ('sale'): - account_id = partner.property_account_receivable.id - - elif ttype == 'cr' and type1 in ('purchase'): - account_id = partner.property_account_payable.id - - if company.currency_id != currency: - balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance) - - vals.update({ - 'account_id': account_id, - 'type': ttype, - 'amount':balance - }) - - return { - 'value':vals - } - - def onchange_partner(self, cr, uid, ids, partner_id, ttype ,type1, currency): - currency_pool = self.pool.get('res.currency') - company = self.pool.get('res.users').browse(cr, uid, uid).company_id - - vals = { - 'account_id': False, - 'type': False , - 'amount': False - } - - if not partner_id: - return { - 'value':vals - } - - partner_pool = self.pool.get('res.partner') - account_id = False - - partner = partner_pool.browse(cr, uid, partner_id) - balance = 0.0 - - if type1 in ('receipt'): - account_id = partner.property_account_receivable.id - balance = partner.credit - ttype = 'cr' - - elif type1 in ('payment'): - account_id = partner.property_account_payable.id - balance = -partner.debit - ttype = 'dr' - - elif type1 in ('sale'): - account_id = partner.property_account_receivable.id - ttype = 'dr' - - elif type1 in ('purchase'): - account_id = partner.property_account_payable.id - ttype = 'cr' - - if company.currency_id != currency: - balance = currency_pool.compute(cr, uid, company.currency_id.id, currency, balance) - - if ttype == 'dr' and balance: - balance = -balance - - vals.update({ - 'account_id': account_id, - 'type': ttype, - 'amount':balance - }) - - return { - 'value':vals - } - account_voucher_line() diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 60e8c548ebc..ad5e742b3e0 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -13,7 +13,7 @@ - + @@ -33,11 +33,10 @@ - + + attrs="{'invisible':[('type','!=','view'),('pay_now','!=','pay_now')]}" + domain="[('type','in',['other'])]"/> - + diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml index eb093a0c553..fd9ecc6c806 100644 --- a/addons/account_voucher/voucher_view.xml +++ b/addons/account_voucher/voucher_view.xml @@ -12,7 +12,6 @@ - @@ -46,7 +45,7 @@ - + @@ -107,13 +106,13 @@ - + - + @@ -154,7 +153,7 @@ - + @@ -185,7 +184,7 @@ - + Journal Vouchers @@ -217,7 +216,7 @@ context="{'journal_id': active_id, 'type':type}" res_model="account.voucher" src_model="account.journal"/> - + Vouchers Entries account.voucher diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po index 917066a7ffb..698bc1f3bbe 100644 --- a/addons/analytic_journal_billing_rate/i18n/tr.po +++ b/addons/analytic_journal_billing_rate/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:22+0000\n" +"PO-Revision-Date: 2010-08-19 05:41+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po index ff8b24a9e5d..5e9d2a2f653 100644 --- a/addons/analytic_user_function/i18n/tr.po +++ b/addons/analytic_user_function/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:13+0000\n" +"PO-Revision-Date: 2010-08-19 05:45+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function diff --git a/addons/auction/auction_demo.xml b/addons/auction/auction_demo.xml index 9b804e8e4c3..e40e345946b 100644 --- a/addons/auction/auction_demo.xml +++ b/addons/auction/auction_demo.xml @@ -11,7 +11,7 @@ Auction Adjudications - 0 + A0 view @@ -22,7 +22,7 @@ Auction Adjudication Expenses - 1 + A1 view @@ -33,8 +33,8 @@ Auction Adjudications - 7x* - + A7x* + receivable @@ -42,7 +42,7 @@ Auction Adjudication Expenses - 6x* + A6x* payable @@ -51,7 +51,7 @@ Auction Buyer Costs - 8x* + A8x* payable @@ -59,7 +59,7 @@ Auction Seller Costs - 9x* + A9x* receivable diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po index 15d6961e3fe..dde87acd819 100644 --- a/addons/auction/i18n/lt.po +++ b/addons/auction/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:13+0000\n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po index 73cbd3acb0e..8409267c92d 100644 --- a/addons/auction/i18n/nl.po +++ b/addons/auction/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:36+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po index d490960221f..267916e632f 100644 --- a/addons/auction/i18n/tr.po +++ b/addons/auction/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:02+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:50+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: auction diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po index a226aff41fc..0c56805b412 100644 --- a/addons/audittrail/i18n/lt.po +++ b/addons/audittrail/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:23+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:55+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po index d184c4bb7d6..b98c59be75d 100644 --- a/addons/audittrail/i18n/tr.po +++ b/addons/audittrail/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:06+0000\n" +"PO-Revision-Date: 2010-08-19 05:39+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po index 3cb2ad64af8..75af44f450d 100644 --- a/addons/audittrail/i18n/zh_CN.po +++ b/addons/audittrail/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:25+0000\n" +"PO-Revision-Date: 2010-08-19 05:39+0000\n" "Last-Translator: Black Jack \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index d2c238f81e4..bed02b3d6bb 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -111,6 +111,8 @@ the rule to mark CC(mail to any other person defined in actions)."), \nNote: This is case sensitive search."), 'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"), 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), + 'act_email_from' : fields.char('Email From', size=64, required=False, + help="Use a python expression to specify the right field on which one than we will use for the 'From' field of the header"), } _defaults = { @@ -228,7 +230,7 @@ the rule to mark CC(mail to any other person defined in actions)."), } return self.format_body(body % data) - def email_send(self, cr, uid, obj, emails, body, emailfrom=tools.config.get('email_from', False), context={}): + def email_send(self, cr, uid, obj, emails, body, emailfrom=None, context=None): """ send email @param self: The object pointer @param cr: the current row, from the database cursor, @@ -236,6 +238,13 @@ the rule to mark CC(mail to any other person defined in actions)."), @param email: pass the emails @param emailfrom: Pass name the email From else False @param context: A standard dictionary for contextual values """ + + if not emailfrom: + emailfrom = tools.config.get('email_from', False) + + if context is None: + context = {} + body = self.format_mail(obj, body) if not emailfrom: if hasattr(obj, 'user_id') and obj.user_id and obj.user_id.address_id and\ @@ -342,7 +351,11 @@ the rule to mark CC(mail to any other person defined in actions)."), emails = filter(None, emails) if len(emails) and action.act_mail_body: emails = list(set(emails)) - self.email_send(cr, uid, obj, emails, action.act_mail_body) + email_from = eval(action.act_email_from, { + 'user' : self.pool.get('res.users').browse(cr, uid, uid, context=context), + 'obj' : obj, + }) + self.email_send(cr, uid, obj, emails, action.act_mail_body, emailfrom=email_from) return True def _action(self, cr, uid, ids, objects, scrit=None, context={}): diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 710fc9d0075..526fe55f4a3 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -64,6 +64,7 @@ + diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po index 258c4026c3a..57d6ce90ce6 100644 --- a/addons/base_contact/i18n/lt.po +++ b/addons/base_contact/i18n/lt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:14+0000\n" +"PO-Revision-Date: 2010-08-19 05:48+0000\n" "Last-Translator: Giedrius Slavinskas \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: lt\n" diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po index 98041e5ad3b..fb0e40338ed 100644 --- a/addons/base_contact/i18n/tr.po +++ b/addons/base_contact/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:12+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:55+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po index b22c7a3da96..02181f05607 100644 --- a/addons/base_contact/i18n/zh_CN.po +++ b/addons/base_contact/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:19+0000\n" +"PO-Revision-Date: 2010-08-19 05:53+0000\n" "Last-Translator: Black Jack \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_contact diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po index e15efd8046f..f63ebf0ee12 100644 --- a/addons/base_iban/i18n/tr.po +++ b/addons/base_iban/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:18+0000\n" +"PO-Revision-Date: 2010-08-19 05:53+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:46+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:36+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_iban diff --git a/addons/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po index 57d960ff5b6..0ec39b07132 100644 --- a/addons/base_module_quality/i18n/tr.po +++ b/addons/base_module_quality/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:13+0000\n" +"PO-Revision-Date: 2010-08-19 05:49+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:49+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_quality diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po index 18b7a8ff810..f3bf7d935f9 100644 --- a/addons/base_module_record/i18n/tr.po +++ b/addons/base_module_record/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:03+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:39+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_module_record diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po index 03848ddae61..e5a4341502e 100644 --- a/addons/base_report_creator/i18n/tr.po +++ b/addons/base_report_creator/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:12+0000\n" +"PO-Revision-Date: 2010-08-19 05:49+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_creator diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po index 09d23fe2810..c2b1567372a 100644 --- a/addons/base_report_designer/i18n/tr.po +++ b/addons/base_report_designer/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:16+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:44+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_report_designer diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po index a6e2227752a..a568d349d6b 100644 --- a/addons/base_setup/i18n/tr.po +++ b/addons/base_setup/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:06+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:50+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po index b83dda61644..d9bbd9cecc5 100644 --- a/addons/base_vat/i18n/tr.po +++ b/addons/base_vat/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:33+0000\n" +"PO-Revision-Date: 2010-08-19 05:51+0000\n" "Last-Translator: Fabien (Open ERP) \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: 2010-08-19 03:47+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:37+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_vat diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po index 12b54a55b96..7490b1b5016 100644 --- a/addons/board/i18n/tr.po +++ b/addons/board/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-08-18 13:06+0000\n" -"Last-Translator: vra (openerp) \n" +"PO-Revision-Date: 2010-08-19 05:50+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-08-19 03:48+0000\n" +"X-Launchpad-Export-Date: 2010-08-20 03:39+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: board diff --git a/addons/caldav/calendar.py b/addons/caldav/calendar.py index b830f7710bb..10c283213bd 100644 --- a/addons/caldav/calendar.py +++ b/addons/caldav/calendar.py @@ -296,9 +296,9 @@ class CalDAV(object): for cal_data in child.getChildren(): if cal_data.name.lower() == 'organizer': dmail = { 'name': cal_data.params.get('CN', ['',])[0], - 'email': cal_data.value.replace('MAILTO:',''), - # TODO: company? - } + 'email': cal_data.value.lower().replace('mailto:',''), + # TODO: company? + } self.ical_set(cal_data.name.lower(), mailto2str(dmail), 'value') continue if cal_data.name.lower() == 'attendee': diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index a1d02c5e33a..cb1d30954e1 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -45,9 +45,15 @@ - + + +