diff --git a/addons/account/account.py b/addons/account/account.py index 467619fce0f..b2a4589b9cb 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -29,6 +29,8 @@ import pooler from osv import fields, osv import decimal_precision as dp from tools.translate import _ +from tools.float_utils import float_round + _logger = logging.getLogger(__name__) def check_cycle(self, cr, uid, ids, context=None): @@ -313,8 +315,8 @@ class account_account(osv.osv): cr.execute(request, params) _logger.debug('Status: %s',(cr.statusmessage)) - for res in cr.dictfetchall(): - accounts[res['id']] = res + for row in cr.dictfetchall(): + accounts[row['id']] = row # consolidate accounts with direct children children_and_consolidated.reverse() @@ -2090,7 +2092,7 @@ class account_tax(osv.osv): tax_compute_precision = precision if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally': tax_compute_precision += 5 - totalin = totalex = round(price_unit * quantity, precision) + totalin = totalex = float_round(price_unit * quantity, precision) tin = [] tex = [] for tax in taxes: diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 57832b48246..a5141cd6b3f 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -32,7 +32,7 @@ class account_cashbox_line(osv.osv): _name = 'account.cashbox.line' _description = 'CashBox Line' - _rec_name = 'number' + _rec_name = 'pieces' def _sub_total(self, cr, uid, ids, name, arg, context=None): @@ -332,7 +332,7 @@ account_journal() class account_journal_cashbox_line(osv.osv): _name = 'account.journal.cashbox.line' - _rec_name = 'value' + _rec_name = 'pieces' _columns = { 'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')), 'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1), diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 1296d5c718a..f1a8c82b382 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -196,7 +196,7 @@ - + @@ -344,7 +344,22 @@ - + + + + + + + + + + + + +
@@ -427,32 +442,22 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1e1f7b91851..26e66c66281 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -63,15 +63,10 @@ search - - - - - - - - - + + + + @@ -146,11 +141,8 @@ search - - - - - + + @@ -217,18 +209,12 @@ search - - - - - - - - - + + + + - @@ -440,21 +426,15 @@ search - - - - - - - - + + @@ -542,22 +522,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -587,22 +560,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -833,7 +799,7 @@ - + @@ -916,10 +882,8 @@ search - - - - + + @@ -1195,38 +1159,26 @@ search - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - @@ -1444,27 +1396,19 @@ search - - - - - - - - - - - - - - - + + + + + + + + + - - @@ -1673,16 +1617,11 @@ search - - - - - - - - - - + + + + + @@ -1852,17 +1791,11 @@ search - - - - - - - - - - - + + + + + @@ -2119,17 +2052,12 @@ search - - - - - - - - - - - + + + + + + @@ -2188,20 +2116,14 @@ search - - - - - - - + + + - - @@ -2310,14 +2232,10 @@ search - - - - - - - - + + + + @@ -2353,11 +2271,8 @@ search - - - - - + + @@ -2601,7 +2516,7 @@ action = pool.get('res.config').next(cr, uid, [], context)

- + @@ -2789,16 +2704,11 @@ action = pool.get('res.config').next(cr, uid, [], context) search - - - - - - - + + + - diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index 7eff1938061..14beb1f5d65 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -10,15 +10,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2011-12-31 16:16+0000\n" -"Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) " -"\n" +"PO-Revision-Date: 2012-07-30 03:26+0000\n" +"Last-Translator: Cristian Salamea (Gnuthink) \n" "Language-Team: Spanish (Ecuador) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. module: account #: view:account.invoice.report:0 @@ -446,7 +445,7 @@ msgstr "Total crédito" #. module: account #: view:account.move.line.unreconcile.select:0 msgid "Open for Unreconciliation" -msgstr "" +msgstr "Abrir para romper conciliación" #. module: account #: field:account.account.template,chart_template_id:0 @@ -1612,7 +1611,7 @@ msgstr "Base Imponible" #. module: account #: view:account.partner.reconcile.process:0 msgid "Go to Next Partner" -msgstr "" +msgstr "Ir a la siguiente empresa" #. module: account #: view:account.bank.statement:0 @@ -2859,7 +2858,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_tax_code_list #: model:ir.ui.menu,name:account.menu_action_tax_code_list msgid "Tax Codes" -msgstr "" +msgstr "Códigos de impuestos" #. module: account #: view:account.account:0 @@ -3229,7 +3228,7 @@ msgstr "Plantillas para el plan contable" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart msgid "Set Your Accounting Options" -msgstr "" +msgstr "Configurar tu Contabilidad" #. module: account #: view:report.account.sales:0 @@ -4405,7 +4404,7 @@ msgstr "Reconcile Writeoff" #. module: account #: view:report.account.receivable:0 msgid "Accounts by Type" -msgstr "" +msgstr "Cuentas por tipo" #. module: account #: view:account.bank.statement:0 @@ -4447,7 +4446,7 @@ msgstr "res_config_contents" #. module: account #: view:account.unreconcile:0 msgid "Unreconciliate Transactions" -msgstr "" +msgstr "Transacciones no conciliadas" #. module: account #: help:account.chart.template,visible:0 @@ -4650,7 +4649,7 @@ msgstr "Fecha de realizacion" #. module: account #: view:account.unreconcile.reconcile:0 msgid "Unreconciliation Transactions" -msgstr "" +msgstr "Desconcialiación de Transacciones" #. module: account #: field:account.tax,ref_tax_code_id:0 @@ -4785,7 +4784,7 @@ msgstr "Pagado" #. module: account #: view:account.period.close:0 msgid "Are you sure?" -msgstr "" +msgstr "¿Está Seguro?" #. module: account #: help:account.move.line,statement_id:0 @@ -5183,7 +5182,7 @@ msgstr "Cuenta impuesto" #. module: account #: view:account.automatic.reconcile:0 msgid "Reconciliation Result" -msgstr "" +msgstr "Resultado de conciliación" #. module: account #: model:account.financial.report,name:account.account_financial_report_balancesheet0 @@ -6173,7 +6172,7 @@ msgstr "Impuesto de venta(%)" #. module: account #: view:account.addtmpl.wizard:0 msgid "Create an Account Based on this Template" -msgstr "" +msgstr "Crear una cuenta basada en esta plantilla" #. module: account #: view:account.account.type:0 diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po index 770abf9dce5..6a19e582ed3 100644 --- a/addons/account/i18n/nl_BE.po +++ b/addons/account/i18n/nl_BE.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2010-07-22 16:28+0000\n" -"Last-Translator: Niels Huylebroeck \n" +"PO-Revision-Date: 2012-07-27 12:48+0000\n" +"Last-Translator: Els Van Vossel (Agaplan) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:58+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-28 04:57+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: account #: view:account.invoice.report:0 @@ -444,7 +444,7 @@ msgstr "Totaal credit" #. module: account #: view:account.move.line.unreconcile.select:0 msgid "Open for Unreconciliation" -msgstr "" +msgstr "Afpunting ongedaan maken" #. module: account #: field:account.account.template,chart_template_id:0 @@ -1611,7 +1611,7 @@ msgstr "Onbelast" #. module: account #: view:account.partner.reconcile.process:0 msgid "Go to Next Partner" -msgstr "" +msgstr "Naar volgende relatie" #. module: account #: view:account.bank.statement:0 @@ -2854,7 +2854,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_tax_code_list #: model:ir.ui.menu,name:account.menu_action_tax_code_list msgid "Tax Codes" -msgstr "" +msgstr "Btw-codes" #. module: account #: view:account.account:0 @@ -3226,7 +3226,7 @@ msgstr "Sjablonen boekhoudplan" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart msgid "Set Your Accounting Options" -msgstr "" +msgstr "Stel uw boekhouding in" #. module: account #: view:report.account.sales:0 @@ -4402,7 +4402,7 @@ msgstr "Afpunten met afschrijving" #. module: account #: view:report.account.receivable:0 msgid "Accounts by Type" -msgstr "" +msgstr "Rekeningen per type" #. module: account #: view:account.bank.statement:0 @@ -4444,7 +4444,7 @@ msgstr "res_config_contents" #. module: account #: view:account.unreconcile:0 msgid "Unreconciliate Transactions" -msgstr "" +msgstr "Afpuntingen ongedaan maken" #. module: account #: help:account.chart.template,visible:0 @@ -4645,7 +4645,7 @@ msgstr "Bewerkingsdatum" #. module: account #: view:account.unreconcile.reconcile:0 msgid "Unreconciliation Transactions" -msgstr "" +msgstr "Afpuntingen ongedaan maken" #. module: account #: field:account.tax,ref_tax_code_id:0 @@ -4780,7 +4780,7 @@ msgstr "Betaald" #. module: account #: view:account.period.close:0 msgid "Are you sure?" -msgstr "" +msgstr "Bent u zeker?" #. module: account #: help:account.move.line,statement_id:0 @@ -5177,7 +5177,7 @@ msgstr "Btw-rekening" #. module: account #: view:account.automatic.reconcile:0 msgid "Reconciliation Result" -msgstr "" +msgstr "Afpuntresultaat" #. module: account #: model:account.financial.report,name:account.account_financial_report_balancesheet0 @@ -6169,7 +6169,7 @@ msgstr "Verkoop-btw (%)" #. module: account #: view:account.addtmpl.wizard:0 msgid "Create an Account Based on this Template" -msgstr "" +msgstr "Maak een rekening op basis van deze sjabloon" #. module: account #: view:account.account.type:0 @@ -7310,7 +7310,7 @@ msgstr "Hoofdrekeningsjabloon" #. module: account #: model:ir.actions.act_window,name:account.action_account_configuration_installer msgid "Configure your Chart of Accounts" -msgstr "" +msgstr "Installeer uw boekhoudplan" #. module: account #: view:account.bank.statement:0 @@ -8205,7 +8205,7 @@ msgstr "Omgekeerde analytische balans -" #. module: account #: view:account.move.bank.reconcile:0 msgid "Open for Bank Reconciliation" -msgstr "" +msgstr "Bank afpunten" #. module: account #: view:account.analytic.line:0 @@ -8394,7 +8394,7 @@ msgstr "" #. module: account #: view:account.tax.template:0 msgid "Compute Code for Taxes Included Prices" -msgstr "" +msgstr "Bereken code voor prijzen inclusief btw" #. module: account #: code:addons/account/account_invoice.py:1030 @@ -9071,7 +9071,7 @@ msgstr "Verkopen van dit jaar per type" #. module: account #: view:account.analytic.cost.ledger.journal.report:0 msgid "Cost Ledger for Period" -msgstr "" +msgstr "Analytisch dagboek voor periode" #. module: account #: help:account.tax,child_depend:0 @@ -9539,7 +9539,7 @@ msgstr "U moet een bankrekening instellen in het afpuntjournaal." #. module: account #: view:account.move.line.reconcile:0 msgid "Reconciliation Transactions" -msgstr "" +msgstr "Afpunttransacties" #. module: account #: model:ir.actions.act_window,name:account.action_account_common_menu @@ -9644,7 +9644,7 @@ msgstr "Vervaldatum" #. module: account #: view:account.move.journal:0 msgid "Standard Entries" -msgstr "" +msgstr "Standaardboekingen" #. module: account #: help:account.journal,type:0 @@ -10598,7 +10598,7 @@ msgstr "" #. module: account #: view:account.payment.term:0 msgid "Description on Invoices" -msgstr "" +msgstr "Omschrijving op facturen" #. module: account #: model:ir.model,name:account.model_account_analytic_chart diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 48b27e67be2..885a88d84c4 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-06-20 16:26+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-07-28 14:05+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:57+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: account #: view:account.invoice.report:0 @@ -3235,7 +3235,7 @@ msgstr "Modelo de plano de contas" #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart msgid "Set Your Accounting Options" -msgstr "" +msgstr "Defina suas opções Contábeis" #. module: account #: view:report.account.sales:0 @@ -4222,6 +4222,10 @@ msgid "" "some non legal fields or you must unconfirm the journal entry first! \n" "%s" msgstr "" +"Você não pode fazer essa modificação em uma entrada confirmada! Você pode " +"apenas mudar alguns campos não legais ou você deve primeiro desconfirmar a " +"entrada de diário em primeiro lugar\" \n" +"%s" #. module: account #: field:res.company,paypal_account:0 @@ -4472,6 +4476,10 @@ msgid "" "you want to generate accounts of this template only when loading its child " "template." msgstr "" +"Marque como False se você não quer que este template seja usado no " +"configurador que gera o Plano de Contas dos modelos, isto é útil quando você " +"deseja criar as contas desse modelo somente quando for carregar os modelos " +"filhos." #. module: account #: view:account.use.model:0 @@ -4816,6 +4824,9 @@ msgid "" "You can not define children to an account with internal type different of " "\"View\"! " msgstr "" +"Erro de configuração!\n" +"Você não pode definir um filho a uma conta com tipo interno diferente de " +"\"Visualização\"! " #. module: account #: code:addons/account/account.py:923 @@ -5120,6 +5131,10 @@ msgid "" "encode the sale and purchase rates or choose from list of taxes. This last " "choice assumes that the set of tax defined on this template is complete" msgstr "" +"Esta lógica ajuda você a escolher se você quer propor para o usuário " +"codificar as taxas de compra e venda ou escolher de um conjunto de impostos. " +" Esta última escolha pressupõe que o conjunto de imposto definido para o " +"modelo escolhido está completa" #. module: account #: view:account.financial.report:0 @@ -5748,7 +5763,7 @@ msgstr "Sub-contas" #: code:addons/account/account_move_line.py:1214 #, python-format msgid "Move name (id): %s (%s)" -msgstr "" +msgstr "Mova nome (id) %s (%s)" #. module: account #: view:account.move.line.reconcile:0 @@ -6091,6 +6106,9 @@ msgid "" "You can not define children to an account with internal type different of " "\"View\"! " msgstr "" +"Erro de configuração!\n" +"Você não pode definir um filho a uma conta com tipo interno diferente de " +"\"Visualização\"! " #. module: account #: help:res.partner.bank,journal_id:0 @@ -6211,6 +6229,10 @@ msgid "" "choice assumes that the set of tax defined for the chosen template is " "complete" msgstr "" +"Este logica ajuda você a escolher se você quer propor ao usuário para " +"codificar as vendas e as taxas de compra ou use os campos usuais m2o. Esta " +"última escolha pressupõe que o conjunto de imposto definido para o modelo " +"escolhido está completa" #. module: account #: report:account.vat.declaration:0 @@ -6230,7 +6252,7 @@ msgstr "Faturas em Aberto e Pagos" #. module: account #: selection:account.financial.report,display_detail:0 msgid "Display children flat" -msgstr "" +msgstr "Mostrar plano filho" #. module: account #: code:addons/account/account.py:629 @@ -6662,7 +6684,7 @@ msgstr "Criar lançamentos recorrentes manuais no diário escolhido." #. module: account #: help:res.partner.bank,currency_id:0 msgid "Currency of the related account journal." -msgstr "" +msgstr "Moeda da conta do diário relacionada." #. module: account #: code:addons/account/account.py:1563 @@ -6787,7 +6809,7 @@ msgstr "Criar lançamento" #: code:addons/account/account.py:182 #, python-format msgid "Profit & Loss (Expense account)" -msgstr "" +msgstr "Ganhos e perdas (conta de Despesa)" #. module: account #: code:addons/account/account.py:622 @@ -6914,6 +6936,9 @@ msgid "" "some non legal fields or you must unreconcile first!\n" "%s" msgstr "" +"Você não pode fazer essa modificação em uma entrada reconciliada! Você pode " +"apenas mudar alguns campos não legais ou você deve desconciliar primeiro!\n" +"%s" #. module: account #: report:account.general.ledger:0 @@ -7054,6 +7079,9 @@ msgid "" "Please define BIC/Swift code on bank for bank type IBAN Account to make " "valid payments" msgstr "" +"\n" +"Por favor defina o BIC/Swift code no Banco para o tipo de conta IBAN para " +"fazer pagamentos válidos" #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -7186,7 +7214,7 @@ msgstr "Documento de Origem" #: code:addons/account/account.py:1432 #, python-format msgid "You can not delete a posted journal entry \"%s\"!" -msgstr "" +msgstr "Você não pode excluir um lançamento do diário publicado \"%s\"!" #. module: account #: selection:account.partner.ledger,filter:0 @@ -7360,7 +7388,7 @@ msgstr "Entradas Postadas" #. module: account #: help:account.payment.term.line,value_amount:0 msgid "For percent enter a ratio between 0-1." -msgstr "" +msgstr "Para porcentagem introduzir um razão entre 0-1." #. module: account #: report:account.invoice:0 @@ -7590,7 +7618,7 @@ msgstr "Os prazos para gerar entradas de abertura não foram encontrados" #. module: account #: model:account.account.type,name:account.data_account_type_view msgid "Root/View" -msgstr "" +msgstr "Origem/Visualização" #. module: account #: code:addons/account/account.py:3121 @@ -7660,7 +7688,7 @@ msgstr "Multi-Moedas" #. module: account #: field:account.model.line,date_maturity:0 msgid "Maturity Date" -msgstr "" +msgstr "Data de Vencimento" #. module: account #: code:addons/account/account_move_line.py:1302 @@ -7706,6 +7734,11 @@ msgid "" "few new accounts (You don't need to define the whole structure that is " "common to both several times)." msgstr "" +"Este campo opcional te permite criar um link para um modelo específico de " +"plano de contas que pode ser diferente do que o superior pertence. Isto " +"permite a você definir o plano de contas que amplia e completa com algumas " +"novas contas (você não precisa definir toda uma estrutura que é comum aos " +"dois várias vezes)." #. module: account #: view:account.move:0 @@ -7758,6 +7791,7 @@ msgstr "Cancelar Faturas Selecionadas" msgid "" "This field is used to generate legal reports: profit and loss, balance sheet." msgstr "" +"Este campo é usado para gerar relatórios legais: de lucros e perdas, balanço." #. module: account #: model:ir.actions.act_window,help:account.action_review_payment_terms_installer @@ -7767,6 +7801,10 @@ msgid "" "terms for each letter. Each customer or supplier can be assigned to one of " "these payment terms." msgstr "" +"Termos de pagamento define as condições para pagamento de um cliente ou " +"fornecedor em um ou mais pagamentos. Lembretes periódicos irão usar os " +"termos de pagamento em cada aviso. Cada cliente ou fornecedor pode ser " +"associado para um desses termos de pagamento." #. module: account #: selection:account.entries.report,month:0 @@ -7897,7 +7935,7 @@ msgstr "Quantidade ideal de entradas." #. module: account #: view:account.financial.report:0 msgid "Parent Report" -msgstr "" +msgstr "Relatório" #. module: account #: view:account.state.open:0 @@ -7947,7 +7985,7 @@ msgstr " 7 Dias " #. module: account #: field:account.bank.statement,balance_end:0 msgid "Computed Balance" -msgstr "" +msgstr "Balanço computado" #. module: account #: field:account.account,parent_id:0 @@ -8032,7 +8070,7 @@ msgstr "Status da Linha de Movimento" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile msgid "Account move line reconcile" -msgstr "" +msgstr "Reconciliar movimentação de linha de conta" #. module: account #: view:account.subscription.generate:0 @@ -8075,7 +8113,7 @@ msgstr "Selecione uma moeda para ser usada na fatura" #, python-format msgid "" "The bank account defined on the selected chart of accounts hasn't a code." -msgstr "" +msgstr "A conta bancária definida no plano de contas não possui um código" #. module: account #: code:addons/account/wizard/account_invoice_refund.py:108 @@ -8092,7 +8130,7 @@ msgstr "Sem Linhas na Fatura !" #. module: account #: view:account.financial.report:0 msgid "Report Type" -msgstr "" +msgstr "Tipo de Relatório" #. module: account #: view:account.analytic.account:0 @@ -8121,6 +8159,8 @@ msgid "" "Select Fiscal Year which you want to remove entries for its End of year " "entries journal" msgstr "" +"Escolha o Ano Fiscal que você deseja remover entradas de diário de " +"Fechamento de ano" #. module: account #: field:account.tax.template,type_tax_use:0 @@ -8153,6 +8193,12 @@ msgid "" "Most of the OpenERP operations (invoices, timesheets, expenses, etc) " "generate analytic entries on the related account." msgstr "" +"Um plano de contas normal tem uma estrutura definida por uma legislação " +"mínima obrigatória no país. A estrutura do plano de contas analítico deve " +"refletir sua própria necessidade empresarial em termos de relatórios de " +"receitas/despesas. Eles são geralmente estruturados por contratos, projetos, " +"produtos ou departamentos. A maioria das operações do OpenErp (faturas, " +"planilhas de tempo, despesas, etc) geram uma entrada em uma conta relacionada" #. module: account #: field:account.account.type,close_method:0 @@ -8251,6 +8297,15 @@ msgid "" "related journal entries may or may not be reconciled. \n" "* The 'Cancelled' state is used when user cancel invoice." msgstr "" +" * 'Cotação' é usada quando um usuário está criando uma fatura nova e sem " +"confirmação. \n" +"* 'Pro-forma' quando uma fatura está em Pro-forma ela não possui um código " +"de fatura. \n" +"* 'Aberto' é quando um usuário cria uma fatura, um número de fatura é " +"gerado. Ficará em Aberto enquanto o usuário não pagar a fatura\n" +"* 'Pago' é definido automaticamente quando a fatura for paga. Suas entradas " +"nos diários podem ou não ser reconciliadas. \n" +"* 'Cancelado' é usado quando o usuário cancela a fatura." #. module: account #: view:account.invoice.report:0 @@ -8281,6 +8336,7 @@ msgstr "" msgid "" "Can not find a chart of accounts for this company, you should create one." msgstr "" +"Não encontramos um plano de contas para esta empresa, você deve criar um." #. module: account #: view:account.invoice:0 @@ -8290,7 +8346,7 @@ msgstr "Pro-forma" #. module: account #: report:account.analytic.account.cost_ledger:0 msgid "J.C. /Move name" -msgstr "" +msgstr "J.C. /Nome da movimentação" #. module: account #: model:ir.model,name:account.model_account_open_closed_fiscalyear @@ -8359,6 +8415,8 @@ msgid "" "Total amount (in Company currency) for transactions held in secondary " "currency for this account." msgstr "" +"Valor Total (na moeda da empresa) para as transações mantidas em uma moeda " +"secundária para esta conta." #. module: account #: report:account.invoice:0 @@ -8395,6 +8453,8 @@ msgid "" "You can not cancel an invoice which is partially paid! You need to " "unreconcile related payment entries first!" msgstr "" +"Você não pode cancelar uma fatura que foi parcialmente paga! Você precisa " +"desconciliar as entradas de pagamento primeiro!" #. module: account #: field:account.chart.template,property_account_income_categ:0 @@ -8425,7 +8485,7 @@ msgstr "Valor do Imposto/Base" #. module: account #: view:account.payment.term.line:0 msgid " Valuation: Percent" -msgstr "" +msgstr " Avaliação: Percentual" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree3 @@ -8516,18 +8576,18 @@ msgstr "Conciliação parcial" #. module: account #: model:ir.model,name:account.model_account_analytic_inverted_balance msgid "Account Analytic Inverted Balance" -msgstr "" +msgstr "Balanço invertido da conta analítica" #. module: account #: model:ir.model,name:account.model_account_common_report msgid "Account Common Report" -msgstr "" +msgstr "Relatório de Conta Comum" #. module: account #: view:account.invoice.report:0 #: view:analytic.entries.report:0 msgid "current month" -msgstr "" +msgstr "mês atual" #. module: account #: code:addons/account/account.py:1052 @@ -8536,6 +8596,8 @@ msgid "" "No period defined for this date: %s !\n" "Please create one." msgstr "" +"Nenhum período definido para esta data: %s !\n" +"Por favor, crie um." #. module: account #: model:process.transition,name:account.process_transition_filestatement0 @@ -8563,7 +8625,7 @@ msgstr "Tipos de Conta" #. module: account #: view:account.payment.term.line:0 msgid " Value amount: n.a" -msgstr "" +msgstr " Valor total: n.a" #. module: account #: view:account.automatic.reconcile:0 @@ -8595,11 +8657,17 @@ msgid "" "You should press this button to re-open it and let it continue its normal " "process after having resolved the eventual exceptions it may have created." msgstr "" +"Este botão só aparece quando a situação da fatura for 'Paga' (mostrando que " +"foi paga e totalmente reconciliada) e o valor gerado automaticamente " +"'Reconciliado' for falso (representando que não é mais o caso). Em outras " +"palavras, a fatura foi desconciliada e não cabe mais usar a situação 'paga' " +". Você deve clicar neste botão e re-abrir e então continuar o processo " +"normal depois de resolver as exceções que possa ter gerado" #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close_state msgid "Fiscalyear Close state" -msgstr "" +msgstr "Situação do Fechamento do Ano Fiscal" #. module: account #: field:account.invoice.refund,journal_id:0 @@ -8635,6 +8703,8 @@ msgstr "" msgid "" "In order to close a period, you must first post related journal entries." msgstr "" +"Para fechar um período você precisa primeiro criar as entradas de diário " +"relacionadas." #. module: account #: view:account.entries.report:0 @@ -8652,7 +8722,7 @@ msgstr "A conta do parceiro usada para esta fatura" #: code:addons/account/account.py:3296 #, python-format msgid "Tax %.2f%%" -msgstr "" +msgstr "Imposto %.2f%%" #. module: account #: view:account.analytic.account:0 @@ -8763,6 +8833,8 @@ msgstr "Faturas Não Pagas" #, python-format msgid "The payment term of supplier does not have a payment term line!" msgstr "" +"O termo de pagamento do fornecedor não possui uma linha de prazo de " +"pagamento!" #. module: account #: field:account.move.line.reconcile,debit:0 @@ -8827,17 +8899,17 @@ msgstr "Nome do diário" #. module: account #: view:account.move.line:0 msgid "Next Partner Entries to reconcile" -msgstr "" +msgstr "Próxima entrada a reconciliar" #. module: account #: selection:account.financial.report,style_overwrite:0 msgid "Smallest Text" -msgstr "" +msgstr "Menor Texto" #. module: account #: model:res.groups,name:account.group_account_invoice msgid "Invoicing & Payments" -msgstr "" +msgstr "Faturamento & Pagamentos" #. module: account #: help:account.invoice,internal_number:0 @@ -8889,6 +8961,9 @@ msgid "" "Make sure you have configured payment terms properly !\n" "The latest payment term line should be of the type \"Balance\" !" msgstr "" +"Você não pode validar uma entrada sem balanço!\n" +"Tenha certeza de que você configurou os termos de pagamento corretamente!\n" +"A última linha de prazo de pagamento deve ser do tipo \"Balanço\"!" #. module: account #: view:account.account:0 @@ -8966,7 +9041,7 @@ msgstr "Endereço do contato" #: code:addons/account/account.py:2256 #, python-format msgid "Wrong model !" -msgstr "" +msgstr "Modelo errado!" #. module: account #: field:account.invoice.refund,period:0 @@ -8987,6 +9062,11 @@ msgid "" "accounts that are typically more credited than debited and that you would " "like to print as positive amounts in your reports; e.g.: Income account." msgstr "" +"Para contas que são tipicamente mais debitadas do que creditadas e que você " +"deseja exibir como valores negativos nos relatórios, você deve inverter o " +"sinal do balanço; ex.: Conta de despesa. O mesmo aplica para contas que são " +"tipicamente mais creditadas do que debitadas e você deseja exibir como " +"valores positivos nos relatórios; ex.: Contas de recebimento." #. module: account #: field:res.partner,contract_ids:0 @@ -9028,7 +9108,7 @@ msgstr "" #: code:addons/account/account_invoice.py:808 #, python-format msgid "Please define sequence on the journal related to this invoice." -msgstr "" +msgstr "Defina a sequencia do diário referente a essa fatura." #. module: account #: view:account.move:0 @@ -9041,7 +9121,7 @@ msgstr "Nota Interna" #. module: account #: view:report.account.sales:0 msgid "This year's Sales by type" -msgstr "" +msgstr "Vendas deste ano, por tipo" #. module: account #: view:account.analytic.cost.ledger.journal.report:0 @@ -9095,7 +9175,7 @@ msgstr "Linhas de lançamentos" #. module: account #: model:ir.actions.act_window,name:account.action_view_financial_accounts_installer msgid "Review your Financial Accounts" -msgstr "" +msgstr "Reveja as suas contas financeiras" #. module: account #: model:ir.actions.act_window,name:account.action_open_journal_button @@ -9136,7 +9216,7 @@ msgstr "Pagamento registrado" #. module: account #: view:account.fiscalyear.close.state:0 msgid "Close states of Fiscal year and periods" -msgstr "" +msgstr "Situação do fechamento de Ano Fiscal e períodos" #. module: account #: view:account.analytic.line:0 @@ -9176,7 +9256,7 @@ msgstr "Caros Ser/Senhora," #. module: account #: field:account.vat.declaration,display_detail:0 msgid "Display Detail" -msgstr "" +msgstr "Mostrar Detalhes" #. module: account #: code:addons/account/account.py:3118 @@ -9221,7 +9301,7 @@ msgstr "Fim do Período" #: model:ir.actions.act_window,name:account.action_account_report_pl #: model:ir.ui.menu,name:account.menu_account_reports msgid "Financial Reports" -msgstr "" +msgstr "Relatórios Financeiros" #. module: account #: report:account.account.balance:0 @@ -9305,7 +9385,7 @@ msgstr "Documento: demonstrativo da conta cliente" #. module: account #: field:account.account.type,report_type:0 msgid "P&L / BS Category" -msgstr "" +msgstr "Categoria P&L / BS" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree4 @@ -9481,12 +9561,12 @@ msgstr "" #. module: account #: view:analytic.entries.report:0 msgid "Analytic Entries of last 365 days" -msgstr "" +msgstr "Entradas analíticas dos últimos 365 dias" #. module: account #: report:account.central.journal:0 msgid "A/C No." -msgstr "" +msgstr "No. A/C" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement @@ -9522,7 +9602,7 @@ msgstr "Conciliação de transações" #. module: account #: model:ir.actions.act_window,name:account.action_account_common_menu msgid "Common Report" -msgstr "" +msgstr "Relatório Comum" #. module: account #: view:account.account:0 @@ -9543,7 +9623,7 @@ msgstr "" #. module: account #: view:account.invoice.report:0 msgid "Customer And Supplier Invoices" -msgstr "" +msgstr "Faturas de clientes e fornecedores" #. module: account #: model:process.node,note:account.process_node_paymententries0 @@ -9583,6 +9663,8 @@ msgid "" "No opening/closing period defined, please create one to set the initial " "balance!" msgstr "" +"Nenhum período de abertura/fechamento definido, por favor crie um e defina o " +"balanço inicial!" #. module: account #: report:account.account.balance:0 @@ -9631,6 +9713,11 @@ msgid "" "journals. Select 'Opening/Closing Situation' for entries generated for new " "fiscal years." msgstr "" +"Escolha 'Venda' para diários de faturas de clientes. Escolha 'Compra' para " +"diários de faturas de fornecedores. Escolha 'Dinheiro' ou 'Banco' para " +"diários que são usados nos pagamentos de clientes ou fornecedores. Escolha " +"'Geral' para diários de operações diversas. Escolha 'Situação de " +"Abertura/Fechamento' para entradas geradas em um novo ano fiscal." #. module: account #: model:ir.model,name:account.model_account_subscription @@ -9683,6 +9770,8 @@ msgid "" "It indicates that the invoice has been paid and the journal entry of the " "invoice has been reconciled with one or several journal entries of payment." msgstr "" +"Indica que a fatura foi paga e a entrada do diário foi reconciliada com um " +"ou mais diários de pagamentos" #. module: account #: view:account.invoice:0 @@ -9720,6 +9809,13 @@ msgid "" "open period. Close a period when you do not want to record new entries and " "want to lock this period for tax related calculation." msgstr "" +"Um período é um período fiscal em que a contabilidade deve ser registrada " +"para atividades relacionadas. Períodos mensais costumam ser o padrão, mas " +"dependendo do seu pais ou necessidades da empresa, você também pode definir " +"períodos trimestrais. Após fechar um período é impossível adicionar novas " +"entradas, todas as novas entradas deverão ser feitas no período seguinte. " +"Feche um período quando você não desejar mais gravar novas entradas e quer " +"bloquear o período para o cálculo de impostos" #. module: account #: view:account.analytic.account:0 @@ -9755,7 +9851,7 @@ msgstr "Ativo" #. module: account #: view:accounting.report:0 msgid "Comparison" -msgstr "" +msgstr "Comparação" #. module: account #: code:addons/account/account_invoice.py:372 @@ -9828,7 +9924,7 @@ msgstr "" #: code:addons/account/account.py:181 #, python-format msgid "Profit & Loss (Income account)" -msgstr "" +msgstr "Ganhos e perdas (conta Lucro)" #. module: account #: constraint:account.account:0 @@ -9837,6 +9933,9 @@ msgid "" "You can not select an account type with a deferral method different of " "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! " msgstr "" +"Erro de Configuração!\n" +"Você não pode selecionar um tipo de conta com um método de deferimento " +"diferente de \"Não conciliado\" para contas do tipo \"Pagáveis/Recebíveis\" " #. module: account #: view:account.model:0 @@ -9873,7 +9972,7 @@ msgstr "Geral" #. module: account #: view:analytic.entries.report:0 msgid "Analytic Entries of last 30 days" -msgstr "" +msgstr "Entradas analíticas dos últimos 30 dias" #. module: account #: selection:account.aged.trial.balance,filter:0 @@ -9930,7 +10029,7 @@ msgstr "Abril" #. module: account #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0 msgid "Profit (Loss) to report" -msgstr "" +msgstr "Lucro (Prejuízo) para relatório" #. module: account #: view:account.move.line.reconcile.select:0 @@ -9954,7 +10053,7 @@ msgstr "" #. module: account #: selection:account.financial.report,style_overwrite:0 msgid "Title 2 (bold)" -msgstr "" +msgstr "Título 2 (em negrito)" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree2 @@ -9995,6 +10094,8 @@ msgid "" "When new statement is created the state will be 'Draft'.\n" "And after getting confirmation from the bank it will be in 'Confirmed' state." msgstr "" +"Quando um novo statement for criado, a situação será 'Rascunho'.\n" +"E após a confirmação do banco a situação será \"Confirmada\"." #. module: account #: model:ir.model,name:account.model_account_period @@ -10115,7 +10216,7 @@ msgstr "Sequências de ano fiscal" #. module: account #: selection:account.financial.report,display_detail:0 msgid "No detail" -msgstr "" +msgstr "Não há detalhes" #. module: account #: code:addons/account/account_analytic_line.py:102 @@ -10126,14 +10227,14 @@ msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)" #. module: account #: constraint:account.move.line:0 msgid "You can not create journal items on closed account." -msgstr "" +msgstr "Você não pode criar ítens de diário em uma conta fechada." #. module: account #: field:account.account,unrealized_gain_loss:0 #: model:ir.actions.act_window,name:account.action_account_gain_loss #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses msgid "Unrealized Gain or Loss" -msgstr "" +msgstr "Perdas ou Ganhos não realizados" #. module: account #: view:account.fiscalyear:0 @@ -10146,12 +10247,12 @@ msgstr "Estado" #. module: account #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice msgid "Auto-email confirmed invoices" -msgstr "" +msgstr "Enviar automaticamente as Faturas confirmadas" #. module: account #: field:account.invoice,check_total:0 msgid "Verification Total" -msgstr "" +msgstr "Verificação total" #. module: account #: report:account.analytic.account.balance:0 @@ -10279,7 +10380,7 @@ msgstr "Esvaziar as contas ? " #. module: account #: constraint:account.bank.statement:0 msgid "The journal and period chosen have to belong to the same company." -msgstr "" +msgstr "O diário e o período escolhido tem que pertencer à mesma empresa." #. module: account #: view:account.invoice:0 @@ -10303,11 +10404,13 @@ msgid "" "This account will be used to value outgoing stock for the current product " "category using cost price" msgstr "" +"Esta conta será usada para para estimar o estoque de saída da categoria de " +"produtos usando o preço de custo" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Generate Your Chart of Accounts from a Chart Template" -msgstr "" +msgstr "Crie seu Plano de Contas através de um modelo" #. module: account #: model:ir.actions.act_window,help:account.action_account_invoice_report_all @@ -10379,7 +10482,7 @@ msgstr "Débito" #. module: account #: selection:account.financial.report,style_overwrite:0 msgid "Title 3 (bold, smaller)" -msgstr "" +msgstr "Título 3 (em negrito, menor)" #. module: account #: field:account.invoice,invoice_line:0 @@ -10394,7 +10497,7 @@ msgstr "Erro ! Você não pode criar templates recursivos para contas." #. module: account #: selection:account.print.journal,sort_selection:0 msgid "Journal Entry Number" -msgstr "" +msgstr "Número da Entrada de Diário" #. module: account #: view:account.subscription:0 @@ -10408,6 +10511,8 @@ msgid "" "You cannot change the type of account from 'Closed' to any other type which " "contains journal items!" msgstr "" +"Você não pode mudar o tipo de conta de 'Fechado' para nenhum outro tipo que " +"contém entradas de diário!" #. module: account #: code:addons/account/account_move_line.py:832 @@ -10433,7 +10538,7 @@ msgstr "Intervalo" #. module: account #: view:account.analytic.line:0 msgid "Analytic Journal Items related to a purchase journal." -msgstr "" +msgstr "Itens de diário relacionados a um diário de compras." #. module: account #: help:account.account,type:0 @@ -10444,6 +10549,11 @@ msgid "" "payable/receivable are for partners accounts (for debit/credit " "computations), closed for depreciated accounts." msgstr "" +"O 'Tipo Interno' é usado para recursos disponíveis em diferentes tipo de " +"contas: visualizações não podem conter itens de diário, consolidações são " +"contas que possuem contas filhas de consolidações multi-empresas, " +"pagáveis/recebíveis são para contas de parceiros (para cálculo de " +"débito/crédito), fechado para contas de depreciação." #. module: account #: selection:account.balance.report,display_account:0 @@ -10485,7 +10595,7 @@ msgstr "Imprimir diários analíticos" #. module: account #: view:account.invoice.report:0 msgid "Group by month of Invoice Date" -msgstr "" +msgstr "Agrupar por mês da fatura" #. module: account #: view:account.analytic.line:0 @@ -10519,6 +10629,8 @@ msgstr "A outra moeda opcional se este for um lançamento multi-moeda" msgid "" "Import of the statement in the system from a supplier or customer invoice" msgstr "" +"Importar da declaração no sistema a partir de uma fatura do fornecedor ou " +"cliente" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing @@ -10551,7 +10663,7 @@ msgstr "" #. module: account #: view:account.payment.term:0 msgid "Description on Invoices" -msgstr "" +msgstr "Descrição nas Faturas" #. module: account #: model:ir.model,name:account.model_account_analytic_chart @@ -10578,7 +10690,7 @@ msgstr "Conta inválida!" #. module: account #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted by" -msgstr "" +msgstr "Entradas classificadas por" #. module: account #: help:account.move,state:0 @@ -10589,6 +10701,11 @@ msgid "" "created by the system on document validation (invoices, bank statements...) " "and will be created in 'Posted' state." msgstr "" +"Todas as entradas de diário criadas manualmente ficam na situação 'Não " +"publicadas', mas você pode definir uma opção para pular esta situação no " +"diário relacionado. Neste caso, elas se comportarão como entradas de diário " +"automaticamente pelo sistema na validação do documento (faturas, extratos " +"bancários...) e serão criadas na situação 'Publicadas'." #. module: account #: view:account.fiscal.position.template:0 @@ -10719,6 +10836,76 @@ msgid "" "% endif\n" " " msgstr "" +"\n" +"Olá ${object.address_invoice_id.name and ' ' or " +"''}${object.address_invoice_id.name or ''},\n" +"\n" +"Uma nova fatura está disponível para ${object.partner_id.name}:\n" +" | Número da Fatura: *${object.number}*\n" +" | Total da Fatura: *${object.amount_total} " +"${object.currency_id.name}*\n" +" | Data da Fatura: ${object.date_invoice}\n" +" % if object.origin:\n" +" | Referente a: ${object.origin}\n" +" % endif\n" +" | Seu contato: ${object.user_id.name} ${object.user_id.user_email and " +"'<%s>'%(object.user_id.user_email) or ''}\n" +"\n" +"Você pode ver a fatura, fazer o download e pagar online usando o seguinte " +"link:\n" +" ${ctx.get('edi_web_url_view') or 'n/a'}\n" +"\n" +"% if object.company_id.paypal_account and object.type in ('out_invoice', " +"'in_refund'):\n" +"<% \n" +"comp_name = quote(object.company_id.name)\n" +"inv_number = quote(object.number)\n" +"paypal_account = quote(object.company_id.paypal_account)\n" +"inv_amount = quote(str(object.amount_total))\n" +"cur_name = quote(object.currency_id.name)\n" +"paypal_url = \"https://www.paypal.com/cgi-" +"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s\"\\\n" +" " +"\"&invoice=%s&amount=%s¤cy_code=%s&button_subtype=services&no_note=1&bn" +"=OpenERP_Invoice_PayNow_%s\" % \\\n" +" " +"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)" +"\n" +"%>\n" +"É possível pagar diretamente através do Paypal:\n" +" ${paypal_url}\n" +"% endif\n" +"\n" +"Se você tiver alguma dúvida por favor entre em contato conosco.\n" +"\n" +"\n" +"Obrigado por escolher ${object.company_id.name}!\n" +"\n" +"\n" +"--\n" +"${object.user_id.name} ${object.user_id.user_email and " +"'<%s>'%(object.user_id.user_email) or ''}\n" +"${object.company_id.name}\n" +"% if object.company_id.street:\n" +"${object.company_id.street or ''}\n" +"% endif\n" +"% if object.company_id.street2:\n" +"${object.company_id.street2}\n" +"% endif\n" +"% if object.company_id.city or object.company_id.zip:\n" +"${object.company_id.zip or ''} ${object.company_id.city or ''}\n" +"% endif\n" +"% if object.company_id.country_id:\n" +"${object.company_id.state_id and ('%s, ' % object.company_id.state_id.name) " +"or ''} ${object.company_id.country_id.name or ''}\n" +"% endif\n" +"% if object.company_id.phone:\n" +"Phone: ${object.company_id.phone}\n" +"% endif\n" +"% if object.company_id.website:\n" +"${object.company_id.website or ''}\n" +"% endif\n" +" " #. module: account #: model:ir.model,name:account.model_res_partner_bank @@ -13102,3 +13289,6 @@ msgstr "" #~ msgid "Install your Chart of Accounts" #~ msgstr "Instale o seu Plano de Contas" + +#~ msgid "Description On Invoices" +#~ msgstr "Descrição em Faturas" diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 76aaaf7df6a..de1a087d9c5 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -30,22 +30,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -183,27 +176,20 @@ search - - - - - - - - - - - - - - + + + + + + + + + - - @@ -304,11 +290,8 @@ search - - - - - + + diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 7c9870ca07e..35031180523 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -34,31 +34,21 @@ search - - - - - - - - - - - - + + + + + + - - - - diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 54275f6a4b3..8c445052094 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -67,54 +67,35 @@ search - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + - - - - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 7d6a4003b53..e3e0b210f20 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -55,68 +55,32 @@ search - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml index 9e07c196f3c..f0096b561bb 100644 --- a/addons/account/report/account_treasury_report_view.xml +++ b/addons/account/report/account_treasury_report_view.xml @@ -36,12 +36,9 @@ search - - - - - - + + + diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index ff4e3faa3b6..7c97112b875 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -24,7 +24,7 @@ "author" : "OpenERP SA", "category": 'Accounting & Finance', "sequence": 10, - "summary": "Accounts Moves, Journals, Chart of Accounts", + "summary": "Financial and Analytic Accounting", "description": """ Accounting Access Rights. ========================= diff --git a/addons/account_accountant/account_accountant_data.xml b/addons/account_accountant/account_accountant_data.xml index 3d665e680c3..7724dcb6774 100644 --- a/addons/account_accountant/account_accountant_data.xml +++ b/addons/account_accountant/account_accountant_data.xml @@ -1,20 +1,23 @@ - Accounting + - - + + + + + + Module Accounting and Finance has been installed + From the top menu Accounting, manage all of your accounting: + general accounting, cost/analytic accounting, third party + accounting, taxes, budgets, customer and supplier invoices, + bank statements, reconciliation process. + + diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 93718a75211..c84b311f307 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -455,7 +455,6 @@ class account_analytic_account(osv.osv): 'invoice_on_timesheets' : fields.boolean("Invoice On Timesheets"), 'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'), 'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'), - 'template_id': fields.many2one('account.analytic.account', 'Template of Contract'), 'hours_qtt_est': fields.float('Estimation of Hours to Invoice'), 'est_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Estimation"), 'invoiced_total' : fields.function(_sum_of_fields, type="float",multi="sum_of_all", string="Total Invoiced"), @@ -483,18 +482,15 @@ class account_analytic_account(osv.osv): def on_change_template(self, cr, uid, ids, template_id, context=None): if not template_id: return {} - res = {'value':{}} - template = self.browse(cr, uid, template_id, context=context) - res['value']['date_start'] = template.date_start - res['value']['date'] = template.date - res['value']['fix_price_invoices'] = template.fix_price_invoices - res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets - res['value']['quantity_max'] = template.quantity_max - res['value']['hours_qtt_est'] = template.hours_qtt_est - res['value']['amount_max'] = template.amount_max - res['value']['to_invoice'] = template.to_invoice.id - res['value']['pricelist_id'] = template.pricelist_id.id - res['value']['description'] = template.description + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['fix_price_invoices'] = template.fix_price_invoices + res['value']['invoice_on_timesheets'] = template.invoice_on_timesheets + res['value']['hours_qtt_est'] = template.hours_qtt_est + res['value']['amount_max'] = template.amount_max + res['value']['to_invoice'] = template.to_invoice.id + res['value']['pricelist_id'] = template.pricelist_id.id return res account_analytic_account() @@ -532,40 +528,25 @@ class account_analytic_account_summary_user(osv.osv): def init(self, cr): tools.sql.drop_view_if_exists(cr, 'account_analytic_analysis_summary_user') - cr.execute('CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS (' \ - 'SELECT ' \ - '(u.account_id * u.max_user) + u."user" AS id, ' \ - 'u.account_id AS account_id, ' \ - 'u."user" AS "user", ' \ - 'COALESCE(SUM(l.unit_amount), 0.0) AS unit_amount ' \ - 'FROM ' \ - '(SELECT ' \ - 'a.id AS account_id, ' \ - 'u1.id AS "user", ' \ - 'MAX(u2.id) AS max_user ' \ - 'FROM ' \ - 'res_users AS u1, ' \ - 'res_users AS u2, ' \ - 'account_analytic_account AS a ' \ - 'GROUP BY u1.id, a.id ' \ - ') AS u ' \ - 'LEFT JOIN ' \ - '(SELECT ' \ - 'l.account_id AS account_id, ' \ - 'l.user_id AS "user", ' \ - 'SUM(l.unit_amount) AS unit_amount ' \ - 'FROM account_analytic_line AS l, ' \ - 'account_analytic_journal AS j ' \ - 'WHERE (j.type = \'general\') and (j.id=l.journal_id) ' \ - 'GROUP BY l.account_id, l.user_id ' \ - ') AS l ' - 'ON (' \ - 'u.account_id = l.account_id ' \ - 'AND u."user" = l."user"' \ - ') ' \ - 'GROUP BY u."user", u.account_id, u.max_user' \ - ')') - + cr.execute('''CREATE OR REPLACE VIEW account_analytic_analysis_summary_user AS ( + with mu as + (select max(id) as max_user from res_users) + , lu AS + (SELECT + l.account_id AS account_id, + coalesce(l.user_id, 0) AS user_id, + SUM(l.unit_amount) AS unit_amount + FROM account_analytic_line AS l, + account_analytic_journal AS j + WHERE (j.type = 'general' ) and (j.id=l.journal_id) + GROUP BY l.account_id, l.user_id + ) + select (lu.account_id * mu.max_user) + lu.user_id as id, + lu.account_id as account_id, + lu.user_id as "user", + unit_amount + from lu, mu)''') + account_analytic_account_summary_user() class account_analytic_account_summary_month(osv.osv): diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 8f86e9eeedc..bca6b2ab260 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -19,32 +19,24 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index ead87c176e3..32839063f02 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -20,9 +20,6 @@ - - - - - - - + + + +
@@ -328,37 +332,22 @@ search - - - - - - - - - - - - - - + + + + + + + + + + + - - - + @@ -474,8 +463,8 @@
@@ -529,34 +518,21 @@ search - - - - - - - - - - - - - + + + + + + + + + - - @@ -571,12 +547,11 @@ view_ - - + diff --git a/addons/event/i18n/nb.po b/addons/event/i18n/nb.po new file mode 100644 index 00000000000..4a868590e68 --- /dev/null +++ b/addons/event/i18n/nb.po @@ -0,0 +1,1264 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-07-25 13:20+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-26 04:39+0000\n" +"X-Generator: Launchpad (build 15679)\n" + +#. module: event +#: view:event.event:0 +msgid "Invoice Information" +msgstr "Fakturainformasjon" + +#. module: event +#: view:partner.event.registration:0 +msgid "Event Details" +msgstr "Hendelsesdetaljer" + +#. module: event +#: field:event.event,main_speaker_id:0 +msgid "Main Speaker" +msgstr "Hovedtaler" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: view:report.event.registration:0 +msgid "Group By..." +msgstr "Grupper etter..." + +#. module: event +#: field:event.event,register_min:0 +msgid "Minimum Registrations" +msgstr "Minimum registrerte" + +#. module: event +#: model:ir.model,name:event.model_event_confirm_registration +msgid "Confirmation for Event Registration" +msgstr "Bekreftelse for hendelsesregistrering" + +#. module: event +#: field:event.registration.badge,title:0 +msgid "Title" +msgstr "Tittel" + +#. module: event +#: field:event.event,mail_registr:0 +msgid "Registration Email" +msgstr "Epost for registrering" + +#. module: event +#: model:ir.actions.act_window,name:event.action_event_confirm_registration +msgid "Make Invoices" +msgstr "Lag fakturaer" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +msgid "Registration Date" +msgstr "Registreringsdato" + +#. module: event +#: view:partner.event.registration:0 +msgid "_Close" +msgstr "_Lukk" + +#. module: event +#: model:event.event,name:event.event_0 +msgid "Concert of Bon Jovi" +msgstr "Konsert med Bon Jovi" + +#. module: event +#: view:report.event.registration:0 +msgid "Invoiced Registrations only" +msgstr "Bare fakturerte registreringer" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "March" +msgstr "Mars" + +#. module: event +#: field:event.event,mail_confirm:0 +msgid "Confirmation Email" +msgstr "Bekreftelsesepost" + +#. module: event +#: field:event.registration,nb_register:0 +msgid "Quantity" +msgstr "Kvantum" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:63 +#, python-format +msgid "Registration doesn't have any partner to invoice." +msgstr "Registreringer har ingen partner å fakturere mot" + +#. module: event +#: field:event.event,company_id:0 +#: field:event.registration,company_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,company_id:0 +msgid "Company" +msgstr "Firma" + +#. module: event +#: field:event.make.invoice,invoice_date:0 +msgid "Invoice Date" +msgstr "Fakturadato" + +#. module: event +#: help:event.event,pricelist_id:0 +msgid "Pricelist version for current event." +msgstr "Prisliste for gjeldende hendelse." + +#. module: event +#: code:addons/event/wizard/partner_event_registration.py:88 +#: view:event.registration:0 +#: model:ir.actions.act_window,name:event.action_partner_event_registration +#: model:ir.model,name:event.model_event_registration +#: view:partner.event.registration:0 +#, python-format +msgid "Event Registration" +msgstr "Hendelseregistrering" + +#. module: event +#: field:event.event,parent_id:0 +msgid "Parent Event" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,name:event.action_make_invoices +msgid "Make Invoice" +msgstr "Lag faktura" + +#. module: event +#: field:event.registration,price_subtotal:0 +msgid "Subtotal" +msgstr "Subtotal" + +#. module: event +#: view:report.event.registration:0 +msgid "Event on Registration" +msgstr "" + +#. module: event +#: help:event.event,reply_to:0 +msgid "The email address put in the 'Reply-To' of all emails sent by OpenERP" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Add Internal Note" +msgstr "Legg til internt notat" + +#. module: event +#: view:event.event:0 +msgid "Confirmed events" +msgstr "Bekreftede hendelser" + +#. module: event +#: view:report.event.registration:0 +msgid "Event Beginning Date" +msgstr "Startdato hendelse" + +#. module: event +#: model:ir.actions.act_window,name:event.action_report_event_registration +#: model:ir.model,name:event.model_report_event_registration +#: model:ir.ui.menu,name:event.menu_report_event_registration +#: view:report.event.registration:0 +msgid "Events Analysis" +msgstr "Hendelse analyse" + +#. module: event +#: field:event.registration,message_ids:0 +msgid "Messages" +msgstr "Meldinger" + +#. module: event +#: model:ir.model,name:event.model_event_registration_badge +msgid "event.registration.badge" +msgstr "event.registration.badge" + +#. module: event +#: field:event.event,mail_auto_confirm:0 +msgid "Mail Auto Confirm" +msgstr "" + +#. module: event +#: model:product.template,name:event.event_product_1_product_template +msgid "Ticket for Opera" +msgstr "Operabillett" + +#. module: event +#: code:addons/event/event.py:125 +#: view:event.event:0 +#, python-format +msgid "Confirm Event" +msgstr "Bekreft hendelse" + +#. module: event +#: selection:event.event,state:0 +#: selection:event.registration,state:0 +#: selection:report.event.registration,state:0 +msgid "Cancelled" +msgstr "Kansellert" + +#. module: event +#: field:event.event,reply_to:0 +msgid "Reply-To" +msgstr "Svar til" + +#. module: event +#: model:ir.actions.act_window,name:event.open_board_associations_manager +#: model:ir.ui.menu,name:event.menu_board_associations_manager +msgid "Event Dashboard" +msgstr "Hendelse konsoll" + +#. module: event +#: model:event.event,name:event.event_1 +msgid "Opera of Verdi" +msgstr "Verdis opera" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "July" +msgstr "Juli" + +#. module: event +#: help:event.event,register_prospect:0 +msgid "Total of Prospect Registrations" +msgstr "" + +#. module: event +#: help:event.event,mail_auto_confirm:0 +msgid "" +"Check this box if you want to use automatic confirmation emailing or " +"reminder." +msgstr "" + +#. module: event +#: field:event.registration,ref:0 +msgid "Reference" +msgstr "Referanse" + +#. module: event +#: help:event.event,date_end:0 +#: help:partner.event.registration,end_date:0 +msgid "Closing Date of Event" +msgstr "Siste dato for hendelse" + +#. module: event +#: view:event.registration:0 +msgid "Emails" +msgstr "E-poster" + +#. module: event +#: view:event.registration:0 +msgid "Extra Info" +msgstr "Ekstra informasjon" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:83 +#, python-format +msgid "Customer Invoices" +msgstr "Kundefaktura" + +#. module: event +#: selection:event.event,state:0 +#: selection:report.event.registration,state:0 +msgid "Draft" +msgstr "Utkast" + +#. module: event +#: field:event.type,name:0 +msgid "Event type" +msgstr "Hendelsetype" + +#. module: event +#: model:ir.model,name:event.model_event_type +msgid " Event Type " +msgstr " Hendelsestype " + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration,event_id:0 +#: model:ir.model,name:event.model_event_event +#: field:partner.event.registration,event_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,event_id:0 +#: view:res.partner:0 +msgid "Event" +msgstr "Hendelse" + +#. module: event +#: view:event.registration:0 +#: field:event.registration,badge_ids:0 +msgid "Badges" +msgstr "Skilt" + +#. module: event +#: view:event.event:0 +#: selection:event.event,state:0 +#: view:event.registration:0 +#: selection:event.registration,state:0 +#: selection:report.event.registration,state:0 +msgid "Confirmed" +msgstr "Bekreftet" + +#. module: event +#: view:event.confirm.registration:0 +msgid "Registration Confirmation" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Events in New state" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Confirm" +msgstr "Bekreft" + +#. module: event +#: view:event.event:0 +#: field:event.event,speaker_ids:0 +msgid "Other Speakers" +msgstr "Andre talere" + +#. module: event +#: model:ir.model,name:event.model_event_make_invoice +msgid "Event Make Invoice" +msgstr "" + +#. module: event +#: help:event.registration,nb_register:0 +msgid "Number of Registrations or Tickets" +msgstr "Antall registreringer eller billetter" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:50 +#: code:addons/event/wizard/event_make_invoice.py:54 +#: code:addons/event/wizard/event_make_invoice.py:58 +#: code:addons/event/wizard/event_make_invoice.py:62 +#, python-format +msgid "Warning !" +msgstr "Advarsel !" + +#. module: event +#: view:event.registration:0 +msgid "Send New Email" +msgstr "Send ny e-post" + +#. module: event +#: help:event.event,register_min:0 +msgid "Provide Minimum Number of Registrations" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Location" +msgstr "Plassering" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: view:report.event.registration:0 +msgid "New" +msgstr "Ny" + +#. module: event +#: field:event.event,register_current:0 +#: view:report.event.registration:0 +msgid "Confirmed Registrations" +msgstr "Bekreftede registreringer" + +#. module: event +#: field:event.event,mail_auto_registr:0 +msgid "Mail Auto Register" +msgstr "" + +#. module: event +#: field:event.event,type:0 +#: field:partner.event.registration,event_type:0 +msgid "Type" +msgstr "Type" + +#. module: event +#: field:event.registration,email_from:0 +msgid "Email" +msgstr "E-post" + +#. module: event +#: help:event.event,mail_confirm:0 +msgid "" +"This email will be sent when the event gets confirmed or when someone " +"subscribes to a confirmed event. This is also the email sent to remind " +"someone about the event." +msgstr "" + +#. module: event +#: field:event.registration,tobe_invoiced:0 +msgid "To be Invoiced" +msgstr "Til fakturering" + +#. module: event +#: view:event.event:0 +msgid "My Sales Team(s)" +msgstr "Mine salgsteam" + +#. module: event +#: code:addons/event/event.py:398 +#, python-format +msgid "Error !" +msgstr "Feil !" + +#. module: event +#: field:event.event,name:0 +#: field:event.registration,name:0 +msgid "Summary" +msgstr "Sammendrag" + +#. module: event +#: field:event.registration,create_date:0 +msgid "Creation Date" +msgstr "Opprettelsesdato" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: view:res.partner:0 +msgid "Cancel Registration" +msgstr "Kanseller registrering" + +#. module: event +#: code:addons/event/event.py:399 +#, python-format +msgid "Registered partner doesn't have an address to make the invoice." +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events created in last month" +msgstr "Arrangementer opprettet forrige måned" + +#. module: event +#: view:report.event.registration:0 +msgid "Events created in current year" +msgstr "Arrangementer opprettet dette år" + +#. module: event +#: help:event.event,type:0 +msgid "Type of Event like Seminar, Exhibition, Conference, Training." +msgstr "" +"Type arrangement som f.eks- seminar, utstilling, konferanse, trening." + +#. module: event +#: view:event.registration:0 +msgid "Confirmed registrations" +msgstr "Bekreftede registreringer" + +#. module: event +#: view:event.event:0 +msgid "Event Organization" +msgstr "Arrangementsorganisasjon" + +#. module: event +#: view:event.registration:0 +msgid "History Information" +msgstr "Historisk informasjon" + +#. module: event +#: view:event.registration:0 +msgid "Dates" +msgstr "Datoer" + +#. module: event +#: view:event.confirm:0 +#: view:event.confirm.registration:0 +msgid "Confirm Anyway" +msgstr "Bekreft uansett" + +#. module: event +#: code:addons/event/wizard/event_confirm_registration.py:54 +#, python-format +msgid "Warning: The Event '%s' has reached its Maximum Limit (%s)." +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid " Month-1 " +msgstr " Måned-1 " + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration.badge,registration_id:0 +#: model:ir.actions.act_window,name:event.act_event_list_register_event +msgid "Registration" +msgstr "Registrering" + +#. module: event +#: field:report.event.registration,nbevent:0 +msgid "Number Of Events" +msgstr "Antall arrangementer" + +#. module: event +#: help:event.event,main_speaker_id:0 +msgid "Speaker who will be giving speech at the event." +msgstr "" + +#. module: event +#: help:event.event,state:0 +msgid "" +"If event is created, the state is 'Draft'.If event is confirmed for the " +"particular dates the state is set to 'Confirmed'. If the event is over, the " +"state is set to 'Done'.If event is cancelled the state is set to 'Cancelled'." +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Cancel Event" +msgstr "Kanseller arrangement" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +msgid "Contact" +msgstr "Kontakt" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration,partner_id:0 +#: model:ir.model,name:event.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: event +#: view:board.board:0 +#: model:ir.actions.act_window,name:event.act_event_reg +#: view:report.event.registration:0 +msgid "Events Filling Status" +msgstr "" + +#. module: event +#: field:event.make.invoice,grouped:0 +msgid "Group the invoices" +msgstr "Gruppering av fakturaer" + +#. module: event +#: view:event.event:0 +msgid "Mailing" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events States" +msgstr "" + +#. module: event +#: view:board.board:0 +#: field:event.event,register_prospect:0 +msgid "Unconfirmed Registrations" +msgstr "Ubekreftede registreringer" + +#. module: event +#: field:event.registration,partner_invoice_id:0 +msgid "Partner Invoiced" +msgstr "Partner fakturert" + +#. module: event +#: help:event.event,register_max:0 +msgid "Provide Maximum Number of Registrations" +msgstr "" + +#. module: event +#: field:event.registration,log_ids:0 +msgid "Logs" +msgstr "Logger" + +#. module: event +#: view:event.event:0 +#: field:event.event,state:0 +#: view:event.registration:0 +#: field:event.registration,state:0 +#: view:report.event.registration:0 +#: field:report.event.registration,state:0 +msgid "State" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "September" +msgstr "September" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "December" +msgstr "Desember" + +#. module: event +#: field:event.registration,event_product:0 +msgid "Invoice Name" +msgstr "Fakturanavn" + +#. module: event +#: field:report.event.registration,draft_state:0 +msgid " # No of Draft Registrations" +msgstr " # Antall foreløpige registreringer" + +#. module: event +#: view:report.event.registration:0 +#: field:report.event.registration,month:0 +msgid "Month" +msgstr "Måned" + +#. module: event +#: view:event.event:0 +msgid "Event Done" +msgstr "Arrangement gjennomført" + +#. module: event +#: view:event.registration:0 +msgid "Registrations in unconfirmed state" +msgstr "" + +#. module: event +#: help:event.event,register_current:0 +msgid "Total of Open and Done Registrations" +msgstr "" + +#. module: event +#: field:event.confirm.registration,msg:0 +msgid "Message" +msgstr "Melding" + +#. module: event +#: constraint:event.event:0 +msgid "Error ! You cannot create recursive event." +msgstr "" + +#. module: event +#: field:event.registration,ref2:0 +msgid "Reference 2" +msgstr "Referanse 2" + +#. module: event +#: code:addons/event/event.py:361 +#: view:report.event.registration:0 +#, python-format +msgid "Invoiced" +msgstr "Fakturert" + +#. module: event +#: view:event.event:0 +#: view:report.event.registration:0 +msgid "My Events" +msgstr "Mine arrangementer" + +#. module: event +#: view:event.event:0 +msgid "Speakers" +msgstr "Talere" + +#. module: event +#: view:event.make.invoice:0 +msgid "Create invoices" +msgstr "Opprett fakturaer" + +#. module: event +#: help:event.registration,email_cc:0 +msgid "" +"These email addresses will be added to the CC field of all inbound and " +"outbound emails for this record before being sent. Separate multiple email " +"addresses with a comma" +msgstr "" + +#. module: event +#: view:event.make.invoice:0 +msgid "Do you really want to create the invoice(s) ?" +msgstr "Vil du virkerlig opprette faktura(ene) ?" + +#. module: event +#: view:event.event:0 +msgid "Beginning Date" +msgstr "Startdato" + +#. module: event +#: field:event.registration,date_closed:0 +msgid "Closed" +msgstr "Lukket" + +#. module: event +#: view:report.event.registration:0 +msgid "Events which are in New state" +msgstr "" + +#. module: event +#: view:event.event:0 +#: model:ir.actions.act_window,name:event.action_event_view +#: model:ir.ui.menu,name:event.menu_event_event +#: model:ir.ui.menu,name:event.menu_event_event_assiciation +#: view:res.partner:0 +msgid "Events" +msgstr "Arrangementer" + +#. module: event +#: field:partner.event.registration,nb_register:0 +msgid "Number of Registration" +msgstr "Antall registreringer" + +#. module: event +#: field:event.event,child_ids:0 +msgid "Child Events" +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "August" +msgstr "August" + +#. module: event +#: field:res.partner,event_ids:0 +#: field:res.partner,event_registration_ids:0 +msgid "unknown" +msgstr "ukjent" + +#. module: event +#: help:event.event,product_id:0 +msgid "" +"The invoices of this event registration will be created with this Product. " +"Thus it allows you to set the default label and the accounting info you want " +"by default on these invoices." +msgstr "" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "June" +msgstr "Juni" + +#. module: event +#: model:product.template,name:event.event_product_0_product_template +msgid "Ticket for Concert" +msgstr "Konsertbillett" + +#. module: event +#: field:event.registration,write_date:0 +msgid "Write Date" +msgstr "Utskriftsdato" + +#. module: event +#: view:event.registration:0 +msgid "My Registrations" +msgstr "Mine registreringer" + +#. module: event +#: view:event.confirm:0 +msgid "" +"Warning: This Event has not reached its Minimum Registration Limit. Are you " +"sure you want to confirm it?" +msgstr "" + +#. module: event +#: field:event.registration,active:0 +msgid "Active" +msgstr "Aktiv" + +#. module: event +#: field:event.registration,date:0 +msgid "Start Date" +msgstr "Startdato" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "November" +msgstr "November" + +#. module: event +#: view:report.event.registration:0 +msgid "Extended Filters..." +msgstr "Utvidede filtre ..." + +#. module: event +#: field:partner.event.registration,start_date:0 +msgid "Start date" +msgstr "Startdato" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "October" +msgstr "Oktober" + +#. module: event +#: field:event.event,language:0 +msgid "Language" +msgstr "Språk" + +#. module: event +#: view:event.registration:0 +#: field:event.registration,email_cc:0 +msgid "CC" +msgstr "CC" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "January" +msgstr "Januar" + +#. module: event +#: help:event.registration,email_from:0 +msgid "These people will receive email." +msgstr "Disse personene vil motta e-post." + +#. module: event +#: view:event.event:0 +msgid "Set To Draft" +msgstr "" + +#. module: event +#: code:addons/event/event.py:499 +#: view:event.event:0 +#: view:event.registration:0 +#: view:res.partner:0 +#, python-format +msgid "Confirm Registration" +msgstr "Bekreft registrering" + +#. module: event +#: view:event.event:0 +#: view:report.event.registration:0 +#: view:res.partner:0 +msgid "Date" +msgstr "Dato" + +#. module: event +#: view:event.event:0 +msgid "Registration Email Body" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Confirmation Email Body" +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Registrations in confirmed or done state" +msgstr "" + +#. module: event +#: view:event.registration:0 +#: view:res.partner:0 +msgid "History" +msgstr "Historikk" + +#. module: event +#: field:event.event,address_id:0 +msgid "Location Address" +msgstr "Lokasjonsadresse" + +#. module: event +#: model:ir.actions.act_window,name:event.action_event_type +#: model:ir.ui.menu,name:event.menu_event_type +msgid "Types of Events" +msgstr "Type arrangement" + +#. module: event +#: field:event.registration,contact_id:0 +msgid "Partner Contact" +msgstr "Partnerkontakt" + +#. module: event +#: field:event.event,pricelist_id:0 +msgid "Pricelist" +msgstr "Prisliste" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:59 +#, python-format +msgid "Event related doesn't have any product defined" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Auto Confirmation Email" +msgstr "" + +#. module: event +#: view:event.registration:0 +msgid "Misc" +msgstr "Div." + +#. module: event +#: constraint:event.event:0 +msgid "Error ! Closing Date cannot be set before Beginning Date." +msgstr "Feil ! Sluttdato kan ikke settes før startdato." + +#. module: event +#: code:addons/event/event.py:446 +#: selection:event.event,state:0 +#: view:event.make.invoice:0 +#: selection:event.registration,state:0 +#: selection:report.event.registration,state:0 +#, python-format +msgid "Done" +msgstr "Utført" + +#. module: event +#: field:event.event,date_begin:0 +msgid "Beginning date" +msgstr "Startdato" + +#. module: event +#: view:event.registration:0 +#: field:event.registration,invoice_id:0 +msgid "Invoice" +msgstr "faktura" + +#. module: event +#: view:report.event.registration:0 +#: field:report.event.registration,year:0 +msgid "Year" +msgstr "År" + +#. module: event +#: code:addons/event/event.py:465 +#, python-format +msgid "Cancel" +msgstr "Kanseller" + +#. module: event +#: view:event.confirm:0 +#: view:event.confirm.registration:0 +#: view:event.make.invoice:0 +msgid "Close" +msgstr "Lukk" + +#. module: event +#: view:event.event:0 +msgid "Event by Registration" +msgstr "" + +#. module: event +#: code:addons/event/event.py:436 +#, python-format +msgid "Open" +msgstr "Åpen" + +#. module: event +#: field:event.event,user_id:0 +msgid "Responsible User" +msgstr "Ansvarlig bruker" + +#. module: event +#: code:addons/event/event.py:561 +#: code:addons/event/event.py:568 +#, python-format +msgid "Auto Confirmation: [%s] %s" +msgstr "Automatisk bekreftelse: [%s] %s" + +#. module: event +#: view:event.event:0 +#: view:event.registration:0 +#: field:event.registration,user_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,user_id:0 +msgid "Responsible" +msgstr "Ansvarlig" + +#. module: event +#: field:event.event,unit_price:0 +#: view:event.registration:0 +#: field:partner.event.registration,unit_price:0 +msgid "Registration Cost" +msgstr "Registreringskostnad" + +#. module: event +#: field:event.registration,unit_price:0 +msgid "Unit Price" +msgstr "Enhetspris" + +#. module: event +#: view:report.event.registration:0 +#: field:report.event.registration,speaker_id:0 +#: field:res.partner,speaker:0 +msgid "Speaker" +msgstr "Taler" + +#. module: event +#: model:event.event,name:event.event_2 +msgid "Conference on ERP Buisness" +msgstr "Konferanse om ERP forretningsområdet" + +#. module: event +#: view:event.registration:0 +msgid "Reply" +msgstr "Svar" + +#. module: event +#: view:report.event.registration:0 +msgid "Events created in current month" +msgstr "" + +#. module: event +#: help:event.event,mail_auto_registr:0 +msgid "" +"Check this box if you want to use automatic emailing for new registration." +msgstr "" + +#. module: event +#: field:event.event,date_end:0 +#: field:partner.event.registration,end_date:0 +msgid "Closing date" +msgstr "Sluttdato" + +#. module: event +#: field:event.event,product_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,product_id:0 +msgid "Product" +msgstr "Produkt" + +#. module: event +#: view:event.event:0 +#: field:event.event,note:0 +#: view:event.registration:0 +#: field:event.registration,description:0 +msgid "Description" +msgstr "Beskrivelse" + +#. module: event +#: field:report.event.registration,confirm_state:0 +msgid " # No of Confirmed Registrations" +msgstr " # Antall bekreftede registreringer" + +#. module: event +#: model:ir.actions.act_window,name:event.act_register_event_partner +msgid "Subscribe" +msgstr "Abonner" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "May" +msgstr "Mai" + +#. module: event +#: view:res.partner:0 +msgid "Events Registration" +msgstr "Arrangemnetsregistrering" + +#. module: event +#: help:event.event,mail_registr:0 +msgid "This email will be sent when someone subscribes to the event." +msgstr "" + +#. module: event +#: model:product.template,name:event.event_product_2_product_template +msgid "Ticket for Conference" +msgstr "Konferansebillett" + +#. module: event +#: model:ir.ui.menu,name:event.menu_event_type_association +msgid "Events Type" +msgstr "Arrangementstype" + +#. module: event +#: field:event.registration.badge,address_id:0 +msgid "Address" +msgstr "Adresse" + +#. module: event +#: view:board.board:0 +#: model:ir.actions.act_window,name:event.act_event_view +msgid "Next Events" +msgstr "Neste arrangement" + +#. module: event +#: view:partner.event.registration:0 +msgid "_Subcribe" +msgstr "_Abonner" + +#. module: event +#: model:ir.model,name:event.model_partner_event_registration +msgid " event Registration " +msgstr "" + +#. module: event +#: help:event.event,date_begin:0 +#: help:partner.event.registration,start_date:0 +msgid "Beginning Date of Event" +msgstr "Startdato for arrangementet" + +#. module: event +#: selection:event.registration,state:0 +msgid "Unconfirmed" +msgstr "Ubekreftet" + +#. module: event +#: code:addons/event/event.py:565 +#, python-format +msgid "Auto Registration: [%s] %s" +msgstr "Autoregistrering: [%s] %s" + +#. module: event +#: field:event.registration,date_deadline:0 +msgid "End Date" +msgstr "Sluttdato" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "February" +msgstr "Februar" + +#. module: event +#: view:board.board:0 +msgid "Association Dashboard" +msgstr "" + +#. module: event +#: view:event.event:0 +#: field:event.registration.badge,name:0 +msgid "Name" +msgstr "Navn" + +#. module: event +#: field:event.event,section_id:0 +#: field:event.registration,section_id:0 +#: view:report.event.registration:0 +#: field:report.event.registration,section_id:0 +msgid "Sale Team" +msgstr "Salgsteam" + +#. module: event +#: field:event.event,country_id:0 +msgid "Country" +msgstr "Land" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:55 +#, python-format +msgid "Registration is set as Cannot be invoiced" +msgstr "Regsitreringen har stus 'kan ikke faktureres'" + +#. module: event +#: code:addons/event/event.py:527 +#: view:event.event:0 +#: view:event.registration:0 +#: view:res.partner:0 +#, python-format +msgid "Close Registration" +msgstr "Lukk registrering" + +#. module: event +#: selection:report.event.registration,month:0 +msgid "April" +msgstr "April" + +#. module: event +#: help:event.event,unit_price:0 +msgid "" +"This will be the default price used as registration cost when invoicing this " +"event. Note that you can specify a specific amount for each registration." +msgstr "" + +#. module: event +#: view:report.event.registration:0 +msgid "Events which are in confirm state" +msgstr "Arrangementer som ahr en bekreftetstatus" + +#. module: event +#: view:event.event:0 +#: view:event.type:0 +#: view:report.event.registration:0 +#: field:report.event.registration,type:0 +msgid "Event Type" +msgstr "Arrangementstype" + +#. module: event +#: view:event.event:0 +#: field:event.event,registration_ids:0 +#: model:ir.actions.act_window,name:event.action_registration +#: model:ir.ui.menu,name:event.menu_action_registration +#: model:ir.ui.menu,name:event.menu_action_registration_association +msgid "Registrations" +msgstr "Registreringer" + +#. module: event +#: field:event.registration,id:0 +msgid "ID" +msgstr "ID" + +#. module: event +#: field:event.event,register_max:0 +#: field:report.event.registration,register_max:0 +msgid "Maximum Registrations" +msgstr "Maksimum registreringer" + +#. module: event +#: constraint:res.partner:0 +msgid "Error ! You cannot create recursive associated members." +msgstr "" + +#. module: event +#: field:report.event.registration,date:0 +msgid "Event Start Date" +msgstr "" + +#. module: event +#: view:partner.event.registration:0 +msgid "Event For Registration" +msgstr "" + +#. module: event +#: code:addons/event/wizard/event_make_invoice.py:51 +#, python-format +msgid "Invoice cannot be created if the registration is in %s state." +msgstr "" + +#. module: event +#: view:event.confirm:0 +#: model:ir.actions.act_window,name:event.action_event_confirm +#: model:ir.model,name:event.model_event_confirm +msgid "Event Confirmation" +msgstr "" + +#. module: event +#: view:event.event:0 +msgid "Auto Registration Email" +msgstr "" + +#. module: event +#: view:event.registration:0 +#: view:report.event.registration:0 +#: field:report.event.registration,total:0 +msgid "Total" +msgstr "" + +#. module: event +#: field:event.event,speaker_confirmed:0 +msgid "Speaker Confirmed" +msgstr "" + +#. module: event +#: model:ir.actions.act_window,help:event.action_event_view +msgid "" +"Event is the low level object used by meeting and others documents that " +"should be synchronized with mobile devices or calendar applications through " +"caldav. Most of the users should work in the Calendar menu, and not in the " +"list of events." +msgstr "" diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 7ae6c0fae2e..f05fdcc09e1 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -52,24 +52,12 @@ search - - - - - - - - - + + + + + + @@ -80,27 +68,18 @@ - - - - - - - + + + - + diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index e0d17c3bacb..f46bc5fff96 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -1,45 +1,46 @@ - + - + Event Helps you manage your Events. 3 - - User - - + + User + + - - Manager - - - - + + Manager + + + + - + + + Event multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + - - Event multi-company - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - - Event Registration multi-company - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - + + Event Registration multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + - - Report Event Registration multi-company - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - --> - + + Report Event Registration multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 9567f7746f3..3325ae38c0b 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -80,10 +80,9 @@ - - + diff --git a/addons/fetchmail/i18n/pt_BR.po b/addons/fetchmail/i18n/pt_BR.po index b9e5fd0e7a1..6b74bfa4910 100644 --- a/addons/fetchmail/i18n/pt_BR.po +++ b/addons/fetchmail/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2011-02-28 21:26+0000\n" -"Last-Translator: Emerson \n" +"PO-Revision-Date: 2012-07-28 22:38+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:18+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n" +"X-Generator: Launchpad (build 15702)\n" #. module: fetchmail #: selection:fetchmail.server,state:0 @@ -25,17 +25,19 @@ msgstr "Confirmado" #. module: fetchmail #: field:fetchmail.server,server:0 msgid "Server Name" -msgstr "" +msgstr "Nome do Servidor" #. module: fetchmail #: field:fetchmail.server,script:0 msgid "Script" -msgstr "" +msgstr "Script" #. module: fetchmail #: help:fetchmail.server,priority:0 msgid "Defines the order of processing, lower values mean higher priority" msgstr "" +"Define a ordem de processamento, valores mais baixos significam prioridade " +"maior" #. module: fetchmail #: help:fetchmail.server,is_ssl:0 @@ -43,11 +45,13 @@ msgid "" "Connections are encrypted with SSL/TLS through a dedicated port (default: " "IMAPS=993, POP3S=995)" msgstr "" +"Conexões são encriptadas com SSL/TLS através de uma porta dedicada (padrão: " +"IMAPS=993, POP3S=995)" #. module: fetchmail #: field:fetchmail.server,attach:0 msgid "Keep Attachments" -msgstr "" +msgstr "Manter Anexos" #. module: fetchmail #: help:fetchmail.server,original:0 @@ -56,6 +60,9 @@ msgid "" "attached to each processed message. This will usually double the size of " "your message database." msgstr "" +"Se uma cópia completa de cada email deve ser mantida para referência e " +"anexada a cada mensagem processada, isto geralmente dobra o tamanho do " +"espaço de mensagens" #. module: fetchmail #: field:fetchmail.server,priority:0 @@ -75,13 +82,13 @@ msgstr "POP" #. module: fetchmail #: view:fetchmail.server:0 msgid "Fetch Now" -msgstr "" +msgstr "Buscar Agora" #. module: fetchmail #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree msgid "Incoming Mail Servers" -msgstr "" +msgstr "Servidores de Email de Entrada" #. module: fetchmail #: field:fetchmail.server,port:0 @@ -96,12 +103,12 @@ msgstr "Servidores POP/IMAP" #. module: fetchmail #: selection:fetchmail.server,type:0 msgid "Local Server" -msgstr "" +msgstr "Servidor Local" #. module: fetchmail #: field:fetchmail.server,user:0 msgid "Username" -msgstr "" +msgstr "Usuário" #. module: fetchmail #: model:ir.model,name:fetchmail.model_fetchmail_server @@ -111,7 +118,7 @@ msgstr "Servidor POP/IMAP" #. module: fetchmail #: view:fetchmail.server:0 msgid "Reset Confirmation" -msgstr "" +msgstr "Resetar Confirmação" #. module: fetchmail #: view:fetchmail.server:0 @@ -121,12 +128,12 @@ msgstr "SSL" #. module: fetchmail #: model:ir.model,name:fetchmail.model_mail_message msgid "Email Message" -msgstr "" +msgstr "Mensagem de Email" #. module: fetchmail #: field:fetchmail.server,date:0 msgid "Last Fetch Date" -msgstr "" +msgstr "Data da última verificação" #. module: fetchmail #: help:fetchmail.server,action_id:0 @@ -134,6 +141,8 @@ msgid "" "Optional custom server action to trigger for each incoming mail, on the " "record that was created or updated by this mail" msgstr "" +"Ação opcional para disparar a cada email que chegar, no registro que foi " +"atualizado por este email" #. module: fetchmail #: view:fetchmail.server:0 @@ -143,7 +152,7 @@ msgstr "# de emails" #. module: fetchmail #: field:fetchmail.server,original:0 msgid "Keep Original" -msgstr "" +msgstr "Manter original" #. module: fetchmail #: code:addons/fetchmail/fetchmail.py:155 @@ -152,33 +161,35 @@ msgid "" "Here is what we got instead:\n" " %s" msgstr "" +"Aqui está o que temos em vez disso:\n" +" %s" #. module: fetchmail #: view:fetchmail.server:0 #: field:fetchmail.server,configuration:0 msgid "Configuration" -msgstr "" +msgstr "Configuração" #. module: fetchmail #: view:fetchmail.server:0 msgid "Incoming Mail Server" -msgstr "" +msgstr "Servidor de Email de Entrada" #. module: fetchmail #: code:addons/fetchmail/fetchmail.py:155 #, python-format msgid "Connection test failed!" -msgstr "" +msgstr "Teste de conexão falhou!" #. module: fetchmail #: help:fetchmail.server,server:0 msgid "Hostname or IP of the mail server" -msgstr "" +msgstr "Hostname ou IP do servidor de emails" #. module: fetchmail #: view:fetchmail.server:0 msgid "Server type IMAP." -msgstr "" +msgstr "Servidor tipo IMAP" #. module: fetchmail #: field:fetchmail.server,name:0 @@ -188,22 +199,22 @@ msgstr "Nome" #. module: fetchmail #: field:fetchmail.server,is_ssl:0 msgid "SSL/TLS" -msgstr "" +msgstr "SSL/TLS" #. module: fetchmail #: view:fetchmail.server:0 msgid "Test & Confirm" -msgstr "" +msgstr "Testar & Confirmar" #. module: fetchmail #: field:fetchmail.server,action_id:0 msgid "Server Action" -msgstr "" +msgstr "Ação de Servidor" #. module: fetchmail #: field:mail.message,fetchmail_server_id:0 msgid "Inbound Mail Server" -msgstr "" +msgstr "Servidor de email de entrada" #. module: fetchmail #: field:fetchmail.server,message_ids:0 @@ -214,7 +225,7 @@ msgstr "Mensagens" #. module: fetchmail #: view:fetchmail.server:0 msgid "Search Incoming Mail Servers" -msgstr "" +msgstr "Buscar servidor de email de entrada" #. module: fetchmail #: field:fetchmail.server,active:0 @@ -227,11 +238,13 @@ msgid "" "Whether attachments should be downloaded. If not enabled, incoming emails " "will be stripped of any attachments before being processed" msgstr "" +"Se os anexos devem ser baixados. Se não estiver habilitado, os servidores de " +"email irão excluir qualquer anexo antes de processar" #. module: fetchmail #: view:fetchmail.server:0 msgid "Advanced Options" -msgstr "" +msgstr "Opções Avançadas" #. module: fetchmail #: selection:fetchmail.server,type:0 @@ -246,7 +259,7 @@ msgstr "IMAP" #. module: fetchmail #: view:fetchmail.server:0 msgid "Server type POP." -msgstr "" +msgstr "Servidor tipo POP" #. module: fetchmail #: field:fetchmail.server,password:0 @@ -256,7 +269,7 @@ msgstr "Senha" #. module: fetchmail #: view:fetchmail.server:0 msgid "Actions to Perform on Incoming Mails" -msgstr "" +msgstr "Ações a serem executadas nos emails recebidos" #. module: fetchmail #: field:fetchmail.server,type:0 @@ -276,12 +289,12 @@ msgstr "Informação do Servidor" #. module: fetchmail #: view:fetchmail.server:0 msgid "If SSL required." -msgstr "" +msgstr "Se SSL obrigatório." #. module: fetchmail #: view:fetchmail.server:0 msgid "Advanced" -msgstr "" +msgstr "Avançado" #. module: fetchmail #: view:fetchmail.server:0 @@ -295,11 +308,14 @@ msgid "" "document type. This will create new documents for new conversations, or " "attach follow-up emails to the existing conversations (documents)." msgstr "" +"Processar cada servidor de entrada como parte de uma conversa correspondente " +"a este tipo de email. Isto irá criar novos documentos para novas conversas, " +"ou anexar os emails como parte da conversa (documentos)" #. module: fetchmail #: field:fetchmail.server,object_id:0 msgid "Create a New Record" -msgstr "" +msgstr "Criar um Novo Registro" #. module: fetchmail #: selection:fetchmail.server,state:0 @@ -378,3 +394,6 @@ msgstr "Servidor de Email" #~ msgid "Fetch Emails" #~ msgstr "Baixar Emails" + +#~ msgid "Advanced options" +#~ msgstr "Opções avançadas" diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po new file mode 100644 index 00000000000..e8e510c183c --- /dev/null +++ b/addons/google_base_account/i18n/pt_BR.po @@ -0,0 +1,122 @@ +# Brazilian Portuguese translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-07-28 22:59+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n" +"X-Generator: Launchpad (build 15702)\n" + +#. module: google_base_account +#: field:res.users,gmail_user:0 +msgid "Username" +msgstr "Usuário" + +#. module: google_base_account +#: model:ir.actions.act_window,name:google_base_account.act_google_login_form +msgid "Google Login" +msgstr "Login do Google" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "Google Contacts Import Error!" +msgstr "Erro de importação dos contatos Google!" + +#. module: google_base_account +#: view:res.users:0 +msgid " Synchronization " +msgstr " Sincronização " + +#. module: google_base_account +#: sql_constraint:res.users:0 +msgid "You can not have two users with the same login !" +msgstr "Você não pode ter dois usuários com o mesmo login!" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Error" +msgstr "Erro" + +#. module: google_base_account +#: view:google.login:0 +msgid "Google login" +msgstr "Login do Google" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_res_users +msgid "res.users" +msgstr "res.users" + +#. module: google_base_account +#: field:google.login,password:0 +msgid "Google Password" +msgstr "Senha do Google" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Cancel" +msgstr "_Cancelar" + +#. module: google_base_account +#: view:res.users:0 +msgid "Google Account" +msgstr "Conta do Google" + +#. module: google_base_account +#: field:google.login,user:0 +msgid "Google Username" +msgstr "Usuário do Google" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "" +"Please install gdata-python-client from http://code.google.com/p/gdata-" +"python-client/downloads/list" +msgstr "" +"Por favor instale gdata-python-client de http://code.google.com/p/gdata-" +"python-client/downloads/list" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_google_login +msgid "Google Contact" +msgstr "Contatos do Google" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Login" +msgstr "_Login" + +#. module: google_base_account +#: constraint:res.users:0 +msgid "The chosen company is not in the allowed companies for this user" +msgstr "" +"A empresa escolhida não está entre as empresas habilitadas para este usuário" + +#. module: google_base_account +#: field:res.users,gmail_password:0 +msgid "Password" +msgstr "Senha" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:75 +#, python-format +msgid "Authentication fail check the user and password !" +msgstr "Usuário e senha não conferem!" + +#. module: google_base_account +#: view:google.login:0 +msgid "ex: user@gmail.com" +msgstr "ex: usuario@gmail.com" diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index ebf8d7ba83e..39dad795c0b 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -26,7 +26,7 @@ "category": "Human Resources", "sequence": 12, "website": "http://www.openerp.com", - "summary": "Hierarchy, Jobs, Departments", + "summary": "All Infos on Employees", "description": """ Module for Human Resource Management. ===================================== diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml index adb6efbd1d7..d8c9251c62e 100644 --- a/addons/hr/hr_data.xml +++ b/addons/hr/hr_data.xml @@ -1,6 +1,23 @@ + + + + + Module Employee Directory has been installed + Manage your human resources in OpenERP: employees and hierarchy, + HR departments and jobs. + + More features are available in the following modules: + Recruitment Process (manage job positions and recruitment), + Timesheets Validation (record timesheets and attendance), + Leaves Management (keep track of employee leaves), + Expenses Management (manage employee expenses), + Employee Appraisals (organize employee surveys, where employees + evaluate their subordinates or their manager.) + + Administrator diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index bbf66f0d4c3..ed0156e6cce 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -2,11 +2,7 @@ - + hr.department.form hr.department @@ -37,18 +33,17 @@ - + Departments hr.department search - - + Departments @@ -60,5 +55,5 @@ - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 0706da45c86..ca07c8ce173 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -9,9 +9,9 @@ sequence="110"/> - + + parent="menu_hr_reporting" sequence="6"/> @@ -40,9 +40,9 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -109,16 +109,13 @@ - - - + + - - @@ -142,7 +139,9 @@
-

()

+

+ () +

  • @@ -225,12 +224,7 @@ - - + hr.employee.tree hr.employee @@ -269,12 +263,7 @@ - - + hr.employee.category.form hr.employee.category @@ -348,7 +337,7 @@ + id="menu_view_employee_category_tree" parent="menu_hr_management" groups="base.group_no_one" sequence="2"/> hr.job.form @@ -373,8 +362,8 @@ - - + + @@ -418,16 +407,9 @@ - - - - - - + + + diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 448e6401cbd..8a671e8438f 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -55,16 +55,13 @@ - - - - - - + + + + - diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index ae6789ea234..2009e500bf9 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -28,7 +28,7 @@ - + @@ -40,22 +40,15 @@ search - - - - - - - - - - + + + + + - - @@ -174,9 +167,7 @@ search - - - + diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index 4748883b1ce..bb1322bccf3 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -25,7 +25,7 @@ "author": "OpenERP SA", "category": "Human Resources", "website": "http://www.openerp.com", - "summary": "Top-Down and Bottom-Up Evaluation", + "summary": "Periodical Evaluations, Surveys", "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"], "depends": ["hr","base_calendar","survey"], "description": """ diff --git a/addons/hr_evaluation/hr_evaluation_data.xml b/addons/hr_evaluation/hr_evaluation_data.xml index bf482d2fcd7..6cd10f2d07a 100644 --- a/addons/hr_evaluation/hr_evaluation_data.xml +++ b/addons/hr_evaluation/hr_evaluation_data.xml @@ -1,6 +1,18 @@ + + + + + Module Employee Appraisals has been installed + Create evaluations for your subordinates or manager. You can + define a plan with several surveys, where you organize evaluation + surveys related to the hierarchy levels. Evaluations filled by + employees can exported as pdf files. + + + Self Appraisal 20 diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index a5efaf42347..c67b5b51d1f 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -8,12 +8,8 @@ search - - - - - - + + @@ -234,22 +230,15 @@ search - - - - - - - - - - + + + + + - - @@ -281,7 +270,6 @@
- + @@ -150,7 +145,7 @@ - + @@ -173,19 +170,15 @@ - - - - @@ -216,45 +209,29 @@ search - - - - - - - - - - - - - - + + + + + + + + + + + + - - - @@ -262,7 +239,6 @@ - Hr Applicants Calendar hr.applicant @@ -271,15 +247,14 @@ - - + + - - + Hr Applicants kanban hr.applicant @@ -348,10 +323,7 @@ - # ------------------------------------------------------ - # HR Job - # ------------------------------------------------------ - + hr.job.form1 hr.job @@ -359,20 +331,19 @@ - - - + hr.recruitment.stage.tree hr.recruitment.stage @@ -387,8 +358,7 @@ - - + hr.recruitment.stage.form hr.recruitment.stage @@ -407,8 +377,7 @@ - - + Stages hr.recruitment.stage @@ -424,8 +393,7 @@ action="hr_recruitment_stage_act" sequence="1" groups="base.group_no_one"/> - - + hr.recruitment.degree.tree hr.recruitment.degree @@ -438,8 +406,7 @@ - - + hr.recruitment.degree.form hr.recruitment.degree @@ -454,8 +421,7 @@ - - + Degree hr.recruitment.degree @@ -470,8 +436,7 @@ action="hr_recruitment_degree_action" sequence="5" groups="base.group_no_one"/> - - + hr.recruitment.source.tree hr.recruitment.source @@ -498,11 +463,12 @@ form - + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 9d81d39f240..afb87aba4ff 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -49,55 +49,32 @@ search - - - - - - - - - - - - + + + + + + + + + - - + + - - - + - - - diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 68def938191..95f996a2a5a 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -198,6 +198,13 @@ class account_analytic_account(osv.osv): _columns = { 'use_timesheets': fields.boolean('Timesheets', help="Check this field if this project manages timesheets"), } + + def on_change_template(self, cr, uid, ids, template_id, context=None): + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['use_timesheets'] = template.use_timesheets + return res account_analytic_account() diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 7875aff12a0..77dbc643a08 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -68,24 +68,17 @@ search - - - - - - - + + + - - - diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py index 54257f5efba..a4f08a854ec 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py @@ -126,6 +126,25 @@ class account_analytic_line(osv.osv): 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"), } + def _default_journal(self, cr, uid, context=None): + proxy = self.pool.get('hr.employee') + record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context) + employee = proxy.browse(cr, uid, record_ids[0], context=context) + return employee.journal_id and employee.journal_id.id or False + + def _default_general_account(self, cr, uid, context=None): + proxy = self.pool.get('hr.employee') + record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context) + employee = proxy.browse(cr, uid, record_ids[0], context=context) + if employee.product_id and employee.product_id.property_account_income: + return employee.product_id.property_account_income.id + return False + + _defaults = { + 'journal_id' : _default_journal, + 'general_account_id' : _default_general_account, + } + def write(self, cr, uid, ids, vals, context=None): self._check_inv(cr, uid, ids, vals) return super(account_analytic_line,self).write(cr, uid, ids, vals, diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 81dc1e3c9cf..90305c772cb 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -89,11 +89,11 @@ search - + + - - + @@ -144,9 +144,7 @@ search - - - + diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 59b4ceb67a3..5048f2c9193 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -46,29 +46,19 @@ search - - - - - - - - + + + + - - + - - @@ -149,12 +139,9 @@ search - - - - - - + + + @@ -201,7 +188,6 @@ search - @@ -282,13 +268,10 @@ search - - - - - - - + + + + @@ -351,13 +334,10 @@ search - - - - - - - + + + + diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml index c7d0c6b7c25..6dbbb85aea9 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml +++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml @@ -113,13 +113,10 @@ search - - - - - - - + + + + diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py index 8a812dbd3eb..618e55407df 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py @@ -90,32 +90,28 @@ class account_analytic_line(osv.osv): context2 = context.copy() context2['lang'] = partner.lang - cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id " \ + cr.execute("SELECT product_id, to_invoice, sum(unit_amount), product_uom_id, name " \ "FROM account_analytic_line as line " \ "WHERE account_id = %s " \ "AND id IN %s AND to_invoice IS NOT NULL " \ - "GROUP BY product_id,to_invoice,product_uom_id", (account.id, tuple(ids),)) + "GROUP BY product_id, to_invoice, product_uom_id, name", (account.id, tuple(ids),)) - for product_id, factor_id, qty, uom in cr.fetchall(): - product = product_obj.browse(cr, uid, product_id, context2) + for product_id, factor_id, qty, uom, line_name in cr.fetchall(): + if data.get('product'): + product_id = data['product'][0] + product = product_obj.browse(cr, uid, product_id, context=context2) if not product: - raise osv.except_osv(_('Error !'), _('At least one line has no product!')) - factor_name = '' - factor = invoice_factor_obj.browse(cr, uid, factor_id, context2) - if not data.get('product', False): - if factor.customer_name: - factor_name = product.name+' - '+factor.customer_name - else: - factor_name = product.name - else: - data['product'] = data['product'][0] - factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1] + raise osv.except_osv(_('Error'), _('There is no product defined for the line %s. Please select one or force the product through the wizard.') % (line_name)) + factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2) + factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1] + if factor.customer_name: + factor_name += ' - ' + factor.customer_name ctx = context.copy() ctx.update({'uom':uom}) if account.pricelist_id: pl = account.pricelist_id.id - price = pro_price_obj.price_get(cr,uid,[pl], data.get('product', False) or product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl] + price = pro_price_obj.price_get(cr,uid,[pl], product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl] else: price = 0.0 @@ -131,7 +127,7 @@ class account_analytic_line(osv.osv): 'invoice_line_tax_id': [(6,0,tax )], 'invoice_id': last_invoice, 'name': factor_name, - 'product_id': data.get('product',product_id), + 'product_id': product_id, 'invoice_line_tax_id': [(6,0,tax)], 'uos_id': uom, 'account_id': account_id, @@ -179,7 +175,7 @@ class hr_timesheet_invoice_create(osv.osv_memory): 'time': fields.boolean('Time spent', help='The time of each work done will be displayed on the invoice'), 'name': fields.boolean('Description', help='The detail of each work done will be displayed on the invoice'), 'price': fields.boolean('Cost', help='The cost of each work done will be displayed on the invoice. You probably don\'t want to check this'), - 'product': fields.many2one('product.product', 'Product', help='Fill this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'), + 'product': fields.many2one('product.product', 'Force Product', help='Fill this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost.'), } _defaults = { diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index cc788d95a83..1acaa5780b8 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -21,11 +21,11 @@ { - 'name': 'Timesheets Validation', + 'name': 'Timesheets', 'version': '1.0', 'category': 'Human Resources', "sequence": 16, - "summary": "Attendances, Activities, Timing", + "summary": "Timesheets, Attendances, Activities", 'description': """ This module helps you to easily encode and validate timesheet and attendances within the same view. =================================================================================================== diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml index e66694223d2..c5839f886d3 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml @@ -1,6 +1,15 @@ + + + + + Module Timesheets Validation has been installed + From the top menu "Human Resources", encode and validate + timesheets and attendances. + + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index dbc9e1d6dac..86ef3255286 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -23,11 +23,9 @@ search - - - - - + + + @@ -158,16 +156,11 @@ search - - - - - - - - - - + + + + + diff --git a/addons/hr_timesheet_sheet/i18n/pt_BR.po b/addons/hr_timesheet_sheet/i18n/pt_BR.po index 8ca428bafc5..b37c1f5577b 100644 --- a/addons/hr_timesheet_sheet/i18n/pt_BR.po +++ b/addons/hr_timesheet_sheet/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-02-19 15:16+0000\n" +"PO-Revision-Date: 2012-07-28 22:13+0000\n" "Last-Translator: Joe Pimentel \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:05+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 field:hr.attendance,sheet_id:0 @@ -746,7 +746,7 @@ msgstr "Dia" #: model:ir.actions.server,name:hr_timesheet_sheet.ir_actions_server_timsheet_sheet #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my_current msgid "My Current Timesheet" -msgstr "" +msgstr "Minha Planilha de Horas Atual" #. module: hr_timesheet_sheet #: view:timesheet.report:0 selection:timesheet.report,state:0 diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index fd5d6b0b6d1..7492d94cba2 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -40,29 +40,21 @@ search - - - - - + + - - - + - - - diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 613f92d3cf6..9956ed2655e 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -48,51 +48,30 @@ search - - - - - - - - - + + + + + - - + - - - - - + + - - - - - - - diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index ec7f0e6d328..4508301ca8c 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -110,22 +110,14 @@ search - - - - - - - - - - + + + + + - - diff --git a/addons/import_base/i18n/pt_BR.po b/addons/import_base/i18n/pt_BR.po new file mode 100644 index 00000000000..9587acd607f --- /dev/null +++ b/addons/import_base/i18n/pt_BR.po @@ -0,0 +1,105 @@ +# Brazilian Portuguese translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-08-01 01:59+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n" +"X-Generator: Launchpad (build 15719)\n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:434 +#, python-format +msgid "Import failed due to an unexpected error" +msgstr "A importação falhou devido a um erro inesperado" + +#. module: import_base +#: code:addons/import_base/import_framework.py:461 +#, python-format +msgid "started at %s and finished at %s \n" +msgstr "Início em %s e término em %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:448 +#, python-format +msgid "Import of your data finished at %s" +msgstr "A Importação de seus dados terminou em %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:463 +#, python-format +msgid "" +"but failed, in consequence no data were imported to keep database " +"consistency \n" +" error : \n" +msgstr "" +"mas falhou, por isso nenhum dado foi importado para manter a consistência do " +"banco de dados \n" +" erro: \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:477 +#, python-format +msgid "" +"The import of data \n" +" instance name : %s \n" +msgstr "" +"A importação de dados \n" +" nome da instância: %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:470 +#, python-format +msgid "%s has been successfully imported from %s %s, %s \n" +msgstr "%s foi importada com sucesso de %s %s, %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:447 +#, python-format +msgid "Data Import failed at %s due to an unexpected error" +msgstr "A importação falhou em %s devido a um erro inesperado" + +#. module: import_base +#: code:addons/import_base/import_framework.py:436 +#, python-format +msgid "Import finished, notification email sended" +msgstr "Importação Concluída, o email de notificação foi enviado" + +#. module: import_base +#: code:addons/import_base/import_framework.py:190 +#, python-format +msgid "%s is not a valid model name" +msgstr "%s não é um nome de modelo válido" + +#. module: import_base +#: model:ir.ui.menu,name:import_base.menu_import_crm +msgid "Import" +msgstr "Importar" + +#. module: import_base +#: code:addons/import_base/import_framework.py:467 +#, python-format +msgid "with no warning" +msgstr "sem nenhum erro" + +#. module: import_base +#: code:addons/import_base/import_framework.py:469 +#, python-format +msgid "with warning : %s" +msgstr "com avisos: %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:191 +#, python-format +msgid " fields imported : " +msgstr " campos importados: " diff --git a/addons/import_google/i18n/pt_BR.po b/addons/import_google/i18n/pt_BR.po index 56654d0f9e7..e130a50e59a 100644 --- a/addons/import_google/i18n/pt_BR.po +++ b/addons/import_google/i18n/pt_BR.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-07-16 20:10+0000\n" -"Last-Translator: Rafael \n" +"PO-Revision-Date: 2012-07-28 21:30+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-17 04:49+0000\n" -"X-Generator: Launchpad (build 15627)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:38+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: import_google #: help:synchronize.google.import,group_name:0 msgid "Choose which group to import, By default it takes all." -msgstr "" +msgstr "Escolha qual grupo importar, por padrão todos são importados." #. module: import_google #: view:synchronize.google.import:0 @@ -30,7 +30,7 @@ msgstr "Importar o Calendário de Eventos da Google" #. module: import_google #: view:synchronize.google.import:0 msgid "_Import Events" -msgstr "" +msgstr "_Importar Eventos" #. module: import_google #: code:addons/import_google/wizard/import_google_data.py:71 @@ -39,6 +39,8 @@ msgid "" "No Google Username or password Defined for user.\n" "Please define in user view" msgstr "" +"Não foi definido nome de usuário ou senha para o usuário Google.\n" +"Por favor definir na visão de usuário" #. module: import_google #: code:addons/import_google/wizard/import_google_data.py:127 @@ -47,6 +49,8 @@ msgid "" "Invalid login detail !\n" " Specify Username/Password." msgstr "" +"Detalhes de acesso inválidos!\n" +" Especificar Usuário/Senha." #. module: import_google #: field:synchronize.google.import,supplier:0 @@ -66,7 +70,7 @@ msgstr "Nome do Grupo" #. module: import_google #: model:ir.model,name:import_google.model_crm_case_categ msgid "Category of Case" -msgstr "" +msgstr "Categoria de Caso" #. module: import_google #: model:ir.actions.act_window,name:import_google.act_google_login_contact_form @@ -77,12 +81,12 @@ msgstr "Importar Contatos do Google" #. module: import_google #: view:google.import.message:0 msgid "Import Google Data" -msgstr "" +msgstr "Importar Dados do Google" #. module: import_google #: view:crm.meeting:0 msgid "Meeting Type" -msgstr "" +msgstr "Tipo de Reunião" #. module: import_google #: code:addons/import_google/wizard/import_google.py:38 @@ -92,22 +96,24 @@ msgid "" "Please install gdata-python-client from http://code.google.com/p/gdata-" "python-client/downloads/list" msgstr "" +"Por favor instale gdata-python-client de http://code.google.com/p/gdata-" +"python-client/downloads/list" #. module: import_google #: model:ir.model,name:import_google.model_google_login msgid "Google Contact" -msgstr "" +msgstr "Contatos do Google" #. module: import_google #: view:synchronize.google.import:0 msgid "Import contacts from a google account" -msgstr "" +msgstr "Importar contatos de uma conta Google" #. module: import_google #: code:addons/import_google/wizard/import_google_data.py:133 #, python-format msgid "Please specify correct user and password !" -msgstr "" +msgstr "Por favor especificar usuário e senha corretos !" #. module: import_google #: field:synchronize.google.import,customer:0 @@ -117,7 +123,7 @@ msgstr "Cliente" #. module: import_google #: view:synchronize.google.import:0 msgid "_Cancel" -msgstr "" +msgstr "_Cancelar" #. module: import_google #: model:ir.model,name:import_google.model_synchronize_google_import @@ -127,7 +133,7 @@ msgstr "sincronizar.importação.google" #. module: import_google #: view:synchronize.google.import:0 msgid "_Import Contacts" -msgstr "" +msgstr "_Importar Contatos" #. module: import_google #: model:ir.actions.act_window,name:import_google.act_google_login_form @@ -139,7 +145,7 @@ msgstr "Importar Calendário do Google" #: code:addons/import_google/wizard/import_google_data.py:50 #, python-format msgid "Import google" -msgstr "" +msgstr "Importar do Google" #. module: import_google #: code:addons/import_google/wizard/import_google_data.py:127 @@ -169,12 +175,12 @@ msgstr "_Ok" #: code:addons/import_google/wizard/import_google_data.py:28 #, python-format msgid "Google Contacts Import Error!" -msgstr "" +msgstr "Erro de importação dos contatos Google!" #. module: import_google #: model:ir.model,name:import_google.model_google_import_message msgid "Import Message" -msgstr "" +msgstr "Importar Mensagem" #. module: import_google #: field:synchronize.google.import,calendar_name:0 @@ -184,12 +190,12 @@ msgstr "Nome do Calendário" #. module: import_google #: help:synchronize.google.import,supplier:0 msgid "Check this box to set newly created partner as Supplier." -msgstr "" +msgstr "Selecione para marcar este parceiro recém criado como Fornecedor." #. module: import_google #: selection:synchronize.google.import,create_partner:0 msgid "Import only address" -msgstr "" +msgstr "Importar somente endereços" #. module: import_google #: field:crm.case.categ,user_id:0 @@ -199,7 +205,7 @@ msgstr "Usuário" #. module: import_google #: view:synchronize.google.import:0 msgid "Partner Status for this Group:" -msgstr "" +msgstr "Situação do Parceiro para este grupo." #. module: import_google #: field:google.import.message,name:0 @@ -209,9 +215,12 @@ msgstr "Mensagem" #. module: import_google #: selection:synchronize.google.import,create_partner:0 msgid "Create partner for each contact" -msgstr "" +msgstr "Criar um parceiro para cada contato" #. module: import_google #: help:synchronize.google.import,customer:0 msgid "Check this box to set newly created partner as Customer." -msgstr "" +msgstr "Selecione para marcar o parceiro recém criado como Cliente" + +#~ msgid "Partner status for this group:" +#~ msgstr "Situação do Parceiro para este grupo" diff --git a/addons/l10n_ar/__init__.py b/addons/l10n_ar/__init__.py new file mode 100644 index 00000000000..92da5dbf966 --- /dev/null +++ b/addons/l10n_ar/__init__.py @@ -0,0 +1,32 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com). +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py new file mode 100644 index 00000000000..8971ce94b22 --- /dev/null +++ b/addons/l10n_ar/__openerp__.py @@ -0,0 +1,51 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 Cubic ERP - Teradata SAC (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + "name": "Argentina Localization Chart Account", + "version": "1.0", + "description": """ +Argentinian accounting chart and tax localization. + +Plan contable argentino e impuestos de acuerdo a disposiciones vigentes + + """, + "author": ["Cubic ERP"], + "website": "http://cubicERP.com", + "category": "Localization/Account Charts", + "depends": [ + "account_chart", + ], + "data":[ + "account_tax_code.xml", + "l10n_ar_chart.xml", + "account_tax.xml", + "l10n_ar_wizard.xml", + ], + "demo_xml": [ + ], + "update_xml": [ + ], + "active": False, + "installable": True, + "certificate" : "", + 'images': ['images/config_chart_l10n_ar.jpeg','images/l10n_ar_chart.jpeg'], +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ar/account_tax.xml b/addons/l10n_ar/account_tax.xml new file mode 100644 index 00000000000..8c8c648f0af --- /dev/null +++ b/addons/l10n_ar/account_tax.xml @@ -0,0 +1,101 @@ + + + + + + + IVA 21% Venta + 0.210000 + percent + sale + + + + + + + + + + IVA 21% Compra + 0.210000 + percent + purchase + + + + + + + + + + + IVA 27% Venta + 0.270000 + percent + sale + + + + + + + + + + IVA 27% Compra + 0.270000 + percent + purchase + + + + + + + + + + + IVA 10.5% Venta + 0.105000 + percent + sale + + + + + + + + + + IVA 10.5% Compra + 0.105000 + percent + purchase + + + + + + + + + + + Percepción IVA 2% + 0.02000 + percent + purchase + + + + + + + + + + diff --git a/addons/l10n_ar/account_tax_code.xml b/addons/l10n_ar/account_tax_code.xml new file mode 100644 index 00000000000..806a358f7cc --- /dev/null +++ b/addons/l10n_ar/account_tax_code.xml @@ -0,0 +1,106 @@ + + + + + + Argentina Impuestos + + + Base Imponible + + + + Base Imponible - Ventas + + + + Ventas Gravadas con IVA + + + + Ventas NO Gravadas (Exoneradas) + + + + Ventas Gravadas Fuera de Ámbito + + + + Base Imponible - Compras + + + + Compras Gravadas con IVA + + + + Compras NO Gravadas (Exoneradas) + + + + Compras Gravadas Fuera de Ámbito + + + + + Impuesto General a las Ventas (IVA) Total a Pagar + + + + Impuesto Pagado + + + + Impuesto Pagado IVA + + -1 + + + Impuesto Pagado de Exonerados al IVA + + -1 + + + Impuesto Pagado Fuera de Ámbito + + -1 + + + Impuesto Cobrado + + + + Impuesto Cobrado IVA + + + + Impuesto Cobrado de Exonerados al IVA + + + + Impuesto Cobrado Fuera de Ámbito + + + + + Impuesto Nacionales a Pagar + + + + Impuesto a las Ganancias a Pagar + + + + Impuesto a los Bienes Personales a Pagar + + + + Impuesto a la Ganancia Mínima Presunta a Pagar + + + + Monotributo a Pagar + + + + diff --git a/addons/l10n_ar/i18n/es.po b/addons/l10n_ar/i18n/es.po new file mode 100644 index 00000000000..097598864fe --- /dev/null +++ b/addons/l10n_ar/i18n/es.po @@ -0,0 +1,72 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-01-10 13:46+0000\n" +"Last-Translator: Yury Tello \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n" +"X-Generator: Launchpad (build 12177)\n" + +#. module: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "" +"\n" +" Argentinian Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Peruana : Plan de cuentas\n" +" " + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Argentinian Chart of Account" +msgstr "Plan de cuentas de Argentina" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." + +#~ msgid "Liability" +#~ msgstr "Pasivo" + +#~ msgid "Asset" +#~ msgstr "Activo" + +#~ msgid "Closed" +#~ msgstr "Cerrado" + +#~ msgid "Income" +#~ msgstr "Ingreso" + +#~ msgid "Expense" +#~ msgstr "Gasto" + +#~ msgid "View" +#~ msgstr "Vista" diff --git a/addons/l10n_ar/i18n/es_AR.po b/addons/l10n_ar/i18n/es_AR.po new file mode 100644 index 00000000000..2260a43cf74 --- /dev/null +++ b/addons/l10n_ar/i18n/es_AR.po @@ -0,0 +1,54 @@ +# Spanish (Paraguay) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-03-21 16:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Paraguay) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-03-22 04:36+0000\n" +"X-Generator: Launchpad (build 12559)\n" + +#. module: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "" +"\n" +" Argentinian Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Argentina : Plan de cuentas\n" +" " + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Argentinian Chart of Account" +msgstr "Plan de cuentas de la Argentina" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." diff --git a/addons/l10n_ar/i18n/l10n_ar.pot b/addons/l10n_ar/i18n/l10n_ar.pot new file mode 100644 index 00000000000..8d117342eea --- /dev/null +++ b/addons/l10n_ar/i18n/l10n_ar.pot @@ -0,0 +1,35 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_ar +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1.0-rc1\n" +"Report-Msgid-Bugs-To: soporte@cubicerp.com\n" +"POT-Creation-Date: 2011-01-11 11:15:31+0000\n" +"PO-Revision-Date: 2011-01-11 11:15:31+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: l10n_ar +#: model:ir.module.module,description:l10n_ar.module_meta_information +msgid "\n" +" Argentinian Accounting : chart of Account\n" +" " +msgstr "" + +#. module: l10n_ar +#: model:ir.module.module,shortdesc:l10n_ar.module_meta_information +msgid "Argentinian Chart of Account" +msgstr "" + +#. module: l10n_ar +#: model:ir.actions.todo,note:l10n_ar.config_call_account_template_in_minimal +msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" +" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template." +msgstr "" + diff --git a/addons/l10n_ar/l10n_ar_chart.xml b/addons/l10n_ar/l10n_ar_chart.xml new file mode 100644 index 00000000000..062697d5aa6 --- /dev/null +++ b/addons/l10n_ar/l10n_ar_chart.xml @@ -0,0 +1,260 @@ + + + + + + + noneviewVistanone + + balanceBG_ACC_10Caja y Bancosasset + detailBG_ACC_20Inversionesasset + unreconciledBG_ACC_30Créditos por Ventasasset + unreconciledBG_ACC_50Otros Créditosasset + balanceBG_ACC_60Bienes de Cambioasset + + detailBG_ACN_10Otros Créditos No Corrientesasset + detailBG_ACN_40Inversiones Permanentesasset + balanceBG_ACN_50Bienes de Usoasset + + unreconciledBG_PAC_10Deudas Bancarias y Financierasliability + unreconciledBG_PAC_20Cuentas por Pagarliability + unreconciledBG_PAC_35Remuneraciones y Cargas Socialesliability + unreconciledBG_PAC_40Cargas Fiscalesliability + unreconciledBG_PAC_45Otros Pasivosliability + + unreconciledBG_PAN_10Deudas Bancarias y Financieras a Largo Plazoliability + unreconciledBG_PAN_20Otros Pasivos a Largo Plazoliability + unreconciledBG_PAN_40Previsionesliability + + balanceBG_PTN_10Patrimonio Netoliability + + noneEGP_FU_010Ventas Netas de Bienes y Serviciosincome + noneEGP_FU_030Costo Mercaderías y Servicios Vendidosexpense + noneEGP_FU_040Gastos de Administraciónexpense + noneEGP_FU_050Gastos de Comercializaciónexpense + unreconciledEGP_FU_060Ingresos Financieros y por tenenciaincome + noneEGP_FU_070Gastos Financieros y por tenenciaexpense + noneEGP_FU_080Otros Ingresosincome + noneEGP_FU_090Otros Gastosexpense + noneEGP_FU_120Impuesto a las Gananciasexpense + noneEGP_FU_160Ganancia (Pérdida) Neta del Ejercicioincome + + noneEGP_NA_010Compras de Bienes de Usonone + + noneORDCuentas de Ordennone + + noneNCLASIFICADOCuentas No Clasificadasnone + + + + + Argentina + pcge + + view + + + Cuentas Patrimoniales + .1.BG + + + view + + + ACTIVO1view + Caja y Bancos11view + Caja y Bancos - Caja111view + Caja y bancos - Caja / efectivo ARS111.001liquidity + Caja y Bancos - Moneda Extranjera112view + Caja y bancos - Caja / efectivo USD112.001liquidity + Caja y Bancos - Fondos fijos113view + Caja y ...- Fondos fijos / caja chica 01 ARS113.001liquidity + Caja y Bancos - Cuentas Corrientes114view + Caja y Bancos.../ BCO. CTA CTE ARS114.001liquidity + Caja y bancos - Valores a Depositar 115other + Caja y bancos - Recaudaciones a Depositar 116other + Créditos por Ventas12view + Créditos por Ventas / Deudores por Ventas121receivable1 + Créditos por Ventas / Deudores Morosos122receivable1 + Créditos por Ventas / Deudores en Gestión Judicial123receivable + Créditos por Ventas / Deudores Varios124receivable + Créditos por Ventas / (-) Previsión para Ds. Incobrables125receivable1 + Otros Créditos13view + Otros Créditos / Préstamos otorgados131receivable + Otros Créditos / Anticipos a Proveedores132receivable + Otros Créditos / Anticipo de Impuestos133receivable + Otros Créditos / Anticipo al Personal134receivable + Otros Créditos / Alquileres Pagados por Adelantado135receivable + Otros Créditos / Intereses Pagados por Adelantado136receivable + Otros Créditos / Accionistas137receivable + Otros Créditos / (-) Previsión para Descuentos138receivable + Otros Créditos / (-) Intereses (+) a Devengar139receivable + Inversiones14view + Inversiones / Acciones Transitorias141other + Inversiones / Acciones Permanentes142other + Inversiones / Títulos Públicos143other + Inversiones / (-) Previsión para Devalorización de Acciones144other + Bienes de Cambio15view + Bienes de Cambio - Mercaderías151view + Bienes de Cambio - Mercaderías / Categoria de productos 01151.01other + Bienes de Cambio - Mercaderías en Tránsito152other + Materias primas153other + Productos en Curso de Elaboración154other + Productos Elaborados155other + Materiales Varios 156other + (-) Previsión para Desvalorización de Bienes de Cambio157other + Bienes de Uso16view + Bienes de Uso / Inmuebles161other + Bienes de Uso / Maquinaria162other + Bienes de Uso / Equipos163other + Bienes de Uso / Rodados164other + Bienes de Uso / (-) Depreciación Acumulada165other + Bienes Inmateriales17view + Bienes Inmateriales / Marcas de Fábrica171other + Bienes Inmateriales / Concesiones y Franquicias172other + Bienes Inmateriales / Patentes de Invención173other + Bienes Inmateriales / (-) Amortización Acumulada174other + PASIVO2view + Deudas Comerciales21view + Deudas Comerciales / Proveedores211payable1 + Deudas Comerciales / Anticipos de Clientes212payable1 + Deudas Comerciales / (-) Intereses a Devengar por Compras al Crédito213payable1 + Deudas Bancarias y Financieras22view + Deudas Bancarias y Financieras / Adelantos en Cuenta Corriente221payable + Deudas Bancarias y Financieras / Prestamos222payable + Deudas Bancarias y Financieras / Obligaciones a Pagar223payable + Deudas Bancarias y Financieras / Intereses a Pagar224payable + Deudas Bancarias y Financieras / Debentures Emitidos225payable + Deudas Fiscales23view + Deudas Fiscales / IVA a Pagar231other + Deudas Fiscales / Impuesto a los Débitos y Créditos Bancarios a Pagar232other + Deudas Fiscales / Impuesto a las Ganancias a Pagar233other + Deudas Fiscales / Impuesto sobre los Bienes Personales a Pagar234other + Deudas Fiscales / Impuesto a la Ganancia Mínima Presunta a Pagar235other + Deudas Fiscales / Monotributo a Pagar236other + Deudas Sociales24view + Deudas Sociales / Sueldos a Pagar241payable + Deudas Sociales / Cargas Sociales a Pagar242payable + Deudas Sociales / Provisión para Sueldo Anual Complementario243payable + Deudas Sociales / Retenciones a Depositar244payable + Otras Deudas25view + Otras Deudas / Acreedores Varios251payable + Otras Deudas / Dividendos a Pagar252payable + Otras Deudas / Cobros por Adelantado253payable + Otras Deudas / Honorarios Directores y Síndicos a Pagar254payable + Previsiones26view + Previsiones / Previsión Indemnización por Despidos261payable + Previsiones / Previsión para juicios Pendientes262payable + Previsiones / Previsión para Garantías por Service263payable + PATRIMONIO NETO3view + Capital Social31view + Capital social / Capital Suscripto311other + Capital social / Acciones en Circulación312other + Capital social / Dividendos a Distribuir en Acciones313other + Capital social / (-) Descuento de Emisión de Acciones314other + Aportes No Capitalizados32view + Aportes No Capitalizados / Primas de Emsión321other + Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones322other + Ajustes al Patrimonio33view + Ajustes al Patrimonio / Revaluo Técnico de Bienes de Uso331other + Ganancias Reservadas34view + Reserva Legal341other + Reserva Estatutaria342other + Reserva Facultativa343other + Reserva para Renovación de Bienes de Uso344other + Resultados No Asignados35view + Resultados Acumulados351other + Resultados Acumulados del Ejercicio Anterior352other + Ganancias y Pérdidas del Ejercicio353other + Resultado del Ejercicio354other + + + Cuentas de Resultado + .2.GP + + + view + + + RESULTADOS POSITIVOS4view + Resultados Positivos Ordinarios41view + Resultados Positivos Ordinarios411view + Ventas - Categoria de productos 01411.01other + Intereses gananados, obtenidos, percibidos412other + Alquileres gananados, obtenidos, percibidos413other + Comisiones gananados, obtenidos, percibidos414other + Descuentos gananados, obtenidos, percibidos415other + Renta de Títulos Públicos416other + Honorarios gananados, obtenidos, percibidos417other + Ganancia Venta de Acciones418other + Resultados Positivos Extraordinarios42view + Recupero de Rezagos421other + Recupero de Deudores Incobrables422other + Ganancia Venta de Bienes de Uso423other + Donaciones obtenidas, ganandas, percibidas424other + Ganancia Venta Inversiones Permanentes425other + RESULTADOS NEGATIVOS5view + Resultados Negativos Ordinarios51view + Costo de Mercaderías Vendidas511view + Costo de Mercaderías Vendidas - Categoria de productos 01511.01other + Gastos en Depreciación de Bienes de Uso512other + Gastos en Amortización513other + Gastos en Sueldos y Jormales514other + Gastos en Cargas Sociales515other + Gastos en Impuestos516other + Gastos Bancarios517other + Gastos en Servicios Públicos518other + Gastos de Publicidad y Propaganda519other + Resultados Negativos Extraordinarios52view + Gastos en Siniestros521other + Donaciones Cedidas, Otorgadas522other + Pérdida Venta Bienes de Uso523other + + + Cuentas de Movimiento + .3.CC + + + view + + + Compras61view + Compras - Categoria de productos 0161.01other + Costos de Producción62other + Gastos de Administración63other + Gastos de Comercialización64other + + + Cuentas de Orden + .4.CO + + + view + + + CUENTAS DE ORDEN DEUDORAS71view + Mercaderias Recibidas en Consignación711other + Depósito de Valores Recibos en Garantía712other + Garantias Otorgadas713other + Documentos Descontados714other + Documentos Endosados715other + CUENTAS DE ORDEN ACREEDORAS72view + Comitente por Mercaderias Recibidas en Consignación721other + Acreedor por Garantías Otorgadas722other + Acreedor por Documentos Descontados723other + + + Argentina - Plan de Cuentas + + + + + + + + + + + + + diff --git a/addons/l10n_ar/l10n_ar_wizard.xml b/addons/l10n_ar/l10n_ar_wizard.xml new file mode 100644 index 00000000000..1180acb46e8 --- /dev/null +++ b/addons/l10n_ar/l10n_ar_wizard.xml @@ -0,0 +1,15 @@ + + + + + + Generate Chart of Accounts from a Chart Template + Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. + This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. + + + automatic + + + + diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index 800ca7937eb..bd5fe4e6ea0 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -33,13 +33,11 @@ Canadian accounting charts and localizations. "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'], "init_xml" : [], "update_xml" : [ - 'account_types_en.xml', 'account_chart_en.xml', 'account_tax_code_en.xml', 'account_chart_template_en.xml', 'account_tax_en.xml', 'fiscal_templates_en.xml', - 'account_types_fr.xml', 'account_chart_fr.xml', 'account_tax_code_fr.xml', 'account_chart_template_fr.xml', diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml index 103512b40b2..0d67e081d08 100644 --- a/addons/l10n_ca/account_chart_en.xml +++ b/addons/l10n_ca/account_chart_en.xml @@ -8,7 +8,7 @@ Account Chart CA EN view - + @@ -17,7 +17,7 @@ 1 view - + ASSETS @@ -25,7 +25,7 @@ 11 view - + CURRENT ASSETS @@ -33,7 +33,7 @@ 111 view - + CASH @@ -41,7 +41,7 @@ 1111 liquidity - + Checking Account @@ -49,7 +49,7 @@ 112 view - + TREASURY OR TREASURY EQUIVALENTS @@ -57,7 +57,7 @@ 113 view - + CERTIFICATES OF DEPOSITS @@ -65,7 +65,7 @@ 114 view - + STOCKS @@ -73,7 +73,7 @@ 115 view - + ACCOUNTS RECEIVABLES @@ -81,7 +81,7 @@ 1151 receivable - + Customers Account @@ -90,7 +90,7 @@ 1152 view - + ALLOWANCE FOR DOUBTFUL ACCOUNTS @@ -98,7 +98,7 @@ 116 view - + PREPAID EXPENSES @@ -106,7 +106,7 @@ 117 view - + INVESTMENTS HELD FOR TRADING @@ -114,15 +114,15 @@ 118 view - + TAXES RECEIVABLES 1181 - receivable - + other + GST receivable @@ -130,8 +130,8 @@ 1182 - receivable - + other + PST/QST receivable @@ -139,8 +139,8 @@ 1183 - receivable - + other + HST receivable @@ -149,7 +149,7 @@ 15 view - + NON-CURRENT ASSETS @@ -157,7 +157,7 @@ 151 view - + INVESTMENTS AVAILABLE FOR SALE @@ -165,7 +165,7 @@ 152 view - + TANGIBLE ASSETS @@ -173,7 +173,7 @@ 1527 view - + ACCUMULATED DEPRECIATIONS @@ -181,7 +181,7 @@ 153 view - + INTANGIBLE ASSETS @@ -189,7 +189,7 @@ 1531 view - + PATENTS, TRADEMARKS AND COPYRIGHTS @@ -199,7 +199,7 @@ 2 view - + LIABILITIES @@ -207,7 +207,7 @@ 21 view - + CURRENT LIABILITIES @@ -215,7 +215,7 @@ 211 view - + ACCOUNTS PAYABLES @@ -223,7 +223,7 @@ 2111 payable - + Suppliers Account @@ -232,15 +232,15 @@ 212 view - + TAXES PAYABLES 2121 - payable - + other + GST to pay @@ -248,8 +248,8 @@ 2122 - payable - + other + PST/QST to pay @@ -257,8 +257,8 @@ 2123 - payable - + other + HST to pay @@ -267,7 +267,7 @@ 213 view - + CURRENT FINANCIAL DEBTS @@ -275,7 +275,7 @@ 25 view - + NON-CURRENT LIABILITIES @@ -283,7 +283,7 @@ 251 view - + NON-CURRENT FINANCIAL DEBTS @@ -291,7 +291,7 @@ 252 view - + PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES @@ -299,7 +299,7 @@ 253 view - + DEFERRED TAXES @@ -307,7 +307,7 @@ 259 view - + OTHER NON-CURRENT LIABILITIES @@ -317,7 +317,7 @@ 3 view - + EQUITY @@ -325,7 +325,7 @@ 31 view - + SHARE CAPITAL @@ -333,7 +333,7 @@ 32 view - + PREMIUMS @@ -341,7 +341,7 @@ 33 view - + RETAINED EARNINGS @@ -349,7 +349,7 @@ 34 view - + DIVIDENDS @@ -357,7 +357,7 @@ 35 view - + TRANSLATION ADJUSTMENTS @@ -365,7 +365,7 @@ 36 view - + CONTRIBUTED SURPLUS @@ -375,7 +375,7 @@ 4 view - + INCOMES @@ -383,7 +383,7 @@ 41 view - + OPERATING INCOMES @@ -391,7 +391,7 @@ 411 other - + Inside Sales @@ -399,7 +399,7 @@ 412 other - + Harmonized Provinces Sales @@ -407,7 +407,7 @@ 413 other - + Non-Harmonized Provinces Sales @@ -415,7 +415,7 @@ 414 other - + International Sales @@ -423,7 +423,7 @@ 419 view - + OTHER OPERATING INCOMES @@ -431,7 +431,7 @@ 42 view - + NON-OPERATING INCOMES @@ -439,7 +439,7 @@ 421 view - + INTERESTS @@ -447,7 +447,7 @@ 429 view - + OTHER NON-OPERATING INCOMES @@ -457,7 +457,7 @@ 5 view - + EXPENSES @@ -465,7 +465,7 @@ 51 view - + OPERATING EXPENSES @@ -473,7 +473,7 @@ 511 view - + COST OF GOODS SOLD @@ -481,7 +481,7 @@ 5111 other - + Inside Purchases @@ -489,7 +489,7 @@ 5112 other - + Purchases in harmonized provinces @@ -497,7 +497,7 @@ 5113 other - + Purchases in non-harmonized provinces @@ -505,7 +505,7 @@ 5114 other - + International Purchases @@ -513,7 +513,7 @@ 512 view - + LABOUR EXPENSES @@ -521,7 +521,7 @@ 5121 other - + Salaries, wages and commissions @@ -529,7 +529,7 @@ 5122 other - + Holidays @@ -537,7 +537,7 @@ 5123 other - + Employment Insurance @@ -545,7 +545,7 @@ 5124 other - + Health Services Fund @@ -553,7 +553,7 @@ 5125 other - + Annuities @@ -561,7 +561,7 @@ 5126 other - + Parental Insurance @@ -569,7 +569,7 @@ 5127 other - + Labour Health and Safety @@ -577,7 +577,7 @@ 5128 other - + Labour Standards @@ -585,7 +585,7 @@ 513 view - + SALES EXPENSES @@ -593,7 +593,7 @@ 514 view - + GENERAL EXPENSES @@ -601,7 +601,7 @@ 515 view - + RESEARCH AND DEVELOPMENT EXPENSES @@ -609,7 +609,7 @@ 519 view - + OTHER OPERATING EXPENSES @@ -617,7 +617,7 @@ 55 view - + NON-OPERATING EXPENSES @@ -625,7 +625,7 @@ 551 view - + INTEREST EXPENSES @@ -633,7 +633,7 @@ 559 view - + OTHER NON-OPERATING EXPENSES diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml index fd22ba81b2e..dbf4f9aad7c 100644 --- a/addons/l10n_ca/account_chart_fr.xml +++ b/addons/l10n_ca/account_chart_fr.xml @@ -6,7 +6,7 @@ 0 view - + Account Chart CA FR @@ -16,7 +16,7 @@ 1 view - + ACTIF @@ -24,7 +24,7 @@ 11 view - + ACTIFS COURANTS @@ -32,7 +32,7 @@ 111 view - + ENCAISSE @@ -40,7 +40,7 @@ 1111 liquidity - + Compte chèque @@ -48,7 +48,7 @@ 1112 liquidity - + Petite caisse @@ -56,7 +56,7 @@ 112 view - + TRÉSORERIE OU ÉQUIVALENTS DE TRÉSORERIE @@ -64,7 +64,7 @@ 113 view - + CERTIFICATS DE DÉPÔTS @@ -72,7 +72,7 @@ 114 view - + STOCKS @@ -80,7 +80,7 @@ 115 view - + COMPTES CLIENTS @@ -88,7 +88,7 @@ 1151 receivable - + Comptes clients @@ -97,7 +97,7 @@ 1152 view - + PROVISION POUR CRÉANCES DOUTEUSES @@ -105,7 +105,7 @@ 116 view - + FRAIS PAYÉS D'AVANCE @@ -113,7 +113,7 @@ 117 view - + PLACEMENTS DÉTENUS À DES FINS DE TRANSACTION @@ -121,15 +121,15 @@ 118 view - + IMPÔTS À RECEVOIR 1181 - receivable - + other + TPS à recevoir @@ -137,8 +137,8 @@ 1182 - receivable - + other + TVP/TVQ à recevoir @@ -146,8 +146,8 @@ 1183 - receivable - + other + TVH à recevoir @@ -156,7 +156,7 @@ 15 view - + ACTIFS NON-COURANTS @@ -164,7 +164,7 @@ 151 view - + PLACEMENTS DISPONIBLES À LA VENTE @@ -172,7 +172,7 @@ 152 view - + IMMOBILISATIONS CORPORELLES @@ -180,7 +180,7 @@ 1527 view - + AMORTISSEMENTS CUMULÉS @@ -188,7 +188,7 @@ 153 view - + IMMOBILISATIONS INCORPORELLES @@ -196,7 +196,7 @@ 1531 view - + BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS @@ -206,7 +206,7 @@ 2 view - + PASSIF @@ -214,7 +214,7 @@ 21 view - + PASSIFS COURANTS @@ -222,7 +222,7 @@ 211 view - + FOURNISSEURS ET COMPTES RATTACHÉS @@ -230,7 +230,7 @@ 2111 payable - + Comptes fournisseurs @@ -239,7 +239,7 @@ 212 view - + AUTRES COMPTES CRÉDITEURS @@ -247,15 +247,15 @@ 213 view - + IMPÔTS À PAYER 2131 - payable - + other + TPS à payer @@ -263,8 +263,8 @@ 2132 - payable - + other + TVP/TVQ à payer @@ -272,8 +272,8 @@ 2133 - payable - + other + TVH à payer @@ -282,7 +282,7 @@ 214 view - + DETTES FINANCIÈRES COURANTES @@ -290,7 +290,7 @@ 215 view - + PASSIFS LIÉS AUX ACTIFS DÉTENUS EN VUE DE LEUR CESSION @@ -298,7 +298,7 @@ 25 view - + PASSIFS NON-COURANTS @@ -306,7 +306,7 @@ 251 view - + DETTES FINANCIÈRES NON-COURANTES @@ -314,7 +314,7 @@ 252 view - + PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI @@ -322,7 +322,7 @@ 253 view - + IMPÔTS DIFFÉRÉS @@ -330,7 +330,7 @@ 254 view - + AUTRES PASSIFS NON-COURANTS @@ -340,7 +340,7 @@ 3 view - + CAPITAUX PROPRES @@ -348,7 +348,7 @@ 31 view - + CAPITAL-ACTIONS @@ -356,7 +356,7 @@ 32 view - + PRIMES @@ -364,7 +364,7 @@ 33 view - + BÉNÉFICES NON RÉPARTIS @@ -372,7 +372,7 @@ 34 view - + DIVIDENDES @@ -380,7 +380,7 @@ 35 view - + ÉCARTS DE CONVERSION @@ -388,7 +388,7 @@ 36 view - + SURPLUS D'APPORT @@ -396,7 +396,7 @@ 39 view - + AUTRES ÉLÉMENTS DU RÉSULTAT GLOBAL @@ -406,7 +406,7 @@ 4 view - + PRODUITS @@ -414,7 +414,7 @@ 41 view - + PRODUITS D'EXPLOITATION @@ -422,7 +422,7 @@ 411 other - + Ventes @@ -430,7 +430,7 @@ 412 other - + Ventes avec des provinces harmonisées @@ -438,7 +438,7 @@ 413 other - + Ventes avec des provinces non-harmonisées @@ -446,7 +446,7 @@ 414 other - + Ventes à l'étranger @@ -454,7 +454,7 @@ 419 view - + AUTRES PRODUITS D'EXPLOITATION @@ -462,7 +462,7 @@ 42 view - + PRODUITS NON LIÉS À L'EXPLOITATION @@ -470,7 +470,7 @@ 425 view - + INTÉRÊTS @@ -478,7 +478,7 @@ 429 view - + AUTRES PRODUITS NON LIÉS À L'EXPLOITATION @@ -488,7 +488,7 @@ 5 view - + CHARGES @@ -496,7 +496,7 @@ 51 view - + CHARGES D'EXPLOITATION @@ -504,7 +504,7 @@ 511 view - + COÛT DES PRODUITS VENDUS @@ -512,7 +512,7 @@ 5111 other - + Achats @@ -520,7 +520,7 @@ 5112 other - + Achats dans des provinces harmonisées @@ -528,7 +528,7 @@ 5113 other - + Achats dans des provinces non-harmonisées @@ -536,7 +536,7 @@ 5114 other - + Achats à l'étranger @@ -544,7 +544,7 @@ 512 view - + SALAIRES ET CHARGES SOCIALES @@ -552,7 +552,7 @@ 51201 other - + Salaires @@ -560,7 +560,7 @@ 51202 other - + Vacances @@ -568,7 +568,7 @@ 51203 other - + Assurance Emploi @@ -576,7 +576,7 @@ 51204 other - + Fonds des services de santé @@ -584,7 +584,7 @@ 51205 other - + Rentes @@ -592,7 +592,7 @@ 51206 other - + Assurance parental @@ -600,7 +600,7 @@ 51207 other - + Santé et sécurité au travail @@ -608,7 +608,7 @@ 51208 other - + Normes du travail @@ -616,7 +616,7 @@ 513 view - + FRAIS SUR VENTE @@ -624,7 +624,7 @@ 514 view - + FRAIS GÉNÉRAUX @@ -632,7 +632,7 @@ 515 view - + FRAIS DE RECHERCHE ET DÉVELOPPEMENT @@ -640,7 +640,7 @@ 519 view - + AUTRES FRAIS D'EXPLOITATION @@ -648,7 +648,7 @@ 52 view - + FRAIS NON LIÉS À L'EXPLOITATION @@ -656,7 +656,7 @@ 521 view - + INTÉRÊTS DÉBITEURS @@ -664,7 +664,7 @@ 529 view - + AUTRES FRAIS NON LIÉS À L'EXPLOITATION diff --git a/addons/l10n_ca/account_tax_code_en.xml b/addons/l10n_ca/account_tax_code_en.xml index 36221e70a9b..d446f431c96 100644 --- a/addons/l10n_ca/account_tax_code_en.xml +++ b/addons/l10n_ca/account_tax_code_en.xml @@ -7,47 +7,47 @@ - Tax Balance to Pay + Tax Balance - Receivable Taxes + Taxes paid - GST to Receive + GST paid - PST to Receive + PST paid - HST to Receive + HST paid - Payable Taxes + Taxes received - GST to Pay + GST received - PST to Pay + PST received - HST to Pay + HST received diff --git a/addons/l10n_ca/account_tax_code_fr.xml b/addons/l10n_ca/account_tax_code_fr.xml index 389e5e5f8d9..2b6acd2b992 100644 --- a/addons/l10n_ca/account_tax_code_fr.xml +++ b/addons/l10n_ca/account_tax_code_fr.xml @@ -12,42 +12,42 @@ - Taxes à recevoir + Taxes payées - TPS à recevoir + TPS payée - TVP/TVQ à recevoir + TVP/TVQ payée - TVH à recevoir + TVH payée - Taxes à payer + Taxes reçues - TPS à payer + TPS reçue - TVP/TVQ à payer + TVP/TVQ reçue - TVH à payer + TVH reçue diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index 662ac4b52fc..f185f7f9198 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -2,263 +2,544 @@ + + - + - GST + PST (MB) - GSTPST_MB + GST + PST for sales (MB) + GSTPST_MB_SALE + sale 1 1 percent - + - GST - 5% (MB) + GST for sales - 5% (MB) GST + sale 0.050000 percent 1 - + - - + + - + - + - PST - 7% + PST for sales - 7% PST - 0.070000 + sale + 0.700000 percent - 1 - + 2 + - - + + - + - + - GST + PST (PE) - GSTPST_PE + GST + PST for sales (PE) + GSTPST_PE_SALE + sale 1 1 percent - + - GST - 5% (PE) + GST for sales - 5% (PE) GST + sale 0.050000 percent 1 - + - - + + - + - + - PST - 10% + PST for sale - 10% PST + sale 0.100000 percent - 1 - + 2 + - - + + - + - + - GST + PST (QC) - GSTPST_QC + GST + TVQ for sales + GSTTVQ_SALE + sale 1 1 percent - + - GST - 5% (QC) + GST for sales - 5% (QC) GST + sale 0.050000 percent 1 - + - - + + - + - + - PST - 9.5% - PST + TVQ for sales - 9.5% + TVQ + sale 0.095000 percent - 1 - + 2 + - - + + - + - + - GST + PST (SK) - GSTPST_SK + GST + PST for sales (SK) + GSTPST_SK_SALE + sale 1 1 percent - + - GST - 5% (SK) + GST for sales - 5% (SK) GST + sale 0.050000 percent 1 - + - - + + - + - + - PST - 5% + PST for sales - 5% (SK) PST + sale 0.050000 percent - 1 - + 2 + - - + + - + - + - HST - 12% - HST12 + TVH for sales - 12% + TVH12_SALE + sale 0.120000 percent - + - - + + - + - HST - 13% - HST13 + TVH for sales - 13% + TVH13_SALE + sale 0.130000 percent - + - - + + - + - HST - 13.5% - HST135 + TVH for sales - 13.5% + TVH135_SALE + sale 0.135000 percent - + - - + + - + - HST - 15% - HST15 + TVH for sales - 15% + TVH15_SALE + sale 0.150000 percent - + - - + + - + - GST - 5% - GST + GST for sales - 5% + GST_SALE + sale 0.050000 percent - + - - + + - + + + + + + - No tax - No tax - 0.00 + GST + PST for purchases (MB) + GSTPST_MB_PURC + purchase + 1 + 1 percent + + + GST for purchases - 5% (MB) + GST + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + PST for purchases - 7% + PST + purchase + 0.700000 + percent + 2 + + + + + + + + + + + + + + GST + PST for purchases (PE) + GSTPST_PE_PURC + purchase + 1 + 1 + percent + + + + + GST for purchases - 5% (PE) + GST + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + PST for purchases - 10% + PST + purchase + 0.100000 + percent + 2 + + + + + + + + + + + + + + GST + TVQ for purchases + GSTTVQ_PURC + purchase + 1 + 1 + percent + + + + + GST for purchases - 5% (QC) + GST + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + TVQ for purchases - 9.5% + TVQ + purchase + 0.095000 + percent + 2 + + + + + + + + + + + + + + GST + PST for purchases (SK) + GSTPST_SK_PURC + purchase + 1 + 1 + percent + + + + + GST for purchases - 5% (SK) + GST + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + PST for purchases - 5% (SK) + PST + purchase + 0.050000 + percent + 2 + + + + + + + + + + + + + + TVH for purchases - 12% + TVH12_PURC + purchase + 0.120000 + percent + + + + + + + + + + + TVH for purchases - 13% + TVH13_PURC + purchase + 0.130000 + percent + + + + + + + + + + + TVH for purchases - 13.5% + TVH135_PURC + purchase + 0.135000 + percent + + + + + + + + + + + TVH for purchases - 15% + TVH15_PURC + purchase + 0.150000 + percent + + + + + + + + + + + + + GST for purchases - 5% + GST_PURC + purchase + 0.050000 + percent + + + + + + + + diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index 5df4446c611..169bfe4f20b 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -2,263 +2,544 @@ + + - + - TPS + TVP (MB) - TPSTVP_MB + TPS + TVP sur les ventes (MB) + TPSTVP_MB_SALE + sale 1 1 percent - + - TPS - 5% (MB) + TPS sur les ventes - 5% (MB) TPS + sale 0.050000 percent 1 - + - - + + - + - + - TVP - 7% + TVP sur les ventes - 7% TVP + sale 0.700000 percent - 1 - + 2 + - - + + - + - + - TPS + TVP (PE) - TPSTVP_PE + TPS + TVP sur les ventes (PE) + TPSTVP_PE_SALE + sale 1 1 percent - + - TPS - 5% (PE) + TPS sur les ventes - 5% (PE) TPS + sale 0.050000 percent 1 - + - - + + - + - + - TVP - 10% + TVP for sale - 10% TVP + sale 0.100000 percent - 1 - + 2 + - - + + - + - + - TPS + TVQ - TPSTVQ + TPS + TVQ sur les ventes + TPSTVQ_SALE + sale 1 1 percent - + - TPS - 5% (QC) + TPS sur les ventes - 5% (QC) TPS + sale 0.050000 percent 1 - + - - + + - + - + - TVQ - 9.5% + TVQ sur les ventes - 9.5% TVQ + sale 0.095000 percent - 1 - + 2 + - - + + - + - + - TPS + TVP (SK) - TPSTVP_SK + TPS + TVP sur les ventes (SK) + TPSTVP_SK_SALE + sale 1 1 percent - + - TPS - 5% (SK) + TPS sur les ventes - 5% (SK) TPS + sale 0.050000 percent 1 - + - - + + - + - + - TVP - 5% (SK) + TVP sur les ventes - 5% (SK) TVP + sale 0.050000 percent - 1 - + 2 + - - + + - + - + - TVH - 12% - TVH12 + TVH sur les ventes - 12% + TVH12_SALE + sale 0.120000 percent - + - - + + - + - TVH - 13% - TVH13 + TVH sur les ventes - 13% + TVH13_SALE + sale 0.130000 percent - + - - + + - + - TVH - 13.5% - TVH135 + TVH sur les ventes - 13.5% + TVH135_SALE + sale 0.135000 percent - + - - + + - + - TVH - 15% - TVH15 + TVH sur les ventes - 15% + TVH15_SALE + sale 0.150000 percent - + - - + + - + - TPS - 5% - TPS + TPS sur les ventes - 5% + TPS_SALE + sale 0.050000 percent - + - - + + - + + + + + + - Pas de taxes - Pas de taxes - 0.00 + TPS + TVP sur les achats (MB) + TPSTVP_MB_PURC + purchase + 1 + 1 percent + + + TPS sur les achats - 5% (MB) + TPS + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + TVP sur les achats - 7% + TVP + purchase + 0.700000 + percent + 2 + + + + + + + + + + + + + + TPS + TVP sur les achats (PE) + TPSTVP_PE_PURC + purchase + 1 + 1 + percent + + + + + TPS sur les achats - 5% (PE) + TPS + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + TVP sur les achats - 10% + TVP + purchase + 0.100000 + percent + 2 + + + + + + + + + + + + + + TPS + TVQ sur les achats + TPSTVQ_PURC + purchase + 1 + 1 + percent + + + + + TPS sur les achats - 5% (QC) + TPS + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + TVQ sur les achats - 9.5% + TVQ + purchase + 0.095000 + percent + 2 + + + + + + + + + + + + + + TPS + TVP sur les achats (SK) + TPSTVP_SK_PURC + purchase + 1 + 1 + percent + + + + + TPS sur les achats - 5% (SK) + TPS + purchase + 0.050000 + percent + 1 + + + + + + + + + + + + + TVP sur les achats - 5% (SK) + TVP + purchase + 0.050000 + percent + 2 + + + + + + + + + + + + + + TVH sur les achats - 12% + TVH12_PURC + purchase + 0.120000 + percent + + + + + + + + + + + TVH sur les achats - 13% + TVH13_PURC + purchase + 0.130000 + percent + + + + + + + + + + + TVH sur les achats - 13.5% + TVH135_PURC + purchase + 0.135000 + percent + + + + + + + + + + + TVH sur les achats - 15% + TVH15_PURC + purchase + 0.150000 + percent + + + + + + + + + + + + + TPS sur les achats - 5% + TPS_PURC + purchase + 0.050000 + percent + + + + + + + + diff --git a/addons/l10n_ca/account_types_en.xml b/addons/l10n_ca/account_types_en.xml deleted file mode 100644 index cc155a792ae..00000000000 --- a/addons/l10n_ca/account_types_en.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - Receivable - receivable - unreconciled - - - - Payable - payable - unreconciled - - - - View - view - none - - - - Income - income - none - income - - - - Expense - expense - none - expense - - - - Tax - tax - unreconciled - - - - Cash - cash - balance - - - - Asset - asset - balance - asset - - - - Equity - equity - liability - balance - - - - diff --git a/addons/l10n_ca/account_types_fr.xml b/addons/l10n_ca/account_types_fr.xml deleted file mode 100644 index b7d82956195..00000000000 --- a/addons/l10n_ca/account_types_fr.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - Vue - view - none - - - - Capital - capital - asset - balance - - - - Immobilisation - immo - asset - balance - - - - Stock et Encours - stock - asset - balance - - - - Tiers - tiers - balance - - - - Tiers - Recevable - tiers -rec - asset - unreconciled - - - - Tiers - Payable - tiers - pay - liability - unreconciled - - - - Tax - tax - unreconciled - - - - Financier - financier - balance - - - - Charge - charge - expense - none - - - - Produit - produit - income - none - - - - diff --git a/addons/l10n_ca/fiscal_templates_en.xml b/addons/l10n_ca/fiscal_templates_en.xml index ba5c919a383..68e881c3541 100644 --- a/addons/l10n_ca/fiscal_templates_en.xml +++ b/addons/l10n_ca/fiscal_templates_en.xml @@ -39,354 +39,618 @@ + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - - + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + + + - - - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + - - - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/l10n_ca/fiscal_templates_fr.xml b/addons/l10n_ca/fiscal_templates_fr.xml index 07608cdb261..722517366a8 100644 --- a/addons/l10n_ca/fiscal_templates_fr.xml +++ b/addons/l10n_ca/fiscal_templates_fr.xml @@ -39,278 +39,542 @@ + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py index 2e8201cca19..ad29d3ac9c8 100644 --- a/addons/l10n_ch/report/report_webkit_html.py +++ b/addons/l10n_ch/report/report_webkit_html.py @@ -20,22 +20,31 @@ ############################################################################## import time -from report import report_sxw -from report_webkit import webkit_report -from report_webkit import report_helper -from osv import osv -from tools import mod10r import sys import os import re + +from mako.template import Template +from mako.lookup import TemplateLookup +from mako import exceptions + + +from report import report_sxw +from report_webkit import webkit_report +from report_webkit import report_helper + +from osv import osv +from osv.osv import except_osv + +from tools import mod10r +from tools.translate import _ +from tools.config import config + import wizard import addons import pooler -from tools.config import config -from mako.template import Template -from mako import exceptions -from tools.translate import _ -from osv.osv import except_osv + + class l10n_ch_report_webkit_html(report_sxw.rml_parse): @@ -143,53 +152,26 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): 'digits!\nPlease check your company ' 'information for the invoice:\n%s') %(invoice_name))) return '' + +def mako_template(text): + """Build a Mako template. + + This template uses UTF-8 encoding + """ + tmp_lookup = TemplateLookup() #we need it in order to allow inclusion and inheritance + return Template(text, input_encoding='utf-8', output_encoding='utf-8', lookup=tmp_lookup) class BVRWebKitParser(webkit_report.WebKitParser): - def setLang(self, lang): - if not lang: - lang = 'en_US' - self.localcontext['lang'] = lang - - def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False): - """format using the know cursor, language from localcontext""" - if digits is None: - digits = self.parser_instance.get_digits(value) - if isinstance(value, (str, unicode)) and not value: - return '' - pool_lang = self.pool.get('res.lang') - lang = self.localcontext['lang'] - - lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0] - lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids) - - if date or date_time: - if not str(value): - return '' - - date_format = lang_obj.date_format - parse_format = '%Y-%m-%d' - if date_time: - value=value.split('.')[0] - date_format = date_format + " " + lang_obj.time_format - parse_format = '%Y-%m-%d %H:%M:%S' - if not isinstance(value, time.struct_time): - return time.strftime(date_format, time.strptime(value, parse_format)) - - else: - date = datetime(*value.timetuple()[:6]) - return date.strftime(date_format) - - return lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary) - def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None): """generate the PDF""" - self.parser_instance = self.parser( - cursor, + context = context or {} + if report_xml.report_type != 'webkit': + return super(WebKitParser,self).create_single_pdf(cursor, uid, ids, data, report_xml, context=context) + self.parser_instance = self.parser(cursor, uid, self.name2, - context=context - ) + context=context) self.pool = pooler.get_pool(cursor.dbname) objs = self.getObjects(cursor, uid, ids, context) self.parser_instance.set_context(objs, data, ids, report_xml.report_type) @@ -201,7 +183,7 @@ class BVRWebKitParser(webkit_report.WebKitParser): if not template and report_xml.report_webkit_data : template = report_xml.report_webkit_data if not template : - raise except_osv(_('Webkit Report template not found !'), _('')) + raise except_osv(_('Error'),_('Webkit Report template not found !')) header = report_xml.webkit_header.html footer = report_xml.webkit_header.footer_html if not header and report_xml.header: @@ -210,43 +192,19 @@ class BVRWebKitParser(webkit_report.WebKitParser): _('Please set a header in company settings.') ) if not report_xml.header : - #I know it could be cleaner ... - header = u""" - - - - - - - -""" - self.parser_instance.localcontext.update({'setLang':self.setLang}) - self.parser_instance.localcontext.update({'formatLang':self.formatLang}) + header = '' + default_head = addons.get_module_resource('report_webkit', 'default_header.html') + with open(default_head,'r') as f: + header = f.read() css = report_xml.webkit_header.css if not css : css = '' user = self.pool.get('res.users').browse(cursor, uid, uid) company = user.company_id - parse_template = template - #default_filters=['unicode', 'entity'] can be used to set global filter - body_mako_tpl = Template(parse_template ,input_encoding='utf-8', output_encoding='utf-8') + body_mako_tpl = mako_template(template) #BVR specific bvr_path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr.mako')) - body_bvr_tpl = Template(file(bvr_path).read(), input_encoding='utf-8', output_encoding='utf-8') - + body_bvr_tpl = mako_template(file(bvr_path).read()) helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context) ##BVR Specific htmls = [] @@ -254,58 +212,48 @@ class BVRWebKitParser(webkit_report.WebKitParser): self.parser_instance.localcontext['objects'] = [obj] if not company.bvr_only: try: - html = body_mako_tpl.render( - helper=helper, + html = body_mako_tpl.render(helper=helper, css=css, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) htmls.append(html) if not company.invoice_only: try: - bvr = body_bvr_tpl.render( - helper=helper, - css=css, - _=self.translate_call, - **self.parser_instance.localcontext - ) + bvr = body_bvr_tpl.render(helper=helper, + css=css, + _=self.translate_call, + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) htmls.append(bvr) head_mako_tpl = Template(header, input_encoding='utf-8', output_encoding='utf-8') try: - head = head_mako_tpl.render( - helper=helper, + head = head_mako_tpl.render(helper=helper, css=css, _debug=False, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) foot = False if footer and company.invoice_only : foot_mako_tpl = Template(footer, input_encoding='utf-8', output_encoding='utf-8') try: - foot = foot_mako_tpl.render( - helper=helper, + foot = foot_mako_tpl.render(helper=helper, css=css, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) if report_xml.webkit_debug : try: - deb = head_mako_tpl.render( - helper=helper, + deb = head_mako_tpl.render(helper=helper, css=css, _debug=html, _=self.translate_call, - **self.parser_instance.localcontext - ) + **self.parser_instance.localcontext) except Exception, e: raise Exception(exceptions.text_error_template().render()) return (deb, 'html') diff --git a/addons/l10n_cl/__init__.py b/addons/l10n_cl/__init__.py new file mode 100644 index 00000000000..92da5dbf966 --- /dev/null +++ b/addons/l10n_cl/__init__.py @@ -0,0 +1,32 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (c) 2011 Cubic ERP - Teradata SAC. (http://cubicerp.com). +# +# WARNING: This program as such is intended to be used by professional +# programmers who take the whole responsability of assessing all potential +# consequences resulting from its eventual inadequacies and bugs +# End users who are looking for a ready-to-use solution with commercial +# garantees and support are strongly adviced to contract a Free Software +# Service Company +# +# This program is Free Software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +############################################################################## + + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py new file mode 100644 index 00000000000..8c1e1e45b50 --- /dev/null +++ b/addons/l10n_cl/__openerp__.py @@ -0,0 +1,51 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2011 Cubic ERP - Teradata SAC (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + "name": "Chile Localization Chart Account", + "version": "1.0", + "description": """ +Chilean accounting chart and tax localization. + +Plan contable chileno e impuestos de acuerdo a disposiciones vigentes + + """, + "author": "Cubic ERP", + "website": "http://cubicERP.com", + "category": "Localization/Account Charts", + "depends": [ + "account_chart", + ], + "data":[ + "account_tax_code.xml", + "l10n_cl_chart.xml", + "account_tax.xml", + "l10n_cl_wizard.xml", + ], + "demo_xml": [ + ], + "update_xml": [ + ], + "active": False, + "installable": True, + "certificate" : "", + 'images': ['images/config_chart_l10n_cl.jpeg','images/l10n_cl_chart.jpeg'], +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cl/account_tax.xml b/addons/l10n_cl/account_tax.xml new file mode 100644 index 00000000000..1db0d2637f4 --- /dev/null +++ b/addons/l10n_cl/account_tax.xml @@ -0,0 +1,34 @@ + + + + + + + IVA 19% Venta + 0.190000 + percent + sale + + + + + + + + + + + IVA 19% Compra + 0.190000 + percent + purchase + + + + + + + + + + diff --git a/addons/l10n_cl/account_tax_code.xml b/addons/l10n_cl/account_tax_code.xml new file mode 100644 index 00000000000..95c91b60d78 --- /dev/null +++ b/addons/l10n_cl/account_tax_code.xml @@ -0,0 +1,94 @@ + + + + + + Chile Impuestos + + + Base Imponible + + + + Base Imponible - Ventas + + + + Ventas Gravadas con IVA + + + + Ventas NO Gravadas (Exoneradas) + + + + Ventas Gravadas Fuera de Ámbito + + + + Base Imponible - Compras + + + + Compras Gravadas con IVA + + + + Compras NO Gravadas (Exoneradas) + + + + Compras Gravadas Fuera de Ámbito + + + + + Impuesto General a las Ventas (IVA) Total a Pagar + + + + Impuesto Pagado + + + + Impuesto Pagado IVA + + -1 + + + Impuesto Pagado de Exonerados al IVA + + -1 + + + Impuesto Pagado Fuera de Ámbito + + -1 + + + Impuesto Cobrado + + + + Impuesto Cobrado IVA + + + + Impuesto Cobrado de Exonerados al IVA + + + + Impuesto Cobrado Fuera de Ámbito + + + + + Impuestos Directos a Pagar + + + + Impuesto a la Renta Primera Categoría a Pagar + + + + diff --git a/addons/l10n_cl/i18n/es.po b/addons/l10n_cl/i18n/es.po new file mode 100644 index 00000000000..f8b17197008 --- /dev/null +++ b/addons/l10n_cl/i18n/es.po @@ -0,0 +1,72 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-01-10 13:46+0000\n" +"Last-Translator: Yury Tello \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n" +"X-Generator: Launchpad (build 12177)\n" + +#. module: l10n_cl +#: model:ir.module.module,description:l10n_cl.module_meta_information +msgid "" +"\n" +" Chilean Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Peruana : Plan de cuentas\n" +" " + +#. module: l10n_cl +#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information +msgid "Chilean Chart of Account" +msgstr "Plan de cuentas de Chile" + +#. module: l10n_cl +#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañia, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." + +#~ msgid "Liability" +#~ msgstr "Pasivo" + +#~ msgid "Asset" +#~ msgstr "Activo" + +#~ msgid "Closed" +#~ msgstr "Cerrado" + +#~ msgid "Income" +#~ msgstr "Ingreso" + +#~ msgid "Expense" +#~ msgstr "Gasto" + +#~ msgid "View" +#~ msgstr "Vista" diff --git a/addons/l10n_cl/i18n/es_CL.po b/addons/l10n_cl/i18n/es_CL.po new file mode 100644 index 00000000000..cd0a9f9c43e --- /dev/null +++ b/addons/l10n_cl/i18n/es_CL.po @@ -0,0 +1,53 @@ +# Spanish (Paraguay) translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-03-21 16:23+0000\n" +"Last-Translator: FULL NAME \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-03-22 04:36+0000\n" +"X-Generator: Launchpad (build 12559)\n" + +#. module: l10n_cl +#: model:ir.module.module,description:l10n_cl.module_meta_information +msgid "" +"\n" +" Chilean Accounting : chart of Account\n" +" " +msgstr "" +"\n" +" Contabilidad Chile : Plan de cuentas\n" +" " + +#. module: l10n_cl +#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information +msgid "Chilean Chart of Account" +msgstr "Plan de cuentas de la Chile" + +#. module: l10n_cl +#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" +"Generar el plan contable a partir de una plantilla de plan contable. Se le " +"pedirá el nombre de la compañía, la plantilla de plan contable a utilizar, " +"el número de dígitos para generar el código de las cuentas y de la cuenta " +"bancaria, la moneda para crear los diarios. Así pues, se genere una copia " +"exacta de la plantilla de plan contable.\n" +"\tEste es el mismo asistente que se ejecuta desde Contabilidad y finanzas / " +"Configuración / Contabilidad financiera / Cuentas financieras / Generar el " +"plan contable a partir de una plantilla de plan contable." diff --git a/addons/l10n_cl/i18n/l10n_cl.pot b/addons/l10n_cl/i18n/l10n_cl.pot new file mode 100644 index 00000000000..9b3704b75e1 --- /dev/null +++ b/addons/l10n_cl/i18n/l10n_cl.pot @@ -0,0 +1,35 @@ +# Translation of OpenERP Server. +# This file contains the translation of the following modules: +# * l10n_cl +# +msgid "" +msgstr "" +"Project-Id-Version: OpenERP Server 6.1.0-rc1\n" +"Report-Msgid-Bugs-To: soporte@cubicerp.com\n" +"POT-Creation-Date: 2011-01-11 11:15:31+0000\n" +"PO-Revision-Date: 2011-01-11 11:15:31+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: l10n_cl +#: model:ir.module.module,description:l10n_cl.module_meta_information +msgid "\n" +" Chilean Accounting : chart of Account\n" +" " +msgstr "" + +#. module: l10n_cl +#: model:ir.module.module,shortdesc:l10n_cl.module_meta_information +msgid "Chilean Chart of Account" +msgstr "" + +#. module: l10n_cl +#: model:ir.actions.todo,note:l10n_cl.config_call_account_template_in_minimal +msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n" +" This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template." +msgstr "" + diff --git a/addons/l10n_cl/l10n_cl_chart.xml b/addons/l10n_cl/l10n_cl_chart.xml new file mode 100644 index 00000000000..8bc4272c2eb --- /dev/null +++ b/addons/l10n_cl/l10n_cl_chart.xml @@ -0,0 +1,256 @@ + + + + + + + noneviewVistanone + + balanceBG_ACC_10Efectivo y Equivalentes al Efectivoasset + detailBG_ACC_20Otros Activos Financieros Corrientesasset + unreconciledBG_ACC_30Deudores Comercialesasset + unreconciledBG_ACC_50Otras Cuentas por Cobrarasset + balanceBG_ACC_60Inventariosasset + + detailBG_ACN_10Derechos por Cobrar No Corrienteasset + detailBG_ACN_40Otros Activos No Financierosasset + balanceBG_ACN_50Propiedades, Planta y Equipoasset + + unreconciledBG_PAC_10Otros Pasivos Financierosliability + unreconciledBG_PAC_20Cuentas por Pagar Comercialesliability + unreconciledBG_PAC_35Otras Cuentas por Pagarliability + unreconciledBG_PAC_40Otras Provisiones Corrientesliability + unreconciledBG_PAC_45Pasivos por Impuestos Corrientesliability + + unreconciledBG_PAN_10Otros Pasivos Financieros No Corrientesliability + unreconciledBG_PAN_20Otros Cuentas por Pagar No Corrientesliability + unreconciledBG_PAN_40Otras Provisiones No Corrientesliability + + balanceBG_PTN_10Patrimonio Netoliability + + noneEGP_FU_010Ingresos por Actividades Ordinariasincome + noneEGP_FU_030Costo de Ventasexpense + noneEGP_FU_040Gastos de Administraciónexpense + noneEGP_FU_050Costos por Distribuciónexpense + unreconciledEGP_FU_060Ingresos Financierosincome + noneEGP_FU_070Costos Financierosexpense + noneEGP_FU_080Otros Ingresosincome + noneEGP_FU_090Otros Gastosexpense + noneEGP_FU_120Gasto Impuesto a las Rentaexpense + noneEGP_FU_160Ganancia (Pérdida)income + + noneEGP_NA_010Compras de Activo Fijonone + + noneORDCuentas de Ordennone + + noneNCLASIFICADOCuentas No Clasificadasnone + + + + + Chile + pcge + + view + + + inventario del Balance General + .1.BG + + + view + + + ACTIVOS1view + Activo Circulante11view + Activo Circulante - Caja111view + Activo Circulante - Caja / efectivo CLP111.001liquidity + Activo Circulante - Moneda Extranjera112view + Activo Circulante - Caja / efectivo USD112.001liquidity + Activo Circulante - Fondos fijos113view + Activo Circulante - Fondos fijos / caja chica 01 CLP113.001liquidity + Activo Circulante - Bancos114view + Activo Circulante.../ BCO. CTA CTE CLP114.001liquidity + Activo Circulante - Valores a Depositar 115other + Activo Circulante - Recaudaciones a Depositar 116other + Documentos por Cobrar12view + Documentos por Cobrar / Deudores por Ventas121receivable1 + Documentos por Cobrar / Deudores Morosos122receivable1 + Documentos por Cobrar / Deudores en Gestión Judicial123receivable + Documentos por Cobrar / Deudores Varios124receivable + Documentos por Cobrar / (-) Previsión para Incobrables125receivable1 + Cuentas por Cobrar13view + Cuentas por Cobrar / Préstamos otorgados131receivable + Cuentas por Cobrar / Anticipos a Proveedores132receivable + Cuentas por Cobrar / Anticipo de Impuestos133receivable + Cuentas por Cobrar / Anticipo al Personal134receivable + Cuentas por Cobrar / Alquileres Pagados por Adelantado135receivable + Cuentas por Cobrar / Intereses Pagados por Adelantado136receivable + Cuentas por Cobrar / Accionistas137receivable + Cuentas por Cobrar / (-) Previsión para Descuentos138receivable + Cuentas por Cobrar / (-) Intereses (+) a Devengar139receivable + Inversiones Financieras14view + Inversiones / Acciones Transitorias141other + Inversiones / Acciones Permanentes142other + Inversiones / Títulos Públicos143other + Inversiones / (-) Previsión para Devalorización de Acciones144other + Existencias15view + Existencias - Mercaderías151view + Existencias - Mercaderías / Categoria de productos 01151.01other + Existencias - Mercaderías en Tránsito152other + Materias primas153other + Productos en Curso de Elaboración154other + Productos Elaborados155other + Materiales Varios 156other + (-) Previsión para Desvalorización de Existencias157other + Activo Fijo16view + Activo Fijo / Inmuebles161other + Activo Fijo / Maquinaria162other + Activo Fijo / Equipos163other + Activo Fijo / Material Rodante Motorizado164other + Activo Fijo / (-) Depreciación Acumulada165other + Activo Intangible17view + Activo Intangible / Derecho de Llaves171other + Activo Intangible / Concesiones y Franquicias172other + Activo Intangible / Marcas y Patentes de Invención173other + Activo Intangible / (-) Amortización Acumulada174other + PASIVOS2view + Cuentas por Pagar21view + Cuentas por Pagar / Proveedores211payable1 + Cuentas por Pagar / Anticipos de Clientes212payable1 + Cuentas por Pagar / (-) Intereses a Devengar por Compras al Crédito213payable1 + Pasivo Circulante22view + Pasivo Circulante / Adelantos en Cuenta Corriente221payable + Pasivo Circulante / Prestamos222payable + Pasivo Circulante / Obligaciones a Pagar223payable + Pasivo Circulante / Intereses a Pagar224payable + Pasivo Circulante / Debentures Emitidos225payable + Impuestos por Pagar23view + Impuestos por Pagar / IVA a Pagar231other + Impuestos por Pagar / Impuesto a la Renta a Pagar232other + Remuneraciones por Pagar24view + Remuneraciones por Pagar / Sueldos a Pagar241payable + Remuneraciones por Pagar / Cargas Sociales a Pagar242payable + Remuneraciones por Pagar / Provisión para Sueldo Anual Complementario243payable + Remuneraciones por Pagar / Retenciones a Depositar244payable + Otras Cuentas por Pagar25view + Otras Cuentas por Pagar / Acreedores Varios251payable + Otras Cuentas por Pagar / Dividendos a Pagar252payable + Otras Cuentas por Pagar / Cobros por Adelantado253payable + Otras Cuentas por Pagar / Honorarios Directores y Síndicos a Pagar254payable + Provisiones26view + Provisiones / Previsión Indemnización por Despidos261payable + Provisiones / Previsión para juicios Pendientes262payable + Provisiones / Previsión para Garantías por Service263payable + PATRIMONIO3view + Capital31view + Capital / Capital Propio311other + Capital / Acciones en Circulación312other + Capital / Dividendos a Distribuir en Acciones313other + Capital / (-) Descuento de Emisión de Acciones314other + Aportes No Capitalizados32view + Aportes No Capitalizados / Primas de Emsión321other + Aportes No Capitalizados / Aportes Irrevocables Futura Suscripción de Acciones322other + Ajustes al Patrimonio33view + Ajustes al Patrimonio / Revaluo Técnico de Activo Fijo331other + Futuras Eventualidades34view + Reserva Legal341other + Reserva Estatutaria342other + Reserva Facultativa343other + Reserva para Renovación de Activo Fijo344other + Resultados No Asignados35view + Resultados Acumulados351other + Resultados Acumulados del Ejercicio Anterior352other + Utilidades y Pérdidas del Ejercicio353other + Resultado del Ejercicio354other + + + Cuentas de Resultado + .2.GP + + + view + + + RESULTADO GANANCIA4view + Ingresos de Explotación41view + Ventas411view + Ventas - Categoria de productos 01411.01other + Intereses gananados, obtenidos, percibidos412other + Alquileres gananados, obtenidos, percibidos413other + Comisiones gananados, obtenidos, percibidos414other + Descuentos gananados, obtenidos, percibidos415other + Interese sobre Inversiones416other + Honorarios gananados, obtenidos, percibidos417other + Ganancia Venta de Acciones418other + Ingresos Fuera de Explotación42view + Recupero de Rezagos421other + Recupero de Deudores Incobrables422other + Ganancia Venta de Activo Fijo423other + Donaciones obtenidas, ganandas, percibidas424other + Ganancia Venta Inversiones Permanentes425other + RESULTADO PÉRDIDA5view + Egresos de Explotación51view + Costo de Mercaderías Vendidas511view + Costo de Mercaderías Vendidas - Categoria de productos 01511.01other + Gastos en Depreciación de Activo Fijo512other + Gastos en Amortización513other + Gastos en Sueldos y Jornales514other + Gastos en Cargas Sociales515other + Gastos en Impuestos516other + Gastos Bancarios517other + Gastos en Servicios Públicos518other + Gastos de Publicidad y Propaganda519other + Egresos Fuera de Explotación52view + Gastos en Siniestros521other + Donaciones Cedidas, Otorgadas522other + Pérdida Venta Activo Fijo523other + + + Cuentas de Movimiento + .3.CC + + + view + + + Compras61view + Compras - Categoria de productos 0161.01other + Costos de Producción62other + Gastos de Administración63other + Gastos de Comercialización64other + + + Cuentas de Orden + .4.CO + + + view + + + CUENTAS DE ORDEN DEUDORAS71view + Mercaderias Recibidas en Consignación711other + Depósito de Valores Recibos en Garantía712other + Garantias Otorgadas713other + Documentos Descontados714other + Documentos Endosados715other + CUENTAS DE ORDEN ACREEDORAS72view + Comitente por Mercaderias Recibidas en Consignación721other + Acreedor por Garantías Otorgadas722other + Acreedor por Documentos Descontados723other + + + Chile - Plan de Cuentas + + + + + + + + + + + + + diff --git a/addons/l10n_cl/l10n_cl_wizard.xml b/addons/l10n_cl/l10n_cl_wizard.xml new file mode 100644 index 00000000000..191230c5010 --- /dev/null +++ b/addons/l10n_cl/l10n_cl_wizard.xml @@ -0,0 +1,15 @@ + + + + + + Generate Chart of Accounts from a Chart Template + Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated. + This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. + + + automatic + + + + diff --git a/addons/lunch/i18n/nl.po b/addons/lunch/i18n/nl.po new file mode 100644 index 00000000000..481e8a4f79a --- /dev/null +++ b/addons/lunch/i18n/nl.po @@ -0,0 +1,552 @@ +# Dutch translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 01:37+0100\n" +"PO-Revision-Date: 2012-07-29 09:58+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Dutch \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n" +"X-Generator: Launchpad (build 15702)\n" + +#. module: lunch +#: view:lunch.cashbox.clean:0 +msgid "Reset cashbox" +msgstr "Reset kas" + +#. module: lunch +#: view:report.lunch.amount:0 +msgid "Box amount in current year" +msgstr "Kasbedrag in huidig jaar" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_order_form +#: model:ir.ui.menu,name:lunch.menu_lunch_order_form +#: model:ir.ui.menu,name:lunch.menu_lunch_reporting_order +msgid "Lunch Orders" +msgstr "Lunch Orders" + +#. module: lunch +#: view:lunch.order.cancel:0 +msgid "Are you sure you want to cancel this order ?" +msgstr "Weet u zeker dat u deze order wilt annuleren?" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_cashmove_form +#: model:ir.ui.menu,name:lunch.menu_lunch_cashmove_form +msgid "Cash Moves" +msgstr "Kas mutaties" + +#. module: lunch +#: view:lunch.cashmove:0 view:lunch.order:0 view:report.lunch.amount:0 +#: view:report.lunch.order:0 +msgid "Group By..." +msgstr "Groepeer op.." + +#. module: lunch +#: model:ir.model,name:lunch.model_lunch_order_confirm +msgid "confirm Order" +msgstr "Bevestig order" + +#. module: lunch +#: view:report.lunch.order:0 +msgid " 7 Days " +msgstr " 7 Dagen " + +#. module: lunch +#: view:lunch.cashmove:0 view:lunch.order:0 +msgid "Today" +msgstr "Vandaag" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "March" +msgstr "Maart" + +#. module: lunch +#: report:lunch.order:0 +msgid "Total :" +msgstr "Totaal :" + +#. module: lunch +#: field:report.lunch.amount,day:0 view:report.lunch.order:0 +#: field:report.lunch.order,day:0 +msgid "Day" +msgstr "Dag" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel +#: model:ir.actions.act_window,name:lunch.action_lunch_order_cancel_values +#: model:ir.model,name:lunch.model_lunch_order_cancel view:lunch.order:0 +#: view:lunch.order.cancel:0 +msgid "Cancel Order" +msgstr "Annuleer order" + +#. module: lunch +#: model:ir.actions.act_window,help:lunch.action_create_cashbox +msgid "" +"You can create on cashbox by employee if you want to keep track of the " +"amount due by employee according to what have been ordered." +msgstr "" + +#. module: lunch +#: field:lunch.cashmove,amount:0 field:report.lunch.amount,amount:0 +msgid "Amount" +msgstr "Bedrag" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_product_form +#: model:ir.ui.menu,name:lunch.menu_lunch_product_form view:lunch.product:0 +msgid "Products" +msgstr "Producten" + +#. module: lunch +#: model:ir.model,name:lunch.model_report_lunch_amount +msgid "Amount available by user and box" +msgstr "Bedrag beschikbaar per gebruiker en kas" + +#. module: lunch +#: view:report.lunch.amount:0 +msgid " Month " +msgstr " Maand " + +#. module: lunch +#: model:ir.model,name:lunch.model_report_lunch_order +msgid "Lunch Orders Statistics" +msgstr "Lunch order analyses" + +#. module: lunch +#: view:lunch.cashmove:0 field:lunch.order,cashmove:0 +msgid "CashMove" +msgstr "Kas muttatie" + +#. module: lunch +#: view:lunch.order:0 selection:lunch.order,state:0 +msgid "Confirmed" +msgstr "Bevestigd" + +#. module: lunch +#: view:lunch.order.confirm:0 +msgid "Confirm" +msgstr "Bevestig" + +#. module: lunch +#: view:lunch.order:0 +msgid "Search Lunch Order" +msgstr "Zoek lunchorders" + +#. module: lunch +#: field:lunch.order,state:0 +msgid "State" +msgstr "Status" + +#. module: lunch +#: selection:lunch.order,state:0 +msgid "New" +msgstr "Nieuw" + +#. module: lunch +#: field:report.lunch.order,price_total:0 +msgid "Total Price" +msgstr "Totaalprijs" + +#. module: lunch +#: view:report.lunch.amount:0 +msgid "Box Amount by User" +msgstr "" + +#. module: lunch +#: field:lunch.cashmove,create_date:0 +msgid "Creation Date" +msgstr "Aanmaakdatum" + +#. module: lunch +#: report:lunch.order:0 +msgid "Name/Date" +msgstr "Naam/Datum" + +#. module: lunch +#: field:lunch.order,descript:0 +msgid "Description Order" +msgstr "Order omschrijving" + +#. module: lunch +#: view:report.lunch.amount:0 +msgid "Box amount in last month" +msgstr "" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm +#: model:ir.actions.act_window,name:lunch.action_lunch_order_confirm_values +#: view:lunch.order:0 view:lunch.order.confirm:0 +msgid "Confirm Order" +msgstr "Bevestig Order" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "July" +msgstr "Juli" + +#. module: lunch +#: view:lunch.cashmove:0 view:report.lunch.amount:0 view:report.lunch.order:0 +msgid "Box" +msgstr "" + +#. module: lunch +#: view:report.lunch.order:0 +msgid " 365 Days " +msgstr " 365 Dagen " + +#. module: lunch +#: view:report.lunch.amount:0 +msgid " Month-1 " +msgstr " Maand-1 " + +#. module: lunch +#: field:report.lunch.amount,date:0 +msgid "Created Date" +msgstr "Aanmaakdatum" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_category_form +msgid " Product Categories " +msgstr " Product categorieën " + +#. module: lunch +#: view:lunch.cashbox.clean:0 +msgid "Set to Zero" +msgstr "Zet op nul" + +#. module: lunch +#: model:ir.model,name:lunch.model_lunch_cashmove +msgid "Cash Move" +msgstr "Kas mutatie" + +#. module: lunch +#: view:report.lunch.order:0 +msgid "Tasks performed in last 365 days" +msgstr "Taken uitgevoert de laatste 365 dagen" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "April" +msgstr "April" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "September" +msgstr "September" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "December" +msgstr "December" + +#. module: lunch +#: field:report.lunch.amount,month:0 view:report.lunch.order:0 +#: field:report.lunch.order,month:0 +msgid "Month" +msgstr "Maand" + +#. module: lunch +#: field:lunch.order.confirm,confirm_cashbox:0 +msgid "Name of box" +msgstr "" + +#. module: lunch +#: view:lunch.order.cancel:0 +msgid "Yes" +msgstr "Ja" + +#. module: lunch +#: model:ir.model,name:lunch.model_lunch_category view:lunch.category:0 +#: view:lunch.order:0 field:lunch.order,category:0 +#: field:lunch.product,category_id:0 +msgid "Category" +msgstr "Categorie" + +#. module: lunch +#: view:report.lunch.amount:0 +msgid " Year " +msgstr " Jaar " + +#. module: lunch +#: model:ir.ui.menu,name:lunch.menu_lunch_category_form +msgid "Product Categories" +msgstr "Product categorieën" + +#. module: lunch +#: view:lunch.cashbox.clean:0 view:lunch.order.cancel:0 +msgid "No" +msgstr "Nee" + +#. module: lunch +#: view:lunch.order.confirm:0 +msgid "Orders Confirmation" +msgstr "Order bevestigen" + +#. module: lunch +#: view:lunch.cashbox.clean:0 +msgid "Are you sure you want to reset this cashbox ?" +msgstr "" + +#. module: lunch +#: model:ir.actions.act_window,help:lunch.view_lunch_product_form_installer +msgid "" +"Define all products that the employees can order for the lunch time. If you " +"order lunch at several places, you can use the product categories to split " +"by supplier. It will be easier for the lunch manager to filter lunch orders " +"by categories." +msgstr "" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "August" +msgstr "Augustus" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_report_lunch_order_all +#: view:report.lunch.order:0 +msgid "Lunch Order Analysis" +msgstr "Lunch orders analyse" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "June" +msgstr "Juni" + +#. module: lunch +#: field:lunch.cashmove,user_cashmove:0 field:lunch.order,user_id:0 +#: field:report.lunch.amount,user_id:0 field:report.lunch.order,user_id:0 +msgid "User Name" +msgstr "Gebruikersnaam" + +#. module: lunch +#: view:report.lunch.order:0 +msgid "Sales Analysis" +msgstr "Verkoopanalyse" + +#. module: lunch +#: model:ir.ui.menu,name:lunch.menu_lunch_category_root_configuration +msgid "Lunch" +msgstr "Lunch" + +#. module: lunch +#: view:lunch.cashmove:0 view:report.lunch.order:0 +msgid "User" +msgstr "Gebruiker" + +#. module: lunch +#: view:lunch.cashmove:0 field:lunch.order,date:0 +msgid "Date" +msgstr "Datum" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "November" +msgstr "November" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "October" +msgstr "Oktober" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "January" +msgstr "Januari" + +#. module: lunch +#: field:lunch.cashmove,box:0 field:report.lunch.amount,box:0 +msgid "Box Name" +msgstr "" + +#. module: lunch +#: model:ir.model,name:lunch.model_lunch_cashbox_clean +msgid "clean cashbox" +msgstr "" + +#. module: lunch +#: field:lunch.cashmove,active:0 field:lunch.product,active:0 +msgid "Active" +msgstr "Actief" + +#. module: lunch +#: field:report.lunch.order,date:0 +msgid "Date Order" +msgstr "Orderdatum" + +#. module: lunch +#: model:ir.model,name:lunch.model_lunch_cashbox +msgid "Cashbox for Lunch " +msgstr "" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean +#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_clean_values +msgid "Set CashBox to Zero" +msgstr "" + +#. module: lunch +#: view:lunch.product:0 +msgid "General Information" +msgstr "Algemene informatie" + +#. module: lunch +#: view:lunch.order.confirm:0 +msgid "Cancel" +msgstr "Anulleren" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_lunch_cashbox_form +msgid " Cashboxes " +msgstr "" + +#. module: lunch +#: report:lunch.order:0 +msgid "Unit Price" +msgstr "Eenheidsprijs" + +#. module: lunch +#: field:lunch.order,product:0 +msgid "Product" +msgstr "Product" + +#. module: lunch +#: field:lunch.cashmove,name:0 report:lunch.order:0 view:lunch.product:0 +#: field:lunch.product,description:0 +msgid "Description" +msgstr "Omschrijving" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "May" +msgstr "Mei" + +#. module: lunch +#: field:lunch.order,price:0 field:lunch.product,price:0 +msgid "Price" +msgstr "Prijs" + +#. module: lunch +#: view:lunch.cashmove:0 +msgid "Search CashMove" +msgstr "" + +#. module: lunch +#: view:report.lunch.amount:0 +msgid "Total box" +msgstr "" + +#. module: lunch +#: model:ir.model,name:lunch.model_lunch_product +msgid "Lunch Product" +msgstr "Lunch product" + +#. module: lunch +#: field:lunch.cashbox,sum_remain:0 +msgid "Total Remaining" +msgstr "Totaal overgebleven" + +#. module: lunch +#: view:lunch.order:0 +msgid "Total price" +msgstr "" + +#. module: lunch +#: selection:report.lunch.amount,month:0 selection:report.lunch.order,month:0 +msgid "February" +msgstr "Februari" + +#. module: lunch +#: field:lunch.cashbox,name:0 field:lunch.category,name:0 +#: field:lunch.product,name:0 field:report.lunch.order,box_name:0 +msgid "Name" +msgstr "Naam" + +#. module: lunch +#: view:lunch.cashmove:0 +msgid "Total amount" +msgstr "Totaalbedrag" + +#. module: lunch +#: view:report.lunch.order:0 +msgid "Tasks performed in last 30 days" +msgstr "Taken uitgevoerd in de laatste 30 dagen" + +#. module: lunch +#: view:lunch.category:0 +msgid "Category Related to Products" +msgstr "" + +#. module: lunch +#: model:ir.ui.menu,name:lunch.menu_lunch_cashbox_form view:lunch.cashbox:0 +msgid "Cashboxes" +msgstr "" + +#. module: lunch +#: view:lunch.category:0 report:lunch.order:0 view:lunch.order:0 +msgid "Order" +msgstr "Order" + +#. module: lunch +#: model:ir.actions.report.xml,name:lunch.report_lunch_order +#: model:ir.model,name:lunch.model_lunch_order +#: model:ir.ui.menu,name:lunch.menu_lunch report:lunch.order:0 +msgid "Lunch Order" +msgstr "Luchorder" + +#. module: lunch +#: view:report.lunch.amount:0 +msgid "Box amount in current month" +msgstr "" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.view_lunch_product_form_installer +msgid "Define Your Lunch Products" +msgstr "Definieer uw lunch producten" + +#. module: lunch +#: view:report.lunch.order:0 +msgid "Tasks during last 7 days" +msgstr "Taken afgelopen 7 dagen" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_report_lunch_amount_tree +#: model:ir.ui.menu,name:lunch.menu_lunch_report_amount_tree +msgid "Cash Position by User" +msgstr "" + +#. module: lunch +#: field:lunch.cashbox,manager:0 +msgid "Manager" +msgstr "Manager" + +#. module: lunch +#: view:report.lunch.order:0 +msgid " 30 Days " +msgstr " 30 Dagen " + +#. module: lunch +#: view:lunch.order:0 +msgid "To Confirm" +msgstr "" + +#. module: lunch +#: field:report.lunch.amount,year:0 view:report.lunch.order:0 +#: field:report.lunch.order,year:0 +msgid "Year" +msgstr "Jaar" + +#. module: lunch +#: model:ir.actions.act_window,name:lunch.action_create_cashbox +msgid "Create Lunch Cash Boxes" +msgstr "" diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py index 8cca4ced465..c249478ad48 100644 --- a/addons/lunch/lunch.py +++ b/addons/lunch/lunch.py @@ -210,7 +210,7 @@ class report_lunch_amount(osv.osv): _name = 'report.lunch.amount' _description = "Amount available by user and box" _auto = False - _rec_name = "user" + _rec_name = "user_id" _columns = { 'user_id': fields.many2one('res.users', 'User Name', readonly=True), diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 5e870c085c9..d953dfbd1a9 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -76,12 +76,9 @@ - - - @@ -192,12 +189,9 @@ - - - @@ -301,8 +295,8 @@ - + @@ -375,14 +369,10 @@ search - - - - - - - - + + + + diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml index 01de4be1354..717573687df 100644 --- a/addons/lunch/report/report_lunch_order_view.xml +++ b/addons/lunch/report/report_lunch_order_view.xml @@ -25,19 +25,14 @@ search - - - - + - - diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py index ee22b0c153f..323a647c334 100644 --- a/addons/mail/__openerp__.py +++ b/addons/mail/__openerp__.py @@ -24,7 +24,7 @@ 'version': '1.0', 'category':'Social Network', "sequence": 2, - "summary": "Discussions, Feeds, Alerts", + "summary": "Discussions, Mailing Lists, News", 'description': """ A bussiness oriented Social Networking with a fully-integrated email and message management. diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml index 274259e544e..f9edb8b9e2f 100644 --- a/addons/mail/data/mail_demo.xml +++ b/addons/mail/data/mail_demo.xml @@ -29,10 +29,10 @@ mail.group html - sit amet, consectetur adipiscing elit. Pellentesque et quam sapien, in sagittis tellus. - Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. + sit amet, consectetur adipiscing elit. Pellentesque et quam sapien, in sagittis tellus. +Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. -Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. +Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]> comment @@ -54,11 +54,11 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in mail.group html - comment - + @@ -76,10 +76,10 @@ Would it be possible to learn more about the author ? (second comment)]]>mail.group html - diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index 11c259b3ee8..09a6ca29a2d 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -14,5 +14,17 @@ + + + + + Welcome to OpenERP! + Your homepage is a summary of messages you received and key information about documents you follow. + +The top menu bar contains all applications you installed. You can use this <i>Settings</i> menu to intall more applications, activate others features or give access to new users. + +To setup your preferences (name, email signature, avatar), click on the top right corner. + + diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index c755209f952..bd01e50baa5 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -104,7 +104,6 @@ - diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index eb68ab70a3b..b967035bec3 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -64,9 +64,7 @@ - - @@ -80,9 +78,7 @@ 25 - - - + + @@ -209,31 +206,26 @@ - - + - - - - diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index d036150b21c..1655ab98afb 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -822,8 +822,6 @@ class mail_thread(osv.Model): def message_append_note(self, cr, uid, ids, subject=None, body=None, parent_id=False, type='notification', content_subtype='html', context=None): - if type in ['notification', 'comment']: - subject = None if content_subtype == 'html': body_html = body body_text = body diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index f07e1e467ee..68727832e53 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -9,7 +9,8 @@ sequence="10"/> - + + News Feed diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 8ce050fd144..0f50cbb1549 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -521,7 +521,7 @@ openerp.mail = function(session) { this.params.parent_id = this.params.parent_id || false; this.params.thread_level = this.params.thread_level || 0; this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false; - this.params.msg_more_limit = this.params.msg_more_limit || 150; + this.params.msg_more_limit = this.params.msg_more_limit || 250; this.params.limit = this.params.limit || 100; // this.params.limit = 3; // tmp for testing this.params.offset = this.params.offset || 0; @@ -758,11 +758,11 @@ openerp.mail = function(session) { // expand feature this.$element.find('div.oe_mail_msg_body:last').expander({ slicePoint: this.params.msg_more_limit, - expandText: 'see more', - userCollapseText: 'see less', + expandText: 'read more', + userCollapseText: '[^]', detailClass: 'oe_mail_msg_tail', moreClass: 'oe_mail_expand', - lesClass: 'oe_mail_reduce', + lessClass: 'oe_mail_reduce', }); }, @@ -843,10 +843,15 @@ openerp.mail = function(session) { this.ds = new session.web.DataSet(this, this.view.model); this.ds_users = new session.web.DataSet(this, 'res.users'); }, - + start: function() { var self = this; - this._super.apply(this, arguments); + + // NB: all the widget should be modified to check the actual_mode property on view, not use + // any other method to know if the view is in create mode anymore + this.view.on("change:actual_mode", this, this._check_visibility); + this._check_visibility(); + mail.ChatterUtils.bind_events(this); this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); }); if (! this.params.see_subscribers_options) { @@ -859,7 +864,11 @@ openerp.mail = function(session) { .mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); }); this.reinit(); }, - + + _check_visibility: function() { + this.$element.toggle(this.view.get("actual_mode") !== "create"); + }, + destroy: function () { this._super.apply(this, arguments); }, diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index bf8d7fd1475..86d115f29c8 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -33,7 +33,7 @@
- +
@@ -129,7 +129,7 @@
  • Delete
    •  -
  • Remove from Wall
    • +
  • Hide
  • - Attachment - Attachments () + 1 Attachment + Attachments
    • diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 6a06cb33f1d..d0823b93ab1 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -4,19 +4,14 @@ - + + context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/> + view_type="form"/> marketing.campaign.form @@ -43,10 +38,10 @@
    @@ -633,37 +637,28 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - @@ -745,11 +740,8 @@ search - - - - - + +     @@ -820,7 +812,7 @@     - + diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index 3f7f3b26d96..ae87b3f2fe2 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -53,21 +53,20 @@ project.task.history.cumulative search - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 40235ad03b7..ab880536ced 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -58,60 +58,32 @@ search - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + - - - - diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml index 09170c43434..e16c18d1582 100644 --- a/addons/project/res_partner_view.xml +++ b/addons/project/res_partner_view.xml @@ -28,7 +28,5 @@ - - diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 510fcbb99e7..c8250edcafd 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,25 +1,61 @@ openerp.project = function(openerp) { openerp.web_kanban.KanbanView.include({ - on_groups_started: function() { + project_display_members_names: function() { + /* + * Set avatar title for members. + * In kanban views, many2many fields only return a list of ids. + * We can implement return value of m2m fields like [(1,"Adminstration"),...]. + */ var self = this; - self._super.apply(this, arguments); - if (this.dataset.model === 'project.project') { - /* Set avatar title for members. - In many2many fields, returns only list of ids. - we can implement return value of m2m fields like [(1,"Adminstration"),...]. - */ - var members_ids = []; - this.$element.find('.oe_kanban_project_avatars img').each(function() { - members_ids.push($(this).data('member_id')); - }); - var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]); - dataset.read_slice(['id', 'name']).then(function(result) { - _.each(result, function(v, k) { - self.$element.find('.oe_kanban_project_avatars img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({ - offset: 10 - }); + var members_ids = []; + + // Collect members ids + self.$element.find('img[data-member_id]').each(function() { + members_ids.push($(this).data('member_id')); + }); + + // Find their matching names + var dataset = new openerp.web.DataSetSearch(self, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]); + dataset.read_slice(['id', 'name']).then(function(result) { + _.each(result, function(v, k) { + // Set the proper value in the DOM + self.$element.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({ + offset: 10 }); }); + }); + }, + project_display_categ_names: function() { + /* + * Set proper names to project categories. + * In kanban views, many2many fields only return a list of ids. + * Therefore, we have to fetch the matching data by ourselves. + */ + var self = this; + var categ_ids = []; + + // Collect categories ids + self.$element.find('span[data-categ_id]').each(function() { + categ_ids.push($(this).data('categ_id')); + }); + + // Find their matching names + var dataset = new openerp.web.DataSetSearch(self, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]); + dataset.read_slice(['id', 'name']).then(function(result) { + _.each(result, function(v, k) { + // Set the proper value in the DOM and display the element + self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name); + }); + }); + }, + on_groups_started: function() { + var self = this; + self._super.apply(self, arguments); + + if (self.dataset.model === 'project.project') { + self.project_display_members_names(); + } else if (self.dataset.model === 'project.task') { + self.project_display_categ_names(); } } }); diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml index 7d495023f87..38cc247fc32 100644 --- a/addons/project_gtd/project_gtd_data.xml +++ b/addons/project_gtd/project_gtd_data.xml @@ -22,6 +22,20 @@ Long Term terp-project + + + + + + + Module Todo Lists has been installed + + Add todo items on project tasks, to help you organize your work. + This module supports the methodology Getting Things Done (GTD), + created by David Allen, and described in the book of the same + name. + + diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 5b48f6b4648..cce02ab329d 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -112,9 +112,9 @@ - + diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index fa7d002f571..8aeecf2985e 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.0', 'category': 'Project Management', "sequence": 22, - "summary": "Multi Level Support", + "summary": "Support, Bug Traker, Helpdesk", 'description': """ This module provides Issues/Bugs Management in Project. ======================================================= @@ -39,7 +39,7 @@ and decide on their status as they evolve. 'website': 'http://www.openerp.com', 'images': ['images/issue_analysis.jpeg','images/project_issue.jpeg'], 'depends': [ - 'base_status', + 'base_status', 'crm', 'project', ], @@ -66,6 +66,9 @@ and decide on their status as they evolve. 'auto_install': False, 'application': True, 'certificate' : '001236490750848623845', + 'js': [ + 'static/src/js/project_issue.js', + ], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index cedcd85d4fc..8bc34177d7d 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -18,7 +18,7 @@ - + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index ca5bd9224f2..4c973eed068 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -236,7 +236,7 @@ class project_issue(base_stage, osv.osv): 'date_closed': fields.datetime('Closed', readonly=True,select=True), 'date': fields.datetime('Date'), 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), + 'categ_ids': fields.many2many('project.category', string='Categories'), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'version_id': fields.many2one('project.issue.version', 'Version'), 'stage_id': fields.many2one ('project.task.type', 'Stage', @@ -279,7 +279,6 @@ class project_issue(base_stage, osv.osv): 'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c), 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), 'priority': crm.AVAILABLE_PRIORITIES[2][0], - 'categ_id' : lambda *a: False, } _group_by_full = { @@ -304,11 +303,11 @@ class project_issue(base_stage, osv.osv): def convert_issue_task(self, cr, uid, ids, context=None): if context is None: context = {} - + case_obj = self.pool.get('project.issue') data_obj = self.pool.get('ir.model.data') task_obj = self.pool.get('project.task') - + result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form') res = data_obj.read(cr, uid, result, ['res_id']) id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2') @@ -351,23 +350,6 @@ class project_issue(base_stage, osv.osv): 'nodestroy': True } - - def _convert(self, cr, uid, ids, xml_id, context=None): - data_obj = self.pool.get('ir.model.data') - id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id) - categ_id = False - if id2: - categ_id = data_obj.browse(cr, uid, id2, context=context).res_id - if categ_id: - self.write(cr, uid, ids, {'categ_id': categ_id}) - return True - - def convert_to_feature(self, cr, uid, ids, context=None): - return self._convert(cr, uid, ids, 'feature_request_categ', context=context) - - def convert_to_bug(self, cr, uid, ids, context=None): - return self._convert(cr, uid, ids, 'bug_categ', context=context) - def copy(self, cr, uid, id, default=None, context=None): issue = self.read(cr, uid, id, ['name'], context=context) if not default: @@ -376,7 +358,7 @@ class project_issue(base_stage, osv.osv): default['name'] = issue['name'] + _(' (copy)') return super(project_issue, self).copy(cr, uid, id, default=default, context=context) - + def write(self, cr, uid, ids, vals, context=None): #Update last action date every time the user change the stage, the state or send a new email logged_fields = ['stage_id', 'state', 'message_ids'] @@ -463,7 +445,7 @@ class project_issue(base_stage, osv.osv): # ------------------------------------------------------- # Mail gateway # ------------------------------------------------------- - + def message_new(self, cr, uid, msg, custom_values=None, context=None): """ Overrides mail_thread message_new that is called by the mailgateway through message_process. @@ -485,7 +467,7 @@ class project_issue(base_stage, osv.osv): custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context)) res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context) - self.convert_to_bug(cr, uid, [res_id], context=context) + # self.convert_to_bug(cr, uid, [res_id], context=context) return res_id def message_update(self, cr, uid, ids, msg, update_vals=None, context=None): @@ -515,7 +497,7 @@ class project_issue(base_stage, osv.osv): update_vals[key] = res.group(2).lower() return super(project_issue, self).message_update(cr, uid, ids, update_vals=update_vals, context=context) - + # ------------------------------------------------------- # OpenChatter methods and notifications # ------------------------------------------------------- @@ -588,11 +570,18 @@ project() class account_analytic_account(osv.osv): _inherit = 'account.analytic.account' _description = 'Analytic Account' - + _columns = { 'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"), } - + + def on_change_template(self, cr, uid, ids, template_id, context=None): + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['use_issues'] = template.use_issues + return res + def _trigger_project_creation(self, cr, uid, vals, context=None): res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context) return res or vals.get('use_issues') diff --git a/addons/project_issue/project_issue_data.xml b/addons/project_issue/project_issue_data.xml index 34fea22f9b9..add2ce99c19 100644 --- a/addons/project_issue/project_issue_data.xml +++ b/addons/project_issue/project_issue_data.xml @@ -31,5 +31,19 @@ v3.0 + + + + + Module Issues Tracker has been installed + Manage the issues you might face in a project, like bugs in a + system, client complaints or material breakdowns. You can + record issues, assign them to some responsible person, and keep + track of their status as they evolve over time. + + You can access issues from the top menu Project, and access the + issues of a specific project from the projects gallery view. + + diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml index b3fb4582cf2..298dd6a25d9 100644 --- a/addons/project_issue/project_issue_demo.xml +++ b/addons/project_issue/project_issue_demo.xml @@ -1,236 +1,239 @@ - + - - - - - - - - - - - - - - + + + Little problem + + + PBCK + + + Deadly bug + - - - - - - - - - - - - - + + + + 5 + + + + + + + Bug in Accounts module + agr@agrolait.com + + + - - - - - - - - - - - - + + + 3 + + + + + + Program not giving proper output + + + - - - - - - - - - - - - - + + + 4 + + + + + + Output incorrect + + + - - - - - - - - - - - - - + + + 3 + + + + + + + Problem loading page + + - - - - - - - - - - - - - + + + 3 + + + + + + + Page not Found + + - - - - - - - - - - - - - + + + 3 + + + + + + + Programming Error + + + - - - - - - - - - - - - - + + + 2 + + + + + + + Logical Error in Program + + - - - - - - - - - - - - + + + 2 + + + + + + + Constraint Error + + - - - - - - - - - - - - - + + + 2 + + + + + + Error in Program + + - - - - - - - - - - - - - + + + 2 + + + + + + + Patches Error in Program + + - - - - - - - - - - - - - - + + + 4 + + + + + + + New Features To Be Added + + - - - - - - - - - - - - - - + + + 1 + + + + + + + Add menus to the module + info@opensides.be + + - - - - - - - - - - - - - + + + 3 + + + + + + + Include Attendance sheet in Project + contact@tecsas.fr + + - - - - - - - - - - - - - + + + 3 + + + + + + + Create new object + + - - - - - - - - - - - - - + + + 4 + + + + + + + Improve Reports in HRMS + + - - + + + 2 + + + + + + + Improve Reports in PMS + + - + + + + diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index e730805fb46..c7e73010b8b 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -16,9 +16,9 @@ action_project_issue_unread - + action - + project.issue client_action_multi @@ -34,9 +34,9 @@ action_project_issue_read - + action - + project.issue client_action_multi @@ -48,7 +48,6 @@ - @@ -133,14 +132,12 @@ + - - - @@ -194,7 +191,7 @@ - + @@ -206,46 +203,26 @@ search - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + @@ -265,79 +242,81 @@ - + - - Project Issue Kanban - project.issue - kanban - - - - - - - - - -
      -
    • Project:
      • -
    • Category:
      • -
    -     - -
    -
    - i -
    -
    -
    -
    -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - + + Project Issue Kanban + project.issue + kanban + + + + + + + + + +
      +
    • Project:
      • +
    • Category:
      • +
    +     + +
    +
    + i +
    +
    +
    +
    +
    + +
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + +
    +
    -
    -
    - - - - - + + + + + - # ------------------------------------------------------ - # Feature Requests - # ------------------------------------------------------ - + Project Issue- Feature Tracker Tree project.issue @@ -363,22 +342,17 @@ search - - - - - - - - - - - - + + + + + + + - + - # ------------------------------------------------------ - # Project - # ------------------------------------------------------ - + project.project.form.inherited project.project @@ -409,7 +380,7 @@ - + project.project.kanban.inherited project.project @@ -427,7 +398,8 @@ - + + account.analytic.account.issue.form.inherit account.analytic.account form @@ -438,9 +410,10 @@ - + + diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 5957ee284e8..b43cbc51c50 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -50,7 +50,6 @@ class project_issue_report(osv.osv): 'opening_date': fields.date('Date of Opening', readonly=True), 'creation_date': fields.date('Creation Date', readonly=True), 'date_closed': fields.date('Date of Closing', readonly=True), - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"), 'stage_id': fields.many2one('project.task.type', 'Stage'), 'nbr': fields.integer('# of Issues', readonly=True), 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True), @@ -86,7 +85,6 @@ class project_issue_report(osv.osv): c.working_hours_open, c.working_hours_close, c.section_id, - c.categ_id, c.stage_id, to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, c.company_id as company_id, @@ -104,7 +102,7 @@ class project_issue_report(osv.osv): FROM project_issue c - WHERE c.active= 'true' and c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue')) + WHERE c.active= 'true' )""") project_issue_report() diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 862f52b1931..c1ae69517c2 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -17,19 +17,18 @@ - - + - - - - - - + + + + + + @@ -52,61 +51,30 @@ search - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + - - + - - - - - - - - - - + + + + + diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js new file mode 100644 index 00000000000..24e5ff7cc49 --- /dev/null +++ b/addons/project_issue/static/src/js/project_issue.js @@ -0,0 +1,13 @@ +openerp.portal_project_issue = function(openerp) { + openerp.web_kanban.KanbanView.include({ + on_groups_started: function() { + var self = this; + self._super.apply(this, arguments); + + if (self.dataset.model === 'project.issue') { + // Load project's categories names from m2m field + self.project_display_categ_names(); + } + } + }); +}; diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 7604d43af1b..d5ac3868a5e 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -275,6 +275,13 @@ class account_analytic_account(osv.osv): _columns = { 'use_phases': fields.boolean('Phases Planing', help="Check this field if project manages phases"), } + + def on_change_template(self, cr, uid, ids, template_id, context=None): + res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) + if template_id and 'value' in res: + template = self.browse(cr, uid, template_id, context=context) + res['value']['use_phases'] = template.use_phases + return res def _trigger_project_creation(self, cr, uid, vals, context=None): res= super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context) diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 7d7310465d6..3b814cbab6e 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -2,12 +2,9 @@ - - - # ------------------------------------------------------ - # Project User Allocation - # ------------------------------------------------------ + + project.user.allocation.gantt project.user.allocation @@ -69,17 +66,13 @@ search - - - - - - + + + - - - - + + + @@ -94,9 +87,7 @@ - # ------------------------------------------------------ - # Project Phase - # ------------------------------------------------------ + - + @@ -195,7 +186,7 @@ - + @@ -272,25 +263,18 @@ search - - - - - - - - - - - - - - + + + + + + + + + - - @@ -317,10 +301,7 @@ - # ------------------------------------------------------ - # Project Task - # ------------------------------------------------------ - + phase.task.form2 project.task @@ -368,16 +349,15 @@ - + - + account.analytic.account.phase.form.inherit account.analytic.account form @@ -393,10 +373,7 @@ - # ------------------------------------------------------ - # Menu Items - # ------------------------------------------------------ - + diff --git a/addons/project_scrum/i18n/pt_BR.po b/addons/project_scrum/i18n/pt_BR.po index 817ddc5a887..bbb3571497e 100644 --- a/addons/project_scrum/i18n/pt_BR.po +++ b/addons/project_scrum/i18n/pt_BR.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-05-10 18:07+0000\n" -"Last-Translator: Joe Pimentel \n" +"PO-Revision-Date: 2012-07-28 20:36+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:43+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: project_scrum #: view:project.scrum.backlog.assign.sprint:0 @@ -46,7 +46,7 @@ msgstr "O que você executou desde a última reunião?" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Sprint Month" -msgstr "" +msgstr "Mês do Sprint" #. module: project_scrum #: model:ir.actions.act_window,help:project_scrum.action_sprint_all_tree @@ -127,18 +127,18 @@ msgstr "Erro! Você não pode criar tarefas recursivas." #. module: project_scrum #: view:project.scrum.sprint:0 msgid "In Progress Sprints" -msgstr "" +msgstr "Sprints em Progresso" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "For changing to delegate state" -msgstr "" +msgstr "Para mudar para Situação Delegada" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62 #, python-format msgid "Product Backlog '%s' is assigned to sprint %s" -msgstr "" +msgstr "Backlog do produto '%s' está associado ao sprint %s" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.dblc_proj @@ -209,12 +209,12 @@ msgstr "" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Backlogs Assigned To Current Sprints" -msgstr "" +msgstr "Backlogs Atribuídos ao Sprint Atual" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "For cancelling the task" -msgstr "" +msgstr "Para cancelar a tarefa" #. module: project_scrum #: model:ir.model,name:project_scrum.model_project_scrum_product_backlog @@ -287,7 +287,7 @@ msgstr "Total de Horas Gastas" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "Pending Sprints" -msgstr "" +msgstr "Sprints Pendentes" #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_email.py:95 @@ -298,7 +298,7 @@ msgstr "Pontos de bloqueio encontrados:" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Backlogs Not Assigned To Sprints." -msgstr "" +msgstr "Backlogs não atribuídos a Sprints" #. module: project_scrum #: view:project.scrum.sprint:0 @@ -391,7 +391,7 @@ msgstr "Backlogs de Produto" #. module: project_scrum #: model:ir.model,name:project_scrum.model_mail_compose_message msgid "E-mail composition wizard" -msgstr "" +msgstr "Assistente de composição de E-mail." #. module: project_scrum #: field:project.scrum.product.backlog,create_date:0 @@ -639,12 +639,12 @@ msgstr "Mudar o Tipo" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "For changing to done state" -msgstr "" +msgstr "Para mudar o estado para feito" #. module: project_scrum #: view:project.scrum.sprint:0 msgid "New Sprints" -msgstr "" +msgstr "Novos Sprints" #. module: project_scrum #: view:project.scrum.meeting:0 @@ -827,12 +827,12 @@ msgstr "Meus Backlogs" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "In Progress Backlogs" -msgstr "" +msgstr "Backlogs em Andamento" #. module: project_scrum #: view:project.task:0 msgid "View Sprints" -msgstr "" +msgstr "Ver Sprints" #. module: project_scrum #: model:ir.actions.act_window,help:project_scrum.action_product_backlog_form @@ -851,7 +851,7 @@ msgstr "" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Postpone backlog" -msgstr "" +msgstr "Adiar backlog" #. module: project_scrum #: model:process.transition,name:project_scrum.process_transition_backlogtask0 @@ -1015,7 +1015,7 @@ msgstr "Obrigado" #: view:project.scrum.meeting:0 #: view:project.task:0 msgid "Current Sprints" -msgstr "" +msgstr "Sprints Atuais" #. module: project_scrum #: model:ir.actions.act_window,name:project_scrum.action_scrum_backlog_to_sprint @@ -1036,7 +1036,7 @@ msgstr "Tem certeza de adiar Backlog" #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "For changing to open state" -msgstr "" +msgstr "Para alterar para Aberto" #. module: project_scrum #: field:project.scrum.backlog.assign.sprint,sprint_id:0 diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 7208885748c..3e627eaf01d 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -47,8 +47,9 @@ search - - + + + diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py index 3c223ab6b07..b32d852bc5f 100644 --- a/addons/project_timesheet/report/task_report.py +++ b/addons/project_timesheet/report/task_report.py @@ -29,22 +29,8 @@ class report_timesheet_task_user(osv.osv): _auto = False _order = "name" - def _get_task_hours(self, cr, uid, ids, name,args,context): - result = {} - for record in self.browse(cr, uid, ids,context): - last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1) - task_obj = self.pool.get('project.task.work') - task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))]) - tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id']) - total = 0.0 - for hrs in tsk_hrs: - total += hrs['hours'] - result[record.id] = total - return result - def get_hrs_timesheet(self, cr, uid, ids, name,args,context): result = {} - sum = 0.0 for record in self.browse(cr, uid, ids, context): last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1) obj = self.pool.get('hr_timesheet_sheet.sheet.day') @@ -63,7 +49,7 @@ class report_timesheet_task_user(osv.osv): ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), 'user_id': fields.many2one('res.users', 'User',readonly=True), 'timesheet_hrs': fields.function(get_hrs_timesheet, string="Timesheet Hours"), - 'task_hrs': fields.function(_get_task_hours, string="Task Hours"), + 'task_hrs' : fields.float('Task Hours'), } def init(self, cr): @@ -74,7 +60,9 @@ class report_timesheet_task_user(osv.osv): months.name as name, r.id as user_id, to_char(to_date(months.name, 'YYYY/MM/DD'),'YYYY') as year, - to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month + to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month, + (select sum(hours) from project_task_work where user_id = r.id and date between to_date(months.name, 'YYYY/MM/DD') and (to_date(months.name, 'YYYY/MM/DD') + interval '1 month' - + interval '1 day') ) as task_hrs from res_users r, (select to_char(p.date,'YYYY-MM-01') as name, to_char(p.date,'MM') as m_id diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index 7e79b3793b7..32f8719e9a3 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -30,15 +30,10 @@ search - - - - - - + + - diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index cb2e8f093aa..eb8df0ff77b 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.1', 'category': 'Purchase Management', "sequence": 19, - "summary": "Requests for Quotation, Invoicing Control", + "summary": "RfQ, Purchase Orders, Delivery & Invoicing Control", 'description': """ Purchase Management module is for generating a purchase order for purchase of goods from a supplier. ==================================================================================================== diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml index 96981db1502..5a9a731358c 100644 --- a/addons/purchase/partner_view.xml +++ b/addons/purchase/partner_view.xml @@ -11,6 +11,9 @@ + + + diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index dbf3f89dc56..a84fa9d2d22 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -919,15 +919,15 @@ class purchase_order_line(osv.osv): qty = qty or 1.0 supplierinfo = False - supplierinfo_ids = product_supplierinfo.search(cr, uid, [('name','=',partner_id),('product_id','=',product.id)]) - if supplierinfo_ids: - supplierinfo = product_supplierinfo.browse(cr, uid, supplierinfo_ids[0], context=context) - if supplierinfo.product_uom.id != uom_id: - res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s.') % supplierinfo.product_uom.name } - min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) - if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal. - res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)} - qty = min_qty + for supplier in product.seller_ids: + if supplier.name.id == partner_id: + supplierinfo = supplier + if supplierinfo.product_uom.id != uom_id: + res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier only sells this product by %s') % supplierinfo.product_uom.name } + min_qty = product_uom._compute_qty(cr, uid, supplierinfo.product_uom.id, supplierinfo.min_qty, to_uom_id=uom_id) + if qty < min_qty: # If the supplier quantity is greater than entered from user, set minimal. + res['warning'] = {'title': _('Warning'), 'message': _('The selected supplier has a minimal quantity set to %s %s, you should not purchase less.') % (supplierinfo.min_qty, supplierinfo.product_uom.name)} + qty = min_qty dt = self._get_date_planned(cr, uid, supplierinfo, date_order, context=context).strftime(DEFAULT_SERVER_DATETIME_FORMAT) diff --git a/addons/purchase/purchase_data.xml b/addons/purchase/purchase_data.xml index 2b57a2a75bc..9d7399abab0 100644 --- a/addons/purchase/purchase_data.xml +++ b/addons/purchase/purchase_data.xml @@ -1,6 +1,19 @@ + + + + + Module Purchase Management has been installed + From the top menu Purchases, create purchase orders to buy + products from your suppliers, encode supplier invoices and + manage your payments. + + You can also manage purchase requisitions, see the Purchase + Settings. + + Purchase Order diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index ebc7df729b5..313df25a563 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -7,6 +7,7 @@ id="base.menu_purchase_root" groups="group_purchase_manager,group_purchase_user" sequence="40"/> + @@ -54,12 +55,12 @@ action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories" parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/> - + - + [('type','=','in_invoice')] {'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1} - - Use this menu to control the invoices to be received from your supplier. - OpenERP generates draft invoices from your purchase orders or receptions, according to your settings. - Once you receive a supplier invoice, you can match it with the draft invoice and validate it. - + + Use this menu to control the invoices to be received from your supplier. + OpenERP generates draft invoices from your purchase orders or receptions, according to your settings. + Once you receive a supplier invoice, you can match it with the draft invoice and validate it. + - + @@ -140,7 +141,7 @@ client_action_multi - + purchase.order.calendar purchase.order calendar @@ -196,7 +197,7 @@
    - + @@ -223,11 +224,11 @@
    -
    - +
    - - - + + + + + + + + + - - - - + + + + @@ -344,26 +359,19 @@ - - - + + + - - - - @@ -456,7 +464,7 @@ - + @@ -516,13 +524,12 @@ + - - @@ -542,18 +549,17 @@ + + - - - diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 0cb55fb0d30..47a577e77c3 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -35,6 +35,11 @@ + + Properties on lines + + + Discount on lines diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml index bb197763486..505ab0933d0 100644 --- a/addons/sale/test/manual_order_policy.yml +++ b/addons/sale/test/manual_order_policy.yml @@ -16,7 +16,7 @@ ctx = context.copy() ctx.update({"active_model": 'sale.order', "active_ids": [ref("order4")], "active_id":ref("order4")}) order_line = self.pool.get('sale.order.line').browse(cr, uid, ref("line7"), context=context) - pay_id = self.create(cr, uid, {'product_id': order_line.product_id.id, 'amount': order_line.price_subtotal, 'qtty': order_line.product_uom_qty}) + pay_id = self.create(cr, uid, {'advance_payment_method': 'fixed', 'product_id': order_line.product_id.id, 'amount': order_line.price_subtotal, 'qtty': order_line.product_uom_qty}) self.create_invoices(cr, uid, [pay_id], context=ctx) - I check Invoice which made advance diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py index 1094b9f1440..39999a8d1b7 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.py +++ b/addons/sale/wizard/sale_make_invoice_advance.py @@ -26,189 +26,198 @@ class sale_advance_payment_inv(osv.osv_memory): _name = "sale.advance.payment.inv" _description = "Sales Advance Payment Invoice" - def _default_product_id(self, cr, uid, context=None): - try: - product_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'sale', 'advance_product_0') - except ValueError: - #a ValueError is returned if the xml id given is not found in the table ir_model_data - return False - return product_id[1] - _columns = { - 'product_id': fields.many2one('product.product', 'Advance Product', help="Select a product of type service which is called 'Advance Product'. You may have to create it and set it as a default value on this field."), - 'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Sale Price'), required=True, help="The amount to be invoiced in advance."), + 'advance_payment_method':fields.selection( + [('all', 'All'), ('percentage','Percentage'), ('fixed','Fixed Price'), + ('lines', 'Some Order Lines')], + 'Type', required=True, + help="""Use All to create the final invoice. + Use Percentage to invoice a percentage of the total amount. + Use Fixed Price to invoice a specific amound in advance. + Use Some Order Lines to invoice a selection of the sale order lines."""), 'qtty': fields.float('Quantity', digits=(16, 2), required=True), - 'advance_payment_method':fields.selection([('percentage','Percentage'), ('fixed','Fixed Price')], 'Type', required=True, help="Use Fixed Price if you want to give specific amount in Advance. Use Percentage if you want to give percentage of Total Invoice Amount."), + 'product_id': fields.many2one('product.product', 'Advance Product', + help="""Select a product of type service which is called 'Advance Product'. + You may have to create it and set it as a default value on this field."""), + 'amount': fields.float('Advance Amount', digits_compute= dp.get_precision('Sale Price'), + help="The amount to be invoiced in advance."), } + def _get_advance_product(self, cr, uid, context=None): + try: + product = self.pool.get('ir.model.data').get_object(cr, uid, 'sale', 'advance_product_0') + except ValueError: + # a ValueError is returned if the xml id given is not found in the table ir_model_data + return False + return product.id + _defaults = { + 'advance_payment_method': 'all', 'qtty': 1.0, - 'advance_payment_method': 'fixed', - 'product_id': _default_product_id, + 'product_id': _get_advance_product, } - def onchange_advance_payment_method(self, cr, uid, ids, advance_payment_method, product_id, context=None): + def onchange_method(self, cr, uid, ids, advance_payment_method, product_id, context=None): if advance_payment_method == 'percentage': return {'value': {'amount':0, 'product_id':False }} - if not product_id: - return {'value': {'amount': 0}} - product = self.pool.get('product.product').browse(cr, uid, product_id, context=context) - return {'value': {'amount': product.list_price}} - + if product_id: + product = self.pool.get('product.product').browse(cr, uid, product_id, context=context) + return {'value': {'amount': product.list_price}} + return {'value': {'amount': 0}} def create_invoices(self, cr, uid, ids, context=None): - """ - To create invoices. - - @param self: The object pointer. - @param cr: A database cursor - @param uid: ID of the user currently logged in - @param ids: the ID or list of IDs if we want more than one - @param context: A standard dictionary - - @return: - - """ - list_inv = [] - obj_sale = self.pool.get('sale.order') - obj_lines = self.pool.get('account.invoice.line') - inv_obj = self.pool.get('account.invoice') + """ create invoices for the active sale orders """ if context is None: context = {} + wizard = self.browse(cr, uid, ids[0], context) + sale_ids = context.get('active_ids', []) - for sale_adv_obj in self.browse(cr, uid, ids, context=context): - for sale in obj_sale.browse(cr, uid, context.get('active_ids', []), context=context): - create_ids = [] - ids_inv = [] - if sale.order_policy == 'postpaid': - raise osv.except_osv( - _('Error'), - _("You cannot make an advance on a sales order \ - that is defined as 'Automatic Invoice after delivery'.")) - val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id, - uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id) - res = val['value'] + if wizard.advance_payment_method == 'all': + # create the final invoices of the active sale orders + res = self.pool.get('sale.order').manual_invoice(cr, uid, sale_ids, context) + if context.get('open_invoices', False): + return res + return {'type': 'ir.actions.act_window_close'} - if not sale_adv_obj.product_id.id : - prop = self.pool.get('ir.property').get(cr, uid, - 'property_account_income_categ', 'product.category', - context=context) - account_id = prop and prop.id or False - account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, sale.fiscal_position.id or False, account_id) - if not account_id: - raise osv.except_osv(_('Configuration Error!'), - _('Please define income account as global property.')) - res['account_id'] = account_id + if wizard.advance_payment_method == 'lines': + # open the list view of sale order lines to invoice + act_window = self.pool.get('ir.actions.act_window') + res = act_window.for_xml_id(cr, uid, 'sale', 'action_order_line_tree2', context) + res['context'] = { + 'search_default_uninvoiced': 1, + 'search_default_order_id': sale_ids and sale_ids[0] or False, + } + return res - if not res.get('account_id'): - raise osv.except_osv(_('Configuration Error!'), - _('Please define income account ' \ - 'for this product: "%s" (id:%d).') % \ - (sale_adv_obj.product_id.name, sale_adv_obj.product_id.id,)) + assert wizard.advance_payment_method in ('fixed', 'percentage') - final_amount = 0 - if sale_adv_obj.amount <= 0.00: - raise osv.except_osv(_('Data Insufficient!'), - _('Please check the Advance Amount, it should not be 0 or less!')) - if sale_adv_obj.advance_payment_method == 'percentage': - final_amount = sale.amount_total * sale_adv_obj.amount / 100 - if not res.get('name'): - res['name'] = _("Advance of %s %%") % (sale_adv_obj.amount) - else: - final_amount = sale_adv_obj.amount - if not res.get('name'): - #TODO: should find a way to call formatLang() from rml_parse - if sale.pricelist_id.currency_id.position == 'after': - res['name'] = _("Advance of %s %s") % (final_amount, sale.pricelist_id.currency_id.symbol) - else: - res['name'] = _("Advance of %s %s") % (sale.pricelist_id.currency_id.symbol, final_amount) + sale_obj = self.pool.get('sale.order') + inv_obj = self.pool.get('account.invoice') + inv_line_obj = self.pool.get('account.invoice.line') + inv_ids = [] - if res.get('invoice_line_tax_id'): - res['invoice_line_tax_id'] = [(6, 0, res.get('invoice_line_tax_id'))] - else: - res['invoice_line_tax_id'] = False + for sale in sale_obj.browse(cr, uid, sale_ids, context=context): + if sale.order_policy == 'postpaid': + raise osv.except_osv( + _('Error'), + _("You cannot make an advance on a sales order \ + that is defined as 'Automatic Invoice after delivery'.")) - line_id = obj_lines.create(cr, uid, { + val = inv_line_obj.product_id_change(cr, uid, [], wizard.product_id.id, + uom=False, partner_id=sale.partner_id.id, fposition_id=sale.fiscal_position.id) + res = val['value'] + + # determine and check income account + if not wizard.product_id.id : + prop = self.pool.get('ir.property').get(cr, uid, + 'property_account_income_categ', 'product.category', context=context) + prop_id = prop and prop.id or False + account_id = self.pool.get('account.fiscal.position').map_account(cr, uid, sale.fiscal_position.id or False, prop_id) + if not account_id: + raise osv.except_osv(_('Configuration Error !'), + _('There is no income account defined as global property.')) + res['account_id'] = account_id + if not res.get('account_id'): + raise osv.except_osv(_('Configuration Error !'), + _('There is no income account defined for this product: "%s" (id:%d)') % \ + (wizard.product_id.name, wizard.product_id.id,)) + + # determine invoice amount + if wizard.amount <= 0.00: + raise osv.except_osv(_('Incorrect Data'), + _('The value of Advance Amount must be positive.')) + if wizard.advance_payment_method == 'percentage': + inv_amount = sale.amount_total * wizard.amount / 100 + if not res.get('name'): + res['name'] = _("Advance of %s %%") % (wizard.amount) + else: + inv_amount = wizard.amount + if not res.get('name'): + #TODO: should find a way to call formatLang() from rml_parse + symbol = sale.pricelist_id.currency_id.symbol + if sale.pricelist_id.currency_id.position == 'after': + res['name'] = _("Advance of %s %s") % (inv_amount, symbol) + else: + res['name'] = _("Advance of %s %s") % (symbol, inv_amount) + + # determine taxes + if res.get('invoice_line_tax_id'): + res['invoice_line_tax_id'] = [(6, 0, res.get('invoice_line_tax_id'))] + else: + res['invoice_line_tax_id'] = False + + # create the invoice + inv_line_values = { + 'name': res.get('name'), + 'account_id': res['account_id'], + 'price_unit': inv_amount, + 'quantity': wizard.qtty or 1.0, + 'discount': False, + 'uos_id': res.get('uos_id', False), + 'product_id': wizard.product_id.id, + 'invoice_line_tax_id': res.get('invoice_line_tax_id'), + 'account_analytic_id': sale.project_id.id or False, + } + inv_values = { + 'name': sale.client_order_ref or sale.name, + 'origin': sale.name, + 'type': 'out_invoice', + 'reference': False, + 'account_id': sale.partner_id.property_account_receivable.id, + 'partner_id': sale.partner_id.id, + 'invoice_line': [(0, 0, inv_line_values)], + 'currency_id': sale.pricelist_id.currency_id.id, + 'comment': '', + 'payment_term': sale.payment_term.id, + 'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id + } + inv_id = inv_obj.create(cr, uid, inv_values, context=context) + inv_obj.button_reset_taxes(cr, uid, [inv_id], context=context) + inv_ids.append(inv_id) + + # add the invoice to the sale order's invoices + sale.write({'invoice_ids': [(4, inv_id)]}) + + # If invoice on picking: add the cost on the SO + # If not, the advance will be deduced when generating the final invoice + if sale.order_policy == 'picking': + vals = { + 'order_id': sale.id, 'name': res.get('name'), - 'account_id': res['account_id'], - 'price_unit': final_amount, - 'quantity': sale_adv_obj.qtty or 1.0, + 'price_unit': -inv_amount, + 'product_uom_qty': wizard.qtty or 1.0, + 'product_uos_qty': wizard.qtty or 1.0, + 'product_uos': res.get('uos_id', False), + 'product_uom': res.get('uom_id', False), + 'product_id': wizard.product_id.id or False, 'discount': False, - 'uos_id': res.get('uos_id', False), - 'product_id': sale_adv_obj.product_id.id, - 'invoice_line_tax_id': res.get('invoice_line_tax_id'), - 'account_analytic_id': sale.project_id.id or False, - #'note':'', - }) - create_ids.append(line_id) - inv = { - 'name': sale.client_order_ref or sale.name, - 'origin': sale.name, - 'type': 'out_invoice', - 'reference': False, - 'account_id': sale.partner_id.property_account_receivable.id, - 'partner_id': sale.partner_id.id, - 'invoice_line': [(6, 0, create_ids)], - 'currency_id': sale.pricelist_id.currency_id.id, - 'comment': '', - 'payment_term': sale.payment_term.id, - 'fiscal_position': sale.fiscal_position.id or sale.partner_id.property_account_position.id + 'tax_id': res.get('invoice_line_tax_id'), } + self.pool.get('sale.order.line').create(cr, uid, vals, context=context) - inv_id = inv_obj.create(cr, uid, inv) - inv_obj.button_reset_taxes(cr, uid, [inv_id], context=context) - - for inv in sale.invoice_ids: - ids_inv.append(inv.id) - ids_inv.append(inv_id) - obj_sale.write(cr, uid, [sale.id], {'invoice_ids': [(6, 0, ids_inv)]}) - list_inv.append(inv_id) - # - # If invoice on picking: add the cost on the SO - # If not, the advance will be deduced when generating the final invoice - # - if sale.order_policy == 'picking': - vals = { - 'order_id': sale.id, - 'name': res.get('name'), - 'price_unit': -final_amount, - 'product_uom_qty': sale_adv_obj.qtty or 1.0, - 'product_uos_qty': sale_adv_obj.qtty or 1.0, - 'product_uos': res.get('uos_id', False), - 'product_uom': res.get('uom_id', False), - 'product_id': sale_adv_obj.product_id.id or False, - 'discount': False, - 'tax_id': res.get('invoice_line_tax_id'), - } - self.pool.get('sale.order.line').create(cr, uid, vals, context=context) - - context.update({'invoice_id':list_inv}) - - if context.get('open_invoices'): - return self.open_invoices( cr, uid, ids, context=context) + if context.get('open_invoices', False): + return self.open_invoices( cr, uid, ids, inv_ids, context=context) return {'type': 'ir.actions.act_window_close'} - def open_invoices(self, cr, uid, ids, context=None): - if context is None: - context = {} - mod_obj = self.pool.get('ir.model.data') - for advance_pay in self.browse(cr, uid, ids, context=context): - form_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form') - form_id = form_res and form_res[1] or False - tree_res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_tree') - tree_id = tree_res and tree_res[1] or False + def open_invoices(self, cr, uid, ids, invoice_ids, context=None): + """ open a view on one of the given invoice_ids """ + ir_model_data = self.pool.get('ir.model.data') + form_res = ir_model_data.get_object_reference(cr, uid, 'account', 'invoice_form') + form_id = form_res and form_res[1] or False + tree_res = ir_model_data.get_object_reference(cr, uid, 'account', 'invoice_tree') + tree_id = tree_res and tree_res[1] or False return { 'name': _('Advance Invoice'), 'view_type': 'form', 'view_mode': 'form,tree', 'res_model': 'account.invoice', - 'res_id': int(context['invoice_id'][0]), + 'res_id': invoice_ids[0], 'view_id': False, 'views': [(form_id, 'form'), (tree_id, 'tree')], 'context': "{'type': 'out_invoice'}", 'type': 'ir.actions.act_window', - } + } sale_advance_payment_inv() diff --git a/addons/sale/wizard/sale_make_invoice_advance.xml b/addons/sale/wizard/sale_make_invoice_advance.xml index 8d6b78e4f03..28f5dc093cd 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.xml +++ b/addons/sale/wizard/sale_make_invoice_advance.xml @@ -7,19 +7,35 @@ form
    -
    -
    - - - + + - - + + +
    +
    diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po index 5a7e0b77495..aeabdf25de4 100644 --- a/addons/sale_crm/i18n/ja.po +++ b/addons/sale_crm/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-07-06 21:31+0000\n" +"PO-Revision-Date: 2012-07-30 16:29+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. module: sale_crm #: field:sale.order,categ_id:0 @@ -31,12 +31,12 @@ msgstr "注文参照は、会社ごとに固有でなければなりません。 #: code:addons/sale_crm/wizard/crm_make_sale.py:112 #, python-format msgid "Converted to Sales Quotation(%s)." -msgstr "販売見積書(%s)を移動" +msgstr "受注見積（%s）に変換" #. module: sale_crm #: view:crm.make.sale:0 msgid "Convert to Quotation" -msgstr "見積りへ移動" +msgstr "見積に変換" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:89 @@ -48,7 +48,7 @@ msgstr "データ不足です。" #: code:addons/sale_crm/wizard/crm_make_sale.py:89 #, python-format msgid "Customer has no addresses defined!" -msgstr "顧客の住所が不明確です。" +msgstr "顧客の住所が定義されていません。" #. module: sale_crm #: model:ir.model,name:sale_crm.model_crm_make_sale @@ -58,7 +58,7 @@ msgstr "営業する。" #. module: sale_crm #: view:crm.make.sale:0 msgid "_Create" -msgstr "_作成" +msgstr "作成" #. module: sale_crm #: view:sale.order:0 @@ -69,22 +69,22 @@ msgstr "私の営業チーム" #: help:crm.make.sale,close:0 msgid "" "Check this to close the opportunity after having created the sale order." -msgstr "発注書を作成後、これをチェックしオポチュニティを終了します。" +msgstr "発注書を作成後、商談を終了するためにこれをチェックします。" #. module: sale_crm #: view:board.board:0 msgid "My Opportunities" -msgstr "私のオポチュニティ" +msgstr "私の商談" #. module: sale_crm #: view:crm.lead:0 msgid "Convert to Quote" -msgstr "見積りへ移動" +msgstr "見積に変換" #. module: sale_crm #: field:crm.make.sale,shop_id:0 msgid "Shop" -msgstr "お店" +msgstr "店" #. module: sale_crm #: field:crm.make.sale,partner_id:0 @@ -95,12 +95,12 @@ msgstr "顧客" #: code:addons/sale_crm/wizard/crm_make_sale.py:92 #, python-format msgid "Opportunity: %s" -msgstr "オポチュニティ: %s" +msgstr "商談：%s" #. module: sale_crm #: field:crm.make.sale,close:0 msgid "Close Opportunity" -msgstr "オポチュニティ成立" +msgstr "商談を閉じる" #. module: sale_crm #: view:board.board:0 @@ -111,7 +111,7 @@ msgstr "段階別私の計画売上高" #: code:addons/sale_crm/wizard/crm_make_sale.py:110 #, python-format msgid "Opportunity '%s' is converted to Quotation." -msgstr "オポチュニティの'%s' は、見積に変換されました。" +msgstr "商談 %s は見積に変換されました。" #. module: sale_crm #: view:sale.order:0 @@ -122,7 +122,7 @@ msgstr "営業チーム" #. module: sale_crm #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale msgid "Make Quotation" -msgstr "見積り作成" +msgstr "見積作成" #. module: sale_crm #: view:crm.make.sale:0 @@ -132,4 +132,4 @@ msgstr "キャンセル" #. module: sale_crm #: model:ir.model,name:sale_crm.model_sale_order msgid "Sales Order" -msgstr "受注" +msgstr "受注オーダー" diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po index 4737b125eac..110bef65e51 100644 --- a/addons/sale_crm/i18n/pt_BR.po +++ b/addons/sale_crm/i18n/pt_BR.po @@ -7,30 +7,30 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2011-01-29 10:47+0000\n" -"Last-Translator: Emerson \n" +"PO-Revision-Date: 2012-07-28 19:41+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 05:49+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: sale_crm #: field:sale.order,categ_id:0 msgid "Category" -msgstr "" +msgstr "Categoria" #. module: sale_crm #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Referência de ordem deve ser única por empresa!" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:112 #, python-format msgid "Converted to Sales Quotation(%s)." -msgstr "" +msgstr "Convertido para Cotação (%s)." #. module: sale_crm #: view:crm.make.sale:0 @@ -62,7 +62,7 @@ msgstr "_Criar" #. module: sale_crm #: view:sale.order:0 msgid "My Sales Team(s)" -msgstr "" +msgstr "Minha Equipe de Vendas" #. module: sale_crm #: help:crm.make.sale,close:0 @@ -75,7 +75,7 @@ msgstr "" #. module: sale_crm #: view:board.board:0 msgid "My Opportunities" -msgstr "" +msgstr "Minhas Oportunidades" #. module: sale_crm #: view:crm.lead:0 @@ -106,13 +106,13 @@ msgstr "Fechar Oportunidade" #. module: sale_crm #: view:board.board:0 msgid "My Planned Revenues by Stage" -msgstr "" +msgstr "Minhas Receitas Planejadas por Estágio" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:110 #, python-format msgid "Opportunity '%s' is converted to Quotation." -msgstr "" +msgstr "A Oportunidade '%s' foi convertida para uma cotação." #. module: sale_crm #: view:sale.order:0 diff --git a/addons/sale_crm/sale_crm.py b/addons/sale_crm/sale_crm.py index 0072730ab4d..b6d5ec25ce1 100644 --- a/addons/sale_crm/sale_crm.py +++ b/addons/sale_crm/sale_crm.py @@ -26,7 +26,7 @@ class sale_order(osv.osv): _columns = { 'section_id': fields.many2one('crm.case.section', 'Sales Team'), - 'categ_id': fields.many2one('crm.case.categ', 'Category', \ + 'categ_ids': fields.many2many('crm.case.categ', 'sale_order_category_rel', 'order_id', 'category_id', 'Categories', \ domain="['|',('section_id','=',section_id),('section_id','=',False), ('object_id.model', '=', 'crm.lead')]") } diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index 0c46f0ae704..6efaea2ac53 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -24,7 +24,7 @@ - + @@ -36,13 +36,14 @@ + - + diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 21041da404d..83d7a0a7783 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -85,12 +85,12 @@ class crm_make_sale(osv.osv_memory): ['default', 'invoice', 'delivery', 'contact']) pricelist = partner.property_product_pricelist.id if False in partner_addr.values(): - raise osv.except_osv(_('Data Insufficient!'), _('No address defined for customer!')) - + raise osv.except_osv(_('Data Insufficient!'), _('Customer has no addresses defined!')) + vals = { 'origin': _('Opportunity: %s') % str(case.id), 'section_id': case.section_id and case.section_id.id or False, - 'categ_id': case.categ_id and case.categ_id.id or False, + 'categ_ids': [(6, 0, [categ_id.id for categ_id in case.categ_ids])], 'shop_id': make.shop_id.id, 'partner_id': partner.id, 'pricelist_id': pricelist, diff --git a/addons/sale_journal/i18n/pt_BR.po b/addons/sale_journal/i18n/pt_BR.po index 31e94c023d1..0f8910c0e8e 100644 --- a/addons/sale_journal/i18n/pt_BR.po +++ b/addons/sale_journal/i18n/pt_BR.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2011-01-14 09:27+0000\n" -"Last-Translator: Emerson \n" +"PO-Revision-Date: 2012-07-28 19:50+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:04+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: sale_journal #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Referência de ordem deve ser única por empresa!" #. module: sale_journal #: field:sale_journal.invoice.type,note:0 @@ -29,7 +29,7 @@ msgstr "Nota" #. module: sale_journal #: field:res.partner,property_invoice_type:0 msgid "Invoicing Type" -msgstr "" +msgstr "Tipo de Fatura" #. module: sale_journal #: help:res.partner,property_invoice_type:0 @@ -37,11 +37,12 @@ msgid "" "This invoicing type will be used, by default, for invoicing the current " "partner." msgstr "" +"Este tipo de fatura será usada, por padrão, para faturar o parceiro atual." #. module: sale_journal #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "Erro! Você não pode criar recursivamente a membros associados." #. module: sale_journal #: view:res.partner:0 @@ -99,7 +100,7 @@ msgstr "" #. module: sale_journal #: sql_constraint:stock.picking:0 msgid "Reference must be unique per Company!" -msgstr "" +msgstr "A referência deve ser única por empresa!" #. module: sale_journal #: field:sale.order,invoice_type_id:0 diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po index 6d04bd6e6e0..d0b51f8404f 100644 --- a/addons/sale_margin/i18n/ja.po +++ b/addons/sale_margin/i18n/ja.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2012-04-20 04:29+0000\n" -"Last-Translator: Tomomi Mengelberg \n" +"PO-Revision-Date: 2012-07-30 16:32+0000\n" +"Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. module: sale_margin #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "発注参照は、会社ごとにユニークでなければなりません。" +msgstr "オーダー参照は、会社ごとに固有でなければなりません。" #. module: sale_margin #: field:sale.order.line,purchase_price:0 @@ -30,7 +30,7 @@ msgstr "原価" #. module: sale_margin #: model:ir.model,name:sale_margin.model_sale_order msgid "Sales Order" -msgstr "受注" +msgstr "受注オーダー" #. module: sale_margin #: help:sale.order,margin:0 @@ -48,4 +48,4 @@ msgstr "粗利益" #. module: sale_margin #: model:ir.model,name:sale_margin.model_sale_order_line msgid "Sales Order Line" -msgstr "受注明細" +msgstr "受注オーダー行" diff --git a/addons/sale_margin/i18n/pt_BR.po b/addons/sale_margin/i18n/pt_BR.po index aea579c2d60..4dd027ca579 100644 --- a/addons/sale_margin/i18n/pt_BR.po +++ b/addons/sale_margin/i18n/pt_BR.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2011-01-14 10:12+0000\n" -"Last-Translator: Emerson \n" +"PO-Revision-Date: 2012-07-28 19:50+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:17+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: sale_margin #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Referência de ordem deve ser única por empresa!" #. module: sale_margin #: field:sale.order.line,purchase_price:0 diff --git a/addons/sale_order_dates/i18n/pt_BR.po b/addons/sale_order_dates/i18n/pt_BR.po index 85462ecc6f6..b94f7b78657 100644 --- a/addons/sale_order_dates/i18n/pt_BR.po +++ b/addons/sale_order_dates/i18n/pt_BR.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 00:37+0000\n" -"PO-Revision-Date: 2011-01-14 10:07+0000\n" -"Last-Translator: Emerson \n" +"PO-Revision-Date: 2012-07-28 19:51+0000\n" +"Last-Translator: Fábio Martinelli \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-14 06:23+0000\n" -"X-Generator: Launchpad (build 15614)\n" +"X-Launchpad-Export-Date: 2012-07-29 04:37+0000\n" +"X-Generator: Launchpad (build 15694)\n" #. module: sale_order_dates #: sql_constraint:sale.order:0 msgid "Order Reference must be unique per Company!" -msgstr "" +msgstr "Referência de ordem deve ser única por empresa!" #. module: sale_order_dates #: help:sale.order,requested_date:0 diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml index defbc522340..3af69bb025b 100644 --- a/addons/share/res_users_view.xml +++ b/addons/share/res_users_view.xml @@ -7,8 +7,7 @@ search - - + @@ -32,11 +31,8 @@ - - - + diff --git a/addons/signup/__init__.py b/addons/signup/__init__.py new file mode 100644 index 00000000000..d70c1894925 --- /dev/null +++ b/addons/signup/__init__.py @@ -0,0 +1,2 @@ +import res_config +import signup diff --git a/addons/signup/__openerp__.py b/addons/signup/__openerp__.py new file mode 100644 index 00000000000..b899d5bc434 --- /dev/null +++ b/addons/signup/__openerp__.py @@ -0,0 +1,20 @@ +{ + 'name': 'Signup', + 'description': 'Allow users to sign up', + 'author': 'OpenERP SA', + 'version': '1.0', + 'category': 'Tools', + 'website': 'http://www.openerp.com', + 'installable': True, + 'depends': ['anonymous', 'base_setup'], + 'data': [ + 'res_config.xml', + 'signup.xml', + ], + 'js': [ + 'static/src/js/signup.js', + ], + 'qweb': [ + 'static/src/xml/signup.xml', + ], +} diff --git a/addons/signup/res_config.py b/addons/signup/res_config.py new file mode 100644 index 00000000000..53f0513b234 --- /dev/null +++ b/addons/signup/res_config.py @@ -0,0 +1,20 @@ +from openerp.osv import osv, fields + +class base_config_settings(osv.TransientModel): + _inherit = 'base.config.settings' + + _columns = { + 'signup_template_user_id': fields.many2one('res.users', 'Template user for signup') + } + + def get_default_signup(self, cr, uid, fields, context=None): + icp = self.pool.get('ir.config_parameter') + return { + 'signup_template_user_id': icp.get_param(cr, uid, 'signup.template_user_id', 0) or False + } + + def set_signup(self, cr, uid, ids, context=None): + config = self.browse(cr, uid, ids[0], context=context) + icp = self.pool.get('ir.config_parameter') + icp.set_param(cr, uid, 'signup.template_user_id', config.signup_user_template_id.id) + diff --git a/addons/signup/res_config.xml b/addons/signup/res_config.xml new file mode 100644 index 00000000000..d13f7002d17 --- /dev/null +++ b/addons/signup/res_config.xml @@ -0,0 +1,16 @@ + + + + base.config.settings.signup + base.config.settings + + form + + + + + + + + + diff --git a/addons/signup/signup.py b/addons/signup/signup.py new file mode 100644 index 00000000000..3819a63da85 --- /dev/null +++ b/addons/signup/signup.py @@ -0,0 +1,57 @@ +from openerp.osv import osv, fields + +class res_users(osv.Model): + _inherit = 'res.users' + + _sql_constraints = [ + ('email_uniq', 'UNIQUE (user_email)', 'You can not have two users with the same email!') + ] + +class signup_signup(osv.TransientModel): + _name = 'signup.signup' + _columns = { + 'name': fields.char('Name', size=64), + 'email': fields.char('Email', size=64), + 'password': fields.char('Password', size=64), + 'password_confirmation': fields.char('Confirm Password', size=64), + 'state': fields.selection([(x, x) for x in 'draft done missmatch'.split()], required=True), + } + _defaults = { + 'state': 'draft', + } + + def create(self, cr, uid, values, context=None): + # NOTE here, invalid values raises exceptions to avoid storing + # sensitive data into the database (which then are available to anyone) + if values['password'] != values['password_confirmation']: + raise osv.except_osv('Error', 'Passwords missmatch') + + new_user = { + 'name': values['name'], + 'login': values['email'], + 'user_email': values['email'], + 'password': values['password'], + 'active': True, + } + + user_template_id = self.pool.get('ir.config_parameter').get_param(cr, uid, 'signup.user_template_id', 0) + if user_template_id: + self.pool.get('res.users').copy(cr, 1, user_template_id, new_user, context=context) + else: + self.pool.get('res.users').create(cr, 1, new_user, context=context) + + # Dont store the password + values = {'state': 'done'} + return super(signup_signup, self).create(cr, uid, values, context) + + def signup(self, cr, uid, ids, context=None): + return { + 'type': 'ir.actions.client', + 'tag': 'login', + } + + def onchange_pw(self, cr, uid, ids, pw, cpw, context=None): + if pw != cpw: + return {'value': {'state': 'missmatch'}} + return {'value': {'state': 'draft'}} + diff --git a/addons/signup/signup.xml b/addons/signup/signup.xml new file mode 100644 index 00000000000..3dacf85feb4 --- /dev/null +++ b/addons/signup/signup.xml @@ -0,0 +1,41 @@ + + + + + signup.signup.form + signup.signup + form + +
    + + + + + + + +
    Passwords missmatch
    +     + +
    - + @@ -123,7 +123,7 @@ - + Receive Products stock.move @@ -136,7 +136,7 @@ Here you can receive individual products, no matter what purchase order or picking order they come from. You will find the list of all products you are waiting for. Once you receive an order, you can filter based on the name of the supplier or the purchase order reference. Then you can confirm all products received using the buttons on the right of each line. - + Receive Products stock.move @@ -215,17 +215,5 @@ - - diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml index 89cbd9c1340..56d17976aad 100644 --- a/addons/stock/report/report_stock_move_view.xml +++ b/addons/stock/report/report_stock_move_view.xml @@ -56,52 +56,33 @@ search - - - - - - - - - - - + + + + + + + + - - - + - - - - - - - @@ -163,23 +144,15 @@ search - - - - - - - - - - + + + + + + + @@ -189,17 +162,13 @@ - - - - + - diff --git a/addons/stock/report/report_stock_view.xml b/addons/stock/report/report_stock_view.xml index 69a7829f565..15dafbfdbc1 100644 --- a/addons/stock/report/report_stock_view.xml +++ b/addons/stock/report/report_stock_view.xml @@ -35,14 +35,10 @@ - - - - - + + + + diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 51309f6dee2..c20336a35cf 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -619,7 +619,7 @@ class stock_picking(osv.osv): 'name': fields.char('Reference', size=64, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'origin': fields.char('Source', size=64, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Reference of the document", select=True), 'backorder_id': fields.many2one('stock.picking', 'Back Order of', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="If this shipment was split, then this field links to the shipment which contains the already processed part.", select=True), - 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Shipping type specify, goods coming in or going out."), + 'type': fields.selection([('out', 'Sending Goods'), ('in', 'Getting Goods'), ('internal', 'Internal')], 'Shipping Type', required=True, select=True, readonly=True, help="Shipping type specify, goods coming in or going out."), 'note': fields.text('Notes', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'stock_journal_id': fields.many2one('stock.journal','Stock Journal', select=True, states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}), 'location_id': fields.many2one('stock.location', 'Location', states={'done':[('readonly', True)], 'cancel':[('readonly',True)]}, help="Keep empty if you produce at the location where the finished products are needed." \ @@ -1726,10 +1726,15 @@ class stock_move(osv.osv): if location_xml_id: location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id) return location_id + + def _default_destination_address(self, cr, uid, context=None): + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + return user.company_id.partner_id.id _defaults = { 'location_id': _default_location_source, 'location_dest_id': _default_location_destination, + 'partner_id': _default_destination_address, 'state': 'draft', 'priority': '1', 'product_qty': 1.0, diff --git a/addons/stock/stock_data.xml b/addons/stock/stock_data.xml index 3e3ffcb83f5..69bb610ae99 100644 --- a/addons/stock/stock_data.xml +++ b/addons/stock/stock_data.xml @@ -1,6 +1,17 @@ + + + + + Module Warehouse Management has been installed + Manage your product inventoy and stock locations. You can + control your stock moves history and planning, perform stock + valuation, and trace product lots upstream and downstream + (based on serial numbers.) + + Stock Journal Sequence diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml index ec0860f62c7..03a107b6947 100644 --- a/addons/stock/stock_demo.xml +++ b/addons/stock/stock_demo.xml @@ -6,9 +6,9 @@ - + + + IT Suppliers @@ -44,16 +44,14 @@ - + Starting Inventory - + + + @@ -185,10 +183,10 @@ 1 - + Shop 1 - + Felix @@ -197,17 +195,17 @@ - + Shop 1 1 - + Shop 2 - + Edwin @@ -216,36 +214,36 @@ - + Shop 2 - - + internal + none - - + Shop 1 + manual - + internal - + Shop 2 - - + procurement + Internal Shippings - + Shop 1 @@ -266,5 +264,6 @@ + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index e90a2bb8162..3c08c1eaff0 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -79,14 +79,9 @@ search - - - - - - - - + + + @@ -137,7 +132,7 @@ - + @@ -290,13 +285,9 @@ search - - - - - - - + + + @@ -405,16 +396,10 @@ search - - - - - - - - - - + + + + @@ -569,14 +554,9 @@ - - - - - + + + @@ -683,14 +663,9 @@ - - @@ -733,14 +708,16 @@
    -
    @@ -776,7 +753,8 @@