diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 09e51486ad2..1792177ed49 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -79,7 +79,7 @@ module named account_vouchers 'wizard/account_invoice_state_view.xml', 'wizard/account_partner_balance_report_view.xml', 'wizard/account_balance_report_view.xml', - 'wizard/account_move_line_select_view.xml', +# 'wizard/account_move_line_select_view.xml', 'wizard/account_aged_trial_balance_view.xml', 'wizard/account_compare_account_balance_report_view.xml', 'wizard/account_third_party_ledger.xml', @@ -127,7 +127,6 @@ module named account_vouchers 'board_account_demo.xml', ], 'test': [ - 'test/account_sequence_test.yml', 'test/account_customer_invoice.yml', 'test/account_supplier_invoice.yml', 'test/account_change_currency.yml', @@ -137,7 +136,7 @@ module named account_vouchers 'test/account_invoice_state.yml', 'test/account_use_model.yml', 'test/account_validate_account_move.yml', -# 'test/account_fiscalyear_close.yml', + 'test/account_fiscalyear_close.yml', ], 'installable': True, 'active': False, diff --git a/addons/account/account.py b/addons/account/account.py index b01f659a70d..67abf8b4520 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -629,8 +629,8 @@ class account_journal(osv.osv): 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'), 'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"), - 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ - help="The sequence used for invoice numbers in this journal."), +# 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ +# help="The sequence used for invoice numbers in this journal."), 'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'), } @@ -695,13 +695,13 @@ class account_journal(osv.osv): 'sequence_id':seq_id }) - if journal.type in journal_type and not journal.invoice_sequence_id: - res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))]) - inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id - inv_seq_id - res.update({ - 'invoice_sequence_id':inv_seq_id - }) +# if journal.type in journal_type and not journal.invoice_sequence_id: +# res_ids = date_pool.search(cr, uid, [('model','=','ir.sequence'), ('name','=',journal_seq.get(journal.type, 'sale'))]) +# inv_seq_id = date_pool.browse(cr, uid, res_ids[0]).res_id +# inv_seq_id +# res.update({ +# 'invoice_sequence_id':inv_seq_id +# }) result = self.write(cr, uid, [journal.id], res) diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 9cf14295be2..af92d59b89b 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -182,7 +182,7 @@ class account_cash_statement(osv.osv): 'pieces':rs, 'number':0 } - res.append(dct) + res.append((0,0,dct)) return res _columns = { diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 192b4dc7ff2..9dfb5fe1e6a 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -400,7 +400,7 @@ class account_move_line(osv.osv): 'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')), 'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade", domain=[('type','<>','view'), ('type', '<>', 'closed')], select=2), 'move_id': fields.many2one('account.move', 'Move', ondelete="cascade", states={'valid':[('readonly',True)]}, help="The move of this entry line.", select=2), - + 'narration': fields.related('move_id','narration', type='text', relation='account.move', string='Narration'), 'ref': fields.char('Ref.', size=64), 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1), 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2), diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 77267fb18cc..8ae66ba34b7 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -395,15 +395,14 @@ - - - - - + + + + @@ -977,7 +976,8 @@ - + + @@ -1055,22 +1055,27 @@ - - + - + + + + - + + + + @@ -1096,6 +1101,23 @@ + + Journal Items + account.move.line + form + tree,form + + + [('account_id', 'child_of', active_id)] + + + + tree_but_open + account.account + Open Journal Items + + + @@ -1152,28 +1174,75 @@
- - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + - - - - - + + + + + + + + + + + + + + + + + @@ -1217,11 +1286,13 @@ - + - - - + + + + + @@ -1828,7 +1899,7 @@ form tree,form - [('tax_code_id','=',active_id),('state','<>','draft')] + [('tax_code_id','child_of',active_id),('state','<>','draft')] tree_but_open diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 5a82c6d0513..ebd5704f956 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -1,19 +1,19 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * account +# * account # msgid "" 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-24 00:57+0000\n" -"Last-Translator: Pedro_Maschio \n" +"PO-Revision-Date: 2010-07-27 20:17+0000\n" +"Last-Translator: Leandro Chaves \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-06-22 04:07+0000\n" +"X-Launchpad-Export-Date: 2010-07-28 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -92,7 +92,8 @@ msgid "Unreconciled entries" msgstr "Lançamentos não reconciliados" #. module: account -#: field:account.invoice.tax,base_code_id:0 field:account.tax,base_code_id:0 +#: field:account.invoice.tax,base_code_id:0 +#: field:account.tax,base_code_id:0 #: field:account.tax.template,base_code_id:0 msgid "Base Code" msgstr "Código base" @@ -124,7 +125,8 @@ msgid "Residual" msgstr "Residual" #. module: account -#: field:account.tax,base_sign:0 field:account.tax,ref_base_sign:0 +#: field:account.tax,base_sign:0 +#: field:account.tax,ref_base_sign:0 #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" @@ -188,8 +190,8 @@ msgid "Move line select" msgstr "Mover a linha selecionada" #. module: account -#: rml:account.journal.period.print:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.journal.period.print:0 +#: rml:account.tax.code.entries:0 msgid "Entry label" msgstr "Etiqueta de lançamento" @@ -204,12 +206,14 @@ msgid "Period Sum" msgstr "Soma do período" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Compute Code (if type=code)" msgstr "Computar Código (se tipo=código)" #. module: account -#: view:account.move:0 view:account.move.line:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "Account Entry Line" msgstr "Linha de lançamento de conta" @@ -226,10 +230,12 @@ msgstr "Lançamentos recorrentes" #. module: account #: field:account.analytic.line,amount:0 #: field:account.bank.statement.line,amount:0 -#: field:account.bank.statement.reconcile.line,amount:0 rml:account.invoice:0 -#: field:account.invoice.tax,amount:0 field:account.move,amount:0 -#: field:account.tax,amount:0 field:account.tax.template,amount:0 -#: xsl:account.transfer:0 +#: field:account.bank.statement.reconcile.line,amount:0 +#: rml:account.invoice:0 +#: field:account.invoice.tax,amount:0 +#: field:account.move,amount:0 +#: field:account.tax,amount:0 +#: field:account.tax.template,amount:0 msgid "Amount" msgstr "Montante" @@ -269,7 +275,8 @@ msgstr "" "codificação mais rápida em cada diário." #. module: account -#: help:account.invoice,date_due:0 help:account.invoice,payment_term:0 +#: help:account.invoice,date_due:0 +#: help:account.invoice,payment_term:0 msgid "" "If you use payment terms, the due date will be computed automatically at the " "generation of accounting entries. If you keep the payment term and the due " @@ -283,19 +290,20 @@ msgstr "" "exemplo 30/60/90 dias da data." #. module: account -#: selection:account.tax,type:0 selection:account.tax.template,type:0 +#: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 msgid "Fixed" msgstr "Fixo" #. module: account -#: model:ir.actions.report.xml,name:account.account_overdue view:res.company:0 +#: model:ir.actions.report.xml,name:account.account_overdue +#: view:res.company:0 msgid "Overdue Payments" msgstr "Pagamentos atrasados" #. module: account #: wizard_view:account.account.balance.report,checktype:0 #: wizard_view:account.analytic.account.analytic.check.report,init:0 -#: wizard_view:account.analytic.account.balance.report,init:0 #: wizard_view:account.analytic.account.cost_ledger.report,init:0 #: wizard_view:account.analytic.account.inverted.balance.report,init:0 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0 @@ -304,7 +312,8 @@ msgid "Select period" msgstr "Selecione o período" #. module: account -#: field:account.invoice,origin:0 field:account.invoice.line,origin:0 +#: field:account.invoice,origin:0 +#: field:account.invoice.line,origin:0 msgid "Origin" msgstr "Origem" @@ -334,7 +343,9 @@ msgid "Delta Debit" msgstr "Diferença de Débito" #. module: account -#: rml:account.invoice:0 field:account.invoice,amount_tax:0 +#: model:account.account.type,name:account.account_type_tax +#: rml:account.invoice:0 +#: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 msgid "Tax" msgstr "Imposto" @@ -347,18 +358,22 @@ msgstr "Trans. Débito" #. module: account #: field:account.analytic.line,account_id:0 #: field:account.invoice.line,account_analytic_id:0 +#: wizard_field:account.invoice.pay,addendum,analytic_id:0 #: field:account.move.line,analytic_account_id:0 +#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0 #: field:report.hr.timesheet.invoice.journal,account_id:0 msgid "Analytic Account" msgstr "Conta analítica" #. module: account -#: field:account.tax,child_depend:0 field:account.tax.template,child_depend:0 +#: field:account.tax,child_depend:0 +#: field:account.tax.template,child_depend:0 msgid "Tax on Children" msgstr "Imposto nas sub-contas" #. module: account -#: rml:account.central.journal:0 rml:account.general.journal:0 +#: rml:account.central.journal:0 +#: rml:account.general.journal:0 #: field:account.journal,name:0 msgid "Journal Name" msgstr "Nome do diário" @@ -426,8 +441,11 @@ msgid "Contra" msgstr "Contra" #. module: account -#: field:account.analytic.account,state:0 field:account.bank.statement,state:0 -#: field:account.invoice,state:0 view:account.move:0 view:account.move.line:0 +#: field:account.analytic.account,state:0 +#: field:account.bank.statement,state:0 +#: field:account.invoice,state:0 +#: view:account.move:0 +#: view:account.move.line:0 #: view:account.subscription:0 msgid "State" msgstr "Estado" @@ -439,7 +457,8 @@ msgid "Unpaid Supplier Refunds" msgstr "Reembolsos a fornecedores não pagos" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Special Computation" msgstr "Cálculo especial" @@ -462,8 +481,10 @@ msgid "Disc.(%)" msgstr "Desc.(%)" #. module: account -#: rml:account.general.ledger:0 field:account.model,ref:0 -#: field:account.move,ref:0 rml:account.overdue:0 +#: rml:account.general.ledger:0 +#: field:account.model,ref:0 +#: field:account.move,ref:0 +#: rml:account.overdue:0 #: field:account.subscription,ref:0 msgid "Ref" msgstr "Ref" @@ -660,9 +681,13 @@ msgid "Sub-Total :" msgstr "Subtotal:" #. module: account -#: field:account.analytic.account,line_ids:0 view:account.analytic.line:0 +#: field:account.analytic.account,line_ids:0 +#: view:account.analytic.line:0 +#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form +#: model:ir.actions.act_window,name:account.action_account_tree1 #: model:ir.ui.menu,name:account.next_id_41 +#, python-format msgid "Analytic Entries" msgstr "Lançamentos analíticos" @@ -677,6 +702,7 @@ msgid "Associated Partner" msgstr "Parceiro Associado" #. module: account +#: view:account.invoice:0 #: field:account.invoice,comment:0 msgid "Additional Information" msgstr "Informação Adicional" @@ -692,7 +718,8 @@ msgid "Select the Period for Analysis" msgstr "Selecione o Período para Análise" #. module: account -#: field:account.tax,ref_tax_sign:0 field:account.tax,tax_sign:0 +#: field:account.tax,ref_tax_sign:0 +#: field:account.tax,tax_sign:0 #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" @@ -724,7 +751,8 @@ msgid "Field Name" msgstr "Nome do Campo" #. module: account -#: field:account.tax.code,sign:0 field:account.tax.code.template,sign:0 +#: field:account.tax.code,sign:0 +#: field:account.tax.code.template,sign:0 msgid "Sign for parent" msgstr "Sinal para conta-pai" @@ -734,7 +762,8 @@ msgid "End of Year Entries Journal" msgstr "Diário de lançamentos do fim do ano" #. module: account -#: view:product.product:0 view:product.template:0 +#: view:product.product:0 +#: view:product.template:0 msgid "Purchase Properties" msgstr "Propriedades da Compra" @@ -754,9 +783,12 @@ msgid "Move Lines Created." msgstr "Foram criadas linhas de movimento" #. module: account -#: field:account.fiscalyear,state:0 field:account.journal.period,state:0 -#: field:account.move,state:0 field:account.move.line,state:0 -#: field:account.period,state:0 field:account.subscription,state:0 +#: field:account.fiscalyear,state:0 +#: field:account.journal.period,state:0 +#: field:account.move,state:0 +#: field:account.move.line,state:0 +#: field:account.period,state:0 +#: field:account.subscription,state:0 msgid "Status" msgstr "Posição" @@ -913,8 +945,10 @@ msgstr "Selecionar plano de contas" #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: field:account.analytic.line,unit_amount:0 rml:account.invoice:0 -#: field:account.invoice.line,quantity:0 field:account.model.line,quantity:0 +#: field:account.analytic.line,unit_amount:0 +#: rml:account.invoice:0 +#: field:account.invoice.line,quantity:0 +#: field:account.model.line,quantity:0 #: field:account.move.line,quantity:0 msgid "Quantity" msgstr "Quantidade" @@ -957,13 +991,16 @@ msgstr "Fatura analítica" #: wizard_field:account.automatic.reconcile,init,period_id:0 #: field:account.bank.statement,period_id:0 #: wizard_field:account.central.journal.report,init,period_id:0 -#: view:account.fiscalyear:0 rml:account.general.journal:0 +#: view:account.fiscalyear:0 +#: rml:account.general.journal:0 #: wizard_field:account.general.journal.report,init,period_id:0 #: wizard_field:account.invoice.pay,init,period_id:0 -#: field:account.journal.period,period_id:0 field:account.move,period_id:0 +#: field:account.journal.period,period_id:0 +#: field:account.move,period_id:0 #: wizard_field:account.move.journal,init,period_id:0 #: field:account.move.line,period_id:0 -#: wizard_field:account.move.validate,init,period_id:0 view:account.period:0 +#: wizard_field:account.move.validate,init,period_id:0 +#: view:account.period:0 #: wizard_field:account.print.journal.report,init,period_id:0 #: field:account.subscription,period_nbr:0 msgid "Period" @@ -985,7 +1022,8 @@ msgid "Net Total:" msgstr "Total líquido:" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,name:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,name:0 #: field:account.fiscal.position.account,position_id:0 #: field:account.fiscal.position.account.template,position_id:0 #: field:account.fiscal.position.tax,position_id:0 @@ -1109,7 +1147,8 @@ msgid "Fiscal Position Templates" msgstr "Modelo de posição fiscal" #. module: account -#: rml:account.invoice:0 field:account.invoice.line,price_unit:0 +#: rml:account.invoice:0 +#: field:account.invoice.line,price_unit:0 msgid "Unit Price" msgstr "Preço unitário" @@ -1267,7 +1306,8 @@ msgid "Not reconciled transactions" msgstr "Transação não conciliada" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,tax_ids:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" msgstr "Mapeamento de Impostos" @@ -1289,7 +1329,8 @@ msgid "Write-Off account" msgstr "Conta de amortização" #. module: account -#: field:account.model.line,model_id:0 field:account.subscription,model_id:0 +#: field:account.model.line,model_id:0 +#: field:account.subscription,model_id:0 msgid "Model" msgstr "Modelo" @@ -1315,9 +1356,11 @@ msgid "Select invoices you want to pay and manages advances" msgstr "Selecionar as faturas que você quer pagar e adiantamentos a fazer" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: model:account.account.type,name:account.account_type_root -#: selection:account.analytic.account,type:0 field:account.journal,view_id:0 +#: selection:account.analytic.account,type:0 +#: field:account.journal,view_id:0 msgid "View" msgstr "Visualizar" @@ -1389,7 +1432,8 @@ msgstr "Tipos de Conta" #: wizard_field:account.central.journal.report,init,journal_id:0 #: wizard_field:account.general.journal.report,init,journal_id:0 #: field:account.invoice,journal_id:0 -#: field:account.journal.period,journal_id:0 field:account.model,journal_id:0 +#: field:account.journal.period,journal_id:0 +#: field:account.model,journal_id:0 #: field:account.move,journal_id:0 #: wizard_field:account.move.bank.reconcile,init,journal_id:0 #: wizard_field:account.move.journal,init,journal_id:0 @@ -1405,7 +1449,8 @@ msgid "Journal" msgstr "Diário" #. module: account -#: field:account.account,child_id:0 field:account.analytic.account,child_ids:0 +#: field:account.account,child_id:0 +#: field:account.analytic.account,child_ids:0 msgid "Child Accounts" msgstr "Sub-contas" @@ -1431,7 +1476,8 @@ msgid "Statement reconcile line" msgstr "Linha de reconciliação do Demonstrativo" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Keep empty to use the income account" msgstr "Manter vazio para usar a conta de receita" @@ -1440,6 +1486,9 @@ msgstr "Manter vazio para usar a conta de receita" #: field:account.bank.statement.reconcile,line_new_ids:0 #: wizard_view:account.move.line.reconcile,init_full:0 #: wizard_view:account.move.line.reconcile,init_partial:0 +#: code:addons/account/wizard/wizard_pay_invoice.py:0 +#: code:addons/account/wizard/wizard_reconcile.py:0 +#, python-format msgid "Write-Off" msgstr "Baixa ou exclusão" @@ -1560,7 +1609,8 @@ msgid "Account n°" msgstr "Conta n°" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Keep empty to use the expense account" msgstr "Deixe vazio para usar a conta de despesas" @@ -1570,7 +1620,8 @@ msgid "Account to reconcile" msgstr "Conta a reconciliar" #. module: account -#: rml:account.invoice:0 field:account.model.line,partner_id:0 +#: rml:account.invoice:0 +#: field:account.model.line,partner_id:0 #: field:account.move.line,partner_id:0 msgid "Partner Ref." msgstr "Código parceiro" @@ -1582,12 +1633,14 @@ msgid "Receivable and Payable Accounts" msgstr "Contas a Pagar e Receber" #. module: account -#: view:account.subscription:0 field:account.subscription,lines_id:0 +#: view:account.subscription:0 +#: field:account.subscription,lines_id:0 msgid "Subscription Lines" msgstr "Linhas de inscrição" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Purchase" @@ -1751,7 +1804,8 @@ msgid "Period length (days)" msgstr "Duração do Período (dias)" #. module: account -#: selection:account.payment.term.line,value:0 selection:account.tax,type:0 +#: selection:account.payment.term.line,value:0 +#: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "Percent" msgstr "Percentual" @@ -1762,7 +1816,8 @@ msgid "Charts" msgstr "Planos" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "Sale" @@ -1838,9 +1893,11 @@ msgstr "x Diário de Notas de Crédito gastas" #. module: account #: field:account.analytic.journal,type:0 -#: field:account.bank.statement.line,type:0 field:account.invoice,type:0 -#: field:account.journal,type:0 field:account.move,type:0 -#: field:account.move.reconcile,type:0 xsl:account.transfer:0 +#: field:account.bank.statement.line,type:0 +#: field:account.invoice,type:0 +#: field:account.journal,type:0 +#: field:account.move,type:0 +#: field:account.move.reconcile,type:0 msgid "Type" msgstr "Tipo" @@ -1988,7 +2045,8 @@ msgid "Journal-Period Name" msgstr "Diário-Nome do período" #. module: account -#: field:account.tax.code,name:0 field:account.tax.code.template,name:0 +#: field:account.tax.code,name:0 +#: field:account.tax.code.template,name:0 msgid "Tax Case Name" msgstr "Nome do caso da taxa" @@ -2006,7 +2064,8 @@ msgstr "" #. module: account #: field:account.bank.statement.line,partner_id:0 #: field:account.bank.statement.reconcile,partner_id:0 -#: rml:account.general.ledger:0 field:account.invoice,partner_id:0 +#: rml:account.general.ledger:0 +#: field:account.invoice,partner_id:0 #: field:account.move,partner_id:0 #: wizard_field:account.partner.balance.report,init,result_selection:0 #: wizard_field:account.third_party_ledger.report,init,result_selection:0 @@ -2080,8 +2139,10 @@ msgstr "Passado" #: field:account.bank.statement,currency:0 #: field:account.bank.statement.reconcile,total_currency:0 #: field:account.bank.statement.reconcile,total_second_currency:0 -#: rml:account.general.ledger:0 field:account.invoice,currency_id:0 -#: field:account.journal,currency:0 field:account.model.line,currency_id:0 +#: rml:account.general.ledger:0 +#: field:account.invoice,currency_id:0 +#: field:account.journal,currency:0 +#: field:account.model.line,currency_id:0 #: field:account.move.line,currency_id:0 msgid "Currency" msgstr "Moeda" @@ -2119,7 +2180,8 @@ msgid "Analytic Entry" msgstr "Lançamento analítico" #. module: account -#: view:res.company:0 field:res.company,overdue_msg:0 +#: view:res.company:0 +#: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" msgstr "Mensagem para Pagamentos Atrasados" @@ -2171,7 +2233,8 @@ msgid "Detail" msgstr "Detalhe" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Consolidation" msgstr "Consolidação" @@ -2268,17 +2331,22 @@ msgid "The account basis of the tax declaration." msgstr "A base contábil da declaração de imposto." #. module: account -#: rml:account.analytic.account.journal:0 field:account.analytic.line,date:0 +#: rml:account.analytic.account.journal:0 +#: field:account.analytic.line,date:0 #: field:account.bank.statement,date:0 #: field:account.bank.statement.line,date:0 -#: field:account.bank.statement.reconcile,name:0 rml:account.general.ledger:0 +#: field:account.bank.statement.reconcile,name:0 +#: rml:account.general.ledger:0 #: selection:account.general.ledger.report,checktype,sortbydate:0 -#: rml:account.journal.period.print:0 field:account.move,date:0 +#: rml:account.journal.period.print:0 +#: field:account.move,date:0 +#: wizard_field:account.move.line.reconcile,addendum,date_p:0 #: rml:account.overdue:0 #: wizard_field:account.subscription.generate,init,date:0 -#: field:account.subscription.line,date:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 -#: xsl:account.transfer:0 +#: field:account.subscription.line,date:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Date" msgstr "Data" @@ -2294,7 +2362,8 @@ msgid "Unreconcile" msgstr "Não concilidado" #. module: account -#: field:account.tax,type:0 field:account.tax.template,type:0 +#: field:account.tax,type:0 +#: field:account.tax.template,type:0 msgid "Tax Type" msgstr "Tipo de taxa" @@ -2304,7 +2373,8 @@ msgid "Statement Entries" msgstr "Lançamentos do Demonstrativo" #. module: account -#: field:account.analytic.line,user_id:0 field:account.journal,user_id:0 +#: field:account.analytic.line,user_id:0 +#: field:account.journal,user_id:0 msgid "User" msgstr "Usuário" @@ -2394,15 +2464,18 @@ msgid "Date End" msgstr "Data de término" #. module: account -#: view:account.bank.statement:0 field:account.move.reconcile,line_id:0 +#: view:account.bank.statement:0 +#: field:account.move.reconcile,line_id:0 #: model:ir.actions.act_window,name:account.action_move_line_search +#: model:ir.actions.act_window,name:account.action_move_line_select #: model:ir.actions.act_window,name:account.action_move_line_tree1 #: model:ir.ui.menu,name:account.menu_action_move_line_search msgid "Entry Lines" msgstr "Linhas de lançamentos" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Applicable Code (if type=code)" msgstr "Código aplicável (se tipo=código)" @@ -2491,9 +2564,11 @@ msgstr "De contas analíticas, criar fatura." #: wizard_button:account.general.journal.report,init,end:0 #: wizard_button:account.general.ledger.report,account_selection,end:0 #: wizard_button:account.general.ledger.report,checktype,end:0 -#: view:account.invoice:0 wizard_button:account.invoice.pay,addendum,end:0 +#: view:account.invoice:0 +#: wizard_button:account.invoice.pay,addendum,end:0 #: wizard_button:account.invoice.pay,init,end:0 -#: wizard_button:account.invoice.refund,init,end:0 view:account.move:0 +#: wizard_button:account.invoice.refund,init,end:0 +#: view:account.move:0 #: wizard_button:account.move.bank.reconcile,init,end:0 #: wizard_button:account.move.journal,init,end:0 #: wizard_button:account.move.line.reconcile,addendum,end:0 @@ -2512,7 +2587,8 @@ msgstr "De contas analíticas, criar fatura." #: wizard_button:account.third_party_ledger.report,init,end:0 #: wizard_button:account.vat.declaration,init,end:0 #: wizard_button:account_use_models,init_form,end:0 -#: view:wizard.company.setup:0 view:wizard.multi.charts.accounts:0 +#: view:wizard.company.setup:0 +#: view:wizard.multi.charts.accounts:0 msgid "Cancel" msgstr "Cancelar" @@ -2522,8 +2598,10 @@ msgid "Acc. Type Name" msgstr "Nome Tipo de Conta" #. module: account -#: help:account.tax,base_code_id:0 help:account.tax,ref_base_code_id:0 -#: help:account.tax,ref_tax_code_id:0 help:account.tax,tax_code_id:0 +#: help:account.tax,base_code_id:0 +#: help:account.tax,ref_base_code_id:0 +#: help:account.tax,ref_tax_code_id:0 +#: help:account.tax,tax_code_id:0 #: help:account.tax.template,base_code_id:0 #: help:account.tax.template,ref_base_code_id:0 #: help:account.tax.template,ref_tax_code_id:0 @@ -2537,7 +2615,8 @@ msgid "Litigation" msgstr "Litígio" #. module: account -#: view:account.move.line:0 wizard_view:account.move.validate,init:0 +#: view:account.move.line:0 +#: wizard_view:account.move.validate,init:0 #: view:account.payment.term:0 msgid "Information" msgstr "Informação" @@ -2582,6 +2661,8 @@ msgstr "" #. module: account #: rml:account.analytic.account.journal:0 +#: wizard_view:account.invoice.pay,addendum:0 +#: wizard_view:account.move.line.reconcile,addendum:0 #: model:ir.ui.menu,name:account.next_id_40 #: model:process.node,name:account.process_node_analytic0 #: model:process.node,name:account.process_node_analyticcost0 @@ -2654,7 +2735,8 @@ msgid "Price" msgstr "Preço" #. module: account -#: rml:account.analytic.account.journal:0 rml:account.third_party_ledger:0 +#: rml:account.analytic.account.journal:0 +#: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "-" msgstr "-" @@ -2689,6 +2771,7 @@ msgid "Invoice Number" msgstr "Número da Fatura" #. module: account +#: wizard_field:account.analytic.account.balance.report,init,date2:0 #: field:account.period,date_stop:0 msgid "End of Period" msgstr "Fim do Período" @@ -2721,13 +2804,17 @@ msgid "Invoice Reference" msgstr "Referencia fatura" #. module: account -#: field:account.account,name:0 field:account.account.template,name:0 +#: field:account.account,name:0 +#: field:account.account.template,name:0 #: rml:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,name:0 #: field:account.bank.statement.line,name:0 -#: field:account.chart.template,name:0 field:account.config.wizard,name:0 -#: field:account.model.line,name:0 field:account.move,name:0 -#: field:account.move.line,name:0 field:account.move.reconcile,name:0 +#: field:account.chart.template,name:0 +#: field:account.config.wizard,name:0 +#: field:account.model.line,name:0 +#: field:account.move,name:0 +#: field:account.move.line,name:0 +#: field:account.move.reconcile,name:0 #: field:account.subscription,name:0 msgid "Name" msgstr "Nome" @@ -2770,7 +2857,8 @@ msgstr "" "dependentes/derivados." #. module: account -#: field:account.journal.column,view_id:0 view:account.journal.view:0 +#: field:account.journal.column,view_id:0 +#: view:account.journal.view:0 #: field:account.journal.view,name:0 #: model:ir.model,name:account.model_account_journal_view msgid "Journal View" @@ -2863,11 +2951,14 @@ msgid "Full Account Name" msgstr "Nome Completo da Conta" #. module: account -#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.account.balance:0 +#: rml:account.analytic.account.analytic.check:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.vat.declaration:0 msgid "1cm 27.7cm 20cm 27.7cm" msgstr "1cm 27.7cm 20cm 27.7cm" @@ -2888,7 +2979,9 @@ msgid "Document: Customer account statement" msgstr "Documento: demonstrativo da conta cliente" #. module: account -#: view:product.product:0 view:product.template:0 view:res.partner:0 +#: view:product.product:0 +#: view:product.template:0 +#: view:res.partner:0 msgid "Accounting" msgstr "Contas" @@ -2921,9 +3014,11 @@ msgstr "Linhas de lançamento" #: wizard_view:account.move.line.reconcile,init_full:0 #: wizard_view:account.move.line.reconcile,init_partial:0 #: wizard_view:account.move.line.reconcile.select,init:0 +#: code:addons/account/wizard/wizard_reconcile_select.py:0 #: model:ir.ui.menu,name:account.next_id_20 #: model:process.node,name:account.process_node_reconciliation0 #: model:process.node,name:account.process_node_supplierreconciliation0 +#, python-format msgid "Reconciliation" msgstr "Conciliação" @@ -2933,8 +3028,10 @@ msgid "Centralisation" msgstr "Centralização" #. module: account -#: field:account.invoice.tax,tax_code_id:0 field:account.tax,description:0 -#: field:account.tax,tax_code_id:0 field:account.tax.template,tax_code_id:0 +#: field:account.invoice.tax,tax_code_id:0 +#: field:account.tax,description:0 +#: field:account.tax,tax_code_id:0 +#: field:account.tax.template,tax_code_id:0 #: model:ir.model,name:account.model_account_tax_code msgid "Tax Code" msgstr "Código da taxa" @@ -2977,12 +3074,13 @@ msgstr "" "mais o prazo de pagamento\"" #. module: account -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 msgid "Situation" msgstr "Situação" #. module: account -#: rml:account.invoice:0 xsl:account.transfer:0 +#: rml:account.invoice:0 msgid "Document" msgstr "Documento" @@ -3022,7 +3120,8 @@ msgid "Cancel selected invoices" msgstr "Cancelar faturas selecionadas" #. module: account -#: view:account.analytic.journal:0 field:account.analytic.line,journal_id:0 +#: view:account.analytic.journal:0 +#: field:account.analytic.line,journal_id:0 #: field:account.journal,analytic_journal_id:0 #: model:ir.actions.report.xml,name:account.analytic_journal_print #: model:ir.actions.wizard,name:account.account_analytic_account_journal_report @@ -3031,6 +3130,8 @@ msgstr "Diário analítico" #. module: account #: rml:account.general.ledger:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Entry Label" msgstr "Aba de lançamento" @@ -3045,23 +3146,28 @@ msgid "(" msgstr "(" #. module: account -#: view:account.invoice:0 view:account.period:0 view:account.subscription:0 +#: view:account.invoice:0 +#: view:account.period:0 +#: view:account.subscription:0 msgid "Set to Draft" msgstr "Definir como Provisório" #. module: account -#: help:account.invoice,origin:0 help:account.invoice.line,origin:0 +#: help:account.invoice,origin:0 +#: help:account.invoice.line,origin:0 msgid "Reference of the document that produced this invoice." msgstr "Referencia ao documento que produziu esta fatura." #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Payable" msgstr "A Pagar" #. module: account -#: rml:account.invoice:0 field:account.invoice.tax,base:0 +#: rml:account.invoice:0 +#: field:account.invoice.tax,base:0 msgid "Base" msgstr "Base" @@ -3071,7 +3177,8 @@ msgid "Model Name" msgstr "Nome do modelo" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Others" msgstr "Outros" @@ -3081,13 +3188,15 @@ msgid "8" msgstr "8" #. module: account -#: view:account.invoice:0 view:account.move:0 +#: view:account.invoice:0 +#: view:account.move:0 #: wizard_button:account.move.validate,init,validate:0 msgid "Validate" msgstr "Validar" #. module: account -#: view:account.model:0 field:account.model,legend:0 +#: view:account.model:0 +#: field:account.model,legend:0 msgid "Legend" msgstr "Legenda" @@ -3102,14 +3211,17 @@ msgid "account.move.line.select" msgstr "account.move.line.select" #. module: account -#: view:account.account:0 rml:account.account.balance:0 +#: view:account.account:0 +#: rml:account.account.balance:0 #: wizard_field:account.account.balance.report,account_selection,Account_list:0 #: wizard_field:account.automatic.reconcile,init,writeoff_acc_id:0 #: field:account.bank.statement.line,account_id:0 #: field:account.bank.statement.reconcile.line,account_id:0 -#: field:account.invoice,account_id:0 field:account.invoice.line,account_id:0 +#: field:account.invoice,account_id:0 +#: field:account.invoice.line,account_id:0 #: field:account.journal,account_control_ids:0 -#: field:account.model.line,account_id:0 field:account.move.line,account_id:0 +#: field:account.model.line,account_id:0 +#: field:account.move.line,account_id:0 #: wizard_field:account.move.line.reconcile.select,init,account_id:0 #: wizard_field:account.move.line.unreconcile.select,init,account_id:0 #: model:ir.model,name:account.model_account_account @@ -3130,9 +3242,12 @@ msgid "By Date and Period" msgstr "Por data e período" #. module: account -#: view:account.account:0 view:account.account.template:0 -#: view:account.bank.statement:0 field:account.bank.statement.line,note:0 -#: field:account.fiscal.position,note:0 view:account.invoice.line:0 +#: view:account.account:0 +#: view:account.account.template:0 +#: view:account.bank.statement:0 +#: field:account.bank.statement.line,note:0 +#: field:account.fiscal.position,note:0 +#: view:account.invoice.line:0 #: field:account.invoice.line,note:0 msgid "Notes" msgstr "Observações" @@ -3147,7 +3262,8 @@ msgstr "" "pagamentos." #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 #: field:account.invoice.line,invoice_line_tax_id:0 #: model:ir.actions.act_window,name:account.action_tax_form #: model:ir.ui.menu,name:account.menu_action_tax_form @@ -3172,15 +3288,21 @@ msgid "Statement encoding produces payment entries" msgstr "Codificação de demonstrativos para lançamentos de pagamento" #. module: account -#: field:account.account,code:0 rml:account.account.balance:0 -#: field:account.account.template,code:0 field:account.account.type,code:0 +#: field:account.account,code:0 +#: rml:account.account.balance:0 +#: field:account.account.template,code:0 +#: field:account.account.type,code:0 #: rml:account.analytic.account.analytic.check:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.analytic.account.journal:0 field:account.analytic.line,code:0 -#: field:account.config.wizard,code:0 field:account.fiscalyear,code:0 -#: rml:account.general.journal:0 field:account.journal,code:0 -#: rml:account.partner.balance:0 field:account.period,code:0 +#: rml:account.analytic.account.journal:0 +#: field:account.analytic.line,code:0 +#: field:account.config.wizard,code:0 +#: field:account.fiscalyear,code:0 +#: rml:account.general.journal:0 +#: field:account.journal,code:0 +#: rml:account.partner.balance:0 +#: field:account.period,code:0 msgid "Code" msgstr "Código" @@ -3190,7 +3312,8 @@ msgid "Financial Management" msgstr "Administração financeira" #. module: account -#: selection:account.account.type,close_method:0 selection:account.tax,type:0 +#: selection:account.account.type,close_method:0 +#: selection:account.tax,type:0 #: selection:account.tax.template,type:0 msgid "None" msgstr "Nada" @@ -3202,6 +3325,7 @@ msgid "Generate Fiscal Year Opening Entries" msgstr "Gerar Lançamentos Iniciais de Abertura do Ano Fiscal" #. module: account +#: view:account.move.reconcile:0 #: model:ir.actions.wizard,name:account.wizard_reconcile msgid "Reconcile Entries" msgstr "Reconciliar lançamentos" @@ -3217,7 +3341,8 @@ msgid "Additionnal Information" msgstr "Informação adicional" #. module: account -#: field:account.tax,name:0 field:account.tax.template,name:0 +#: field:account.tax,name:0 +#: field:account.tax.template,name:0 #: rml:account.vat.declaration:0 msgid "Tax Name" msgstr "Nome da taxa" @@ -3294,7 +3419,8 @@ msgid "Partner Balance" msgstr "Saldo do parceiro" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Third Party Ledger" msgstr "Ficha de terceiros" @@ -3309,7 +3435,8 @@ msgstr "" #. module: account #: selection:account.tax,applicable_type:0 -#: field:account.tax,python_applicable:0 field:account.tax,python_compute:0 +#: field:account.tax,python_applicable:0 +#: field:account.tax,python_compute:0 #: selection:account.tax,type:0 #: selection:account.tax.template,applicable_type:0 #: field:account.tax.template,python_applicable:0 @@ -3348,7 +3475,8 @@ msgid "Import invoice" msgstr "Importar fatura" #. module: account -#: view:account.invoice:0 view:wizard.company.setup:0 +#: view:account.invoice:0 +#: view:wizard.company.setup:0 #: view:wizard.multi.charts.accounts:0 msgid "Create" msgstr "Criado" @@ -3364,7 +3492,8 @@ msgid "Invoice line" msgstr "Linha da fatura" #. module: account -#: field:account.account,shortcut:0 field:account.account.template,shortcut:0 +#: field:account.account,shortcut:0 +#: field:account.account.template,shortcut:0 msgid "Shortcut" msgstr "Atalho" @@ -3393,13 +3522,15 @@ msgstr "" "moeda" #. module: account -#: field:account.tax,parent_id:0 field:account.tax.template,parent_id:0 +#: field:account.tax,parent_id:0 +#: field:account.tax.template,parent_id:0 msgid "Parent Tax Account" msgstr "Conta-pai de Impostos" #. module: account #: field:account.account,user_type:0 -#: field:account.account.template,user_type:0 view:account.account.type:0 +#: field:account.account.template,user_type:0 +#: view:account.account.type:0 #: field:account.analytic.account,type:0 #: model:ir.model,name:account.model_account_account_type msgid "Account Type" @@ -3435,7 +3566,8 @@ msgid "Central Journal" msgstr "Diário Central" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Balance brought forward" msgstr "Saldo transferido de para" @@ -3511,7 +3643,8 @@ msgid "Journal code" msgstr "Código do diário" #. module: account -#: wizard_button:account.fiscalyear.close,init,close:0 view:account.model:0 +#: wizard_button:account.fiscalyear.close,init,close:0 +#: view:account.model:0 msgid "Create entries" msgstr "Criar lançamentos" @@ -3549,7 +3682,6 @@ msgstr "" "Esta forma de pagamento será usada em vez da padrão para o parceiro atual" #. module: account -#: wizard_field:account.invoice.pay,addendum,comment:0 #: wizard_field:account.invoice.pay,init,name:0 msgid "Entry Name" msgstr "Nome do lançamento" @@ -3570,11 +3702,14 @@ msgstr "" "(VAT) relativos a este código de imposto apareçam nas faturas" #. module: account -#: field:account.account.type,sequence:0 field:account.invoice.tax,sequence:0 -#: field:account.journal.column,sequence:0 field:account.model.line,sequence:0 +#: field:account.account.type,sequence:0 +#: field:account.invoice.tax,sequence:0 +#: field:account.journal.column,sequence:0 +#: field:account.model.line,sequence:0 #: field:account.payment.term.line,sequence:0 #: field:account.sequence.fiscalyear,sequence_id:0 -#: field:account.tax,sequence:0 field:account.tax.template,sequence:0 +#: field:account.tax,sequence:0 +#: field:account.tax.template,sequence:0 #: field:fiscalyear.seq,sequence_id:0 msgid "Sequence" msgstr "Sequencia" @@ -3642,7 +3777,8 @@ msgstr "Inscriçãoda conta" #. module: account #: field:account.model.line,date_maturity:0 -#: field:account.move.line,date_maturity:0 rml:account.overdue:0 +#: field:account.move.line,date_maturity:0 +#: rml:account.overdue:0 msgid "Maturity date" msgstr "Data de vencimento" @@ -3662,7 +3798,8 @@ msgid "Account Configure Wizard " msgstr "Assistente de configuração de conta " #. module: account -#: field:account.config.wizard,date1:0 field:account.fiscalyear,date_start:0 +#: field:account.config.wizard,date1:0 +#: field:account.fiscalyear,date_start:0 #: field:account.subscription,date_start:0 msgid "Start Date" msgstr "Data de Início" @@ -3700,7 +3837,8 @@ msgid "Unreconciled" msgstr "Não conciliado" #. module: account -#: field:account.account,note:0 field:account.account.template,note:0 +#: field:account.account,note:0 +#: field:account.account.template,note:0 msgid "Note" msgstr "Nota" @@ -3733,7 +3871,8 @@ msgid "Entry Sequence" msgstr "Sequencia de lançamento" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 msgid "Closed" msgstr "Fechado" @@ -3863,9 +4002,12 @@ msgid "Code/Date" msgstr "Código/Data" #. module: account -#: field:account.account,active:0 field:account.analytic.account,active:0 -#: field:account.analytic.journal,active:0 field:account.journal,active:0 -#: field:account.journal.period,active:0 field:account.payment.term,active:0 +#: field:account.account,active:0 +#: field:account.analytic.account,active:0 +#: field:account.analytic.journal,active:0 +#: field:account.journal,active:0 +#: field:account.journal.period,active:0 +#: field:account.payment.term,active:0 #: field:account.tax,active:0 msgid "Active" msgstr "Ativo" @@ -3917,15 +4059,20 @@ msgid "Secondary Currency" msgstr "Moeda secundária" #. module: account -#: field:account.account,credit:0 rml:account.account.balance:0 +#: field:account.account,credit:0 +#: rml:account.account.balance:0 #: field:account.analytic.account,credit:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.central.journal:0 rml:account.journal.period.print:0 -#: field:account.model.line,credit:0 field:account.move.line,credit:0 -#: rml:account.partner.balance:0 rml:account.tax.code.entries:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.central.journal:0 +#: rml:account.journal.period.print:0 +#: field:account.model.line,credit:0 +#: field:account.move.line,credit:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 #: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,cost:0 msgid "Credit" @@ -3958,7 +4105,8 @@ msgid "Account Move" msgstr "Movimentos da Conta" #. module: account -#: view:account.bank.statement:0 field:account.bank.statement,line_ids:0 +#: view:account.bank.statement:0 +#: field:account.bank.statement,line_ids:0 msgid "Statement lines" msgstr "Linhas do demonstrativo" @@ -4055,15 +4203,18 @@ msgid "Journal Column" msgstr "Coluna do diário" #. module: account -#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0 -#: selection:account.journal.period,state:0 selection:account.period,state:0 +#: selection:account.fiscalyear,state:0 +#: selection:account.invoice,state:0 +#: selection:account.journal.period,state:0 +#: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Done" msgstr "Concluído" #. module: account #: wizard_field:account.account.balance.report,checktype,periods:0 -#: field:account.config.wizard,period:0 view:account.fiscalyear:0 +#: field:account.config.wizard,period:0 +#: view:account.fiscalyear:0 #: field:account.fiscalyear,period_ids:0 #: wizard_field:account.general.ledger.report,checktype,periods:0 #: wizard_field:account.partner.balance.report,init,periods:0 @@ -4076,7 +4227,8 @@ msgid "Periods" msgstr "Períodos" #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 #: field:account.move.line,invoice:0 #: model:ir.model,name:account.model_account_invoice #: model:res.request.link,name:account.req_link_invoice @@ -4103,7 +4255,8 @@ msgid "Analytic costs to reinvoice purchases, timesheets, ..." msgstr "Custos analíticos para fatura de compra, planilhas, ..." #. module: account -#: field:account.account,tax_ids:0 field:account.account.template,tax_ids:0 +#: field:account.account,tax_ids:0 +#: field:account.account.template,tax_ids:0 msgid "Default Taxes" msgstr "Taxas padrão" @@ -4163,7 +4316,8 @@ msgstr "Controlos de tipo" #. module: account #: field:account.analytic.account,name:0 #: rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.central.journal:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.central.journal:0 msgid "Account Name" msgstr "Nome da conta" @@ -4254,7 +4408,8 @@ msgid "Import file from your bank statement" msgstr "Importar arquivo do seu extrato bancário" #. module: account -#: field:account.account,type:0 field:account.account.template,type:0 +#: field:account.account,type:0 +#: field:account.account.template,type:0 msgid "Internal Type" msgstr "Tipo interno" @@ -4280,12 +4435,14 @@ msgid "Posted" msgstr "Publicado" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Credit Notes" msgstr "Notas de crédito" #. module: account -#: field:account.config.wizard,date2:0 field:account.fiscalyear,date_stop:0 +#: field:account.config.wizard,date2:0 +#: field:account.fiscalyear,date_stop:0 msgid "End Date" msgstr "Data de Término" @@ -4306,7 +4463,8 @@ msgid "Day of the Month" msgstr "Dia do mês" #. module: account -#: field:account.analytic.journal,line_ids:0 field:account.tax.code,line_ids:0 +#: field:account.analytic.journal,line_ids:0 +#: field:account.tax.code,line_ids:0 msgid "Lines" msgstr "Linhas" @@ -4327,7 +4485,8 @@ msgstr "" "impostos derivados." #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Tax Declaration" msgstr "Declaração da taxa" @@ -4387,12 +4546,14 @@ msgid "The optional quantity on entries" msgstr "A quantidade opcional nos lançamentos" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "JNRL" msgstr "JNRL" #. module: account -#: view:account.fiscalyear:0 view:account.period:0 +#: view:account.fiscalyear:0 +#: view:account.period:0 msgid "States" msgstr "Estado" @@ -4428,7 +4589,8 @@ msgstr "Data de início" #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.inverted.balance:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: field:account.invoice,amount_total:0 field:account.invoice,check_total:0 +#: field:account.invoice,amount_total:0 +#: field:account.invoice,check_total:0 msgid "Total" msgstr "Total" @@ -4547,9 +4709,11 @@ msgstr "Lançamentos válidos da fatura" #: field:account.fiscal.position,company_id:0 #: field:account.fiscalyear,company_id:0 #: wizard_field:account.general.ledger.report,checktype,company_id:0 -#: field:account.invoice,company_id:0 field:account.journal,company_id:0 +#: field:account.invoice,company_id:0 +#: field:account.journal,company_id:0 #: wizard_field:account.partner.balance.report,init,company_id:0 -#: field:account.tax,company_id:0 field:account.tax.code,company_id:0 +#: field:account.tax,company_id:0 +#: field:account.tax.code,company_id:0 #: wizard_field:account.third_party_ledger.report,init,company_id:0 #: wizard_field:account.vat.declaration,init,company_id:0 #: field:wizard.company.setup,company_id:0 @@ -4646,9 +4810,12 @@ msgid "Print Aged Trial Balance" msgstr "Imprimir saldo tentativo anterior" #. module: account -#: field:account.analytic.line,ref:0 field:account.bank.statement.line,ref:0 -#: field:account.model.line,ref:0 field:account.move.line,ref:0 -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: field:account.analytic.line,ref:0 +#: field:account.bank.statement.line,ref:0 +#: field:account.model.line,ref:0 +#: field:account.move.line,ref:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "Ref." msgstr "Ref." @@ -4728,7 +4895,8 @@ msgid "Control Invoice" msgstr "Controlar fatura" #. module: account -#: selection:account.account,type:0 selection:account.account.template,type:0 +#: selection:account.account,type:0 +#: selection:account.account.template,type:0 #: selection:account.aged.trial.balance,init,result_selection:0 msgid "Receivable" msgstr "Receber" @@ -4755,7 +4923,8 @@ msgstr "Imposto:" #. module: account #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.quantity_cost_ledger:0 -#: rml:account.central.journal:0 rml:account.general.journal:0 +#: rml:account.central.journal:0 +#: rml:account.general.journal:0 #: rml:account.invoice:0 msgid "Total:" msgstr "Total:" @@ -4766,7 +4935,8 @@ msgid "account.analytic.journal" msgstr "account.analytic.journal" #. module: account -#: view:account.fiscal.position:0 field:account.fiscal.position,account_ids:0 +#: view:account.fiscal.position:0 +#: field:account.fiscal.position,account_ids:0 #: field:account.fiscal.position.template,account_ids:0 msgid "Account Mapping" msgstr "Mapeamento de contas" @@ -4782,7 +4952,8 @@ msgid "Account Reconciliation" msgstr "Reconciliação da conta" #. module: account -#: view:account.bank.statement:0 selection:account.bank.statement,state:0 +#: view:account.bank.statement:0 +#: selection:account.bank.statement,state:0 msgid "Confirm" msgstr "Confirmar" @@ -4797,7 +4968,8 @@ msgid "Parent Account Template" msgstr "Modelo de conta-pai" #. module: account -#: help:account.tax,domain:0 help:account.tax.template,domain:0 +#: help:account.tax,domain:0 +#: help:account.tax.template,domain:0 msgid "" "This field is only used if you develop your own module allowing developers " "to create specific taxes in a custom domain." @@ -4818,7 +4990,8 @@ msgid "Analytic account" msgstr "Conta analítica" #. module: account -#: rml:account.invoice:0 selection:account.invoice,type:0 +#: rml:account.invoice:0 +#: selection:account.invoice,type:0 msgid "Supplier Invoice" msgstr "Fatura do fornecedor" @@ -4828,16 +5001,22 @@ msgid "Valid" msgstr "Válido" #. module: account -#: field:account.account,debit:0 rml:account.account.balance:0 +#: field:account.account,debit:0 +#: rml:account.account.balance:0 #: field:account.analytic.account,debit:0 #: rml:account.analytic.account.balance:0 #: rml:account.analytic.account.cost_ledger:0 #: rml:account.analytic.account.inverted.balance:0 -#: rml:account.central.journal:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 field:account.model.line,debit:0 -#: field:account.move.line,debit:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.central.journal:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: field:account.model.line,debit:0 +#: field:account.move.line,debit:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 +#: rml:account.vat.declaration:0 #: field:report.hr.timesheet.invoice.journal,revenue:0 msgid "Debit" msgstr "Débito" @@ -4858,6 +5037,7 @@ msgid "Invoice Lines" msgstr "Linhas da fatura" #. module: account +#: wizard_field:account.analytic.account.balance.report,init,date1:0 #: field:account.period,date_start:0 msgid "Start of Period" msgstr "Início do Período" @@ -4899,7 +5079,8 @@ msgid "Reporting" msgstr "Relatórios" #. module: account -#: rml:account.third_party_ledger:0 rml:account.third_party_ledger_other:0 +#: rml:account.third_party_ledger:0 +#: rml:account.third_party_ledger_other:0 msgid "/" msgstr "/" @@ -4930,7 +5111,8 @@ msgid "Configuration" msgstr "Configuração" #. module: account -#: view:account.analytic.line:0 view:account.invoice:0 +#: view:account.analytic.line:0 +#: view:account.invoice:0 msgid "Total amount" msgstr "Quantia total" @@ -4953,7 +5135,8 @@ msgstr "Conta de receita no modelo de produtos" #: help:account.account,currency_id:0 #: help:account.account.template,currency_id:0 msgid "Force all moves for this account to have this secondary currency." -msgstr "Força todos os movimentos dessa conta para usarem a moeda secundária." +msgstr "" +"Força todos os movimentos dessa conta para usarem a moeda secundária." #. module: account #: wizard_button:populate_statement_from_inv,go,end:0 @@ -4980,12 +5163,14 @@ msgid "Paid invoice" msgstr "Fatura paga" #. module: account -#: view:account.tax:0 view:account.tax.template:0 +#: view:account.tax:0 +#: view:account.tax.template:0 msgid "Tax Definition" msgstr "Definição da taxa" #. module: account -#: field:account.tax,tax_group:0 field:account.tax.template,tax_group:0 +#: field:account.tax,tax_group:0 +#: field:account.tax.template,tax_group:0 msgid "Tax Group" msgstr "Grupo da taxa" @@ -5028,7 +5213,8 @@ msgid "With movements" msgstr "Com movimentos" #. module: account -#: field:account.tax,domain:0 field:account.tax.template,domain:0 +#: field:account.tax,domain:0 +#: field:account.tax.template,domain:0 msgid "Domain" msgstr "Domínio" @@ -5053,7 +5239,9 @@ msgid "Manually" msgstr "Manualmente" #. module: account -#: view:account.invoice:0 view:account.tax:0 view:account.tax.template:0 +#: view:account.invoice:0 +#: view:account.tax:0 +#: view:account.tax.template:0 #: selection:account.vat.declaration,init,based_on:0 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened #: model:ir.actions.act_window,name:account.action_invoice_tree @@ -5070,7 +5258,8 @@ msgid "Payable Accounts" msgstr "Contas a pagar" #. module: account -#: view:account.invoice.line:0 field:account.invoice.tax,invoice_id:0 +#: view:account.invoice.line:0 +#: field:account.invoice.tax,invoice_id:0 msgid "Invoice Line" msgstr "Linha da fatura" @@ -5109,7 +5298,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.next_id_43 msgid "This Month" -msgstr "Este mes" +msgstr "Este mês" #. module: account #: field:account.account.type,sign:0 @@ -5122,7 +5311,8 @@ msgid "The optional other currency if it is a multi-currency entry." msgstr "A outra moeda opcional se este for um lançamento multi-moeda" #. module: account -#: view:account.invoice:0 field:account.invoice,payment_ids:0 +#: view:account.invoice:0 +#: field:account.invoice,payment_ids:0 #: selection:account.vat.declaration,init,based_on:0 msgid "Payments" msgstr "Pagamentos" @@ -5168,9 +5358,12 @@ msgstr "Escolha diário e data de pagamento" #. module: account #: selection:account.analytic.account,state:0 #: selection:account.bank.statement,state:0 -#: selection:account.fiscalyear,state:0 selection:account.invoice,state:0 -#: selection:account.journal.period,state:0 selection:account.move,state:0 -#: selection:account.move.line,state:0 selection:account.period,state:0 +#: selection:account.fiscalyear,state:0 +#: selection:account.invoice,state:0 +#: selection:account.journal.period,state:0 +#: selection:account.move,state:0 +#: selection:account.move.line,state:0 +#: selection:account.period,state:0 #: selection:account.subscription,state:0 msgid "Draft" msgstr "Provisório" @@ -5197,7 +5390,8 @@ msgid "Are you sure ?" msgstr "Tem certeza?" #. module: account -#: rml:account.invoice:0 view:account.invoice:0 +#: rml:account.invoice:0 +#: view:account.invoice:0 msgid "PRO-FORMA" msgstr "Pro-forma" @@ -5233,16 +5427,20 @@ msgid "Supplier Invoice Process" msgstr "Processo de fatura do fornecedor" #. module: account -#: rml:account.account.balance:0 rml:account.analytic.account.analytic.check:0 -#: rml:account.analytic.account.balance:0 rml:account.general.ledger:0 -#: rml:account.journal.period.print:0 rml:account.partner.balance:0 -#: rml:account.tax.code.entries:0 rml:account.third_party_ledger:0 -#: rml:account.third_party_ledger_other:0 rml:account.vat.declaration:0 +#: rml:account.account.balance:0 +#: rml:account.analytic.account.analytic.check:0 +#: rml:account.analytic.account.balance:0 +#: rml:account.general.ledger:0 +#: rml:account.journal.period.print:0 +#: rml:account.partner.balance:0 +#: rml:account.tax.code.entries:0 +#: rml:account.vat.declaration:0 msgid "Page" msgstr "Página" #. module: account -#: view:account.move:0 view:account.move.line:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "Optional Information" msgstr "Informação Opcional" @@ -5258,7 +5456,8 @@ msgid "Receivable and Payable" msgstr "A receber e a pagar" #. module: account -#: rml:account.account.balance:0 rml:account.general.journal:0 +#: rml:account.account.balance:0 +#: rml:account.general.journal:0 msgid ":" msgstr ":" @@ -5284,7 +5483,8 @@ msgstr "" "campo conterá um valor básico (sem o imposto)" #. module: account -#: view:account.bank.statement:0 view:account.bank.statement.reconcile:0 +#: view:account.bank.statement:0 +#: view:account.bank.statement.reconcile:0 #: view:account.subscription:0 msgid "Compute" msgstr "Calcular" @@ -5318,7 +5518,6 @@ msgstr "Número de períodos" #. module: account #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0 -#: wizard_field:account.analytic.account.balance.report,init,date2:0 #: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0 #: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0 #: wizard_field:account.analytic.account.journal.report,init,date2:0 @@ -5328,7 +5527,8 @@ msgid "End of period" msgstr "Fim de período" #. module: account -#: view:account.move:0 model:ir.model,name:account.model_account_move +#: view:account.move:0 +#: model:ir.model,name:account.model_account_move msgid "Account Entry" msgstr "Conta Lançamento" @@ -5339,7 +5539,8 @@ msgid "General Journal" msgstr "Diário geral" #. module: account -#: field:account.account,balance:0 rml:account.account.balance:0 +#: field:account.account,balance:0 +#: rml:account.account.balance:0 #: selection:account.account.type,close_method:0 #: field:account.analytic.account,balance:0 #: rml:account.analytic.account.balance:0 @@ -5347,9 +5548,12 @@ msgstr "Diário geral" #: rml:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,balance_end:0 #: field:account.bank.statement.reconcile,total_balance:0 -#: rml:account.general.ledger:0 field:account.move.line,balance:0 -#: rml:account.partner.balance:0 selection:account.payment.term.line,value:0 -#: selection:account.tax,type:0 rml:account.third_party_ledger:0 +#: rml:account.general.ledger:0 +#: field:account.move.line,balance:0 +#: rml:account.partner.balance:0 +#: selection:account.payment.term.line,value:0 +#: selection:account.tax,type:0 +#: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Balance" msgstr "Saldo" @@ -5395,8 +5599,11 @@ msgid "The sequence used for invoice numbers in this journal." msgstr "A sequência utilizada para numeração das faturas neste diário." #. module: account -#: view:account.account:0 view:account.account.template:0 -#: view:account.journal:0 view:account.move:0 view:account.move.line:0 +#: view:account.account:0 +#: view:account.account.template:0 +#: view:account.journal:0 +#: view:account.move:0 +#: view:account.move.line:0 msgid "General Information" msgstr "Informações Gerais" @@ -5438,7 +5645,8 @@ msgid "List of Accounts" msgstr "Lista de contas" #. module: account -#: view:product.product:0 view:product.template:0 +#: view:product.product:0 +#: view:product.template:0 msgid "Sales Properties" msgstr "Propriedades das vendas" @@ -5503,7 +5711,6 @@ msgstr "Ano fiscal para fechar" #. module: account #: wizard_field:account.aged.trial.balance,init,date1:0 #: wizard_field:account.analytic.account.analytic.check.report,init,date1:0 -#: wizard_field:account.analytic.account.balance.report,init,date1:0 #: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0 #: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0 #: wizard_field:account.analytic.account.journal.report,init,date1:0 @@ -5531,11 +5738,15 @@ msgstr "intraCom" #: view:account.analytic.account:0 #: field:account.analytic.account,description:0 #: field:account.analytic.line,name:0 -#: field:account.bank.statement.reconcile.line,name:0 rml:account.invoice:0 -#: field:account.invoice,name:0 field:account.invoice.line,name:0 +#: field:account.bank.statement.reconcile.line,name:0 +#: rml:account.invoice:0 +#: field:account.invoice,name:0 +#: field:account.invoice.line,name:0 #: wizard_field:account.invoice.refund,init,description:0 -#: rml:account.overdue:0 field:account.payment.term,note:0 -#: field:account.tax.code,info:0 field:account.tax.code.template,info:0 +#: rml:account.overdue:0 +#: field:account.payment.term,note:0 +#: field:account.tax.code,info:0 +#: field:account.tax.code.template,info:0 msgid "Description" msgstr "Descrição" @@ -5583,7 +5794,8 @@ msgstr "" "parceiro atual" #. module: account -#: field:account.tax.code,code:0 field:account.tax.code.template,code:0 +#: field:account.tax.code,code:0 +#: field:account.tax.code.template,code:0 msgid "Case Code" msgstr "Codigo do caso" @@ -5665,7 +5877,8 @@ msgstr "Definições do modelo" #. module: account #: model:account.account.type,name:account.account_type_cash_moves -#: selection:account.analytic.journal,type:0 selection:account.journal,type:0 +#: selection:account.analytic.journal,type:0 +#: selection:account.journal,type:0 msgid "Cash" msgstr "Dinheiro" @@ -5705,7 +5918,8 @@ msgid "Keep empty for all open fiscal year" msgstr "Mantenha vazia para todos os anos fiscais abertos" #. module: account -#: rml:account.invoice:0 selection:account.invoice,type:0 +#: rml:account.invoice:0 +#: selection:account.invoice,type:0 msgid "Supplier Refund" msgstr "Reembolso a fornecedor" @@ -5754,8 +5968,10 @@ msgstr "" "categoria de produto" #. module: account -#: help:account.tax,base_sign:0 help:account.tax,ref_base_sign:0 -#: help:account.tax,ref_tax_sign:0 help:account.tax,tax_sign:0 +#: help:account.tax,base_sign:0 +#: help:account.tax,ref_base_sign:0 +#: help:account.tax,ref_tax_sign:0 +#: help:account.tax,tax_sign:0 #: help:account.tax.template,base_sign:0 #: help:account.tax.template,ref_base_sign:0 #: help:account.tax.template,ref_tax_sign:0 @@ -5789,8 +6005,10 @@ msgid "Name of the fiscal year as displayed on screens." msgstr "Nome do ano fiscal para as telas" #. module: account -#: field:account.invoice,payment_term:0 view:account.payment.term:0 -#: field:account.payment.term,name:0 view:account.payment.term.line:0 +#: field:account.invoice,payment_term:0 +#: view:account.payment.term:0 +#: field:account.payment.term,name:0 +#: view:account.payment.term.line:0 #: field:account.payment.term.line,payment_id:0 #: model:ir.model,name:account.model_account_payment_term #: field:res.partner,property_payment_term:0 @@ -5849,7 +6067,8 @@ msgstr "Sim" #. module: account #: help:account.account,reconcile:0 -msgid "Check this if the user is allowed to reconcile entries in this account." +msgid "" +"Check this if the user is allowed to reconcile entries in this account." msgstr "" "Marque isto se ao usuário é permitido reconciliar lançamentos nesta conta." @@ -5875,7 +6094,8 @@ msgid "Accounting Dashboard" msgstr "" #. module: account -#: view:board.board:0 model:ir.actions.act_window,name:account.act_my_account +#: view:board.board:0 +#: model:ir.actions.act_window,name:account.act_my_account msgid "Accounts to invoice" msgstr "" @@ -5923,39 +6143,39 @@ msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "All accounts" -msgstr "Todas as Contas" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,period_manner:0 msgid "Entries Selection Based on" -msgstr "Seleção de entradas baseada em" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "Notification" -msgstr "Notificação" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,period_manner:0 msgid "Financial Period" -msgstr "Período Financeiro" +msgstr "" #. module: account #: model:ir.actions.report.xml,name:account.account_account_balance #: model:ir.actions.report.xml,name:account.account_account_balance_landscape msgid "Account balance" -msgstr "Saldo da Conta" +msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Select Period(s)" -msgstr "Selecione o(s) Período(s)" +msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 msgid "Percentage" -msgstr "Porcentagem" +msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,compare_pattern:0 @@ -5970,12 +6190,12 @@ msgstr "Selecione Ano(s) Fiscal(is) (máximo três anos)" #. module: account #: wizard_field:account.balance.account.balance.report,init,select_account:0 msgid "Select Reference Account(for % comparision)" -msgstr "Selecione conta de referência (para comparação %)" +msgstr "Selecione conta de referência (para comparação de %)" #. module: account #: model:ir.actions.wizard,name:account.wizard_account_balance_report msgid "Account balance-Compare Years" -msgstr "Conta Saldo Comparar Anos" +msgstr "" #. module: account #: model:ir.module.module,description:account.module_meta_information @@ -6002,7 +6222,7 @@ msgstr "" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You have to select 'Landscape' option. Please Check it." -msgstr "" +msgstr "Você tem que selecionar a opção 'Paisagem'. Por favor marque-a." #. module: account #: wizard_field:account.balance.account.balance.report,init,landscape:0 @@ -6021,14 +6241,14 @@ msgid "Show Comparision in %" msgstr "Mostrar comparação em %" #. module: account -#: wizard_view:account.balance.account.balance.report,init:0 +#: wizard_view:account.analytic.account.balance.report,init:0 msgid "Select Period" -msgstr "Selecione o Período" +msgstr "Selecione o período" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "Opções de Relatório" +msgstr "Opções de relatório" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 @@ -6043,23 +6263,23 @@ msgstr "Mostrar Contas" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "1. You have selected more than 3 years in any case." -msgstr "" +msgstr "1. Você selecionou mais de 3 anos em qualquer caso." #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information msgid "Accounting and financial management-Compare Accounts" -msgstr "" +msgstr "Comparação de Contas de Contabilidade e gestão financeira," #. module: account #: rml:account.account.balance.landscape:0 #: rml:account.balance.account.balance:0 msgid "Year :" -msgstr "" +msgstr "Ano :" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "You can select maximum 3 years. Please check again." -msgstr "" +msgstr "Você pode escolher no maximo 3 anos. Por favor tente novamente" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -6067,22 +6287,26 @@ msgid "" "3. You have selected 'Percentage' option with more than 2 years, but you " "have not selected landscape format." msgstr "" +"3. Você selecionou a opção 'Porcentagem' com mais de 2 anos, mas não " +"escolheu o formato paisagem." #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 msgid "" "You might have done following mistakes. Please correct them and try again." msgstr "" +"Você pode ter cometido os enganos a seguir. Por favor, corrija-os e tente " +"novamente." #. module: account #: help:account.balance.account.balance.report,init,select_account:0 msgid "Keep empty for comparision to its parent" -msgstr "" +msgstr "Mantenha vazia para a comparação com sua matriz" #. module: account #: selection:account.balance.account.balance.report,init,period_manner:0 msgid "Creation Date" -msgstr "" +msgstr "Data de criação" #. module: account #: wizard_view:account.balance.account.balance.report,backtoinit:0 @@ -6090,93 +6314,98 @@ msgid "" "2. You have not selected 'Percentage' option, but you have selected more " "than 2 years." msgstr "" +"2. Você não selecionou a Opção 'Porcentagem', mas você selecionou mais de 2 " +"anos." #. module: account #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "" -"You may have selected the compare options with more than 1 year with credit/" -"debit columns and % option.This can lead contents to be printed out of the " -"paper.Please try again." +"You may have selected the compare options with more than 1 year with " +"credit/debit columns and % option.This can lead contents to be printed out " +"of the paper.Please try again." msgstr "" +"Você pode ter selecionado a opção de comparar com mais de 1 ano de colunas " +"crédito/débito e opção %. Isso pode gerar a impressão fora do papel. Por " +"favor tente novamente." #. module: account #: wizard_view:account.balance.account.balance.report,zero_years:0 msgid "You have to select at least 1 Fiscal Year. Try again." -msgstr "" +msgstr "Você tem que escolher pelo menos 1 ano fiscal. Tente novamente." #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Customize Report" -msgstr "" +msgstr "Personalizar relatório" #. module: account #: field:report.aged.receivable,name:0 msgid "Month Range" -msgstr "" +msgstr "Faixa de Mês(es)" #. module: account -#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard +#: model:ir.actions.act_window,name:report_account.action_view_created_invoice_dashboard msgid "Invoices Created Within Past 15 Days" -msgstr "" +msgstr "Faturas criadas nos últimos 15 dias" #. module: account -#: model:ir.model,name:account.model_report_invoice_created +#: model:ir.model,name:report_account.model_report_invoice_created msgid "Report of Invoices Created within Last 15 days" -msgstr "" +msgstr "Relatório de faturas criadas nos últimos 15 dias" #. module: account #: view:report.invoice.created:0 msgid "Total Amount" -msgstr "" +msgstr "Quantia total" #. module: account #: view:report.account.receivable:0 msgid "Accounts by type" -msgstr "" +msgstr "Contas por tipo" #. module: account -#: model:ir.model,name:account.model_report_aged_receivable +#: model:ir.model,name:report_account.model_report_aged_receivable msgid "Aged Receivable Till Today" msgstr "" #. module: account -#: model:ir.model,name:account.model_report_account_receivable +#: model:ir.model,name:report_account.model_report_account_receivable msgid "Receivable accounts" -msgstr "" +msgstr "Contas a receber" #. module: account #: field:temp.range,name:0 msgid "Range" -msgstr "" +msgstr "Intervalo" #. module: account -#: model:ir.module.module,description:account.module_meta_information +#: model:ir.module.module,description:report_account.module_meta_information msgid "A module that adds new reports based on the account module." -msgstr "" +msgstr "Um módulo que adiciona novos relatórios com base no módulo de conta." #. module: account -#: model:ir.module.module,shortdesc:account.module_meta_information +#: model:ir.module.module,shortdesc:report_account.module_meta_information msgid "Account Reporting - Reporting" msgstr "" #. module: account -#: model:ir.actions.act_window,name:account.action_account_receivable_graph -#: model:ir.ui.menu,name:account.menu_account_receivable_graph +#: model:ir.actions.act_window,name:report_account.action_account_receivable_graph +#: model:ir.ui.menu,name:report_account.menu_account_receivable_graph msgid "Balance by Type of Account" -msgstr "" +msgstr "Saldo por tipo de conta" #. module: account #: field:report.account.receivable,name:0 msgid "Week of Year" -msgstr "" +msgstr "Semana do Ano" #. module: account #: field:report.invoice.created,create_date:0 msgid "Create Date" -msgstr "" +msgstr "Criar data" #. module: account -#: model:ir.actions.act_window,name:account.action_aged_receivable_graph +#: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph #: view:report.aged.receivable:0 msgid "Aged Receivable" msgstr "" @@ -6184,7 +6413,331 @@ msgstr "" #. module: account #: view:report.invoice.created:0 msgid "Untaxed Amount" -msgstr "" +msgstr "Valor sem Impostos" + +#, python-format +#~ msgid "Bank Journal " +#~ msgstr "Diário Bancário " + +#, python-format +#~ msgid "Integrity Error !" +#~ msgstr "Erro de integridade !" + +#, python-format +#~ msgid "Purchase Journal" +#~ msgstr "Diário de compras" + +#, python-format +#~ msgid "No sequence defined in the journal !" +#~ msgstr "Nenhuma sequencia definida no diário !" + +#, python-format +#~ msgid "The journal must have default credit and debit account" +#~ msgstr "O diário precisa ter uma conta de débito e crédito padrão" + +#, python-format +#~ msgid "No Analytic Journal !" +#~ msgstr "Nenum diário analítico !" + +#, python-format +#~ msgid "Please set an analytic journal on this financial journal !" +#~ msgstr "Por favor fixe um diário analítico neste diário financeiro!" + +#, python-format +#~ msgid "Sales Journal" +#~ msgstr "Diário de vendas" + +#, python-format +#~ msgid "Couldn't create move between different companies" +#~ msgstr "Não foi possível criar movimentação entre empresas diferentes" + +#, python-format +#~ msgid "The journal must have centralised counterpart" +#~ msgstr "O diário deve ter uma contrapartida centralizada" + +#, python-format +#~ msgid "BNK" +#~ msgstr "BNK" + +#, python-format +#~ msgid "SAJ" +#~ msgstr "SAJ" + +#, python-format +#~ msgid "EXJ" +#~ msgstr "EXJ" + +#, python-format +#~ msgid "Bad total !" +#~ msgstr "Total inválido!" + +#, python-format +#~ msgid "End of Fiscal Year Entry" +#~ msgstr "Lançamento de Fim do Período Fiscal" + +#, python-format +#~ msgid "Free Reference" +#~ msgstr "Referencia livre" + +#, python-format +#~ msgid "Please verify that an account is defined in the journal." +#~ msgstr "Por favor verifique se uma conta está definida no diário." + +#, python-format +#~ msgid "Standard Encoding" +#~ msgstr "Codificação padrão" + +#, python-format +#~ msgid "Bad account!" +#~ msgstr "Conta inválida!" + +#, python-format +#~ msgid "Taxes missing !" +#~ msgstr "Impostos faltando!" + +#, python-format +#~ msgid "Closing of fiscal year cancelled, please check the box !" +#~ msgstr "Fechamento do ano fiscal cancelado, por favor marque a caixa." + +#, python-format +#~ msgid "No piece number !" +#~ msgstr "Nenhum número da parte!" + +#, python-format +#~ msgid "Closing of states cancelled, please check the box !" +#~ msgstr "Fechamento dos estados cancelado, por favor marque a caixa!" + +#, python-format +#~ msgid "You have to define an analytic journal on the '%s' journal!" +#~ msgstr "Você deve definir um diário analítico no '%s' de diário!" + +#, python-format +#~ msgid "" +#~ "Specified Journal does not have any account move entries in draft state for " +#~ "this period" +#~ msgstr "" +#~ "O diário especificado não tem nenhuma entrada do movimento da conta no " +#~ "estado do esboço para este período" + +#, python-format +#~ msgid "Account move line \"%s\" is not valid" +#~ msgstr "Linha \" %s\" do movimento da conta é inválido" + +#, python-format +#~ msgid "You have to provide an account for the write off entry !" +#~ msgstr "Você tem que fornecer uma conta para a amortizar lançamento!" + +#, python-format +#~ msgid "Warning !" +#~ msgstr "Mensagem !" + +#, python-format +#~ msgid "You can not delete posted movement: \"%s\"!" +#~ msgstr "Você não pode excluir o movimento: \"% s\"!" + +#, python-format +#~ msgid "No analytic journal !" +#~ msgstr "Nenhum diário analítico !" + +#, python-format +#~ msgid "You can not use this general account in this journal !" +#~ msgstr "You can not use this general account in this journal !" + +#, python-format +#~ msgid "You can not add/modify entries in a closed journal." +#~ msgstr "Você não pode incluir/modificar as lançamentos em um diário fechado." + +#, python-format +#~ msgid "" +#~ "You can not do this modification on a reconciled entry ! Please note that " +#~ "you can just change some non important fields !" +#~ msgstr "" +#~ "Você não pode fazer uma modificação em lançamentos conciliados! Observe que " +#~ "você pode simplesmente mudar alguns campos sem importância!" + +#, python-format +#~ msgid "You must first select a partner !" +#~ msgstr "Voce precisa selecionar um parceiro primeiro !" #~ msgid "account.config.wizard" #~ msgstr "account.config.wizard" + +#, python-format +#~ msgid "" +#~ "The expected balance (%.2f) is different than the computed one. (%.2f)" +#~ msgstr "O balanço esperado (%.2f) é diferente do calculado. (%.2f)" + +#, python-format +#~ msgid "" +#~ "You can not do this modification on a confirmed entry ! Please note that you " +#~ "can just change some non important fields !" +#~ msgstr "" +#~ "Voce não pode modificar um lançamento confirmado ! Voce pode apenas trocar " +#~ "alguns campos sem importância !" + +#, python-format +#~ msgid "No Partner Defined !" +#~ msgstr "Número do parceiro definido !" + +#, python-format +#~ msgid "Entries are not of the same account or already reconciled ! " +#~ msgstr "Lançamentos não são das mesmas contas ou já estão conciliados ! " + +#, python-format +#~ msgid "Invalid action !" +#~ msgstr "Ação invalida !" + +#, python-format +#~ msgid "Some entries are already reconciled !" +#~ msgstr "Alguns lançamentos já estão conciliados !" + +#, python-format +#~ msgid "Already Reconciled" +#~ msgstr "Já conciliado" + +#, python-format +#~ msgid "Entries: " +#~ msgstr "Lancamentos: " + +#, python-format +#~ msgid "Error !" +#~ msgstr "Erro !" + +#, python-format +#~ msgid "UserError" +#~ msgstr "Erro de usuário" + +#, python-format +#~ msgid "Warning" +#~ msgstr "Mensagem" + +#, python-format +#~ msgid "You can not use an inactive account!" +#~ msgstr "Voce não pode usar uma conta inativa!" + +#, python-format +#~ msgid "Entry is already reconciled" +#~ msgstr "Lançamentos estão conciliados" + +#, python-format +#~ msgid "This period is already closed !" +#~ msgstr "Este período já está fechado" + +#, python-format +#~ msgid "" +#~ "Selected Move lines does not have any account move enties in draft state" +#~ msgstr "" +#~ "As linhas do movimento selecionado nao tem nenhuma conta a ser movida para o " +#~ "estado de esboço" + +#, python-format +#~ msgid "Bad account !" +#~ msgstr "Conta errada!" + +#, python-format +#~ msgid "Error" +#~ msgstr "Erro" + +#, python-format +#~ msgid "Your journal must have a default credit and debit account." +#~ msgstr "Seu diário precisa ter uma conta de crédito e débito padrão." + +#, python-format +#~ msgid "No Period found on Invoice!" +#~ msgstr "Nenhum período encontrado na fatura!" + +#, python-format +#~ msgid "No journal for ending writing has been defined for the fiscal year" +#~ msgstr "Nenhum diário para escrituração foi definido para o ano fiscal" + +#, python-format +#~ msgid "No period found !" +#~ msgstr "Nenhum período encontrado !" + +#, python-format +#~ msgid "No Data Available" +#~ msgstr "Nenhum dado disponível" + +#, python-format +#~ msgid "Cannot delete invoice(s) that are already opened or paid !" +#~ msgstr "Impossível excluir fatura(s) que já foram abertas ou pagas!" + +#, python-format +#~ msgid "Unable to find a valid period !" +#~ msgstr "Não foi possível encontrar um período válido!" + +#, python-format +#~ msgid "No records found for your selection!" +#~ msgstr "Nenhum registro encontrado para sua seleção" + +#, python-format +#~ msgid "You can not change the tax, you should remove and recreate lines !" +#~ msgstr "" +#~ "Você não pode alterar o imposto, ao invés disso remova e recrie as linhas!" + +#, python-format +#~ msgid "Date to must be set between %s and %s" +#~ msgstr "Data deve ser definida entre %s e %s" + +#, python-format +#~ msgid "Global taxes defined, but are not in invoice lines !" +#~ msgstr "" +#~ "As taxas globais estão definidas, mas não estão nas linhas da fatura!" + +#, python-format +#~ msgid "Data Insufficient !" +#~ msgstr "Dados insuficientes!" + +#, python-format +#~ msgid "Invoice is already reconciled" +#~ msgstr "Fatura já está reconciliada" + +#, python-format +#~ msgid "You must enter a period length that cannot be 0 or below !" +#~ msgstr "Você deve digitar um período que não seja 0 ou menor !" + +#, python-format +#~ msgid "The opening journal must not have any entry in the new fiscal year !" +#~ msgstr "" +#~ "O diário de abertura não deve ter nenhum lançamento no novo ano fiscal !" + +#, python-format +#~ msgid "You must select accounts to reconcile" +#~ msgstr "Você deve selecionar as contas para reconciliar" + +#, python-format +#~ msgid "Cannot create invoice move on centralised journal" +#~ msgstr "Não é possível criar um movimento de fatura no diário centralizado" + +#, python-format +#~ msgid "Entry \"%s\" is not valid !" +#~ msgstr "Lançamento \"%s\" não é válido" + +#, python-format +#~ msgid "Unable to reconcile entry \"%s\": %.2f" +#~ msgstr "Incapaz reconciliar lançamento \"% s \": %.2f" + +#, python-format +#~ msgid "The account entries lines are not in valid state." +#~ msgstr "As linhas de lançamentos de conta não estão em formato válido." + +#, python-format +#~ msgid "You can not modify/delete a journal with entries for this period !" +#~ msgstr "" +#~ "Você não pode modificar/apagar um diário com lançamentos para esse período !" + +#, python-format +#~ msgid "Can not %s draft/proforma/cancel invoice." +#~ msgstr "Não pode %s provisório/proforma/cancelar fatura." + +#, python-format +#~ msgid "Can not pay draft/proforma/cancel invoice." +#~ msgstr "Não se pode pagar uma fatura provisória/proforma/cancelada" + +#, python-format +#~ msgid "You must define an analytic journal of type '%s' !" +#~ msgstr "Você tem que definir um diário analítico '%s' !" + +#, python-format +#~ msgid "Unable to change tax !" +#~ msgstr "Não foi possível alterar o imposto!" diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 03e4b844b36..ef056e454a9 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -219,7 +219,7 @@ class account_invoice(osv.osv): _name = "account.invoice" _description = 'Invoice' - _order = "number" + _order = "id" _columns = { 'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}), @@ -231,7 +231,8 @@ class account_invoice(osv.osv): ('in_refund','Supplier Refund'), ],'Type', readonly=True, select=True, change_default=True), - 'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."), + 'number': fields.related('move_id','name', type='char', readonly=True, size=64, relation='account.move', store=True, string='Number'), + #'number': fields.char('Invoice Number', size=32, readonly=True, help="Unique number of the invoice, computed automatically when the invoice is created."), 'reference': fields.char('Invoice Reference', size=64, help="The partner reference of this invoice."), 'reference_type': fields.selection(_get_reference_type, 'Reference Type', required=True, readonly=True, states={'draft':[('readonly',False)]}), @@ -768,8 +769,8 @@ class account_invoice(osv.osv): cur_obj = self.pool.get('res.currency') context = {} for inv in self.browse(cr, uid, ids): - if not inv.journal_id.invoice_sequence_id: - raise osv.except_osv(_('Error !'), _('Please define invoice sequence on invoice journal')) + if not inv.journal_id.sequence_id: + raise osv.except_osv(_('Error !'), _('Please define sequence on invoice journal')) if not inv.invoice_line: raise osv.except_osv(_('No Invoice Lines !'), _('Please create some invoice lines.')) if inv.move_id: @@ -875,7 +876,14 @@ class account_invoice(osv.osv): line = self.finalize_invoice_move_lines(cr, uid, inv, line) - move = {'ref': inv.number, 'line_id': line, 'journal_id': journal_id, 'date': date, 'type': entry_type} + move = { + 'ref': inv.number, + 'line_id': line, + 'journal_id': journal_id, + 'date': date, + 'type': entry_type, + 'narration':inv.comment + } period_id=inv.period_id and inv.period_id.id or False if not period_id: period_ids= self.pool.get('account.period').search(cr, uid, [('date_start','<=',inv.date_invoice or time.strftime('%Y-%m-%d')),('date_stop','>=',inv.date_invoice or time.strftime('%Y-%m-%d'))]) @@ -919,44 +927,32 @@ class account_invoice(osv.osv): } def action_number(self, cr, uid, ids, *args): + #TODO: not correct fix but required a frech values before reading it. + self.write(cr, uid, ids, {}) + for obj_inv in self.browse(cr, uid, ids): id = obj_inv.id invtype = obj_inv.type number = obj_inv.number move_id = obj_inv.move_id and obj_inv.move_id.id or False reference = obj_inv.reference or '' - if not number: - tmp_context = { - 'fiscalyear_id': obj_inv.period_id.fiscalyear_id.id - } - if obj_inv.journal_id.invoice_sequence_id: - sequence_id = obj_inv.journal_id.invoice_sequence_id.id - number = self.pool.get('ir.sequence').get_id(cr, uid, - sequence_id, - 'id', - context=tmp_context) - else: - number = self.pool.get('ir.sequence').get_id(cr, uid, - 'account.invoice.%s' % invtype, - 'code', - context=tmp_context) - if invtype in ('in_invoice', 'in_refund'): - ref = reference - else: - ref = self._convert_ref(cr, uid, number) - cr.execute('UPDATE account_invoice SET number=%s ' \ - 'WHERE id=%s', (number, id)) - cr.execute('UPDATE account_move SET ref=%s ' \ - 'WHERE id=%s AND (ref is null OR ref = \'\')', + + if invtype in ('in_invoice', 'in_refund'): + ref = reference + else: + ref = self._convert_ref(cr, uid, number) + + cr.execute('UPDATE account_move SET ref=%s ' \ + 'WHERE id=%s AND (ref is null OR ref = \'\')', + (ref, move_id)) + cr.execute('UPDATE account_move_line SET ref=%s ' \ + 'WHERE move_id=%s AND (ref is null OR ref = \'\')', + (ref, move_id)) + cr.execute('UPDATE account_analytic_line SET ref=%s ' \ + 'FROM account_move_line ' \ + 'WHERE account_move_line.move_id = %s ' \ + 'AND account_analytic_line.move_id = account_move_line.id', (ref, move_id)) - cr.execute('UPDATE account_move_line SET ref=%s ' \ - 'WHERE move_id=%s AND (ref is null OR ref = \'\')', - (ref, move_id)) - cr.execute('UPDATE account_analytic_line SET ref=%s ' \ - 'FROM account_move_line ' \ - 'WHERE account_move_line.move_id = %s ' \ - 'AND account_analytic_line.move_id = account_move_line.id', - (ref, move_id)) for inv_id, name in self.name_get(cr, uid, [id]): message = _('Invoice ') + " '" + name + "' "+ _("is validated.") self.log(cr, uid, inv_id, message) diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml index 98fcb8fa370..da1cb8f8fa7 100644 --- a/addons/account/project/analytic_account_demo.xml +++ b/addons/account/project/analytic_account_demo.xml @@ -2,7 +2,7 @@ - Analytic Chart + 0 diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index f49e90b99a6..d4d5050e5bb 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -23,25 +23,25 @@ account.analytic.account search - - - - - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + + + @@ -54,17 +54,17 @@ - - - - - - - - - - + + + + + + + + + + @@ -109,13 +109,13 @@ form tree,graph,form - {"search_default_user_id":uid} + {"search_default_user_id":uid} - + Accounts to Renew ir.actions.act_window account.analytic.account @@ -141,7 +141,7 @@ - @@ -200,22 +200,26 @@ account.analytic.line search - - + + - + - - - - - - - - - + + + + + + + + + + + + + @@ -298,16 +302,16 @@ - + account.analytic.journal.search account.analytic.journal search - - + + - + @@ -446,14 +450,14 @@ search - - - - - - - - + + + + + + + + diff --git a/addons/account/report/report_balance_sheet.rml b/addons/account/report/report_balance_sheet.rml index c540e16f58e..20f52cdd2f2 100644 --- a/addons/account/report/report_balance_sheet.rml +++ b/addons/account/report/report_balance_sheet.rml @@ -186,7 +186,7 @@ [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]] @@ -196,7 +196,7 @@ Balance:([[ get_currency(data['form']) ]]) - [[ sum_dr() and formatLang(sum_dr()) or 0.0 ]] + [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]] @@ -221,10 +221,10 @@ [[ repeatIn(get_lines_another('asset'), 'a') ]][[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]] - [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]] + [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]] @@ -234,7 +234,7 @@ Balance:([[ get_currency(data['form']) ]]) - [[ sum_cr() and formatLang(sum_cr()) or 0.0 ]] + [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]] diff --git a/addons/account/report/report_balance_sheet_horizontal.rml b/addons/account/report/report_balance_sheet_horizontal.rml index d9b92da3856..3e60f7bfd2c 100644 --- a/addons/account/report/report_balance_sheet_horizontal.rml +++ b/addons/account/report/report_balance_sheet_horizontal.rml @@ -197,7 +197,7 @@ [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name'] ]] - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['code1'] ]] @@ -206,7 +206,7 @@ [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) ]][[ a['name1'] ]] - [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] + [[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]] @@ -216,13 +216,13 @@ Balance:([[ get_currency(data['form']) ]]) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] + [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]] Balance:([[ get_currency(data['form']) ]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] + [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]] diff --git a/addons/account/report/report_bs.py b/addons/account/report/report_bs.py index 5a7294338c5..04fafd7ed30 100644 --- a/addons/account/report/report_bs.py +++ b/addons/account/report/report_bs.py @@ -37,6 +37,7 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): self.result_temp=[] self.localcontext.update({ 'time': time, + 'get_abs' : self.get_abs, 'get_lines' : self.get_lines, 'get_lines_another' : self.get_lines_another, 'get_company': self.get_company, @@ -48,6 +49,9 @@ class report_balancesheet_horizontal(rml_parse.rml_parse): }) self.context = context + + def get_abs(self,amount): + return abs(amount) def sum_dr(self): if self.res_pl['type'] == 'Net Profit': diff --git a/addons/account/report/report_pl.py b/addons/account/report/report_pl.py index c693b9940c9..e78639cff83 100644 --- a/addons/account/report/report_pl.py +++ b/addons/account/report/report_pl.py @@ -35,6 +35,7 @@ class report_pl_account_horizontal(rml_parse.rml_parse): self.result_temp=[] self.localcontext.update( { 'time': time, + 'get_abs' : self.get_abs, 'get_lines' : self.get_lines, 'get_lines_another' : self.get_lines_another, 'get_company': self.get_company, @@ -45,7 +46,10 @@ class report_pl_account_horizontal(rml_parse.rml_parse): 'final_result' : self.final_result, }) self.context = context - + + def get_abs(self,amount): + return abs(amount) + def final_result(self): return self.res_pl diff --git a/addons/account/report/report_pl_account.rml b/addons/account/report/report_pl_account.rml index 6e72a198115..80aa4b97701 100644 --- a/addons/account/report/report_pl_account.rml +++ b/addons/account/report/report_pl_account.rml @@ -201,7 +201,7 @@ - [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] + [[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]] @@ -214,7 +214,7 @@ [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]] @@ -224,7 +224,7 @@ Total:([[ get_currency(data['form']) ]]) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] + [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]] @@ -256,7 +256,7 @@ - [[ a.balance and formatLang(abs(a.balance)) or 0.0 ]] + [[ a.balance and formatLang(get_abs(a.balance)) or 0.0 ]] @@ -269,7 +269,7 @@ [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or removeParentNode('blockTable') ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]] @@ -279,7 +279,7 @@ Total:([[ get_currency(data['form']) ]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] + [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]] diff --git a/addons/account/report/report_pl_account_horizontal.rml b/addons/account/report/report_pl_account_horizontal.rml index b68d375d3be..35e4ff47268 100644 --- a/addons/account/report/report_pl_account_horizontal.rml +++ b/addons/account/report/report_pl_account_horizontal.rml @@ -214,7 +214,7 @@ - [[ a['balance'] and formatLang(abs(a['balance'])) or 0.0 ]] + [[ a['balance'] and formatLang(get_abs(a['balance'])) or 0.0 ]] @@ -227,7 +227,7 @@ - [[ a['balance1'] and formatLang(abs(a['balance1'])) or 0.0 ]] + [[ a['balance1'] and formatLang(get_abs(a['balance1'])) or 0.0 ]] @@ -240,7 +240,7 @@ [[ final_result()['type'] == 'Net Profit C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Profit C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]] @@ -249,7 +249,7 @@ [[ final_result()['type'] == 'Net Loss C.F.B.L.' and final_result()['type'] or '' ]] - [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(abs(final_result()['balance'])) or 0.0 ]] + [[ final_result()['balance'] and final_result()['type'] == 'Net Loss C.F.B.L.' and formatLang(get_abs(final_result()['balance'])) or 0.0 ]] @@ -260,13 +260,13 @@ Total:([[ get_currency(data['form']) ]]) - [[ sum_dr() and formatLang(abs(sum_dr())) or 0.0 ]] + [[ sum_dr() and formatLang(get_abs(sum_dr())) or 0.0 ]] Total:([[ get_currency(data['form']) ]]) - [[ sum_cr() and formatLang(abs(sum_cr())) or 0.0 ]] + [[ sum_cr() and formatLang(get_abs(sum_cr())) or 0.0 ]] diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index 63c096d0215..42a4720efd9 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -62,6 +62,7 @@ "access_account_fiscalyear","account.fiscalyear","model_account_fiscalyear","account.group_account_manager",1,1,1,1 "access_account_fiscalyear_user","account.fiscalyear.user","model_account_fiscalyear","account.group_account_user",1,0,0,0 "access_account_fiscalyear_invoice","account.fiscalyear.invoice","model_account_fiscalyear","account.group_account_invoice",1,0,0,0 +"access_account_fiscalyear_partner_manager","account.fiscalyear.partnermanager","model_account_fiscalyear","base.group_partner_manager",1,0,0,0 "access_res_currency_account_manager","res.currency account manager","base.model_res_currency","group_account_manager",1,1,1,1 "access_res_currency_rate_account_manager","res.currency.rate account manager","base.model_res_currency_rate","group_account_manager",1,1,1,1 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0 diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py index 1dea8e8d4f3..3f6bd126251 100644 --- a/addons/account/wizard/__init__.py +++ b/addons/account/wizard/__init__.py @@ -45,7 +45,9 @@ import account_open_closed_fiscalyear import account_compare_account_balance_report import account_invoice_state import account_chart -import account_move_line_select +#TODO: remove this file no moe used +# also remove related view fiel +#import account_move_line_select import account_validate_account_move import account_use_model diff --git a/addons/account/wizard/account_bs_report.py b/addons/account/wizard/account_bs_report.py index 27c50b4b880..dfd035680f2 100644 --- a/addons/account/wizard/account_bs_report.py +++ b/addons/account/wizard/account_bs_report.py @@ -114,14 +114,12 @@ class account_bs_report(osv.osv_memory): 'type': 'ir.actions.report.xml', 'report_name': 'account.balancesheet.horizontal', 'datas': data, - 'nodestroy':True, } else: return { 'type': 'ir.actions.report.xml', 'report_name': 'account.balancesheet', 'datas': data, - 'nodestroy':True, } def _check_date(self, cr, uid, data, context=None): diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml index bf3831baea0..8c462318271 100644 --- a/addons/account/wizard/account_move_line_select_view.xml +++ b/addons/account/wizard/account_move_line_select_view.xml @@ -7,12 +7,12 @@ account.move.line.select form -
-