diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 3fabb495ba1..6faf8772a67 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -25,15 +25,19 @@ "version" : "1.1", "depends" : ["product", "analytic", "process"], "author" : "Tiny", + "category": 'Generic Modules/Accounting', "description": """Financial and accounting module that covers: - General accounting + General accountings Cost / Analytic accounting Third party accounting Taxes management Budgets Customer and Supplier Invoices Bank statements - Account Balance Report + +The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or +grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a +module named account_voucherss """, 'website': 'http://www.openerp.com', 'init_xml': [], diff --git a/addons/account/account.py b/addons/account/account.py index 84e7e0c74c5..12868487c49 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2182,6 +2182,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): #create all the tax code children_tax_code_template = self.pool.get('account.tax.code.template').search(cr, uid, [('parent_id','child_of',[tax_code_root_id])], order='id') + children_tax_code_template.sort() for tax_code_template in self.pool.get('account.tax.code.template').browse(cr, uid, children_tax_code_template): vals={ 'name': (tax_code_root_id == tax_code_template.id) and obj_multi.company_id.name or tax_code_template.name, diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py index 18f63733ff6..c42597e785d 100644 --- a/addons/account/account_analytic_line.py +++ b/addons/account/account_analytic_line.py @@ -147,8 +147,9 @@ class account_analytic_line(osv.osv): # Compute based on pricetype pricetype=self.pool.get('product.price.type').browse(cr,uid,company_obj.browse(cr,uid,company_id).property_valuation_price_type.id) + # Take the company currency as the reference one + context['currency_id']=company_obj.browse(cr,uid,company_id).currency_id.id amount_unit=prod.price_get(pricetype.field, context)[prod.id] - amount=amount_unit*unit_amount or 1.0 return {'value': { 'amount': - round(amount, 2), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 0adc85a942e..07d8e1a02ac 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -278,7 +278,7 @@ class account_move_line(osv.osv): data['amount_currency'] = v return data - def _on_create_write(self, cr, uid, id, context={}): + def on_create_write(self, cr, uid, id, context={}): ml = self.browse(cr, uid, id, context) return map(lambda x: x.id, ml.move_id.line_id) @@ -733,7 +733,7 @@ class account_move_line(osv.osv): state = ' colors="red:state==\'draft\'"' #xml = '''\n\n\t''' % (title, state) - xml = '''\n\n\t''' % (title, state) + xml = '''\n\n\t''' % (title, state) fields = [] widths = { diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d865823e9cd..88205521b1c 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -159,7 +159,7 @@ - + List of Accounts account.account @@ -681,7 +681,7 @@ tree - + diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index 932d4e3cf3d..417964044e5 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-17 20:55+0000\n" +"PO-Revision-Date: 2010-03-28 20:40+0000\n" "Last-Translator: mitev.dmitry \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-03-18 04:34+0000\n" +"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -110,7 +110,7 @@ msgstr "Vytištěné reporty o daních" #. module: account #: field:account.account,parent_id:0 msgid "Parent" -msgstr "" +msgstr "Rodič" #. module: account #: selection:account.move,type:0 @@ -415,7 +415,7 @@ msgstr "Datum:" #. module: account #: selection:account.account.type,sign:0 msgid "Negative" -msgstr "" +msgstr "Negativ" #. module: account #: rml:account.partner.balance:0 diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index c26e1b0416a..516525d921d 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/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-03-18 14:20+0000\n" +"PO-Revision-Date: 2010-03-22 15:02+0000\n" "Last-Translator: Henri Kovalainen \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-03-19 07:50+0000\n" +"X-Launchpad-Export-Date: 2010-03-24 04:53+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -824,7 +824,7 @@ msgstr "(Jätä tyhjäksi käyttääksesi kaikkia avoimia tilikausia)" #. module: account #: field:account.invoice,move_lines:0 msgid "Move Lines" -msgstr "Siirtymärivit" +msgstr "Siirron rivit" #. module: account #: model:ir.model,name:account.model_account_config_wizard @@ -1041,12 +1041,12 @@ msgstr "Talouskanta" #: field:account.analytic.line,product_uom_id:0 #: field:account.move.line,product_uom_id:0 msgid "UoM" -msgstr "Yksikkö" +msgstr "Mittayksikkö" #. module: account #: wizard_field:account.third_party_ledger.report,init,page_split:0 msgid "One Partner Per Page" -msgstr "Yksi kumppani sivulla" +msgstr "Yksi kumppani per sivu" #. module: account #: field:account.account,child_parent_ids:0 @@ -1577,7 +1577,7 @@ msgstr "Luo tilikartta mallista" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Statements" -msgstr "Lailliset lausunnot" +msgstr "Lakimääräiset tiliotteet" #. module: account #: field:account.tax.code,parent_id:0 @@ -4759,7 +4759,7 @@ msgstr "Muuta" #. module: account #: field:account.journal.period,icon:0 msgid "Icon" -msgstr "Kuvake" +msgstr "Icon" #. module: account #: model:ir.model,name:account.model_account_journal_period diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 45ef33f37ce..11692706164 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-04 15:48+0000\n" -"Last-Translator: JCF \n" +"PO-Revision-Date: 2010-03-24 00:57+0000\n" +"Last-Translator: Pedro_Maschio \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-03-11 04:52+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -911,7 +911,7 @@ msgstr "Diário de Baixas" #: field:account.model.line,amount_currency:0 #: field:account.move.line,amount_currency:0 msgid "Amount Currency" -msgstr "" +msgstr "Moeda do valor" #. module: account #: field:account.chart.template,property_account_expense_categ:0 @@ -1415,7 +1415,7 @@ msgstr "Crédito do cliente" #. module: account #: field:account.invoice,tax_line:0 msgid "Tax Lines" -msgstr "Linhas de taxa" +msgstr "Linhas de Impostos" #. module: account #: field:ir.sequence,fiscal_ids:0 @@ -1464,7 +1464,7 @@ msgstr "Exibir histórico" #. module: account #: wizard_field:account.third_party_ledger.report,init,date1:0 msgid " Start date" -msgstr " Data de inicío" +msgstr " Data de início" #. module: account #: wizard_field:account.account.balance.report,checktype,display_account:0 @@ -1475,13 +1475,13 @@ msgstr "Exibir contas " #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile_line msgid "Statement reconcile line" -msgstr "Linha de procecimentos de conciliação" +msgstr "Linha de reconciliação do Demonstrativo" #. module: account #: view:account.tax:0 #: view:account.tax.template:0 msgid "Keep empty to use the income account" -msgstr "Manter vazio para usar a conta da fatura" +msgstr "Manter vazio para usar a conta de receita" #. module: account #: view:account.bank.statement.reconcile:0 @@ -1489,7 +1489,7 @@ msgstr "Manter vazio para usar a conta da fatura" #: wizard_view:account.move.line.reconcile,init_full:0 #: wizard_view:account.move.line.reconcile,init_partial:0 msgid "Write-Off" -msgstr "Amortização" +msgstr "Baixa ou exclusão" #. module: account #: help:account.invoice,partner_bank:0 @@ -1543,7 +1543,7 @@ msgstr "Tel. :" #. module: account #: field:account.invoice.tax,tax_amount:0 msgid "Tax Code Amount" -msgstr "Quantia de taxa" +msgstr "Valor do Código do Imposto" #. module: account #: selection:account.account.type,sign:0 @@ -1566,7 +1566,7 @@ msgstr "Modelo de plano de contas" #. module: account #: field:account.invoice,move_id:0 msgid "Invoice Movement" -msgstr "Movimento da fatura" +msgstr "Movimento de Faturas" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart @@ -1578,18 +1578,18 @@ msgstr "Gerar plano de contas de um modelo de plano" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Statements" -msgstr "Procedimentos legais" +msgstr "Demonstrativos Legais" #. module: account #: field:account.tax.code,parent_id:0 #: field:account.tax.code.template,parent_id:0 msgid "Parent Code" -msgstr "Código pai" +msgstr "Código da Conta-pai" #. module: account #: wizard_button:account.move.line.reconcile.select,init,open:0 msgid "Open for reconciliation" -msgstr "Abrir para conciliação" +msgstr "Abrir para reconciliação" #. module: account #: model:account.journal,name:account.bilan_journal @@ -1600,7 +1600,7 @@ msgstr "Diário de abertura" #: selection:account.tax,tax_group:0 #: selection:account.tax.template,tax_group:0 msgid "VAT" -msgstr "Imposto" +msgstr "VAT (imposto europeu)" #. module: account #: rml:account.analytic.account.journal:0 @@ -1629,7 +1629,7 @@ msgstr "Código parceiro" #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Receivable and Payable Accounts" -msgstr "Contas a receber e a pagar" +msgstr "Contas a Pagar e Receber" #. module: account #: view:account.subscription:0 @@ -1643,7 +1643,7 @@ msgstr "Linhas de inscrição" #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Purchase" -msgstr "Compras" +msgstr "Compra" #. module: account #: view:account.analytic.line:0 @@ -1674,12 +1674,12 @@ msgstr "Terceiros" #. module: account #: view:account.journal:0 msgid "Accounts Type Allowed (empty for no control)" -msgstr "Tipo de contas permitidas (vazio para não controlar)" +msgstr "Tipos de contas permitidas (vazio para não controlar)" #. module: account #: field:account.bank.statement,balance_start:0 msgid "Starting Balance" -msgstr "Iniciar balanço" +msgstr "Saldo Inicial" #. module: account #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0 @@ -1697,7 +1697,7 @@ msgstr "Qtd máx:" #. module: account #: wizard_button:account.invoice.refund,init,refund:0 msgid "Refund Invoice" -msgstr "Reembolso da fatura" +msgstr "Fatura de Devolução" #. module: account #: model:ir.actions.act_window,name:account.action_account_period_tree @@ -1734,7 +1734,7 @@ msgstr "Forçar período" #. module: account #: help:account.account.type,sequence:0 msgid "Gives the sequence order when displaying a list of account types." -msgstr "Dá a ordem da seqüência ao indicar uma lista de tipos de conta." +msgstr "Dá a ordem sequencial ao mostrar uma lista de tipos de conta." #. module: account #: view:account.invoice:0 @@ -1765,7 +1765,7 @@ msgstr "Desfazer reconciliação de Lançamentos" #. module: account #: model:process.node,note:account.process_node_supplierdraftinvoices0 msgid "Pre-generated invoice from control" -msgstr "Fatura pré-gerada pelo controle" +msgstr "Fatura pré-gerada do controle" #. module: account #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 @@ -1776,7 +1776,7 @@ msgstr "Custo Razão para um período" #: model:ir.actions.act_window,name:account.action_bank_statement_tree2 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2 msgid "New Statement" -msgstr "Novo procedimento" +msgstr "Novo Demonstrativo" #. module: account #: wizard_field:account.analytic.account.chart,init,from_date:0 @@ -1788,7 +1788,7 @@ msgstr "De" #: model:process.node,note:account.process_node_reconciliation0 #: model:process.node,note:account.process_node_supplierreconciliation0 msgid "Reconciliation of entries from invoice(s) and payment(s)" -msgstr "Conciliação de entradas de fatura(s) e pagamento(s)" +msgstr "Reconciliação dos lançamentos das fatura(s) e pagamento(s)" #. module: account #: wizard_view:account.central.journal.report,init:0 @@ -1820,7 +1820,7 @@ msgstr "Planos" #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Sale" -msgstr "vender" +msgstr "Venda" #. module: account #: wizard_button:account.account.balance.report,account_selection,checktype:0 @@ -1834,7 +1834,7 @@ msgid "" "The fiscal position will determine taxes and the accounts used for the the " "partner." msgstr "" -"A posição fiscal poderá determinar as taxas e as contas usadas para o " +"A posição fiscal irá determinar os impostos e as contas usadas para o " "parceiro." #. module: account @@ -1845,7 +1845,7 @@ msgstr "Data ou Código" #. module: account #: field:account.analytic.account,user_id:0 msgid "Account Manager" -msgstr "Administrar contas" +msgstr "Gerente de Contas" #. module: account #: rml:account.analytic.account.journal:0 @@ -1856,7 +1856,7 @@ msgstr "para:" #: wizard_field:account.move.line.reconcile,init_full,debit:0 #: wizard_field:account.move.line.reconcile,init_partial,debit:0 msgid "Debit amount" -msgstr "Quantia de débito" +msgstr "Valor do débito" #. module: account #: selection:account.subscription,period_type:0 @@ -1904,18 +1904,18 @@ msgstr "Tipo" #. module: account #: view:account.journal:0 msgid "Accounts Allowed (empty for no control)" -msgstr "Contas permitidas(Vazio para não controlar)" +msgstr "Contas permitidas (Vazio para não controlar)" #. module: account #: view:account.invoice:0 msgid "Untaxed amount" -msgstr "Quantia não taxada" +msgstr "Valor não tributado" #. module: account #: field:account.tax,account_collected_id:0 #: field:account.tax.template,account_collected_id:0 msgid "Invoice Tax Account" -msgstr "Conta de taxa da fatura" +msgstr "Conta de Impostos da Fatura" #. module: account #: view:account.move.line:0 @@ -1937,7 +1937,7 @@ msgstr "Erro: Número Bvr Inválido (erro dígito verificador)." #: model:ir.actions.act_window,name:account.action_invoice_tree5 #: model:ir.ui.menu,name:account.menu_invoice_draft msgid "Draft Customer Invoices" -msgstr "Esboço de faturas de clientes" +msgstr "Fatura de Clientes Provisória" #. module: account #: model:ir.model,name:account.model_account_subscription_line @@ -2006,7 +2006,7 @@ msgstr "Este nome será exibido nos relatórios" #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.quantity_cost_ledger:0 msgid "Printing date" -msgstr "Imprimindo data" +msgstr "Data de impressão" #. module: account #: constraint:ir.ui.view:0 @@ -2161,7 +2161,7 @@ msgstr "Conciliar pagamento" #: model:ir.actions.act_window,name:account.action_bank_statement_reconciliation_form #: model:ir.ui.menu,name:account.menu_action_account_bank_reconcile_tree msgid "Statements reconciliation" -msgstr "Procedimento de conciliação" +msgstr "Reconciliação dos Demonstrativos" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -2198,7 +2198,7 @@ msgstr "Quantia" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open msgid "Reconciled entries" -msgstr "Lançamentos conciliados" +msgstr "Lançamentos reconciliados" #. module: account #: field:account.invoice,address_contact_id:0 @@ -2219,7 +2219,7 @@ msgstr "(Mantenha vazio para usar o período atual)" #: model:ir.actions.act_window,name:account.action_invoice_tree8 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8 msgid "Draft Supplier Invoices" -msgstr "Esboço de faturas de fornecedores" +msgstr "Fatura Provisória de Fornecedores" #. module: account #: wizard_field:account.invoice.refund,init,period:0 @@ -2276,7 +2276,7 @@ msgstr "x Conferências diárias" #: model:ir.actions.wizard,name:account.wizard_generate_subscription #: model:ir.ui.menu,name:account.menu_generate_subscription msgid "Create subscription entries" -msgstr "Crie entradas da subscrição" +msgstr "Criar lançamentos de inscrição" #. module: account #: wizard_field:account.fiscalyear.close,init,journal_id:0 @@ -2286,7 +2286,7 @@ msgstr "Diário de Abertura de Lançamentos" #. module: account #: view:account.config.wizard:0 msgid "Create a Fiscal Year" -msgstr "Criar ano fiscal" +msgstr "Criar um ano fiscal" #. module: account #: field:product.template,taxes_id:0 @@ -2369,7 +2369,7 @@ msgstr "Tipo de taxa" #. module: account #: model:process.transition,name:account.process_transition_statemententries0 msgid "Statement Entries" -msgstr "Procedimentos para lançamentos" +msgstr "Lançamentos do Demonstrativo" #. module: account #: field:account.analytic.line,user_id:0 @@ -2381,7 +2381,7 @@ msgstr "Usuário" #: model:ir.actions.act_window,name:account.action_account_template_form #: model:ir.ui.menu,name:account.menu_action_account_template_form msgid "Account Templates" -msgstr "Modelos de contas" +msgstr "Modelos de conta" #. module: account #: view:account.chart.template:0 @@ -2523,7 +2523,7 @@ msgstr "Informação adicional" #: model:process.transition,name:account.process_transition_entriesreconcile0 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0 msgid "Entries Reconcile" -msgstr "Conciliar lançamentos" +msgstr "Reconciliar lançamentos" #. module: account #: help:account.bank.statement.reconcile,total_second_amount:0 @@ -2879,7 +2879,7 @@ msgstr "ID do parceiro" #: wizard_view:account.invoice.pay,addendum:0 #: wizard_view:account.move.line.reconcile,addendum:0 msgid "Write-Off Move" -msgstr "Mover amortização" +msgstr "Movimentação de Baixa ou Exclusão" #. module: account #: view:account.move.line:0 @@ -2927,7 +2927,7 @@ msgstr "Abrir estado" #. module: account #: field:account.journal,entry_posted:0 msgid "Skip 'Draft' State for Created Entries" -msgstr "Saltar o estado 'Esboço' para criar novas entradas" +msgstr "Pular a forma 'Provisório' para lançamentos criados" #. module: account #: field:account.invoice.tax,account_id:0 @@ -2963,12 +2963,12 @@ msgstr "1cm 27.7cm 20cm 27.7cm" #: model:ir.actions.act_window,name:account.action_invoice_tree12 #: model:ir.ui.menu,name:account.menu_action_invoice_tree12 msgid "Draft Supplier Refunds" -msgstr "Esboço de reembolso a fornecedor" +msgstr "Reembolso a Fornecedores Provisório" #. module: account #: model:process.node,name:account.process_node_accountingstatemententries0 msgid "Accounting Statement" -msgstr "Procedimento para contas" +msgstr "Demonstrativo de Contas" #. module: account #: rml:account.overdue:0 @@ -2997,7 +2997,7 @@ msgstr "Transações não conciliadas" #: model:process.transition,note:account.process_transition_paymentorderbank0 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0 msgid "Reconcilation of entries from payment order." -msgstr "Conciliação de lançamentos para ordem de pagamento" +msgstr "Reconciliação de lançamentos da ordem de pagamento" #. module: account #: field:account.bank.statement,move_line_ids:0 @@ -3050,7 +3050,7 @@ msgstr "Taxa de moedas correntes de partida" #: model:ir.actions.act_window,name:account.action_invoice_tree10 #: model:ir.ui.menu,name:account.menu_action_invoice_tree10 msgid "Draft Customer Refunds" -msgstr "Esboço de reembolso a cliente" +msgstr "Reembolso a Clientes Provisório" #. module: account #: field:account.journal.column,readonly:0 @@ -3127,12 +3127,12 @@ msgstr "Diário analítico" #. module: account #: rml:account.general.ledger:0 msgid "Entry Label" -msgstr "Etiqueta de lançamento" +msgstr "Aba de lançamento" #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 msgid "Reconcilate the entries from payment" -msgstr "Conciliação de lançamentos de pagamento" +msgstr "Reconciliar os lançamentos do pagamento" #. module: account #: rml:account.tax.code.entries:0 @@ -3144,7 +3144,7 @@ msgstr "(" #: view:account.period:0 #: view:account.subscription:0 msgid "Set to Draft" -msgstr "Definir como esboço" +msgstr "Definir como Provisório" #. module: account #: help:account.invoice,origin:0 @@ -3279,7 +3279,7 @@ msgstr "Taxa média" #: model:process.node,note:account.process_node_bankstatement0 #: model:process.node,note:account.process_node_supplierbankstatement0 msgid "Statement encoding produces payment entries" -msgstr "Codificação de procedimentos de lançamentos de pagamento" +msgstr "Codificação de demonstrativos para lançamentos de pagamento" #. module: account #: field:account.account,code:0 @@ -3321,7 +3321,7 @@ msgstr "Gerar Lançamentos Iniciais de Abertura do Ano Fiscal" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile msgid "Reconcile Entries" -msgstr "Conciliar lançamentos" +msgstr "Reconciliar lançamentos" #. module: account #: wizard_view:account.wizard_paid_open,init:0 @@ -3460,7 +3460,7 @@ msgstr "" #. module: account #: view:account.bank.statement:0 msgid "Real Entries" -msgstr "Lançamento real" +msgstr "Lançamentos Reais" #. module: account #: model:process.node,name:account.process_node_importinvoice0 @@ -3518,7 +3518,7 @@ msgstr "" #: field:account.tax,parent_id:0 #: field:account.tax.template,parent_id:0 msgid "Parent Tax Account" -msgstr "Conta pai da taxa" +msgstr "Conta-pai de Impostos" #. module: account #: field:account.account,user_type:0 @@ -3649,7 +3649,7 @@ msgstr "Linha do projeto" #. module: account #: wizard_field:account.automatic.reconcile,init,max_amount:0 msgid "Maximum write-off amount" -msgstr "Monante máximo de amortização" +msgstr "Valor máximo da Baixa ou Exclusão" #. module: account #: field:account.invoice.tax,manual:0 @@ -3732,7 +3732,7 @@ msgstr "Definir ano fiscal e selecionar plano de contas" #. module: account #: wizard_field:account.move.line.reconcile,addendum,period_id:0 msgid "Write-Off Period" -msgstr "Amortização do período" +msgstr "Período de Baixa ou Exclusão" #. module: account #: selection:account.config.wizard,period:0 @@ -3756,7 +3756,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_payment_term_line msgid "Payment Term Line" -msgstr "Linha do termo de pagamento" +msgstr "Linha da forma de pagamento" #. module: account #: selection:account.config.wizard,period:0 @@ -3789,7 +3789,7 @@ msgstr "Por data" #. module: account #: model:ir.actions.act_window,name:account.action_account_config_wizard_form msgid "Account Configure Wizard " -msgstr "Assistente de configurção de conga " +msgstr "Assistente de configuração de conta " #. module: account #: field:account.config.wizard,date1:0 @@ -3813,7 +3813,7 @@ msgstr "Todos lançamentos" #: model:process.node,name:account.process_node_draftinvoices0 #: model:process.node,name:account.process_node_supplierdraftinvoices0 msgid "Draft Invoices" -msgstr "Esboço de faturas" +msgstr "Faturas Provisórias" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template @@ -3909,7 +3909,7 @@ msgstr "Outro" #: model:ir.actions.wizard,name:account.wizard_general_ledger_report #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" -msgstr "Ficha geral" +msgstr "Livro Razão" #. module: account #: field:account.journal.view,columns_id:0 @@ -3938,7 +3938,7 @@ msgstr "" #. module: account #: model:process.node,note:account.process_node_manually0 msgid "Encode manually the statement" -msgstr "Codifique manualmente o procedimento" +msgstr "Codifique manualmente o demonstrativo" #. module: account #: model:ir.actions.act_window,name:account.action_account_journal_form @@ -4152,7 +4152,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_invoice_tree1 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1 msgid "Customer Invoices" -msgstr "Faturas de clients" +msgstr "Faturas de Clientes" #. module: account #: field:res.partner,debit_limit:0 @@ -4502,7 +4502,7 @@ msgstr "Linha Modelo de lançamento" #. module: account #: view:account.tax.template:0 msgid "Account Tax Template" -msgstr "Modelo de conta de taxa" +msgstr "Modelo de conta de impostos" #. module: account #: help:account.model,name:0 @@ -4517,7 +4517,7 @@ msgstr "Abrir fatura" #. module: account #: model:process.node,note:account.process_node_draftstatement0 msgid "Set starting and ending balance for control" -msgstr "Definir início e fim para o controle do balanço" +msgstr "Defina o saldo inicial e final para controle" #. module: account #: wizard_view:account.wizard_paid_open,init:0 @@ -4556,7 +4556,7 @@ msgstr "Estado" #: model:process.node,name:account.process_node_accountingentries0 #: model:process.node,name:account.process_node_supplieraccountingentries0 msgid "Accounting Entries" -msgstr "Lançando contas" +msgstr "Lançamentos Contábeis" #. module: account #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled @@ -4566,7 +4566,7 @@ msgstr "Receber & Pagar" #. module: account #: rml:account.general.ledger:0 msgid "General Ledger -" -msgstr "Ficha geral -" +msgstr "Livro Razão -" #. module: account #: field:report.hr.timesheet.invoice.journal,quantity:0 @@ -4592,20 +4592,20 @@ msgstr "Total" #: model:process.transition,note:account.process_transition_customerinvoice0 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0 msgid "Number of entries are generated" -msgstr "Numero de lançamentos a ser gerado" +msgstr "Numero de lançamentos são gerados" #. module: account #: model:process.transition,name:account.process_transition_suppliervalidentries0 #: model:process.transition,name:account.process_transition_validentries0 msgid "Valid Entries" -msgstr "Validar lançamentos" +msgstr "Lançamentos Válidos" #. module: account #: model:ir.actions.wizard,name:account.wizard_account_use_model #: model:ir.actions.wizard,name:account.wizard_line_account_use_model #: model:ir.ui.menu,name:account.menu_account_use_model msgid "Create Entries From Models" -msgstr "Criar lançamentos de modelos" +msgstr "Criar lançamentos dos modelos" #. module: account #: field:account.account.template,reconcile:0 @@ -4624,7 +4624,7 @@ msgstr "Por data" #: model:ir.actions.act_window,name:account.action_invoice_tree4 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4 msgid "Supplier Refunds" -msgstr "reembolsos do fornecedor" +msgstr "Reembolsos de Fornecedor" #. module: account #: help:account.model.line,date:0 @@ -4737,7 +4737,7 @@ msgstr "" #. module: account #: model:process.node,name:account.process_node_draftstatement0 msgid "Draft statement" -msgstr "Procedimento de esboço" +msgstr "Demonstrativo provisório" #. module: account #: field:account.analytic.journal,name:0 @@ -4843,7 +4843,7 @@ msgstr "Cancelado" #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree #: model:ir.ui.menu,name:account.menu_bank_statement_draft_tree msgid "Draft statements" -msgstr "Esboço de procedimentos" +msgstr "Demonstrativos provisórios" #. module: account #: wizard_field:populate_statement_from_inv,init,date:0 @@ -4959,7 +4959,7 @@ msgstr "Selecione a conta-pai" #. module: account #: field:account.account.template,parent_id:0 msgid "Parent Account Template" -msgstr "Modelo de conta pai" +msgstr "Modelo de conta-pai" #. module: account #: help:account.tax,domain:0 @@ -5224,7 +5224,7 @@ msgstr "Modelo de codificação da conta de impostos" #. module: account #: view:account.subscription:0 msgid "Subscription Periods" -msgstr "Inscrever períodos" +msgstr "Períodos de Inscrição" #. module: account #: model:process.node,name:account.process_node_manually0 @@ -5286,7 +5286,7 @@ msgstr "Taxa de troca" #: model:process.transition,note:account.process_transition_invoicemanually0 msgid "Encode manually statement comes into the draft statement" msgstr "" -"Codifique manualmente o procedimento dentro do procedimento de esboço" +"O demonstrativo codificado manualmente entra no demonstrativo provisório" #. module: account #: model:ir.ui.menu,name:account.next_id_43 @@ -5359,7 +5359,7 @@ msgstr "Escolha diário e data de pagamento" #: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Draft" -msgstr "Esboço" +msgstr "Provisório" #. module: account #: rml:account.overdue:0 @@ -5774,7 +5774,7 @@ msgstr "Contas financeiras" #. module: account #: model:ir.model,name:account.model_account_chart_template msgid "Templates for Account Chart" -msgstr "Modelo de plano de contas" +msgstr "Modelos para plano de contas" #. module: account #: view:account.config.wizard:0 @@ -5912,7 +5912,7 @@ msgstr "Futuro" #: help:account.partner.balance.report,init,fiscalyear:0 #: help:account.third_party_ledger.report,init,fiscalyear:0 msgid "Keep empty for all open fiscal year" -msgstr "Mantenha vazia para abrir todos os anos fiscais" +msgstr "Mantenha vazia para todos os anos fiscais abertos" #. module: account #: rml:account.invoice:0 @@ -6072,4 +6072,4 @@ msgstr "" #. module: account #: wizard_button:account.subscription.generate,init,generate:0 msgid "Compute Entry Dates" -msgstr "Calcular datas de entrada" +msgstr "Processar Datas de Lançamento" diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 071d06f1483..74c60176c3a 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-15 14:11+0000\n" -"Last-Translator: Anders Wallenquist \n" +"PO-Revision-Date: 2010-03-24 14:33+0000\n" +"Last-Translator: Anders Eriksson (Mobila System) \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-03-16 04:46+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 04:59+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -24,7 +24,7 @@ msgstr "Internt namn" #. module: account #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "Skattekontokod" +msgstr "Konto, skattekod" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree9 @@ -45,7 +45,7 @@ msgstr "Ange meddelande till rapporten försenade betalningar." #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement from draft" -msgstr "Bekräfta verifikat från utkast" +msgstr "Bekräfta preliminära verifikat" #. module: account #: model:account.account.type,name:account.account_type_asset @@ -55,7 +55,7 @@ msgstr "Tillgång" #. module: account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Ogiltigt modellnamn i åtgärdsdefinitionen." +msgstr "Felaktigt namn för modell i händelsedefinitionen." #. module: account #: help:account.journal,currency:0 @@ -112,7 +112,7 @@ msgstr "Skriv ut momsrapport" #. module: account #: field:account.account,parent_id:0 msgid "Parent" -msgstr "Ovanliggande" +msgstr "Överliggande" #. module: account #: selection:account.move,type:0 @@ -141,7 +141,7 @@ msgstr "Ej avstämda transaktioner" #. module: account #: constraint:account.period:0 msgid "Error ! The duration of the Period(s) is/are invalid. " -msgstr "Fel ! Varaktigheten i perioden/erna är felaktig " +msgstr "Fel! Fel periodintervall. " #. module: account #: view:account.bank.statement.reconcile:0 @@ -262,7 +262,7 @@ msgstr "Summa Debet" #. module: account #: rml:account.tax.code.entries:0 msgid "Accounting Entries-" -msgstr "Bokföringstransaktioner" +msgstr "Bokföringstransaktioner-" #. module: account #: help:account.journal,view_id:0 @@ -272,6 +272,10 @@ msgid "" "in which order. You can create your own view for a faster encoding in each " "journal." msgstr "" +"Ger vyn som används när du skriver eller bläddrar poster i journalen. Vyn " +"berättar för OpenERP vilka fält som ska synas, krävs eller skrivskyddas och " +"i vilken ordning. Du kan skapa din egen vy för en snabbare kodning i varje " +"journal." #. module: account #: help:account.invoice,date_due:0 @@ -282,6 +286,11 @@ msgid "" "date empty, it means direct payment. The payment term may compute several " "due dates, for example 50% now, 50% in one month." msgstr "" +"Om du använder betalningsvillkor, förfallodagen kommer att beräknas " +"automatiskt vid generering av bokföringsposter. Om du lämnar " +"betalningsvillkor och förfallodagen tomma betyder det direkt betalning. " +"Betalningsvillkor kan beräkna flera förfallodatum, till exempel 50% nu, 50% " +"efter en månad." #. module: account #: selection:account.tax,type:0 @@ -310,7 +319,7 @@ msgstr "Välj period" #: field:account.invoice,origin:0 #: field:account.invoice.line,origin:0 msgid "Origin" -msgstr "Ursprung" +msgstr "Orginal" #. module: account #: rml:account.analytic.account.journal:0 @@ -355,7 +364,7 @@ msgstr "Debettransaktion" #: field:account.move.line,analytic_account_id:0 #: field:report.hr.timesheet.invoice.journal,account_id:0 msgid "Analytic Account" -msgstr "Objektkonto" +msgstr "Objekt" #. module: account #: field:account.tax,child_depend:0 @@ -373,7 +382,7 @@ msgstr "Journalnamn" #. module: account #: view:account.payment.term:0 msgid "Description on invoices" -msgstr "Beskrivning på faktura" +msgstr "Beskrivning på fakturor" #. module: account #: constraint:account.analytic.account:0 @@ -425,7 +434,7 @@ msgstr "Negativ" #. module: account #: rml:account.partner.balance:0 msgid "(Account/Partner) Name" -msgstr "(Konto/Företag) namn" +msgstr "(Konto/Partner) namn" #. module: account #: selection:account.move,type:0 @@ -446,7 +455,7 @@ msgstr "Status" #: model:ir.actions.act_window,name:account.action_invoice_tree13 #: model:ir.ui.menu,name:account.menu_action_invoice_tree13 msgid "Unpaid Supplier Refunds" -msgstr "" +msgstr "Obetald Leverantörskredit" #. module: account #: view:account.tax:0 @@ -500,7 +509,7 @@ msgstr "" #. module: account #: view:report.hr.timesheet.invoice.journal:0 msgid "Analytic Entries Stats" -msgstr "Objektposter" +msgstr "Objektposter statistikKredit ber" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form @@ -517,7 +526,7 @@ msgstr "Leverantörsfaktura" #: model:process.transition,name:account.process_transition_reconcilepaid0 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "Reconcile Paid" -msgstr "" +msgstr "Kreditering betald" #. module: account #: wizard_field:account.chart,init,target_move:0 @@ -533,7 +542,7 @@ msgstr "Momsmallar" #. module: account #: field:account.invoice,reconciled:0 msgid "Paid/Reconciled" -msgstr "" +msgstr "Betald/Återbetald" #. module: account #: field:account.account.type,close_method:0 @@ -543,7 +552,7 @@ msgstr "" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "" +msgstr "Inkluder i basbeloppet" #. module: account #: field:account.tax,ref_base_code_id:0 @@ -573,6 +582,8 @@ msgid "" "Number of days to add before computation of the day of month.If Date=15/01, " "Number of Days=22, Day of Month=-1, then the due date is 28/02." msgstr "" +"Antal dagar för att lägga före beräkning av dagen i månaden. Om Datum = " +"15/01, antal dagar = 22, Dag i månaden =- 1, blir sedan förfallodagen 28/02." #. module: account #: model:ir.model,name:account.model_account_tax @@ -1337,7 +1348,7 @@ msgstr "Meddelande" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 msgid "Select invoices you want to pay and manages advances" -msgstr "" +msgstr "Välj fakturor du vill betala och hantera förväg" #. module: account #: selection:account.account,type:0 @@ -1674,7 +1685,7 @@ msgstr "Max antal:" #. module: account #: wizard_button:account.invoice.refund,init,refund:0 msgid "Refund Invoice" -msgstr "" +msgstr "Kreditera Faktura" #. module: account #: model:ir.actions.act_window,name:account.action_account_period_tree @@ -2060,7 +2071,7 @@ msgstr "Preliminär faktura" #. module: account #: model:account.account.type,name:account.account_type_expense msgid "Expense" -msgstr "Kostnad" +msgstr "Utgift" #. module: account #: field:account.journal,invoice_sequence_id:0 @@ -2190,7 +2201,7 @@ msgstr "(lämna blank för aktuell period)" #: model:ir.actions.act_window,name:account.action_invoice_tree8 #: model:ir.ui.menu,name:account.menu_action_invoice_tree8 msgid "Draft Supplier Invoices" -msgstr "" +msgstr "Preliminära kundfakturor" #. module: account #: wizard_field:account.invoice.refund,init,period:0 @@ -3057,6 +3068,8 @@ msgid "" "If this box is checked, the system will try to group the accounting lines " "when generating them from invoices." msgstr "" +"Om denna ruta är markerad, kommer systemet att försöka gruppera redovisning " +"raderna när du skapar dem från fakturor." #. module: account #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0 @@ -3255,7 +3268,7 @@ msgstr "Kod" #. module: account #: model:ir.ui.menu,name:account.menu_finance msgid "Financial Management" -msgstr "Bokföring" +msgstr "Redovisning" #. module: account #: selection:account.account.type,close_method:0 @@ -3316,7 +3329,7 @@ msgstr "" #: field:account.tax.code,notprintable:0 #: field:account.tax.code.template,notprintable:0 msgid "Not Printable in Invoice" -msgstr "" +msgstr "Inte utskrivbar i faktura" #. module: account #: field:account.move.line,move_id:0 @@ -3637,6 +3650,8 @@ msgid "" "Check this box if you don't want any VAT related to this Tax Code to appear " "on invoices" msgstr "" +"Markera rutan om du inte vill att någon moms i samband med detta skattelagen " +"att visas på fakturor" #. module: account #: field:account.account.type,sequence:0 @@ -3649,7 +3664,7 @@ msgstr "" #: field:account.tax.template,sequence:0 #: field:fiscalyear.seq,sequence_id:0 msgid "Sequence" -msgstr "Nummerserie" +msgstr "Sekvens" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template @@ -4053,7 +4068,7 @@ msgstr "Nettobelopp" #. module: account #: field:account.invoice.line,invoice_id:0 msgid "Invoice Ref" -msgstr "" +msgstr "Fakturaref" #. module: account #: field:account.analytic.line,general_account_id:0 @@ -4125,7 +4140,7 @@ msgstr "Valuta för boken" #: view:account.journal.column:0 #: model:ir.model,name:account.model_account_journal_column msgid "Journal Column" -msgstr "" +msgstr "Journalkolumn" #. module: account #: selection:account.fiscalyear,state:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 8b5131c0683..8d2ee5edb76 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 5.0.6\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-20 07:43+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2010-03-29 00:34+0000\n" +"Last-Translator: digitalsatori \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-03-21 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-03-29 03:45+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -896,7 +896,7 @@ msgstr "货币金额" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "" +msgstr "费用类科目" #. module: account #: wizard_field:account.fiscalyear.close,init,fy2_id:0 @@ -1110,7 +1110,7 @@ msgstr "列表模板" #. module: account #: field:account.chart.template,property_account_income_categ:0 msgid "Income Category Account" -msgstr "" +msgstr "收入类科目" #. module: account #: model:ir.actions.act_window,name:account.analytic_account_form diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index f551d77ccaa..cd9727d5903 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -46,7 +46,7 @@ child_of user.company_id.id - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -60,7 +60,7 @@ child_of user.company_id.id - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -72,7 +72,7 @@ child_of user.company_id.id - ['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -85,7 +85,7 @@ child_of user.company_id.id - ['|','|',('company_id','=',False),('company_id.child_ids','child_of',[user.company_id.id]),('company_id','child_of',[user.company_id.id])] + ['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] diff --git a/addons/account_analytic_analysis/__terp__.py b/addons/account_analytic_analysis/__terp__.py index 2f44e0cd62a..276f8e1dd65 100644 --- a/addons/account_analytic_analysis/__terp__.py +++ b/addons/account_analytic_analysis/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -24,9 +24,14 @@ 'name': 'report_account_analytic', 'version': '1.0', 'category': 'Generic Modules/Accounting', - 'description': """Modify account analytic view to show -important data for project manager of services companies. -Add menu to show relevant information for each manager.""", + 'description': """ + This module is for modifying account analytic view to show + important data to project manager of services companies. + Adds menu to show relevant information to each manager.. + + You can also view the report of account analytic summary + user-wise as well as month wise. +""", "version" : "1.1", "author" : "Camptocamp", "category" : "Generic Modules/Accounting", diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po index a20701c0aae..a37b184a372 100644 --- a/addons/account_analytic_default/i18n/zh_CN.po +++ b/addons/account_analytic_default/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-20 03:48+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2010-03-29 00:37+0000\n" +"Last-Translator: digitalsatori \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-03-21 04:42+0000\n" +"X-Launchpad-Export-Date: 2010-03-29 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default @@ -42,7 +42,7 @@ msgstr "这对象名必须以x_开头并且不能包含特殊的字符!" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Seq" -msgstr "" +msgstr "序号" #. module: account_analytic_default #: field:account.analytic.default,date_stop:0 diff --git a/addons/account_analytic_plans/__terp__.py b/addons/account_analytic_plans/__terp__.py index 63b09bf1dc0..b3067358a62 100644 --- a/addons/account_analytic_plans/__terp__.py +++ b/addons/account_analytic_plans/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -51,6 +51,8 @@ Plan2: So when this line of invoice will be confirmed, it will generate 3 analytic lines, for one account entry. +The analytic plan validates the minimum and maximum percentage at the time of creation +of distribution models. """, 'author': 'Tiny', 'website': 'http://www.openerp.com', diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 52fc1aa1f9b..af197076c23 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -95,6 +95,18 @@ class account_analytic_plan_instance(osv.osv): 'account6_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account6 Id'), 'plan_id':fields.many2one('account.analytic.plan', "Model's Plan"), } + + def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False): + if context.get('journal_id', False): + journal = self.pool.get('account.journal').browse(cr, user, [context['journal_id']], context=context)[0] + analytic_journal = journal.analytic_journal_id and journal.analytic_journal_id.id or False + args.append('|') + args.append(('journal_id', '=', analytic_journal)) + args.append(('journal_id', '=', False)) + res = super(account_analytic_plan_instance, self).search(cr, user, args, offset=offset, limit=limit, order=order, + context=context, count=count) + return res + def copy(self, cr, uid, id, default=None, context=None): if not default: default = {} diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml index acd8debb18b..da10d698dfa 100644 --- a/addons/account_analytic_plans/account_analytic_plans_view.xml +++ b/addons/account_analytic_plans/account_analytic_plans_view.xml @@ -24,7 +24,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/addons/account_analytic_plans/i18n/oc.po b/addons/account_analytic_plans/i18n/oc.po new file mode 100644 index 00000000000..c697c75a25c --- /dev/null +++ b/addons/account_analytic_plans/i18n/oc.po @@ -0,0 +1,376 @@ +# Occitan (post 1500) translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +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-03-25 12:58+0000\n" +"Last-Translator: Cédric VALMARY (Per Tot en òc) \n" +"Language-Team: Occitan (post 1500) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account4_ids:0 +msgid "Account4 Id" +msgstr "" + +#. module: account_analytic_plans +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Lo nom de l'objècte deu començar amb x_ e conténer pas de caractèrs " +"especials !" + +#. module: account_analytic_plans +#: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic +#: model:ir.actions.wizard,name:account_analytic_plans.account_analytic_account_inverted_balance_report +msgid "Crossovered Analytic" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account5_ids:0 +msgid "Account5 Id" +msgstr "Identificant del Compte5" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,date2:0 +msgid "End Date" +msgstr "Data de fin" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,rate:0 +msgid "Rate (%)" +msgstr "Taus (%)" + +#. module: account_analytic_plans +#: view:account.analytic.plan:0 +#: field:account.analytic.plan,name:0 +#: field:account.analytic.plan.line,plan_id:0 +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_form_action +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action +msgid "Analytic Plan" +msgstr "Plan Analitic" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line +msgid "Analytic Instance Line" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan.instance.line:0 +msgid "Analytic Distribution Lines" +msgstr "" + +#. module: account_analytic_plans +#: wizard_button:wizard.crossovered.analytic,init,print:0 +msgid "Print" +msgstr "Estampar" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "To Date" +msgstr "Data de Fin" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,plan_id:0 +msgid "Plan Id" +msgstr "Identificant del Plan" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action +msgid "Analytic Distribution's Models" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Account Name" +msgstr "Nom del compte" + +#. module: account_analytic_plans +#: view:account.analytic.plan.instance.line:0 +msgid "Analytic Distribution Line" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,code:0 +msgid "Distribution Code" +msgstr "" + +#. module: account_analytic_plans +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Nom del Modèl invalid per la definicion de l'accion." + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,name:0 +msgid "Plan Name" +msgstr "Nom del Plan" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Printing date" +msgstr "Data d'estampatge" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Percentage" +msgstr "Percentatge" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,empty_line:0 +msgid "Dont show empty lines" +msgstr "" + +#. module: account_analytic_plans +#: wizard_view:wizard.crossovered.analytic,init:0 +msgid "Select Information" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account3_ids:0 +msgid "Account3 Id" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,journal_id:0 +#: wizard_field:wizard.crossovered.analytic,init,journal_ids:0 +msgid "Analytic Journal" +msgstr "Jornal analitic" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "100.00%" +msgstr "100.00%" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,ref:0 +msgid "Analytic Account Ref." +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account :" +msgstr "Compte Analitic :" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +msgid "Analytic Plan Line" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Analytic Account Reference:" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.actions.wizard,name:account_analytic_plans.create_model +msgid "Create Model" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan,default_instance_id:0 +msgid "Default Entries" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan:0 +#: field:account.analytic.plan,plan_ids:0 +#: field:account.journal,plan_id:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan +msgid "Analytic Plans" +msgstr "Plans Analitics" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,min_required:0 +msgid "Minimum Allowed (%)" +msgstr "Minimum Permés (%)" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account1_ids:0 +msgid "Account1 Id" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,max_required:0 +msgid "Maximum Allowed (%)" +msgstr "Maximum Permés (%)" + +#. module: account_analytic_plans +#: wizard_view:create.model,info:0 +msgid "Distribution Model Saved" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance +msgid "Analytic Plan Instance" +msgstr "" + +#. module: account_analytic_plans +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "XML invalid per l'arquitectura de la vista" + +#. module: account_analytic_plans +#: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open +msgid "Distribution Models" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.module.module,description:account_analytic_plans.module_meta_information +msgid "" +"This module allows to use several analytic plans, according to the general " +"journal,\n" +"so that multiple analytic lines are created when the invoice or the entries\n" +"are confirmed.\n" +"\n" +"For example, you can define the following analytic structure:\n" +" Projects\n" +" Project 1\n" +" SubProj 1.1\n" +" SubProj 1.2\n" +" Project 2\n" +" Salesman\n" +" Eric\n" +" Fabien\n" +"\n" +"Here, we have two plans: Projects and Salesman. An invoice line must\n" +"be able to write analytic entries in the 2 plans: SubProj 1.1 and\n" +"Fabien. The amount can also be split. The following example is for\n" +"an invoice that touches the two subproject and assigned to one salesman:\n" +"\n" +"Plan1:\n" +" SubProject 1.1 : 50%\n" +" SubProject 1.2 : 50%\n" +"Plan2:\n" +" Eric: 100%\n" +"\n" +"So when this line of invoice will be confirmed, it will generate 3 analytic " +"lines,\n" +"for one account entry.\n" +" " +msgstr "" + +#. module: account_analytic_plans +#: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information +msgid "Multiple-plans management in Analytic Accounting" +msgstr "" + +#. module: account_analytic_plans +#: view:account.analytic.plan.line:0 +#: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line +msgid "Analytic Plan Lines" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Crossovered Analytic -" +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,plan_id:0 +msgid "Model's Plan" +msgstr "Plan del Modèl" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account2_ids:0 +msgid "Account2 Id" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Amount" +msgstr "Montant" + +#. module: account_analytic_plans +#: help:account.analytic.plan.line,root_analytic_id:0 +msgid "Root account of this plan." +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account6_ids:0 +msgid "Account6 Id" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Quantity" +msgstr "Quantitat" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance,account_ids:0 +msgid "Account Id" +msgstr "" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "Code" +msgstr "Còde" + +#. module: account_analytic_plans +#: wizard_button:create.model,info,end:0 +msgid "OK" +msgstr "D'acòrdi" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,root_analytic_id:0 +msgid "Root Account" +msgstr "" + +#. module: account_analytic_plans +#: wizard_view:create.model,info:0 +msgid "" +"This distribution model has been saved. You will be able to reuse it later." +msgstr "" + +#. module: account_analytic_plans +#: field:account.analytic.plan.line,sequence:0 +msgid "Sequence" +msgstr "Sequéncia" + +#. module: account_analytic_plans +#: field:account.analytic.plan.instance.line,analytic_account_id:0 +msgid "Analytic Account" +msgstr "Compte Analitic" + +#. module: account_analytic_plans +#: field:account.analytic.default,analytics_id:0 +#: view:account.analytic.plan.instance:0 +#: field:account.analytic.plan.instance,name:0 +#: field:account.invoice.line,analytics_id:0 +#: field:account.move.line,analytics_id:0 +msgid "Analytic Distribution" +msgstr "" + +#. module: account_analytic_plans +#: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_instance_action +msgid "Analytic Distribution's models" +msgstr "" + +#. module: account_analytic_plans +#: wizard_button:wizard.crossovered.analytic,init,end:0 +msgid "Cancel" +msgstr "Anullar" + +#. module: account_analytic_plans +#: wizard_field:wizard.crossovered.analytic,init,date1:0 +msgid "Start Date" +msgstr "Data de començament" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "at" +msgstr "a" + +#. module: account_analytic_plans +#: rml:account.analytic.account.crossovered.analytic:0 +msgid "From Date" +msgstr "" diff --git a/addons/account_anglo_saxon/i18n/es.po b/addons/account_anglo_saxon/i18n/es.po new file mode 100644 index 00000000000..68e7618ac56 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/es.po @@ -0,0 +1,66 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2009-11-24 12:50+0000\n" +"PO-Revision-Date: 2010-03-24 17:25+0000\n" +"Last-Translator: relojero \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr " Contabilidad de la propiedad" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by \n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries \n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales. \n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at he moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account \n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account." +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Account" +msgstr "" + +#. module: account_anglo_saxon +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "Precio de la cuenta diferencia" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" +"Esta cuenta se utilizará para valorar la diferencia de precios entre el " +"precio de compra y precio de coste" diff --git a/addons/account_budget/wizard/wizard_analytic_account_budget.py b/addons/account_budget/wizard/wizard_analytic_account_budget.py index a8d6fb27c06..16702f7633d 100644 --- a/addons/account_budget/wizard/wizard_analytic_account_budget.py +++ b/addons/account_budget/wizard/wizard_analytic_account_budget.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -38,7 +38,7 @@ class wizard_report(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]} + 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]} }, 'report': { 'actions': [], diff --git a/addons/account_budget/wizard/wizard_budget_report.py b/addons/account_budget/wizard/wizard_budget_report.py index 544a401546b..72f251445ba 100644 --- a/addons/account_budget/wizard/wizard_budget_report.py +++ b/addons/account_budget/wizard/wizard_budget_report.py @@ -47,7 +47,7 @@ class wizard_report(wizard.interface): states = { 'init': { 'actions': [_default], - 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]} + 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]} }, 'report': { 'actions': [], diff --git a/addons/account_budget/wizard/wizard_budget_spread.py b/addons/account_budget/wizard/wizard_budget_spread.py index 31c4e8fb76f..a4885df2324 100644 --- a/addons/account_budget/wizard/wizard_budget_spread.py +++ b/addons/account_budget/wizard/wizard_budget_spread.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -43,7 +43,7 @@ class wizard_budget_spread(wizard.interface): states = { 'init': { 'actions': [], - 'result': {'type':'form', 'arch':_spread_form, 'fields':_spread_fields, 'state':[('end','Cancel'),('spread','Spread')]} + 'result': {'type':'form', 'arch':_spread_form, 'fields':_spread_fields, 'state':[('end','Cancel'),('spread','Spread','',True)]} }, 'spread': { 'actions': [_spread], diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_report.py index 2737798e7fe..a1357974126 100644 --- a/addons/account_budget/wizard/wizard_crossovered_budget_report.py +++ b/addons/account_budget/wizard/wizard_crossovered_budget_report.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -43,7 +43,7 @@ class wizard_report(wizard.interface): states = { 'init': { 'actions': [_default], - 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]} + 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]} }, 'report': { 'actions': [], diff --git a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py index cbca68165b6..5580fea385f 100644 --- a/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py +++ b/addons/account_budget/wizard/wizard_crossovered_budget_summary_report.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -42,7 +42,7 @@ class wizard_report_summary(wizard.interface): states = { 'init': { 'actions': [_default], - 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel'),('report','Print')]} + 'result': {'type':'form', 'arch':dates_form, 'fields':dates_fields, 'state':[('end','Cancel', 'gtk-cancel'),('report','Print', 'gtk-print', True)]} }, 'report': { 'actions': [], diff --git a/addons/account_chart/i18n/pt_BR.po b/addons/account_chart/i18n/pt_BR.po index 671c652c689..48873002c79 100644 --- a/addons/account_chart/i18n/pt_BR.po +++ b/addons/account_chart/i18n/pt_BR.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 13:47+0000\n" +"PO-Revision-Date: 2010-03-24 01:00+0000\n" "Last-Translator: Pedro_Maschio \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-03-11 05:05+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_chart #: model:ir.module.module,description:account_chart.module_meta_information msgid "Remove minimal account chart" -msgstr "" +msgstr "Remover plano de contas mínimo" diff --git a/addons/account_date_check/i18n/pt_BR.po b/addons/account_date_check/i18n/pt_BR.po index ed4cb3f003a..46b422bf9ed 100644 --- a/addons/account_date_check/i18n/pt_BR.po +++ b/addons/account_date_check/i18n/pt_BR.po @@ -7,26 +7,26 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 16:21+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-03-24 01:05+0000\n" +"Last-Translator: Pedro_Maschio \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-03-11 04:57+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_date_check #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "Invalido XML para Arquitetura da View" +msgstr "XML inválido para Arquitetura da View" #. module: account_date_check #: field:account.journal,allow_date:0 msgid "Allows date not in the period" -msgstr "" +msgstr "Permite datas fora do período" #. module: account_date_check #: model:ir.module.module,shortdesc:account_date_check.module_meta_information msgid "Account Date check" -msgstr "" +msgstr "Verificação de Data de Conta" diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py index 58f7721d253..2317e0c65a9 100644 --- a/addons/account_invoice_layout/account_invoice_layout.py +++ b/addons/account_invoice_layout/account_invoice_layout.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -70,7 +70,7 @@ class account_invoice_line(osv.osv): res[field]['states'][key] = value return res - def _onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args): + def onchange_invoice_line_view(self, cr, uid, id, type, context={}, *args): if (not type): return {} diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml index 18e7996a7cd..fe11e407bf3 100644 --- a/addons/account_invoice_layout/account_invoice_layout_view.xml +++ b/addons/account_invoice_layout/account_invoice_layout_view.xml @@ -9,7 +9,7 @@ form - + diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po index b2fd6799488..0ea750cd530 100644 --- a/addons/account_payment/i18n/pt_BR.po +++ b/addons/account_payment/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-03-04 16:01+0000\n" -"Last-Translator: JCF \n" +"PO-Revision-Date: 2010-03-24 01:02+0000\n" +"Last-Translator: Pedro_Maschio \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-03-11 04:56+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment @@ -335,7 +335,7 @@ msgstr "Parceiro" #. module: account_payment #: help:payment.line,communication2:0 msgid "The successor message of Communication." -msgstr "" +msgstr "A mensagem que segue a Comunicação." #. module: account_payment #: help:payment.line,info_partner:0 diff --git a/addons/account_voucher/__terp__.py b/addons/account_voucher/__terp__.py index b6843372f4c..a006cb10bab 100755 --- a/addons/account_voucher/__terp__.py +++ b/addons/account_voucher/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -24,20 +24,25 @@ "version" : "1.0", "author" : 'Tiny & Axelor', "description": """ - India Accounting module includes all the basic requirenment of - Basic Accounting, like - * Bank Payment, Receipt - * Cash Payent, Receipt + India Accounting module includes all the basic requirenment of + Basic Accounting, plus new things which available are + * Indian Account Chart + * New Invoice - (Local, Retail) + * Invoice Report + * Tax structure + * Journals + * VAT Declaration report + * Accounting Periods """, - "category" : "Generic Modules/Indian Accounting", + "category" : "Generic Modules/Accounting", "website" : "http://tinyerp.com", "depends" : ["base", "account"], "init_xml" : [ ], - + "demo_xml" : [ ], - + "update_xml" : [ "security/ir.model.access.csv", "voucher_sequence.xml", diff --git a/addons/analytic_user_function/i18n/hr.po b/addons/analytic_user_function/i18n/hr.po index d458ac939a6..05b08aca798 100644 --- a/addons/analytic_user_function/i18n/hr.po +++ b/addons/analytic_user_function/i18n/hr.po @@ -1,64 +1,66 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * analytic_user_function -# +# * analytic_user_function +# Drazen Bosak , 2010. msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 15:12+0000\n" -"Last-Translator: Ivica Perić \n" -"Language-Team: \n" +"PO-Revision-Date: 2010-03-25 00:56+0000\n" +"Last-Translator: Drazen Bosak \n" +"Language-Team: Vinteh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-03-11 05:03+0000\n" +"X-Launchpad-Export-Date: 2010-03-27 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" +"Language: hr\n" #. module: analytic_user_function #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" -msgstr "" +msgstr "Nepravilan XML format za View Architecture!" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid msgid "Relation table between users and products on a analytic account" -msgstr "" +msgstr "Vza između korisnika i proizvoda kod Analitičkog konta." #. module: analytic_user_function #: field:analytic_user_funct_grid,product_id:0 msgid "Product" -msgstr "" +msgstr "Proizvod" #. module: analytic_user_function #: field:analytic_user_funct_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Analitički Konto" #. module: analytic_user_function #: view:account.analytic.account:0 #: field:account.analytic.account,user_product_ids:0 msgid "Users/Products Rel." -msgstr "" +msgstr "veza Korisnici/Proizvodi" #. module: analytic_user_function #: field:analytic_user_funct_grid,user_id:0 msgid "User" -msgstr "" +msgstr "Korisnik" #. module: analytic_user_function #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Naziv Objekta mora početi s x_ i ne smije sadržavati bilo koji posebni znak !" #. module: analytic_user_function #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information msgid "Analytic User Function" -msgstr "" +msgstr "Funkcija Analitičkog Korisnika" #. module: analytic_user_function #: view:analytic_user_funct_grid:0 msgid "User's Product for this Analytic Account" -msgstr "" +msgstr "Korisnikov Proizvod za ovaj Analitički konto." diff --git a/addons/association/__terp__.py b/addons/association/__terp__.py index 29eeb474d9c..43f61ed2392 100644 --- a/addons/association/__terp__.py +++ b/addons/association/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -24,7 +24,7 @@ 'name': 'Association profile', 'version': '0.1', 'category': 'Profile', - 'description': """Profile for Associates""", + 'description': """This module is to create Profile for Associates""", 'author': 'Tiny', 'depends': ['membership', 'board_association'], 'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'], diff --git a/addons/auction/__terp__.py b/addons/auction/__terp__.py index 83064640266..61e91802f44 100644 --- a/addons/auction/__terp__.py +++ b/addons/auction/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . +# along with this program. If not, see . # ############################################################################## @@ -24,16 +24,33 @@ 'name': 'Auction Management', 'version': '1.0', 'category': 'Generic Modules/Auction', - 'description': """This module provides functionality to - manage artists, articles, sellers, buyers and auction. - Manage bids, track of sold, paid and unpaid objects. - Delivery Management. + 'description': """ + This module manages the records of the artists, + the articles to be put up for auction,the buyers and + sellers. + + It completely manages an auction such as managing bids, + keeping track of the sold articles along with the paid + and unpaid objects including delivery of the articles. """, 'author': 'Tiny', 'depends': ['base', 'account', 'hr_attendance'], 'init_xml': ['auction_sequence.xml'], 'update_xml': [ 'security/ir.model.access.csv', + 'wizard/auction_lots_able_view.xml', + 'wizard/auction_lots_enable_view.xml', + 'wizard/auction_lots_make_invoice_buyer_view.xml', + 'wizard/auction_lots_make_invoice_view.xml', + 'wizard/auction_taken_view.xml', + 'wizard/auction_lots_auction_move_view.xml', + 'wizard/auction_pay_buy_view.xml', + 'wizard/auction_payer_sel_view.xml', + 'wizard/auction_lots_sms_send_view.xml', + 'wizard/auction_catalog_flagey_view.xml', +# 'wizard/auction_aie_send_result_view.xml', + 'wizard/auction_lots_buyer_map_view.xml', + 'auction_view.xml', 'auction_report.xml', 'auction_wizard.xml' diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 0ece4690d9f..1687980c029 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -478,13 +478,13 @@ class auction_lots(osv.osv): result = [ (r['id'], str(r['obj_num'])+' - '+r['name']) for r in self.read(cr, user, ids, ['name','obj_num'])] return result - def name_search(self, cr, user, name, args=[], operator='ilike', context={}): - try: - ids = self.search(cr, user, [('obj_num','=',int(name))]+ args) - except: - ids = [] + def name_search(self, cr, user, name, args=None, operator='ilike', context={}): + if not args: + args = [] + + ids = self.search(cr, user, [('obj_num','=',int(name))] + args) if not ids: - ids = self.search(cr, user, [('name',operator,name)]+ args) + ids = self.search(cr, user, [('name',operator,name)] + args) return self.name_get(cr, user, ids) def _sum_taxes_by_type_and_id(self, taxes): diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 2189253f3ce..ee1004ab0f3 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -3,7 +3,8 @@ - + + ======================================================= Auction Management/Configuration/artist ======================================================= @@ -203,6 +204,7 @@ + @@ -277,7 +279,7 @@ - +