diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8ae66ba34b7..716369c429b 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -266,14 +266,7 @@
form
- Define Recurring
+ Recurring Models
account.model
form
tree,form
@@ -1916,11 +1909,11 @@
-
+
-
+
-
+
Create Account
diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml
index 10303dd8cbf..235716e4c94 100644
--- a/addons/account/data/account_data2.xml
+++ b/addons/account/data/account_data2.xml
@@ -74,12 +74,6 @@
credit
-
-
- Analytic Account
- analytic_account_id
-
-
Ref
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 62a2d826964..ff71f9efc36 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-08 08:56+0000\n"
+"PO-Revision-Date: 2010-07-28 12:08+0000\n"
"Last-Translator: eLBati - albatos.com \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
@@ -193,8 +193,6 @@ msgstr "Seleziona la riga del movimento"
#. module: account
#: rml:account.journal.period.print:0
#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
msgid "Entry label"
msgstr "Inserisci etichetta"
@@ -239,7 +237,6 @@ msgstr "Voci ricorrenti"
#: field:account.move,amount:0
#: field:account.tax,amount:0
#: field:account.tax.template,amount:0
-#: xsl:account.transfer:0
msgid "Amount"
msgstr "Importo"
@@ -309,7 +306,6 @@ msgstr "Ritardo Pagamenti"
#. module: account
#: wizard_view:account.account.balance.report,checktype:0
#: wizard_view:account.analytic.account.analytic.check.report,init:0
-#: wizard_view:account.analytic.account.balance.report,init:0
#: wizard_view:account.analytic.account.cost_ledger.report,init:0
#: wizard_view:account.analytic.account.inverted.balance.report,init:0
#: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -349,11 +345,12 @@ msgid "Delta Debit"
msgstr "Delta di Debito"
#. module: account
+#: model:account.account.type,name:account.account_type_tax
#: rml:account.invoice:0
#: field:account.invoice,amount_tax:0
#: field:account.move.line,account_tax_id:0
msgid "Tax"
-msgstr "Tassa"
+msgstr "Imposte"
#. module: account
#: rml:account.general.journal:0
@@ -363,7 +360,9 @@ msgstr "Debito Trans."
#. module: account
#: field:account.analytic.line,account_id:0
#: field:account.invoice.line,account_analytic_id:0
+#: wizard_field:account.invoice.pay,addendum,analytic_id:0
#: field:account.move.line,analytic_account_id:0
+#: wizard_field:account.move.line.reconcile,addendum,analytic_id:0
#: field:report.hr.timesheet.invoice.journal,account_id:0
msgid "Analytic Account"
msgstr "Contabilità Analitica"
@@ -684,8 +683,11 @@ msgstr "Sub-totale"
#. module: account
#: field:account.analytic.account,line_ids:0
#: view:account.analytic.line:0
+#: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
#: model:ir.actions.act_window,name:account.action_account_analytic_line_form
+#: model:ir.actions.act_window,name:account.action_account_tree1
#: model:ir.ui.menu,name:account.next_id_41
+#, python-format
msgid "Analytic Entries"
msgstr "Voci analitiche"
@@ -700,6 +702,7 @@ msgid "Associated Partner"
msgstr "Partner associato"
#. module: account
+#: view:account.invoice:0
#: field:account.invoice,comment:0
msgid "Additional Information"
msgstr "Informazioni Aggiuntive"
@@ -1473,6 +1476,9 @@ msgstr "Lasciare vuoto per usare il conto di ricavo"
#: field:account.bank.statement.reconcile,line_new_ids:0
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
+#: code:addons/account/wizard/wizard_pay_invoice.py:0
+#: code:addons/account/wizard/wizard_reconcile.py:0
+#, python-format
msgid "Write-Off"
msgstr ""
@@ -1879,7 +1885,6 @@ msgstr ""
#: field:account.journal,type:0
#: field:account.move,type:0
#: field:account.move.reconcile,type:0
-#: xsl:account.transfer:0
msgid "Type"
msgstr "Tipo"
@@ -2315,13 +2320,13 @@ msgstr ""
#: selection:account.general.ledger.report,checktype,sortbydate:0
#: rml:account.journal.period.print:0
#: field:account.move,date:0
+#: wizard_field:account.move.line.reconcile,addendum,date_p:0
#: rml:account.overdue:0
#: wizard_field:account.subscription.generate,init,date:0
#: field:account.subscription.line,date:0
#: rml:account.tax.code.entries:0
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
-#: xsl:account.transfer:0
msgid "Date"
msgstr "Data"
@@ -2438,6 +2443,7 @@ msgstr "Data fine"
#: view:account.bank.statement:0
#: field:account.move.reconcile,line_id:0
#: model:ir.actions.act_window,name:account.action_move_line_search
+#: model:ir.actions.act_window,name:account.action_move_line_select
#: model:ir.actions.act_window,name:account.action_move_line_tree1
#: model:ir.ui.menu,name:account.menu_action_move_line_search
msgid "Entry Lines"
@@ -2629,6 +2635,8 @@ msgstr ""
#. module: account
#: rml:account.analytic.account.journal:0
+#: wizard_view:account.invoice.pay,addendum:0
+#: wizard_view:account.move.line.reconcile,addendum:0
#: model:ir.ui.menu,name:account.next_id_40
#: model:process.node,name:account.process_node_analytic0
#: model:process.node,name:account.process_node_analyticcost0
@@ -2732,6 +2740,7 @@ msgid "Invoice Number"
msgstr "Numero fattura"
#. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date2:0
#: field:account.period,date_stop:0
msgid "End of Period"
msgstr ""
@@ -2915,8 +2924,6 @@ msgstr ""
#: rml:account.journal.period.print:0
#: rml:account.partner.balance:0
#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "1cm 27.7cm 20cm 27.7cm"
msgstr ""
@@ -2973,9 +2980,11 @@ msgstr "Righe movimento"
#: wizard_view:account.move.line.reconcile,init_full:0
#: wizard_view:account.move.line.reconcile,init_partial:0
#: wizard_view:account.move.line.reconcile.select,init:0
+#: code:addons/account/wizard/wizard_reconcile_select.py:0
#: model:ir.ui.menu,name:account.next_id_20
#: model:process.node,name:account.process_node_reconciliation0
#: model:process.node,name:account.process_node_supplierreconciliation0
+#, python-format
msgid "Reconciliation"
msgstr "Riconciliazione"
@@ -3035,7 +3044,6 @@ msgstr "Situazione"
#. module: account
#: rml:account.invoice:0
-#: xsl:account.transfer:0
msgid "Document"
msgstr "Documento"
@@ -3083,6 +3091,8 @@ msgstr "Libro Giornale analitico"
#. module: account
#: rml:account.general.ledger:0
+#: rml:account.third_party_ledger:0
+#: rml:account.third_party_ledger_other:0
msgid "Entry Label"
msgstr ""
@@ -3276,6 +3286,7 @@ msgid "Generate Fiscal Year Opening Entries"
msgstr ""
#. module: account
+#: view:account.move.reconcile:0
#: model:ir.actions.wizard,name:account.wizard_reconcile
msgid "Reconcile Entries"
msgstr "Riconcilia registrazioni"
@@ -3625,7 +3636,6 @@ msgid ""
msgstr ""
#. module: account
-#: wizard_field:account.invoice.pay,addendum,comment:0
#: wizard_field:account.invoice.pay,init,name:0
msgid "Entry Name"
msgstr ""
@@ -4940,6 +4950,7 @@ msgid "Invoice Lines"
msgstr ""
#. module: account
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
#: field:account.period,date_start:0
msgid "Start of Period"
msgstr ""
@@ -5213,7 +5224,7 @@ msgstr ""
#: field:account.invoice,payment_ids:0
#: selection:account.vat.declaration,init,based_on:0
msgid "Payments"
-msgstr ""
+msgstr "Pagamenti"
#. module: account
#: model:process.node,note:account.process_node_accountingstatemententries0
@@ -5332,8 +5343,6 @@ msgstr ""
#: rml:account.journal.period.print:0
#: rml:account.partner.balance:0
#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.third_party_ledger_other:0
#: rml:account.vat.declaration:0
msgid "Page"
msgstr ""
@@ -5342,7 +5351,7 @@ msgstr ""
#: view:account.move:0
#: view:account.move.line:0
msgid "Optional Information"
-msgstr ""
+msgstr "Informazioni aggiuntive"
#. module: account
#: model:ir.actions.act_window,name:account.action_payment_term_form
@@ -5415,7 +5424,6 @@ msgstr ""
#. module: account
#: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
-#: wizard_field:account.analytic.account.balance.report,init,date2:0
#: wizard_field:account.analytic.account.cost_ledger.report,init,date2:0
#: wizard_field:account.analytic.account.inverted.balance.report,init,date2:0
#: wizard_field:account.analytic.account.journal.report,init,date2:0
@@ -5501,7 +5509,7 @@ msgstr ""
#: view:account.move:0
#: view:account.move.line:0
msgid "General Information"
-msgstr ""
+msgstr "Informazioni Generali"
#. module: account
#: help:populate_statement_from_inv,init,journal_id:0
@@ -5604,7 +5612,6 @@ msgstr "Anno fiscale da chiudere"
#. module: account
#: wizard_field:account.aged.trial.balance,init,date1:0
#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
#: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
#: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
#: wizard_field:account.analytic.account.journal.report,init,date1:0
@@ -6126,7 +6133,7 @@ msgid "Show Comparision in %"
msgstr ""
#. module: account
-#: wizard_view:account.balance.account.balance.report,init:0
+#: wizard_view:account.analytic.account.balance.report,init:0
msgid "Select Period"
msgstr ""
@@ -6290,3 +6297,92 @@ msgstr ""
#: view:report.invoice.created:0
msgid "Untaxed Amount"
msgstr ""
+
+#~ msgid "account.config.wizard"
+#~ msgstr "account.config.wizard"
+
+#, python-format
+#~ msgid "Integrity Error !"
+#~ msgstr "Errore di Integrità!"
+
+#, python-format
+#~ msgid ""
+#~ "Specified Journal does not have any account move entries in draft state for "
+#~ "this period"
+#~ msgstr ""
+#~ "Il Giornale specificato non ha nessun movimento in stato di bozza per questo "
+#~ "periodo"
+
+#, python-format
+#~ msgid "You have to provide an account for the write off entry !"
+#~ msgstr "Occorre inserire un conto per la scrittura della registrazione"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Attenzione !"
+
+#, python-format
+#~ msgid "You can not delete posted movement: \"%s\"!"
+#~ msgstr "Non è possibile cancellare il movimento registrato \"%s\"!"
+
+#, python-format
+#~ msgid "No analytic journal !"
+#~ msgstr "Nessun Giornale analitico presente!"
+
+#, python-format
+#~ msgid "You can not use this general account in this journal !"
+#~ msgstr "Non è possibile utilizzare questo conto generale in questo giornale!"
+
+#, python-format
+#~ msgid "You can not add/modify entries in a closed journal."
+#~ msgstr "Non si può aggiungere/modificare registrazioni in un giornale chiuso"
+
+#, python-format
+#~ msgid ""
+#~ "You can not do this modification on a reconciled entry ! Please note that "
+#~ "you can just change some non important fields !"
+#~ msgstr ""
+#~ "Non si può fare questa modifica su una registrazione riconcigliata! Per "
+#~ "cortesia, osservare che si possono modificare solo campi non importanti!"
+
+#, python-format
+#~ msgid "You must first select a partner !"
+#~ msgstr "Bisogna prima selezionare un partner!"
+
+#, python-format
+#~ msgid "Free Reference"
+#~ msgstr "Riferimenti vari"
+
+#, python-format
+#~ msgid "Entries are not of the same account or already reconciled ! "
+#~ msgstr "Registrazioni non nello stesso conto, oppure già riconciliate! "
+
+#, python-format
+#~ msgid "Invalid action !"
+#~ msgstr "Azione non valida !"
+
+#, python-format
+#~ msgid "Some entries are already reconciled !"
+#~ msgstr "Alcune registrazioni sono già riconciliate !"
+
+#, python-format
+#~ msgid "The account entries lines are not in valid state."
+#~ msgstr "Queste registrazioni contabili non sono in uno stato valido."
+
+#, python-format
+#~ msgid "Sales Journal"
+#~ msgstr "Giornale Vendite"
+
+#, python-format
+#~ msgid "You can not modify/delete a journal with entries for this period !"
+#~ msgstr ""
+#~ "Non puoi modificare/cancellare un giornale con registrazioni per questo "
+#~ "periodo !"
+
+#, python-format
+#~ msgid "Entries: "
+#~ msgstr "Registrazioni: "
+
+#, python-format
+#~ msgid "Entry is already reconciled"
+#~ msgstr "La registrazione è già stata riconciliata"
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index 1c1ae438094..609b8f0da5a 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -10,7 +10,7 @@
-
+
Accounts to Renew
@@ -335,7 +335,7 @@
form
tree,form,search
-
+
#
# Open journal entries
@@ -469,7 +469,7 @@
tree,graph
-
+
diff --git a/addons/account/test/chart_of_account.yml b/addons/account/test/chart_of_account.yml
index 39d7428ea73..09271f778be 100644
--- a/addons/account/test/chart_of_account.yml
+++ b/addons/account/test/chart_of_account.yml
@@ -25,21 +25,19 @@
"active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_account_tree2")],
"tz": False, "active_id": ref("account.menu_action_account_tree2"), })
--
- In order to test Account Move Line Wizard I check the move line entries using this wizard
--
- !record {model: account.move.line.select, id: account_move_line_select_0}:
- {}
--
- I clicked on Button to open the account move lines
--
- !python {model: account.move.line.select}: |
- self.open_window(cr, uid, [ref("account_move_line_select_0")], {"lang": 'en_US',
- "state": "all", "tz": False, "active_model": "account.account", "active_ids":
- [ref("account.a_recv")], "fiscalyear": 1, "active_id": ref("account.a_recv"),
- })
-
-
+#-
+# In order to test Account Move Line Wizard I check the move line entries using this wizard
+#-
+# !record {model: account.move.line.select, id: account_move_line_select_0}:
+# {}
+#-
+# I clicked on Button to open the account move lines
+#-
+# !python {model: account.move.line.select}: |
+# self.open_window(cr, uid, [ref("account_move_line_select_0")], {"lang": 'en_US',
+# "state": "all", "tz": False, "active_model": "account.account", "active_ids":
+# [ref("account.a_recv")], "fiscalyear": 1, "active_id": ref("account.a_recv"),
+# })
-
In order to test the Analytic Charts of Account wizard I will generate chart
diff --git a/addons/account/wizard/account_report_partner_ledger.py b/addons/account/wizard/account_report_partner_ledger.py
index 58aad8b63fc..3c9ffbf33c6 100644
--- a/addons/account/wizard/account_report_partner_ledger.py
+++ b/addons/account/wizard/account_report_partner_ledger.py
@@ -31,7 +31,7 @@ class account_partner_ledger(osv.osv_memory):
_columns = {
'initial_balance': fields.boolean('Include initial balances',
help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
- 'reconcil': fields.boolean('Include Reconciled Entries'),
+ 'reconcil': fields.boolean('Include Reconciled Entries', help='Consider reconciled entries'),
'page_split': fields.boolean('One Partner Per Page', help='Display Ledger Report with One partner per page'),
'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
}
diff --git a/addons/account/wizard/account_subscription_generate_view.xml b/addons/account/wizard/account_subscription_generate_view.xml
index aeb6aef8324..b272230e89b 100644
--- a/addons/account/wizard/account_subscription_generate_view.xml
+++ b/addons/account/wizard/account_subscription_generate_view.xml
@@ -2,34 +2,34 @@
-
+
account.subscription.generate.form
account.subscription.generate
form
-
+
- Automatic Recurring
+ Generate Entries
account.subscription.generate
form
tree,form
-
- new
+
+ new
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 560030be2f5..6bae6c55d74 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -42,8 +42,8 @@
account.move.line
-
+
+
account.use.model.open.entry.form
diff --git a/addons/account_analytic_plans/account_analytic_plans_view.xml b/addons/account_analytic_plans/account_analytic_plans_view.xml
index d5085b009da..22389386bba 100644
--- a/addons/account_analytic_plans/account_analytic_plans_view.xml
+++ b/addons/account_analytic_plans/account_analytic_plans_view.xml
@@ -192,8 +192,8 @@
tree,form
-
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index 938b5dd2639..e5639535742 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -136,7 +136,7 @@
-
+
diff --git a/addons/account_report/account_view.xml b/addons/account_report/account_view.xml
index 82fb48e5e8b..bec76093070 100644
--- a/addons/account_report/account_view.xml
+++ b/addons/account_report/account_view.xml
@@ -90,8 +90,12 @@
+
-
+
account.report.report.tree
@@ -110,14 +114,14 @@
- Custom reporting
+ Custom Reporting
account.fiscalyear
tree
[('parent_id','=',False)]
-
-
+
+
Fiscal Statements reporting
diff --git a/addons/account_report/i18n/pt_BR.po b/addons/account_report/i18n/pt_BR.po
index df3898bce2c..20abfd409fe 100644
--- a/addons/account_report/i18n/pt_BR.po
+++ b/addons/account_report/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:40+0000\n"
-"Last-Translator: Pedro_Maschio \n"
+"PO-Revision-Date: 2010-07-28 13:15+0000\n"
+"Last-Translator: Leandro Chaves \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 03:55+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
@@ -21,166 +21,166 @@ msgstr ""
#: selection:account.report.report,type:0
#: model:ir.model,name:account_report.model_account_report_history
msgid "Indicator"
-msgstr ""
+msgstr "Indicador"
#. module: account_report
#: wizard_field:print.indicators.pdf,init,file:0
msgid "Select a PDF File"
-msgstr ""
+msgstr "Selecionar um Arquivo PDF"
#. module: account_report
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
#. module: account_report
#: view:account.report.report:0
msgid "Operators:"
-msgstr ""
+msgstr "Operadores"
#. module: account_report
#: field:account.report.report,parent_id:0
msgid "Parent"
-msgstr ""
+msgstr "Conta-pai"
#. module: account_report
#: field:account.report.report,disp_graph:0
msgid "Display As Graph"
-msgstr ""
+msgstr "Mostrar como Gráfico"
#. module: account_report
#: view:account.report.report:0
msgid "Account Debit:"
-msgstr ""
+msgstr "Débito Conta:"
#. module: account_report
#: selection:account.report.report,type:0
msgid "Others"
-msgstr ""
+msgstr "Outros"
#. module: account_report
#: view:account.report.report:0
msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "saldo(['ACCOUNT_CODE',],fiscalyear)"
#. module: account_report
#: rml:print.indicators:0
msgid "Tabular Summary"
-msgstr ""
+msgstr "Resumo Tabular"
#. module: account_report
#: view:account.report.report:0
msgid "Notes"
-msgstr ""
+msgstr "Notas"
#. module: account_report
#: view:account.report.report:0
msgid "= Goodness Indicator Limit:"
-msgstr ""
+msgstr "= Limite do Indicador de Melhora"
#. module: account_report
#: view:account.report.report:0
msgid "Very bad"
-msgstr ""
+msgstr "Muito mal"
#. module: account_report
#: field:account.report.history,val:0
#: field:account.report.report,amount:0
msgid "Value"
-msgstr ""
+msgstr "Valor"
#. module: account_report
#: view:account.report.report:0
msgid "= Badness Indicator Limit:"
-msgstr ""
+msgstr "= Limite do Indicador de Piora"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Bad"
-msgstr ""
+msgstr "Mal"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Select the PDF file on which Indicators will be printed."
-msgstr ""
+msgstr "Selecione o arquivo PDF no qual serão impressos os Indicadores"
#. module: account_report
#: view:account.report.report:0
msgid "> Goodness Indicator Limit:"
-msgstr ""
+msgstr "> Limite do Indicador de Melhora:"
#. module: account_report
#: field:account.report.report,badness_limit:0
msgid "Badness Indicator Limit"
-msgstr ""
+msgstr "Limite do Indicador de Piora"
#. module: account_report
#: selection:account.report.report,status:0
msgid "Very Bad"
-msgstr ""
+msgstr "Muito Mal"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
msgid "Indicator history"
-msgstr ""
+msgstr "Histórico do indicador"
#. module: account_report
#: view:account.report.report:0
msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "crédito(['ACCOUNT_CODE',],fiscalyear)"
#. module: account_report
#: view:account.report.report:0
msgid "Report Amount:"
-msgstr ""
+msgstr "Valor do Relatório"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.fiscal_statements
msgid "Fiscal Statements"
-msgstr ""
+msgstr "Demonstrativos Fiscais"
#. module: account_report
#: wizard_button:print.indicators,init,next:0
msgid "Next"
-msgstr ""
+msgstr "Próximo"
#. module: account_report
#: model:ir.module.module,shortdesc:account_report.module_meta_information
msgid "Reporting for accounting"
-msgstr ""
+msgstr "Relatórios para contabilização"
#. module: account_report
#: wizard_button:print.indicators,next,print:0
#: wizard_button:print.indicators.pdf,init,print:0
msgid "Print"
-msgstr ""
+msgstr "Imprimir"
#. module: account_report
#: field:account.report.report,type:0
msgid "Type"
-msgstr ""
+msgstr "Tipo"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "Imprimir Indicadores em PDF"
#. module: account_report
#: view:account.report.report:0
msgid "Account Tax Code:"
-msgstr ""
+msgstr "Código Contábil do Imposto"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Good"
-msgstr ""
+msgstr "Bom"
#. module: account_report
#: view:account.report.history:0
msgid "Account Report History"
-msgstr ""
+msgstr "Histórico do Relatório de Conta"
#. module: account_report
#: constraint:ir.ui.view:0
@@ -190,54 +190,54 @@ msgstr "Invalido XML para Arquitetura da View"
#. module: account_report
#: help:account.report.report,badness_limit:0
msgid "This Value sets the limit of badness."
-msgstr ""
+msgstr "Este Valor define o limite de piora."
#. module: account_report
#: wizard_field:print.indicators,init,select_base:0
msgid "Choose Criteria"
-msgstr ""
+msgstr "Escolha o critério"
#. module: account_report
#: view:account.report.report:0
msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
+msgstr "débito(['ACCOUNT_CODE',],fiscalyear)"
#. module: account_report
#: view:account.report.report:0
msgid "Account Credit:"
-msgstr ""
+msgstr "Crédito Conta:"
#. module: account_report
#: wizard_view:print.indicators,init:0
msgid "Select the criteria based on which Indicators will be printed."
-msgstr ""
+msgstr "Selecione o critério em função de quais Indicadores serão impressos."
#. module: account_report
#: view:account.report.report:0
msgid "< Badness Indicator Limit:"
-msgstr ""
+msgstr "< Limite do Indicador de Piora"
#. module: account_report
#: view:account.report.report:0
#: selection:account.report.report,status:0
msgid "Very Good"
-msgstr ""
+msgstr "Muito Bom"
#. module: account_report
#: field:account.report.report,note:0
msgid "Note"
-msgstr ""
+msgstr "Nota"
#. module: account_report
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Currency:"
-msgstr ""
+msgstr "Moeda:"
#. module: account_report
#: field:account.report.report,status:0
msgid "Status"
-msgstr ""
+msgstr "Estado"
#. module: account_report
#: help:account.report.report,disp_tree:0
@@ -245,105 +245,108 @@ msgid ""
"When the indicators are printed, if one indicator is set with this field to "
"True, then it will display one more graphs with all its children in tree"
msgstr ""
+"Quando os indicadores são impressos, se um deles estiver marcado nesse campo "
+"como Verdadeiro, então irá mostrar um ou mais gráficos com todas as contas-"
+"filhas em árvore"
#. module: account_report
#: selection:account.report.report,status:0
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#. module: account_report
#: view:account.report.report:0
msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
-msgstr ""
+msgstr "Exemplo: (saldo(['6','45'],-1) - crédito(['7'])) / relatório('RPT1')"
#. module: account_report
#: field:account.report.report,active:0
msgid "Active"
-msgstr ""
+msgstr "Ativo"
#. module: account_report
#: field:account.report.report,disp_tree:0
msgid "Display Tree"
-msgstr ""
+msgstr "Mostrar Árvore"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based On Fiscal Years"
-msgstr ""
+msgstr "Com Base em Anos Fiscais"
#. module: account_report
#: model:ir.model,name:account_report.model_account_report_report
msgid "Account reporting"
-msgstr ""
+msgstr "Relatório de conta"
#. module: account_report
#: view:account.report.report:0
msgid "Account Balance:"
-msgstr ""
+msgstr "Saldo de Conta"
#. module: account_report
#: rml:print.indicators:0
msgid "Expression :"
-msgstr ""
+msgstr "Expressão :"
#. module: account_report
#: view:account.report.report:0
msgid "report('REPORT_CODE')"
-msgstr ""
+msgstr "relatório('REPORT_CODE')"
#. module: account_report
#: field:account.report.report,expression:0
msgid "Expression"
-msgstr ""
+msgstr "Expressão"
#. module: account_report
#: view:account.report.report:0
msgid "Accounting reporting"
-msgstr ""
+msgstr "Relatório contábil"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_form
#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
msgid "New Reporting Item Formula"
-msgstr ""
+msgstr "Fórmula para Item Novo de Relatório"
#. module: account_report
#: field:account.report.report,code:0
#: rml:accounting.report:0
msgid "Code"
-msgstr ""
+msgstr "Código"
#. module: account_report
#: field:account.report.history,tmp:0
msgid "temp"
-msgstr ""
+msgstr "temporário"
#. module: account_report
#: field:account.report.history,period_id:0
msgid "Period"
-msgstr ""
+msgstr "Período"
#. module: account_report
#: view:account.report.report:0
msgid "General"
-msgstr ""
+msgstr "Geral"
#. module: account_report
#: view:account.report.report:0
msgid "Legend of operators"
-msgstr ""
+msgstr "Legenda dos operadores"
#. module: account_report
#: wizard_button:print.indicators,init,end:0
#: wizard_button:print.indicators,next,end:0
#: wizard_button:print.indicators.pdf,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
#. module: account_report
#: field:account.report.report,child_ids:0
msgid "Children"
-msgstr ""
+msgstr "Filhas (contas-filhas)"
#. module: account_report
#: constraint:ir.model:0
@@ -356,7 +359,7 @@ msgstr ""
#. module: account_report
#: help:account.report.report,goodness_limit:0
msgid "This Value sets the limit of goodness."
-msgstr ""
+msgstr "Este valor definie o limite de melhora."
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -364,45 +367,45 @@ msgstr ""
#: wizard_view:print.indicators,init:0
#: wizard_view:print.indicators,next:0
msgid "Print Indicators"
-msgstr ""
+msgstr "Imprimir Indicadores"
#. module: account_report
#: view:account.report.report:0
msgid "+ - * / ( )"
-msgstr ""
+msgstr "+ - * / ( )"
#. module: account_report
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Printing date:"
-msgstr ""
+msgstr "Data de impressão:"
#. module: account_report
#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
msgid "Indicators in PDF"
-msgstr ""
+msgstr "indicadores em PDF"
#. module: account_report
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "at"
-msgstr ""
+msgstr "em"
#. module: account_report
#: rml:accounting.report:0
msgid "Accounting Report"
-msgstr ""
+msgstr "Relatório Contábil"
#. module: account_report
#: field:account.report.report,goodness_limit:0
msgid "Goodness Indicator Limit"
-msgstr ""
+msgstr "Limite do Indicador de Melhora"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
msgid "Other reports"
-msgstr ""
+msgstr "Outros relatórios"
#. module: account_report
#: view:account.report.report:0
@@ -410,61 +413,63 @@ msgid ""
"Note: The second arguement 'fiscalyear' and 'period' are optional "
"arguements.If the value is -1,previous fiscalyear or period is considered."
msgstr ""
+"Nota: O segundo argumento 'ano fiscal' e 'período' são opcionais. Se o valor "
+"for -1 o \"ano fiscal' e 'período' considerados serão os anteriores."
#. module: account_report
#: rml:print.indicators:0
msgid ")"
-msgstr ""
+msgstr ")"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
msgid "Fiscal Statements reporting"
-msgstr ""
+msgstr "Relatório de Demonstrativos Fiscais"
#. module: account_report
#: selection:print.indicators,init,select_base:0
msgid "Based on Fiscal Periods"
-msgstr ""
+msgstr "Com base nos Períodos Fiscais"
#. module: account_report
#: model:ir.actions.report.xml,name:account_report.report_print_indicators
#: rml:print.indicators:0
msgid "Indicators"
-msgstr ""
+msgstr "Indicadores"
#. module: account_report
#: wizard_view:print.indicators.pdf,init:0
msgid "Print Indicators with PDF"
-msgstr ""
+msgstr "Imprimir Indicadores em PDF"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
msgid "Indicators reporting"
-msgstr ""
+msgstr "Relatório de Indicadores"
#. module: account_report
#: field:account.report.report,name:0
#: rml:accounting.report:0
#: rml:print.indicators:0
msgid "Name"
-msgstr ""
+msgstr "Nome"
#. module: account_report
#: wizard_field:print.indicators,next,base_selection:0
msgid "Select Criteria"
-msgstr ""
+msgstr "Selecione o Critério"
#. module: account_report
#: view:account.report.report:0
msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
-msgstr ""
+msgstr "tax_code(['ACCOUNT_TAX_CODE',],period)"
#. module: account_report
#: field:account.report.history,fiscalyear_id:0
msgid "Fiscal Year"
-msgstr ""
+msgstr "Ano fiscal"
#. module: account_report
#: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -472,22 +477,22 @@ msgstr ""
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
msgid "Custom reporting"
-msgstr ""
+msgstr "Relatórios personalizados"
#. module: account_report
#: rml:print.indicators:0
msgid "Page"
-msgstr ""
+msgstr "Página"
#. module: account_report
#: selection:account.report.report,type:0
msgid "View"
-msgstr ""
+msgstr "Ver"
#. module: account_report
#: rml:print.indicators:0
msgid "Indicators -"
-msgstr ""
+msgstr "Indicadores -"
#. module: account_report
#: help:account.report.report,disp_graph:0
@@ -495,26 +500,28 @@ msgid ""
"If the field is set to True, information will be printed as a Graph, "
"otherwise as an array."
msgstr ""
+"Se o campo for definido como Verdadeiro. a informação será impressa como "
+"Gráfico, caso contrário como tabela."
#. module: account_report
#: view:account.report.report:0
msgid "Return value for status"
-msgstr ""
+msgstr "Valor retornado para Estado"
#. module: account_report
#: field:account.report.report,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
#. module: account_report
#: rml:accounting.report:0
msgid "Amount"
-msgstr ""
+msgstr "Valor"
#. module: account_report
#: rml:print.indicators:0
msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
+msgstr "1cm 27.7cm 20cm 27.7cm"
#. module: account_report
#: model:ir.module.module,description:account_report.module_meta_information
@@ -524,8 +531,12 @@ msgid ""
" Indicators\n"
" "
msgstr ""
+"Relatório financeiro e contábil\n"
+" Demonstrativos fiscais\n"
+" Indicadores\n"
+" "
#. module: account_report
#: selection:account.report.report,type:0
msgid "Fiscal Statement"
-msgstr ""
+msgstr "Demonstrativo Fiscal"
diff --git a/addons/account_reporting/i18n/pt_BR.po b/addons/account_reporting/i18n/pt_BR.po
index 263f0852de9..a6d59ddeac6 100644
--- a/addons/account_reporting/i18n/pt_BR.po
+++ b/addons/account_reporting/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:24+0000\n"
-"Last-Translator: Pedro_Maschio \n"
+"PO-Revision-Date: 2010-07-28 14:32+0000\n"
+"Last-Translator: Leandro Chaves \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:15+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
#: field:color.rml,code:0
msgid "code"
-msgstr ""
+msgstr "Código"
#. module: account_reporting
#: constraint:ir.model:0
@@ -32,63 +32,63 @@ msgstr ""
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica-Bold"
-msgstr ""
+msgstr "Helvetica-Bold (negrito)"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica"
-msgstr ""
+msgstr "Helvetica"
#. module: account_reporting
#: field:account.report.bs,note:0
msgid "Note"
-msgstr ""
+msgstr "Nota"
#. module: account_reporting
#: field:account.report.bs,report_type:0
msgid "Report Type"
-msgstr ""
+msgstr "Tipo de Relatório"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
msgid "Balance Sheet Report"
-msgstr ""
+msgstr "Balanço"
#. module: account_reporting
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome de modelo inválido na definição da ação"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier"
-msgstr ""
+msgstr "Courier"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier-BoldOblique"
-msgstr ""
+msgstr "Courier-BoldOblique (negrito)"
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,report:0
msgid "Print BalanceSheet"
-msgstr ""
+msgstr "Imprimir Balanço"
#. module: account_reporting
#: help:account.account.balancesheet.report,init,periods:0
msgid "All periods if empty"
-msgstr ""
+msgstr "Todos os perídos se vazio"
#. module: account_reporting
#: field:account.report.bs,color_font:0
msgid "Font Color"
-msgstr ""
+msgstr "Cor da Fonte"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects With Accounts and child of Accounts"
-msgstr ""
+msgstr "Objetos do Relatório com as Contas e Contas-filhas"
#. module: account_reporting
#: model:ir.module.module,description:account_reporting.module_meta_information
@@ -96,16 +96,18 @@ msgid ""
"Financial and accounting reporting\n"
" Balance Sheet Report"
msgstr ""
+"Relatório financeiro e contábil\n"
+" Balanço"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects With Accounts"
-msgstr ""
+msgstr "Objetos do Relatório com Contas"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier-Oblique"
-msgstr ""
+msgstr "Courier-Oblique"
#. module: account_reporting
#: constraint:ir.ui.view:0
@@ -116,130 +118,130 @@ msgstr "Invalido XML para Arquitetura da View"
#: field:account.report.bs,name:0
#: field:color.rml,name:0
msgid "Name"
-msgstr ""
+msgstr "Nome"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Account reporting"
-msgstr ""
+msgstr "Relatório de Conta"
#. module: account_reporting
#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
msgid "Balance Sheet Report Form"
-msgstr ""
+msgstr "Formulário do Balanço"
#. module: account_reporting
#: view:account.report.bs:0
msgid "Notes"
-msgstr ""
+msgstr "Notas"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-BoldItalic"
-msgstr ""
+msgstr "Times-BoldItalic (negrito itálico)"
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_account_report_bs
msgid "Account reporting for Balance Sheet"
-msgstr ""
+msgstr "Relatório contábil para Balanço"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Courier-Bold"
-msgstr ""
+msgstr "Courier-Bold (negrito)"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-Italic"
-msgstr ""
+msgstr "Times-Italic (itálico)"
#. module: account_reporting
#: selection:account.report.bs,report_type:0
msgid "Report Objects Only"
-msgstr ""
+msgstr "Relatar somento os Objetos"
#. module: account_reporting
#: model:ir.model,name:account_reporting.model_color_rml
msgid "Rml Colors"
-msgstr ""
+msgstr "Rml Colors"
#. module: account_reporting
#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
msgid "Reporting of Balancesheet for accounting"
-msgstr ""
+msgstr "Relatório do Balanço para contabilização"
#. module: account_reporting
#: field:account.report.bs,code:0
msgid "Code"
-msgstr ""
+msgstr "Código"
#. module: account_reporting
#: field:account.report.bs,parent_id:0
msgid "Parent"
-msgstr ""
+msgstr "Conta-pai"
#. module: account_reporting
#: field:account.report.bs,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Sequência"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-Bold"
-msgstr ""
+msgstr "Times-Bold (negrito)"
#. module: account_reporting
#: view:account.report.bs:0
msgid "General"
-msgstr ""
+msgstr "Geral"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
msgid "Fiscal year"
-msgstr ""
+msgstr "Ano Fiscal"
#. module: account_reporting
#: view:account.report.bs:0
#: field:account.report.bs,account_id:0
msgid "Accounts"
-msgstr ""
+msgstr "Contas"
#. module: account_reporting
#: wizard_field:account.account.balancesheet.report,init,periods:0
msgid "Periods"
-msgstr ""
+msgstr "Períodos"
#. module: account_reporting
#: field:account.report.bs,color_back:0
msgid "Back Color"
-msgstr ""
+msgstr "Cor de Fundo"
#. module: account_reporting
#: field:account.report.bs,child_id:0
msgid "Children"
-msgstr ""
+msgstr "Contas-filhas"
#. module: account_reporting
#: wizard_button:account.account.balancesheet.report,init,end:0
msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Times-Roman"
-msgstr ""
+msgstr "Times-Roman"
#. module: account_reporting
#: selection:account.report.bs,font_style:0
msgid "Helvetica-Oblique"
-msgstr ""
+msgstr "Helvetica-Oblique"
#. module: account_reporting
#: field:account.report.bs,font_style:0
msgid "Font"
-msgstr ""
+msgstr "Fonte"
#. module: account_reporting
#: wizard_view:account.account.balancesheet.report,init:0
msgid "Customize Report"
-msgstr ""
+msgstr "Customizar Relatório (ajustes especiais)"
diff --git a/addons/account_voucher/voucher.py b/addons/account_voucher/voucher.py
index 0f1885689c2..0b1b9b01b23 100644
--- a/addons/account_voucher/voucher.py
+++ b/addons/account_voucher/voucher.py
@@ -112,7 +112,6 @@ class account_voucher(osv.osv):
('bank_pay_voucher','Bank Payment'),
('rec_voucher','Cash Receipt'),
('bank_rec_voucher','Bank Receipt'),
-# ('cont_voucher','Contra'),
('journal_sale_vou','Journal Sale'),
('journal_pur_voucher','Journal Purchase'),
('journal_voucher','Journal Voucher'),
@@ -120,9 +119,9 @@ class account_voucher(osv.osv):
'date':fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}, help="Effective date for accounting entries"),
'journal_id':fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'account_id':fields.many2one('account.account', 'Account', required=True, readonly=True, states={'draft':[('readonly',False)]}, domain=[('type','<>','view')]),
- 'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=False, states={'draft':[('readonly',True)]}),
- 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'posted':[('readonly',True)]}),
- 'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}, required=False),
+ 'payment_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=True, states={'draft':[('readonly',False)]}),
+ 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'posted':[('readonly',False)]}),
+ 'narration':fields.text('Narration', readonly=True, states={'draft':[('readonly',False)]}),
'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
'company_id': fields.many2one('res.company', 'Company', required=True),
'state':fields.selection(
@@ -262,26 +261,33 @@ class account_voucher(osv.osv):
move_line_pool = self.pool.get('account.move.line')
analytic_pool = self.pool.get('account.analytic.line')
currency_pool = self.pool.get('res.currency')
+ invoice_pool = self.pool.get('account.invoice')
for inv in self.browse(cr, uid, ids):
-
+
if inv.move_id:
continue
-
- company_currency = inv.company_id.currency_id.id
- diff_currency_p = inv.currency_id.id <> company_currency
-
+
journal = journal_pool.browse(cr, uid, inv.journal_id.id)
if journal.sequence_id:
name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+ ref = False
+ if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
+ ref = inv.reference
+ else:
+ ref = invoice_pool._convert_ref(cr, uid, name)
+
+ company_currency = inv.company_id.currency_id.id
+ diff_currency_p = inv.currency_id.id <> company_currency
+
move = {
- 'name' : name,
- 'journal_id': journal.id,
- 'type' : inv.type,
- 'narration' : inv.narration and inv.narration or inv.name,
+ 'name':name,
+ 'journal_id':journal.id,
+ 'type':inv.type,
+ 'narration':inv.narration and inv.narration or inv.name,
'date':inv.date,
- 'ref':inv.reference
+ 'ref':ref
}
if inv.period_id:
@@ -301,7 +307,7 @@ class account_voucher(osv.osv):
'journal_id': inv.journal_id.id,
'period_id': inv.period_id.id,
'partner_id': False,
- 'ref': inv.reference,
+ 'ref':ref,
'date': inv.date
}
if diff_currency_p:
@@ -321,18 +327,22 @@ class account_voucher(osv.osv):
line_ids += [move_line_pool.create(cr, uid, move_line)]
for line in inv.payment_ids:
amount=0.0
+
+ if inv.type in ('bank_pay_voucher', 'pay_voucher', 'journal_voucher'):
+ ref = line.ref
+
move_line = {
- 'name': line.name,
- 'debit': False,
- 'credit': False,
- 'account_id': line.account_id.id or False,
- 'move_id': move_id ,
- 'journal_id': inv.journal_id.id,
- 'period_id': inv.period_id.id,
- 'partner_id': line.partner_id.id or False,
- 'ref': line.ref,
- 'date': inv.date,
- 'analytic_account_id': False
+ 'name':line.name,
+ 'debit':False,
+ 'credit':False,
+ 'account_id':line.account_id.id or False,
+ 'move_id':move_id ,
+ 'journal_id':inv.journal_id.id,
+ 'period_id':inv.period_id.id,
+ 'partner_id':line.partner_id.id or False,
+ 'ref':ref,
+ 'date':inv.date,
+ 'analytic_account_id':False
}
if diff_currency_p:
@@ -400,9 +410,9 @@ class account_voucher(osv.osv):
context={}
ids = []
if name:
- ids = self.search(cr, user, [('number','=',name)]+ args, limit=limit, context=context)
+ ids = self.search(cr, user, [('number','=',name)]+args, limit=limit, context=context)
if not ids:
- ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
+ ids = self.search(cr, user, [('name',operator,name)]+args, limit=limit, context=context)
return self.name_get(cr, user, ids, context)
def copy(self, cr, uid, id, default=None, context=None):
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 2677f7be5d6..46e1f7342c1 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -6,9 +6,10 @@
account.voucher
tree
-
+
+
@@ -34,7 +35,7 @@
-
+
@@ -55,7 +56,6 @@
-
@@ -88,11 +88,13 @@
-
+
+
-
-
+
+
+
@@ -104,9 +106,11 @@
-
-
-
+
+
+
+
+
@@ -120,15 +124,25 @@
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account_voucher_payment/account_voucher_payment.py b/addons/account_voucher_payment/account_voucher_payment.py
index 38c8bf93f4a..3d860146520 100755
--- a/addons/account_voucher_payment/account_voucher_payment.py
+++ b/addons/account_voucher_payment/account_voucher_payment.py
@@ -22,7 +22,6 @@
from osv import fields, osv
from tools.translate import _
-
class account_move_line(osv.osv):
_inherit = "account.move.line"
_columns = {
@@ -45,26 +44,33 @@ class account_voucher(osv.osv):
analytic_pool = self.pool.get('account.analytic.line')
currency_pool = self.pool.get('res.currency')
invoice_pool = self.pool.get('account.invoice')
+ invoice_pool = self.pool.get('account.invoice')
for inv in self.browse(cr, uid, ids):
if inv.move_id:
continue
-
- company_currency = inv.company_id.currency_id.id
- diff_currency_p = inv.currency_id.id <> company_currency
journal = journal_pool.browse(cr, uid, inv.journal_id.id)
if journal.sequence_id:
name = sequence_pool.get_id(cr, uid, journal.sequence_id.id)
+ ref = False
+ if inv.type in ('journal_pur_voucher', 'bank_rec_voucher', 'rec_voucher'):
+ ref = inv.reference
+ else:
+ ref = invoice_pool._convert_ref(cr, uid, name)
+
+ company_currency = inv.company_id.currency_id.id
+ diff_currency_p = inv.currency_id.id <> company_currency
+
move = {
'name' : name,
'journal_id': journal.id,
'type' : inv.type,
'narration' : inv.narration and inv.narration or inv.name,
'date':inv.date,
- 'ref':inv.reference
+ 'ref':ref
}
if inv.period_id:
@@ -76,16 +82,16 @@ class account_voucher(osv.osv):
#create the first line manually
move_line = {
- 'name': inv.name,
- 'debit': False,
+ 'name':inv.name,
+ 'debit':False,
'credit':False,
- 'account_id': inv.account_id.id or False,
- 'move_id': move_id ,
- 'journal_id': inv.journal_id.id,
- 'period_id': inv.period_id.id,
- 'partner_id': False,
- 'ref': inv.reference,
- 'date': inv.date
+ 'account_id':inv.account_id.id or False,
+ 'move_id':move_id ,
+ 'journal_id':inv.journal_id.id,
+ 'period_id':inv.period_id.id,
+ 'partner_id':False,
+ 'ref':ref,
+ 'date':inv.date
}
if diff_currency_p:
amount_currency = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount)
@@ -103,20 +109,25 @@ class account_voucher(osv.osv):
line_ids = []
line_ids += [move_line_pool.create(cr, uid, move_line)]
rec_ids = []
+
for line in inv.payment_ids:
amount=0.0
+
+ if inv.type in ('bank_pay_voucher', 'pay_voucher', 'journal_voucher'):
+ ref = line.ref
+
move_line = {
- 'name': line.name,
- 'debit': False,
- 'credit': False,
- 'account_id': line.account_id.id or False,
- 'move_id': move_id ,
- 'journal_id': inv.journal_id.id,
- 'period_id': inv.period_id.id,
- 'partner_id': line.partner_id.id or False,
- 'ref': line.ref,
- 'date': inv.date,
- 'analytic_account_id': False
+ 'name':line.name,
+ 'debit':False,
+ 'credit':False,
+ 'account_id':line.account_id.id or False,
+ 'move_id':move_id ,
+ 'journal_id':inv.journal_id.id,
+ 'period_id':inv.period_id.id,
+ 'partner_id':line.partner_id.id or False,
+ 'ref':ref,
+ 'date':inv.date,
+ 'analytic_account_id':False
}
if diff_currency_p:
@@ -151,9 +162,7 @@ class account_voucher(osv.osv):
rec_ids += [move_line_id]
for move_line in line.invoice_id.move_id.line_id:
if line.account_id.id == move_line.account_id.id:
- rec_ids += [move_line.id]
- #move_line_pool.reconcile_partial(cr, uid, rec_ids)
-
+ rec_ids += [move_line.id]
if rec_ids:
move_line_pool.reconcile_partial(cr, uid, rec_ids)
diff --git a/addons/account_voucher_payment/i18n/pt_BR.po b/addons/account_voucher_payment/i18n/pt_BR.po
new file mode 100644
index 00000000000..0899a170f55
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/pt_BR.po
@@ -0,0 +1,89 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-07-28 14:21+0000\n"
+"Last-Translator: Leandro Chaves \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: 2010-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para a arquitetura de exibição"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Transações não conciliadas"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+" * It reconcile the invoice (supplier, customer) while paying through \n"
+" Accounting Vouchers\n"
+" "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Se você desfazer a reconciliação de transações, você deve também verificar "
+"todas as ações que estão ligadas a essas operações, porque elas não serão "
+"desfeitas pelo sistema"
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Linhas de Comprovantes"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Anular reconciliação de lançamentos"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Fatura"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "Parceiro"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Não concilidado"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Desconciliação"
diff --git a/addons/account_voucher_payment/i18n/sl.po b/addons/account_voucher_payment/i18n/sl.po
new file mode 100644
index 00000000000..ff98b869bbf
--- /dev/null
+++ b/addons/account_voucher_payment/i18n/sl.po
@@ -0,0 +1,88 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-07-28 12:23+0000\n"
+"Last-Translator: Simon Vidmar \n"
+"Language-Team: Slovenian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Preklic uskladitve transakcij"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+" * It reconcile the invoice (supplier, customer) while paying through \n"
+" Accounting Vouchers\n"
+" "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Če prekličete uskladitev transakcij, morate tudi preveriti vse akcije, ki so "
+"povezane s temi transakcijami, kajti le te ne bodo onemogočene."
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Prekliči uskladitev vknjižb"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Račun"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Prekliči"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr "Prekliči uskladitev"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr "Preklic uskladitve"
diff --git a/addons/analytic/i18n/sl.po b/addons/analytic/i18n/sl.po
new file mode 100644
index 00000000000..48d92ea1941
--- /dev/null
+++ b/addons/analytic/i18n/sl.po
@@ -0,0 +1,266 @@
+# Slovenian 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: 2010-06-18 10:59+0000\n"
+"PO-Revision-Date: 2010-07-28 12:27+0000\n"
+"Last-Translator: Simon Vidmar \n"
+"Language-Team: Slovenian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Podrejeni konti"
+
+#. module: analytic
+#: help:account.analytic.line,amount_currency:0
+msgid ""
+"The amount expressed in the related account currency if not equal to the "
+"company one."
+msgstr ""
+
+#. module: analytic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Naziv konta"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,currency_id:0
+msgid "The related account currency if not equal to the company one."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+" "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Odgovorni za stranko"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Zaprto"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Breme"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state. "
+" \n"
+"* If any associated partner is there, it can be in 'Open' state. "
+" \n"
+"* If any pending balance is there it can be in 'Pending'. "
+" \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project. "
+" \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr "Vrsta konta"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr "Predloga"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr "Čakajoči"
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr "Družba"
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr "Največja količina"
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr "Uporabnik"
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr "Nadrejeni analitični konto"
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+#: field:account.analytic.line,currency_id:0
+msgid "Account currency"
+msgstr "Valuta konta"
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Pogled"
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr "Dobro"
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr "Znesek"
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr "Stik"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr "Preklicano"
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr "Stanje"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Datum začetka"
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Količina"
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr "Datum konca"
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Običajno"
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr "Polni naziv konta"
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr "Analitični konto"
+
+#. module: analytic
+#: field:account.analytic.account,company_currency_id:0
+msgid "Currency"
+msgstr "Valuta"
+
+#. module: analytic
+#: field:account.analytic.line,amount_currency:0
+msgid "Amount currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Associated Partner"
+msgstr "Pridružen partner"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr "Odpri"
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr "Analitične vknjižbe"
diff --git a/addons/auction/i18n/pt_BR.po b/addons/auction/i18n/pt_BR.po
index 46ddbdca567..f75e1d73416 100644
--- a/addons/auction/i18n/pt_BR.po
+++ b/addons/auction/i18n/pt_BR.po
@@ -1,19 +1,19 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
-# * auction
+# * auction
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-01 18:21+0000\n"
-"Last-Translator: Holverat Bortolossi \n"
+"PO-Revision-Date: 2010-07-28 14:41+0000\n"
+"Last-Translator: Leandro Chaves \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:13+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
@@ -32,16 +32,18 @@ msgid "Set to draft"
msgstr "Definir como rascunho"
#. module: auction
-#: field:auction.deposit,partner_id:0 view:auction.lots:0
-#: xsl:report.auction.seller.list:0 field:report.deposit.border,seller:0
-#: field:report.seller.auction,seller:0 field:report.seller.auction2,seller:0
+#: field:auction.deposit,partner_id:0
+#: view:auction.lots:0
+#: field:report.deposit.border,seller:0
+#: field:report.seller.auction,seller:0
+#: field:report.seller.auction2,seller:0
msgid "Seller"
msgstr "Loja"
#. module: auction
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "Nome de modelo inválido na definição da ação."
+msgstr "Nome de modelo inválido na definição da ação"
#. module: auction
#: selection:auction.lots.send.aie,date_ask,numerotation:0
@@ -87,18 +89,23 @@ msgid "Deposit Form"
msgstr "Formulário de Depósitos"
#. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 field:auction.lots,ach_uid:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
#: wizard_field:auction.lots.buyer_map,check,ach_uid:0
#: wizard_field:auction.lots.make_invoice_buyer,init,buyer_id:0
-#: wizard_field:auction.pay.buy,init,buyer_id:0 rml:buyer.list:0
+#: wizard_field:auction.pay.buy,init,buyer_id:0
+#: rml:buyer.list:0
#: model:ir.ui.menu,name:auction.auction_report_buyer_menu
-#: rml:report.auction.buyer.result:0 field:report.buyer.auction,buyer:0
+#: rml:report.auction.buyer.result:0
+#: field:report.buyer.auction,buyer:0
#: field:report.buyer.auction2,buyer:0
msgid "Buyer"
msgstr "Comprador"
#. module: auction
-#: field:report.auction.view,nobjects:0 field:report.buyer.auction,object:0
+#: field:report.auction.view,nobjects:0
+#: field:report.buyer.auction,object:0
msgid "No of objects"
msgstr "Nenhum dos objetos"
@@ -120,10 +127,11 @@ msgstr "Numeração (por lote)"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Antique/Books, manuscripts, eso."
-msgstr ""
+msgstr "Antiguidades/Livros, manuscritos, etc."
#. module: auction
-#: view:auction.deposit:0 model:ir.model,name:auction.model_auction_deposit
+#: view:auction.deposit:0
+#: model:ir.model,name:auction.model_auction_deposit
msgid "Deposit Border"
msgstr "Limite de Depósito"
@@ -195,7 +203,8 @@ msgid "Objects by Auction"
msgstr "Objetos em leilão"
#. module: auction
-#: field:auction.lots,lot_num:0 field:report.unclassified.objects,lot_num:0
+#: field:auction.lots,lot_num:0
+#: field:report.unclassified.objects,lot_num:0
msgid "List Number"
msgstr "Número de lista"
@@ -212,7 +221,7 @@ msgstr "Antiguidades"
#. module: auction
#: view:auction.dates:0
msgid "State"
-msgstr ""
+msgstr "Estado"
#. module: auction
#: field:report.auction.estimation.adj.category,lot_type:0
@@ -230,9 +239,10 @@ msgid "Contemporary Art"
msgstr "Arte contemporânea"
#. module: auction
-#: view:auction.lots:0 view:report.unclassified.objects:0
+#: view:auction.lots:0
+#: view:report.unclassified.objects:0
msgid "Ref"
-msgstr ""
+msgstr "Ref."
#. module: auction
#: field:report.auction.view,nseller:0
@@ -247,10 +257,11 @@ msgstr ""
#. module: auction
#: constraint:hr.attendance:0
msgid "Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)"
-msgstr ""
+msgstr "Entrada (resp. Saída) deve seguir Saída (resp. Entrada)"
#. module: auction
-#: view:auction.lots:0 field:report.buyer.auction,total_price:0
+#: view:auction.lots:0
+#: field:report.buyer.auction,total_price:0
msgid "Total Adj."
msgstr ""
@@ -260,7 +271,8 @@ msgid "Net margin (%)"
msgstr "Margem líquida (%)"
#. module: auction
-#: selection:auction.lots,state:0 selection:report.object.encoded,state:0
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
#: selection:report.seller.auction,state:0
#: selection:report.unclassified.objects,state:0
msgid "Unsold"
@@ -290,7 +302,9 @@ msgid "Seller Costs"
msgstr "Custos do Vendedor"
#. module: auction
-#: view:auction.bid:0 view:auction.bid_line:0 view:auction.lots:0
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
#: field:auction.lots,bid_lines:0
#: model:ir.actions.report.xml,name:auction.bid_auction
#: model:ir.ui.menu,name:auction.menu_action_bid_open
@@ -313,7 +327,8 @@ msgid "Contact"
msgstr "Contato"
#. module: auction
-#: field:report.auction.view,obj_ret:0 field:report.object.encoded,obj_ret:0
+#: field:report.auction.view,obj_ret:0
+#: field:report.object.encoded,obj_ret:0
#: field:report.object.encoded.manager,obj_ret:0
msgid "# obj ret"
msgstr ""
@@ -326,7 +341,7 @@ msgstr "Enviar SMS"
#. module: auction
#: selection:auction.lot.category,aie_categ:0
msgid "Cont. Art/Painting"
-msgstr ""
+msgstr "Cont. Arte/Pintura"
#. module: auction
#: field:auction.lots,sel_inv_id:0
@@ -354,7 +369,8 @@ msgid "Sold Objects"
msgstr "Objetos vendidos"
#. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
msgid "Sum net margin"
msgstr "Somar margem líquida"
@@ -364,7 +380,9 @@ msgid "Deposit Border Form"
msgstr "Formuálio de Limite de Depósito"
#. module: auction
-#: field:auction.bid,bid_lines:0 rml:auction.bids:0 rml:bids.lots:0
+#: field:auction.bid,bid_lines:0
+#: rml:auction.bids:0
+#: rml:bids.lots:0
#: model:ir.model,name:auction.model_auction_bid_line
msgid "Bid"
msgstr "Lance"
@@ -375,15 +393,17 @@ msgid "Langage"
msgstr "Idioma"
#. module: auction
-#: field:auction.bid_line,lot_id:0 field:auction.lot.history,lot_id:0
-#: view:auction.lots:0 model:ir.model,name:auction.model_auction_lots
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+#: view:auction.lots:0
+#: model:ir.model,name:auction.model_auction_lots
msgid "Object"
msgstr "Objeto"
#. module: auction
#: model:ir.actions.wizard,name:auction.wizard_map_user
msgid "Map buyer username to Partners"
-msgstr ""
+msgstr "Mapear usuário comprador para Parceiros"
#. module: auction
#: wizard_field:auction.lots.numerotate,search,lot_num:0
@@ -409,9 +429,11 @@ msgid "Auction buyer reporting form view"
msgstr ""
#. module: auction
-#: field:auction.dates,state:0 field:auction.lots,state:0
+#: field:auction.dates,state:0
+#: field:auction.lots,state:0
#: field:report.auction.adjudication,state:0
-#: field:report.object.encoded,state:0 field:report.seller.auction,state:0
+#: field:report.object.encoded,state:0
+#: field:report.seller.auction,state:0
#: field:report.unclassified.objects,state:0
msgid "Status"
msgstr "Situação"
@@ -427,7 +449,8 @@ msgid "Antique/Cartoons"
msgstr "Antigo/Desenhos"
#. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
#: selection:report.seller.auction,state:0
#: selection:report.unclassified.objects,state:0
msgid "Sold"
@@ -484,7 +507,7 @@ msgstr "Relatório2 de formulário de Leilão"
#. module: auction
#: model:ir.actions.wizard,name:auction.wizard_pay
msgid "Pay objects of the buyer"
-msgstr ""
+msgstr "Pagar objetos do comprador"
#. module: auction
#: view:report.deposit.border:0
@@ -512,7 +535,8 @@ msgid "auction.dates"
msgstr "leilão.datas"
#. module: auction
-#: rml:auction.total.rml:0 model:ir.ui.menu,name:auction.auction_buyers_menu
+#: rml:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
msgid "Buyers"
msgstr "Vendedores"
@@ -739,7 +763,8 @@ msgid "Antique/Toys"
msgstr "Antiguidade/Briquedos"
#. module: auction
-#: field:auction.deposit,create_uid:0 field:auction.lots,create_uid:0
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
msgid "Created by"
msgstr "Criado por"
@@ -867,7 +892,8 @@ msgid "Gestion emporte"
msgstr ""
#. module: auction
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.vnd_bordereau:0
msgid "Cat. N."
msgstr ""
@@ -902,7 +928,8 @@ msgid "API ID"
msgstr ""
#. module: auction
-#: field:auction.bid,name:0 field:auction.bid_line,bid_id:0
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
msgid "Bid ID"
msgstr ""
@@ -955,13 +982,14 @@ msgid "Antique/Carpet and textilles"
msgstr ""
#. module: auction
-#: xsl:report.auction.seller.list:0 field:report.object.encoded.manager,adj:0
+#: field:report.object.encoded.manager,adj:0
msgid "Adj."
msgstr ""
#. module: auction
-#: field:auction.lot.history,name:0 field:report.attendance,name:0
-#: field:report.auction.adjudication,date:0 xsl:report.auction.deposit:0
+#: field:auction.lot.history,name:0
+#: field:report.attendance,name:0
+#: field:report.auction.adjudication,date:0
#: field:report.auction.estimation.adj.category,date:0
msgid "Date"
msgstr ""
@@ -1002,12 +1030,14 @@ msgid "Specific Costs"
msgstr ""
#. module: auction
-#: view:report.buyer.auction2:0 view:report.seller.auction2:0
+#: view:report.buyer.auction2:0
+#: view:report.seller.auction2:0
msgid "Sum adj"
msgstr ""
#. module: auction
-#: view:auction.dates:0 view:report.auction.view2:0
+#: view:auction.dates:0
+#: view:report.auction.view2:0
msgid "Auctions"
msgstr ""
@@ -1042,8 +1072,7 @@ msgid "Aie Category"
msgstr ""
#. module: auction
-#: xsl:flagey.huissier:0 rml:report.auction.buyer.result:0
-#: xsl:report.auction.deposit:0
+#: rml:report.auction.buyer.result:0
msgid "Num"
msgstr ""
@@ -1090,7 +1119,8 @@ msgid "Detailed lots"
msgstr ""
#. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
msgid "Objects statistics"
msgstr ""
@@ -1105,7 +1135,8 @@ msgid "Send results to Auction-in-europe.com"
msgstr ""
#. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
msgid "Cat.N"
msgstr ""
@@ -1149,7 +1180,8 @@ msgid "-"
msgstr ""
#. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
msgid "Subtotal:"
msgstr ""
@@ -1165,7 +1197,8 @@ msgid "Invoice Number"
msgstr ""
#. module: auction
-#: field:report.buyer.auction,date:0 field:report.buyer.auction2,date:0
+#: field:report.buyer.auction,date:0
+#: field:report.buyer.auction2,date:0
#: field:report.object.encoded,date:0
#: field:report.object.encoded.manager,date:0
#: field:report.seller.auction,date:0
@@ -1188,7 +1221,8 @@ msgid "Name"
msgstr ""
#. module: auction
-#: field:auction.deposit,name:0 field:auction.lots,bord_vnd_id:0
+#: field:auction.deposit,name:0
+#: field:auction.lots,bord_vnd_id:0
#: wizard_field:auction.lots.numerotate,init,bord_vnd_id:0
#: field:report.deposit.border,bord:0
#: field:report.unclassified.objects,bord_vnd_id:0
@@ -1216,7 +1250,7 @@ msgid "Login"
msgstr ""
#. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
msgid "To pay"
msgstr ""
@@ -1236,7 +1270,8 @@ msgid "Seller Form"
msgstr ""
#. module: auction
-#: field:auction.lots,lot_type:0 field:report.unclassified.objects,lot_type:0
+#: field:auction.lots,lot_type:0
+#: field:report.unclassified.objects,lot_type:0
msgid "Object category"
msgstr ""
@@ -1305,7 +1340,8 @@ msgid "Payment's history"
msgstr ""
#. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
msgid "Document"
msgstr ""
@@ -1377,7 +1413,8 @@ msgid "Cont. Art/Curiosa"
msgstr ""
#. module: auction
-#: field:auction.bid,auction_id:0 field:auction.lots,auction_id:0
+#: field:auction.bid,auction_id:0
+#: field:auction.lots,auction_id:0
#: wizard_field:auction.lots.auction_move,init,auction_id:0
#: wizard_field:auction.lots.send.aie,date_ask,dates:0
#: wizard_field:auction.lots.send.aie,init,dates:0
@@ -1425,7 +1462,8 @@ msgid "Cont. Art/Jewelry"
msgstr ""
#. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.vnd_bordereau:0
msgid "Inventory"
msgstr ""
@@ -1435,7 +1473,7 @@ msgid "Next Auctions"
msgstr ""
#. module: auction
-#: rml:buyer.list:0 xsl:report.auction.seller.list:0
+#: rml:buyer.list:0
msgid "#"
msgstr ""
@@ -1566,14 +1604,15 @@ msgid "Buyer Journal"
msgstr ""
#. module: auction
-#: selection:auction.lots,state:0 xsl:report.auction.ach_bordereau:0
+#: selection:auction.lots,state:0
#: selection:report.object.encoded,state:0
#: selection:report.unclassified.objects,state:0
msgid "Paid"
msgstr ""
#. module: auction
-#: rml:bids.lots:0 rml:bids.phones.details:0
+#: rml:bids.lots:0
+#: rml:bids.phones.details:0
msgid "Phone"
msgstr ""
@@ -1604,8 +1643,7 @@ msgid "Antique/Sculpture, bronze, eso."
msgstr ""
#. module: auction
-#: rml:buyer.list:0 xsl:report.auction.ach_bordereau:0
-#: xsl:report.auction.seller.list:0 xsl:report.auction.vnd_bordereau:0
+#: rml:buyer.list:0
msgid "Total:"
msgstr ""
@@ -1751,7 +1789,8 @@ msgid "Plate Number:"
msgstr ""
#. module: auction
-#: view:auction.deposit:0 field:auction.deposit,lot_id:0
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
#: model:ir.ui.menu,name:auction.auction_objects_menu
msgid "Objects"
msgstr "Objetos"
@@ -1773,9 +1812,10 @@ msgid "Allow Negative Amount"
msgstr ""
#. module: auction
-#: rml:auction.bids:0 view:auction.lots:0 rml:auction.total.rml:0
+#: rml:auction.bids:0
+#: view:auction.lots:0
+#: rml:auction.total.rml:0
#: model:ir.ui.menu,name:auction.auction_report_auction_menu
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
msgid "Auction"
msgstr ""
@@ -1785,12 +1825,17 @@ msgid "Cont. Art/Shows"
msgstr ""
#. module: auction
-#: field:auction.dates,name:0 field:auction.lot.history,auction_id:0
+#: field:auction.dates,name:0
+#: field:auction.lot.history,auction_id:0
#: field:report.auction.adjudication,name:0
-#: field:report.auction.view,auction_id:0 field:report.auction.view2,auction:0
-#: field:report.auction.view2,date:0 field:report.buyer.auction,auction:0
-#: field:report.buyer.auction2,auction:0 field:report.seller.auction,auction:0
-#: field:report.seller.auction2,auction:0 field:report.seller.auction2,date:0
+#: field:report.auction.view,auction_id:0
+#: field:report.auction.view2,auction:0
+#: field:report.auction.view2,date:0
+#: field:report.buyer.auction,auction:0
+#: field:report.buyer.auction2,auction:0
+#: field:report.seller.auction,auction:0
+#: field:report.seller.auction2,auction:0
+#: field:report.seller.auction2,date:0
#: field:report.unclassified.objects,auction:0
msgid "Auction date"
msgstr ""
@@ -1852,7 +1897,6 @@ msgstr ""
#. module: auction
#: field:report.attendance,total_attendance:0
-#: xsl:report.auction.ach_bordereau:0
msgid "Total"
msgstr ""
@@ -1942,7 +1986,8 @@ msgstr ""
#. module: auction
#: wizard_view:auction.lots.auction_move,init:0
-msgid "Warning, this will erase the object adjudication price and its buyer !"
+msgid ""
+"Warning, this will erase the object adjudication price and its buyer !"
msgstr ""
#. module: auction
@@ -1966,14 +2011,16 @@ msgid "Income Account"
msgstr ""
#. module: auction
-#: field:auction.lots,net_revenue:0 field:report.auction.view2,net_revenue:0
+#: field:auction.lots,net_revenue:0
+#: field:report.auction.view2,net_revenue:0
#: field:report.object.encoded.manager,net_revenue:0
#: field:report.seller.auction2,net_revenue:0
msgid "Net revenue"
msgstr ""
#. module: auction
-#: xsl:report.auction.deposit:0 xsl:report.auction.lots.list.landscape:0
+#: xsl:report.auction.deposit:0
+#: xsl:report.auction.lots.list.landscape:0
msgid "Limit"
msgstr ""
@@ -2045,7 +2092,8 @@ msgid "Closed"
msgstr ""
#. module: auction
-#: field:auction.lots,obj_comm:0 field:report.unclassified.objects,obj_comm:0
+#: field:auction.lots,obj_comm:0
+#: field:report.unclassified.objects,obj_comm:0
msgid "Commission"
msgstr ""
@@ -2065,7 +2113,8 @@ msgid "Employee"
msgstr ""
#. module: auction
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.vnd_bordereau:0
+#: xsl:report.auction.ach_bordereau:0
+#: xsl:report.auction.vnd_bordereau:0
msgid "Adj.(EUR)"
msgstr ""
@@ -2142,7 +2191,8 @@ msgid "Invoiced"
msgstr ""
#. module: auction
-#: view:auction.lots:0 selection:auction.lots,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
msgid "Taken away"
msgstr ""
@@ -2176,10 +2226,11 @@ msgstr ""
#. module: auction
#: constraint:res.partner:0
msgid "Error ! You can not create recursive associated members."
-msgstr ""
+msgstr "Erro! Você não pode criar membros recursivos associados."
#. module: auction
-#: selection:auction.dates,state:0 selection:auction.lots,state:0
+#: selection:auction.dates,state:0
+#: selection:auction.lots,state:0
#: selection:report.auction.adjudication,state:0
#: selection:report.object.encoded,state:0
#: selection:report.seller.auction,state:0
@@ -2208,7 +2259,8 @@ msgid "Adj"
msgstr ""
#. module: auction
-#: view:auction.dates:0 model:ir.ui.menu,name:auction.auction_date_menu
+#: view:auction.dates:0
+#: model:ir.ui.menu,name:auction.auction_date_menu
msgid "Auction Dates"
msgstr ""
@@ -2354,11 +2406,11 @@ msgid "Report Sign In/Out"
msgstr ""
#. module: auction
-#: view:auction.deposit:0 field:auction.deposit,info:0 view:auction.lots:0
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: view:auction.lots:0
#: wizard_field:auction.lots.numerotate,search,obj_desc:0
-#: rml:bids.phones.details:0 xsl:flagey.huissier:0
-#: xsl:report.auction.ach_bordereau:0 xsl:report.auction.deposit:0
-#: xsl:report.auction.lots.list.landscape:0 xsl:report.auction.vnd_bordereau:0
+#: rml:bids.phones.details:0
msgid "Description"
msgstr ""
@@ -2368,7 +2420,8 @@ msgid "Cont. Art/Arts"
msgstr ""
#. module: auction
-#: field:auction.lots,obj_price:0 field:report.auction.view,adj_price:0
+#: field:auction.lots,obj_price:0
+#: field:report.auction.view,adj_price:0
#: field:report.unclassified.objects,obj_price:0
msgid "Adjudication price"
msgstr ""
@@ -2430,7 +2483,8 @@ msgid "Pay objects"
msgstr ""
#. module: auction
-#: view:report.object.encoded:0 view:report.object.encoded.manager:0
+#: view:report.object.encoded:0
+#: view:report.object.encoded.manager:0
msgid "# objects"
msgstr ""
diff --git a/addons/audittrail/i18n/pt_BR.po b/addons/audittrail/i18n/pt_BR.po
index b3ab5532ca8..678303551ce 100644
--- a/addons/audittrail/i18n/pt_BR.po
+++ b/addons/audittrail/i18n/pt_BR.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-20 01:10+0000\n"
-"Last-Translator: pedrobom \n"
+"PO-Revision-Date: 2010-07-28 13:21+0000\n"
+"Last-Translator: Leandro Chaves \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
#: model:ir.module.module,shortdesc:audittrail.module_meta_information
msgid "Audit Trail"
-msgstr ""
+msgstr "Trilha de Auditoria"
#. module: audittrail
#: constraint:ir.model:0
@@ -62,7 +62,7 @@ msgstr "Status"
#. module: audittrail
#: selection:audittrail.rule,state:0
msgid "Draft"
-msgstr ""
+msgstr "Provisório"
#. module: audittrail
#: field:audittrail.log.line,old_value:0
@@ -77,12 +77,12 @@ msgstr "Nome de modelo inválido na definição da ação."
#. module: audittrail
#: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
msgid "View log"
-msgstr ""
+msgstr "Ver log"
#. module: audittrail
#: model:ir.model,name:audittrail.model_audittrail_log_line
msgid "audittrail.log.line"
-msgstr ""
+msgstr "audittrail.log.line"
#. module: audittrail
#: field:audittrail.log,method:0
@@ -92,7 +92,7 @@ msgstr "Método"
#. module: audittrail
#: wizard_field:audittrail.view.log,init,from:0
msgid "Log From"
-msgstr ""
+msgstr "Log de"
#. module: audittrail
#: field:audittrail.log.line,log:0
@@ -112,7 +112,7 @@ msgstr "Escrever"
#. module: audittrail
#: model:ir.ui.menu,name:audittrail.menu_action_audittrail
msgid "Audittrails"
-msgstr ""
+msgstr "Trilhas de Auditoria"
#. module: audittrail
#: view:audittrail.log:0
@@ -138,17 +138,17 @@ msgstr "Objeto"
#. module: audittrail
#: view:audittrail.rule:0
msgid "AuditTrail Rule"
-msgstr ""
+msgstr "Regra de Trilha de Auditoria"
#. module: audittrail
#: wizard_field:audittrail.view.log,init,to:0
msgid "Log To"
-msgstr ""
+msgstr "'Logar' no"
#. module: audittrail
#: view:audittrail.log:0
msgid "New Value Text: "
-msgstr ""
+msgstr "Texto do Novo Valor: "
#. module: audittrail
#: model:ir.module.module,description:audittrail.module_meta_information
@@ -158,6 +158,10 @@ msgid ""
" Subscribe Rules for read, write, create and delete on objects and check "
"logs"
msgstr ""
+"Permite ao administrador acompanhar cada operação de cada usuário em todos "
+"objetos do sistema.\n"
+" Inscreva Regras para leitura, escrita e apagar nos objetos e marque os "
+"logs"
#. module: audittrail
#: field:audittrail.log,timestamp:0
@@ -172,7 +176,7 @@ msgstr "Usuário"
#. module: audittrail
#: view:audittrail.log:0
msgid "Old Value Text : "
-msgstr ""
+msgstr "Texto do Valor Anterior "
#. module: audittrail
#: constraint:ir.ui.view:0
@@ -272,7 +276,7 @@ msgstr "Ver Logs"
#. module: audittrail
#: field:audittrail.rule,log_create:0
msgid "Log creates"
-msgstr ""
+msgstr "Criações de Logs"
#. module: audittrail
#: view:audittrail.log:0
@@ -307,4 +311,4 @@ msgstr "Cancelar"
#. module: audittrail
#: field:audittrail.rule,log_unlink:0
msgid "Log deletes"
-msgstr ""
+msgstr "Eliminações do Log"
diff --git a/addons/board_account/i18n/pt_BR.po b/addons/board_account/i18n/pt_BR.po
new file mode 100644
index 00000000000..2ff98fb547f
--- /dev/null
+++ b/addons/board_account/i18n/pt_BR.po
@@ -0,0 +1,95 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+# * board_account
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.0\n"
+"Report-Msgid-Bugs-To: support@openerp.com\n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-07-28 14:34+0000\n"
+"Last-Translator: Leandro Chaves \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Analytic accounts to close"
+msgstr "Contas analíticas a fechar"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Draft invoices"
+msgstr ""
+
+#. module: board_account
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalido XML para Arquitetura da View"
+
+#. module: board_account
+#: model:ir.actions.act_window,name:board_account.open_board_account
+#: model:ir.ui.menu,name:board_account.menu_board_account
+msgid "Accounting Dashboard"
+msgstr "Painel contábil"
+
+#. module: board_account
+#: model:ir.actions.act_window,name:board_account.action_aged_receivable
+msgid "Receivable Accounts"
+msgstr "Contas a receber"
+
+#. module: board_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_account.act_my_account
+msgid "Accounts to invoice"
+msgstr "contas a faturar"
+
+#. module: board_account
+#: view:board.board:0
+#: model:ir.actions.act_window,name:board_account.action_account_analytic_line_to_invoice
+msgid "Costs to invoice"
+msgstr "Custos a faturar"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Aged receivables"
+msgstr "Recebíveis vencidos"
+
+#. module: board_account
+#: model:ir.module.module,shortdesc:board_account.module_meta_information
+msgid "Board for accountant"
+msgstr "Painel para contadores"
+
+#. module: board_account
+#: model:ir.actions.act_window,name:board_account.action_aged_income
+msgid "Income Accounts"
+msgstr "Contas de Receita"
+
+#. module: board_account
+#: view:board.board:0
+msgid "My indicators"
+msgstr "Meus indicadores"
+
+#. module: board_account
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome de modelo inválido na definição da ação"
+
+#. module: board_account
+#: model:ir.ui.menu,name:board_account.next_id_68
+msgid "Accounting"
+msgstr "Contabilidade"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Account Board"
+msgstr "Painel Contábil"
+
+#. module: board_account
+#: view:board.board:0
+msgid "Aged income"
+msgstr "Receita vencida"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 2cabefd7f13..47a3938e1e2 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -121,7 +121,6 @@ class crm_case(object):
s = self.get_stage_dict(cr, uid, ids, context=context)
section = self._name
stage = False
- stage_pool = self.pool.get('crm.case.stage')
for case in self.browse(cr, uid, ids, context):
if section in s:
st = not context.get('force_domain', False) and case.stage_id.id or False
@@ -141,8 +140,18 @@ class crm_case(object):
if not context:
context = {}
stage_obj = self.pool.get('crm.case.stage')
- tmp = self.read(cr, uid, ids, ['section_id'], context)[0]['section_id']
- section_id = tmp and tmp[0] or False
+ res = self.read(cr, uid, ids, ['section_id', 'stage_id'], context)[0]
+ section_id = res['section_id'] and res['section_id'][0] or False
+ stage_id = res['stage_id'] and res['stage_id'][0] or False
+
+ # We select either the stages in the same section as the current stage
+ # if it a stage that does not have a section, or the stages of the
+ # current section of the case
+ if stage_id:
+ stage_record = stage_obj.browse(cr, uid, stage_id)
+ if not stage_record.section_id:
+ section_id = False # only select stages without section
+
domain = [('object_id.model', '=', self._name), ('section_id', '=', section_id)]
if 'force_domain' in context and context['force_domain']:
domain += context['force_domain']
@@ -150,6 +159,7 @@ class crm_case(object):
s = {}
previous = {}
section = self._name
+
for stage in stage_obj.browse(cr, uid, sid, context=context):
s.setdefault(section, {})
s[section][previous.get(section, False)] = stage.id
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index dd18d055f64..4ae7b1dd344 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,15 +19,13 @@
#
##############################################################################
-from osv import fields, osv, orm
-from datetime import datetime, timedelta
+from osv import fields, osv
+from datetime import datetime
import crm
-import math
import time
import mx.DateTime
from tools.translate import _
from crm import crm_case
-import collections
import binascii
import tools
@@ -348,7 +346,6 @@ class crm_lead(osv.osv, crm_case):
if isinstance(ids, (str, int, long)):
ids = [ids]
- msg_from = msg['from']
if msg.get('priority'):
vals['priority'] = msg.get('priority')
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 3a2e58efdb0..3ccfb1b1e18 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -156,7 +156,7 @@
name="%(crm.action_crm_send_mail)d"
context="{'mail':'new', 'model': 'crm.lead'}"
icon="terp-mail-message-new" type="action" />
-
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 1337d0eefa8..9965d059c1c 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 5.0.0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-05-22 04:53+0000\n"
-"Last-Translator: Guilherme Santos \n"
+"PO-Revision-Date: 2010-07-28 13:44+0000\n"
+"Last-Translator: Leandro Chaves \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
@@ -27,6 +27,8 @@ msgid ""
"This property defines the list of date/time exceptions for "
"arecurring calendar component."
msgstr ""
+"Esta propriedade define a lista de exceção de data/hora para componente do "
+"calendário recorrente."
#. module: crm
#: help:crm.case.rule,act_mail_to_user:0
@@ -44,12 +46,12 @@ msgstr "Título"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ2
msgid "Cases by section and category2"
-msgstr ""
+msgstr "Casos por seção e categoria2"
#. module: crm
#: wizard_field:crm.lead.partner_create,init,close:0
msgid "Close Lead"
-msgstr ""
+msgstr "Encerrar ligação"
#. module: crm
#: view:crm.job:0
@@ -62,7 +64,7 @@ msgstr " 7 Dias "
#. module: crm
#: help:crm.menu.config_wizard,helpdesk:0
msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Administrar um serviço de helpdesk"
#. module: crm
#: view:crm.job:0
@@ -82,19 +84,17 @@ msgstr "Custos planejados"
#. module: crm
#: wizard_field:crm.job.partner_create,init,close:0
msgid "Close job request"
-msgstr ""
+msgstr "Fechar requisição de trabalho"
#. module: crm
#: field:crm.case.stage,name:0
msgid "Stage Name"
-msgstr ""
+msgstr "Nome do estágio"
#. module: crm
#: view:crm.case:0
#: view:crm.case.history:0
-#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
#: model:ir.actions.act_window,name:crm.crm_case_section_open_act
-#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
#: model:ir.ui.menu,name:crm.next_id_51
msgid "Cases"
msgstr "Casos"
@@ -116,7 +116,7 @@ msgstr "Recursos Humanos"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Casos por Oportunidades, Categoria e Tipo"
#. module: crm
#: help:crm.menu.config_wizard,claims:0
@@ -124,6 +124,8 @@ msgid ""
"Manages the supplier and customers claims, including your corrective or "
"preventive actions."
msgstr ""
+"Administra as reivindicações de fornecedores e clientes, incluindo suas "
+"ações corretivas ou preventivas."
#. module: crm
#: view:crm.fundraising:0
@@ -133,19 +135,16 @@ msgstr "Quantia"
#. module: crm
#: model:process.transition,note:crm.process_transition_opportunitymeeting0
msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Reunião normal ou por telefone para a oportunidade"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim2
#: model:crm.case.stage,name:crm.stage_meet1
msgid "Fixed"
-msgstr ""
+msgstr "Fixo"
#. module: crm
#: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/crm_job_wizard.py:0
-#: code:addons/crm/wizard/crm_lead_wizard.py:0
-#: code:addons/crm/wizard/crm_phonecall_wizard.py:0
#, python-format
msgid "Warning !"
msgstr "Atenção !"
@@ -154,7 +153,7 @@ msgstr "Atenção !"
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Please specify user's email address !"
-msgstr ""
+msgstr "Por favor, especifique o endereço de e-mail do usuário !"
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor5
@@ -196,32 +195,20 @@ msgid ""
"Section to which Case belongs to. Define Responsible user and Email account "
"for mail gateway."
msgstr ""
+"Seção a que pertence o caso. Definir usuário responsável e conta de e-mail "
+"para o acesso."
#. module: crm
-#: view:crm.case:0
#: field:crm.case,partner_id:0
-#: model:crm.case.categ,name:crm.categ_lead4
-#: model:crm.case.categ,name:crm.categ_oppor4
-#: wizard_field:crm.case.opportunity.partner_opportunity,init,partner_id:0
#: field:crm.case.rule,trg_partner_id:0
-#: selection:crm.email.add.cc,name:0
-#: field:crm.email.add.cc,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.lead.opportunity_set,opportunity,partner_id:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,partner_id:0
-#: wizard_field:crm.phonecall.opportunity_set,opportunity,partner_id:0
-#: model:process.node,name:crm.process_node_partner0
msgid "Partner"
msgstr "Parceiro"
#. module: crm
#: field:crm.case.categ,section_id:0
-#: field:crm.case.category2,section_id:0
#: view:crm.case.section:0
#: field:crm.case.section,name:0
-#: field:crm.case.stage,section_id:0
+#: wizard_field:crm.case.section.menu,init,section_id:0
#: model:ir.model,name:crm.model_crm_case_section
msgid "Case Section"
msgstr "Seção de caso"
@@ -275,7 +262,8 @@ msgid "Send New Email"
msgstr "Enviar Novo Email"
#. module: crm
-#: view:crm.case.history:0
+#: model:ir.actions.act_window,name:crm.crm_case_history_my-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_history_my-act
msgid "My Histories"
msgstr "Meus históricos"
@@ -294,11 +282,12 @@ msgstr "Sessões"
#: help:crm.menu.config_wizard,opportunity:0
msgid "Tracks identified business opportunities for your sales pipeline."
msgstr ""
+"As trilhas identificaram oportunidades de negócio para melhoria das vendas."
#. module: crm
#: view:crm.meeting:0
msgid "Exception Dates"
-msgstr ""
+msgstr "Datas excepcionais"
#. module: crm
#: selection:crm.case.rule,trg_date_type:0
@@ -334,11 +323,6 @@ msgstr "Atenção!"
#. module: crm
#: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
msgid "Dates"
msgstr "Datas"
@@ -350,7 +334,7 @@ msgstr "Teste de segmentação"
#. module: crm
#: model:process.transition,name:crm.process_transition_leadpartner0
msgid "Prospect Partner"
-msgstr ""
+msgstr "Perspectiva do Parceiro"
#. module: crm
#: view:crm.fundraising:0
@@ -382,7 +366,7 @@ msgstr "Tipo de atraso"
#: view:crm.opportunity:0
#: view:crm.phonecall:0
msgid "Contact"
-msgstr ""
+msgstr "Contato"
#. module: crm
#: view:crm.job:0
@@ -421,7 +405,6 @@ msgid "Exception Rules"
msgstr "Regras de exceção"
#. module: crm
-#: field:crm.menu.config_wizard,opportunity:0
#: model:ir.actions.report.xml,name:crm.crm_business_opportunities_report
msgid "Business Opportunities"
msgstr "Oportunidades de negócios"
@@ -453,7 +436,7 @@ msgstr "%(email_from)s = Email do Parceiro"
#. module: crm
#: model:crm.case.stage,name:crm.stage_lead6
msgid "Dead"
-msgstr ""
+msgstr "Morta"
#. module: crm
#: view:crm.meeting:0
@@ -469,17 +452,11 @@ msgstr "Cliente existente"
#. module: crm
#: model:crm.case.category2,name:crm.category_meet2
msgid "Home"
-msgstr ""
+msgstr "Início"
#. module: crm
#: field:crm.case,categ_id:0
#: field:crm.case.rule,trg_categ_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,category_id:0
-#: view:crm.opportunity:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,category_id:0
-#: field:report.crm.case.section.categ.categ2,categ_id:0
-#: field:report.crm.case.section.categ.stage,categ_id:0
-#: field:report.crm.case.section.stage,categ_id:0
msgid "Category"
msgstr "Categoria"
@@ -509,11 +486,6 @@ msgstr "%(parceiro)s = Nome do Parceiro"
#. module: crm
#: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
msgid "Action Information"
msgstr "Informação da ação"
@@ -542,13 +514,12 @@ msgstr "Condições"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act_open
msgid "Open Cases"
msgstr "Casos abertos"
#. module: crm
-#: field:crm.case.log,name:0
-#: view:crm.claim:0
-#: view:crm.job:0
+#: field:crm.case,state:0
msgid "Status"
msgstr "Situação"
@@ -560,7 +531,7 @@ msgstr "Situação"
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity
#: model:ir.actions.wizard,name:crm.wizard_partner_create_opportunity1
msgid "Create Opportunity"
-msgstr ""
+msgstr "Criar oportunidade"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -580,9 +551,6 @@ msgstr "Árvore de reuniões"
#: view:crm.case:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
#, python-format
msgid "Escalate"
msgstr "Escalada"
@@ -601,7 +569,7 @@ msgstr "Gestão do Relacionamento entre Cliente & Fornecedor"
#: view:crm.email.add.cc:0
#: model:ir.actions.act_window,name:crm.action_view_crm_email_add_cc_wizard
msgid "Add CC"
-msgstr ""
+msgstr "Adicionar CC"
#. module: crm
#: selection:report.crm.case.section.categ.categ2,month:0
@@ -652,7 +620,7 @@ msgstr "%(case_id)s = Identificação do Caso"
#. module: crm
#: model:crm.case.category2,name:crm.category_oppor2
msgid "New Business"
-msgstr ""
+msgstr "Negócio novo"
#. module: crm
#: help:crm.case,email_from:0
@@ -696,12 +664,10 @@ msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim3
msgid "Policy Claims"
-msgstr ""
+msgstr "Política de Reclamações"
#. module: crm
#: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid ""
"You must define a responsible user for this case in order to use this action!"
@@ -727,7 +693,7 @@ msgstr "Contrato proposto"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_job_req_main
msgid "Jobs - Hiring Process"
-msgstr ""
+msgstr "Trabalhos - Processo de contratação"
#. module: crm
#: view:crm.case:0
@@ -747,11 +713,6 @@ msgstr "Setembro"
#. module: crm
#: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
msgid "Communication history"
msgstr "Histórico"
@@ -794,7 +755,7 @@ msgstr "Linhas da segmentação de parceiro"
#. module: crm
#: model:ir.actions.act_window,name:crm.crm_case_category_act_leads_all
msgid "All Leads"
-msgstr ""
+msgstr "Todas as iniciativas (leads)"
#. module: crm
#: view:crm.lead:0
@@ -868,7 +829,7 @@ msgstr "Oportunidade"
#: view:crm.lead:0
#: view:crm.opportunity:0
msgid "Emails"
-msgstr ""
+msgstr "E-mails"
#. module: crm
#: model:crm.case.category2,name:crm.category_lead7
@@ -883,18 +844,18 @@ msgstr "Parar processo"
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim1
msgid "Factual Claims"
-msgstr ""
+msgstr "Reclamações Efetivas"
#. module: crm
#: view:crm.phonecall:0
msgid "Search Phonecalls"
-msgstr ""
+msgstr "Chamadas telefônicas de pesquisa"
#. module: crm
#: wizard_button:crm.lead.opportunity_set,create_partner,create:0
#: wizard_button:crm.phonecall.opportunity_set,create_partner,create:0
msgid "Continue"
-msgstr ""
+msgstr "Continuar"
#. module: crm
#: field:crm.segmentation,som_interval:0
@@ -1174,10 +1135,8 @@ msgid "Next Action"
msgstr "Próxima ação"
#. module: crm
-#: view:crm.case:0
#: field:crm.case,date_deadline:0
#: selection:crm.case.rule,trg_date_type:0
-#: view:crm.opportunity:0
msgid "Deadline"
msgstr "Prazo final"
@@ -1196,7 +1155,7 @@ msgstr ""
#. module: crm
#: view:crm.segmentation:0
msgid "Partner Segmentations"
-msgstr "Segmentação de Parceiros"
+msgstr "Segmentações de Parceiros"
#. module: crm
#: view:crm.meeting:0
@@ -1363,12 +1322,6 @@ msgstr "%(partner_email)s = Email do Parceiro"
#. module: crm
#: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
msgid "Reset to Draft"
msgstr "Restaurar para esboço"
@@ -1581,8 +1534,6 @@ msgstr "Aguardando resposta"
#: field:crm.case,date:0
#: field:crm.case.log,date:0
#: selection:crm.case.rule,trg_date_type:0
-#: view:crm.claim:0
-#: view:crm.phonecall:0
msgid "Date"
msgstr "Data"
@@ -1629,11 +1580,6 @@ msgstr "Dá a localização da reunião"
#. module: crm
#: view:crm.case:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
msgid "History"
msgstr "Histórico"
@@ -1668,40 +1614,18 @@ msgstr "Enviar lembrete"
#. module: crm
#: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
msgid "References"
msgstr "Referências"
#. module: crm
#: code:addons/crm/crm.py:0
#: view:crm.case:0
-#: wizard_button:crm.case.opportunity.partner_opportunity,init,end:0
-#: view:crm.claim:0
-#: view:crm.claim.assign_wizard:0
-#: view:crm.fundraising:0
-#: view:crm.helpdesk.assign_wizard:0
-#: wizard_button:crm.job.meeting_set,init,end:0
-#: wizard_button:crm.job.partner_create,init,end:0
-#: wizard_button:crm.job.reschedule_phone_call,init,end:0
-#: view:crm.lead:0
-#: wizard_button:crm.lead.opportunity_set,create_partner,end:0
-#: wizard_button:crm.lead.opportunity_set,opportunity,end:0
-#: wizard_button:crm.lead.partner_create,init,end:0
-#: view:crm.meeting.generic_wizard:0
-#: wizard_button:crm.new.send.mail,init,end:0
-#: view:crm.opportunity:0
-#: view:crm.opportunity.assign_wizard:0
-#: wizard_button:crm.opportunity.reschedule_phone_call,init,end:0
-#: view:crm.phonecall:0
-#: view:crm.phonecall.assign_wizard:0
-#: wizard_button:crm.phonecall.meeting_set,init,end:0
-#: wizard_button:crm.phonecall.opportunity_set,create_partner,end:0
-#: wizard_button:crm.phonecall.opportunity_set,opportunity,end:0
-#: wizard_button:crm.phonecall.partner_create,init,end:0
-#: wizard_button:crm.send.mail,init,end:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
+#: wizard_button:crm.case.section.menu,design_menu,end:0
+#: wizard_button:crm.case.section.menu,init,end:0
#, python-format
msgid "Cancel"
msgstr "Cancelar"
@@ -1814,9 +1738,6 @@ msgid "="
msgstr "="
#. module: crm
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: field:crm.menu.config_wizard,name:0
#: field:crm.segmentation,name:0
msgid "Name"
msgstr "Nome"
@@ -1868,11 +1789,6 @@ msgstr ""
#. module: crm
#: view:crm.case:0
#: view:crm.case.rule:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
msgid "Actions"
msgstr "Ações"
@@ -2133,17 +2049,12 @@ msgstr "Estado do caso"
#. module: crm
#: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "Send"
msgstr "Enviar"
#. module: crm
#: field:crm.case,priority:0
-#: view:crm.fundraising:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
msgid "Priority"
msgstr "Prioridade"
@@ -2189,11 +2100,6 @@ msgstr ""
#. module: crm
#: code:addons/crm/crm.py:0
-#: code:addons/crm/crm_claim.py:0
-#: code:addons/crm/crm_helpdesk.py:0
-#: code:addons/crm/crm_meeting.py:0
-#: code:addons/crm/crm_opportunity.py:0
-#: code:addons/crm/crm_phonecall.py:0
#, python-format
msgid "Error !"
msgstr "Erro !"
@@ -2437,14 +2343,6 @@ msgstr "Baixo"
#. module: crm
#: field:crm.case,date_closed:0
-#: selection:crm.case,state:0
-#: selection:crm.case.rule,act_state:0
-#: selection:crm.case.rule,trg_state_from:0
-#: selection:crm.case.rule,trg_state_to:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
msgid "Closed"
msgstr "Fechado"
@@ -2626,10 +2524,9 @@ msgid "Are you sure you want to create a partner based on this job request ?"
msgstr ""
#. module: crm
-#: wizard_field:crm.lead.opportunity_set,create_partner,action:0
-#: wizard_field:crm.phonecall.opportunity_set,create_partner,action:0
+#: field:crm.case.log,name:0
msgid "Action"
-msgstr "Ação"
+msgstr ""
#. module: crm
#: code:addons/crm/crm_claim.py:0
@@ -2675,7 +2572,6 @@ msgstr ""
#. module: crm
#: view:crm.case:0
-#: view:crm.phonecall:0
msgid "General"
msgstr "Geral"
@@ -2722,16 +2618,6 @@ msgstr ""
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Open"
msgstr "Abrir"
@@ -2767,16 +2653,6 @@ msgstr ""
#. module: crm
#: field:crm.case,user_id:0
#: field:crm.case.rule,trg_user_id:0
-#: view:crm.claim:0
-#: field:crm.claim.assign_wizard,user_id:0
-#: view:crm.fundraising:0
-#: field:crm.helpdesk.assign_wizard,user_id:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: field:crm.meeting.generic_wizard,user_id:0
-#: view:crm.opportunity:0
-#: field:crm.opportunity.assign_wizard,user_id:0
-#: field:crm.phonecall.assign_wizard,user_id:0
msgid "Responsible"
msgstr "Responsável"
@@ -3011,6 +2887,8 @@ msgid "Jobs Hiring Process"
msgstr ""
#. module: crm
+#: model:ir.actions.act_window,name:crm.crm_case_categ0-act
+#: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act
#: model:ir.ui.menu,name:crm.next_id_52
msgid "All Cases"
msgstr "Todos os casos"
@@ -3130,7 +3008,6 @@ msgstr ""
#. module: crm
#: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_cal_subscribe.py:0
#, python-format
msgid "Error!"
msgstr "Erro!"
@@ -3219,17 +3096,6 @@ msgstr "%(case_subject)s = Assunto do Caso"
#: field:crm.case,section_id:0
#: field:crm.case.log,section_id:0
#: field:crm.case.rule,trg_section_id:0
-#: field:crm.claim.assign_wizard,section_id:0
-#: field:crm.helpdesk.assign_wizard,section_id:0
-#: wizard_field:crm.job.reschedule_phone_call,init,section_id:0
-#: field:crm.meeting.generic_wizard,section_id:0
-#: field:crm.opportunity.assign_wizard,section_id:0
-#: wizard_field:crm.opportunity.reschedule_phone_call,init,section_id:0
-#: field:crm.phonecall.assign_wizard,section_id:0
-#: field:report.crm.case.section.categ.categ2,section_id:0
-#: field:report.crm.case.section.categ.stage,section_id:0
-#: field:report.crm.case.section.categ2,section_id:0
-#: field:report.crm.case.section.stage,section_id:0
msgid "Section"
msgstr "Seção"
@@ -3260,10 +3126,7 @@ msgid "Your action"
msgstr "Sua ação"
#. module: crm
-#: model:crm.case.category2,name:crm.category_lead3
#: field:crm.case.history,email:0
-#: field:crm.email.add.cc,email:0
-#: view:crm.job:0
msgid "Email"
msgstr "E-mail"
@@ -3320,16 +3183,6 @@ msgstr ""
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
-#: view:crm.claim:0
-#: view:crm.fundraising:0
-#: view:crm.job:0
-#: view:crm.lead:0
-#: selection:crm.new.send.mail,init,state:0
-#: view:crm.opportunity:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Pending"
msgstr "Pendente"
@@ -3475,11 +3328,25 @@ msgid "All Funds"
msgstr ""
#. module: crm
-#: field:crm.case.section,calendar:0
-#: view:crm.meeting:0
-#: model:ir.ui.menu,name:crm.menu_crm_case_category_act_meetings
+#: selection:crm.case.section.menu,design_menu,menu10_option:0
+#: selection:crm.case.section.menu,design_menu,menu11_option:0
+#: selection:crm.case.section.menu,design_menu,menu12_option:0
+#: selection:crm.case.section.menu,design_menu,menu13_option:0
+#: selection:crm.case.section.menu,design_menu,menu14_option:0
+#: selection:crm.case.section.menu,design_menu,menu15_option:0
+#: selection:crm.case.section.menu,design_menu,menu16_option:0
+#: selection:crm.case.section.menu,design_menu,menu17_option:0
+#: selection:crm.case.section.menu,design_menu,menu1_option:0
+#: selection:crm.case.section.menu,design_menu,menu2_option:0
+#: selection:crm.case.section.menu,design_menu,menu3_option:0
+#: selection:crm.case.section.menu,design_menu,menu4_option:0
+#: selection:crm.case.section.menu,design_menu,menu5_option:0
+#: selection:crm.case.section.menu,design_menu,menu6_option:0
+#: selection:crm.case.section.menu,design_menu,menu7_option:0
+#: selection:crm.case.section.menu,design_menu,menu8_option:0
+#: selection:crm.case.section.menu,design_menu,menu9_option:0
msgid "Calendar"
-msgstr "Calendário"
+msgstr ""
#. module: crm
#: model:crm.case.categ,name:crm.categ_job1
@@ -3523,6 +3390,7 @@ msgstr ""
#. module: crm
#: code:addons/crm/crm.py:0
+#: view:crm.case:0
#, python-format
msgid "Historize"
msgstr "Historiar"
@@ -3550,11 +3418,6 @@ msgstr ""
#: selection:crm.case.rule,act_state:0
#: selection:crm.case.rule,trg_state_from:0
#: selection:crm.case.rule,trg_state_to:0
-#: view:crm.meeting:0
-#: selection:report.crm.case.section.categ.categ2,state:0
-#: selection:report.crm.case.section.categ.stage,state:0
-#: selection:report.crm.case.section.categ2,state:0
-#: selection:report.crm.case.section.stage,state:0
#, python-format
msgid "Draft"
msgstr "Esboço"
@@ -3584,8 +3447,6 @@ msgstr "Normal"
#. module: crm
#: code:addons/crm/crm.py:0
-#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
-#: code:addons/crm/wizard/wizard_crm_send_email.py:0
#, python-format
msgid "You must put a Partner eMail to use this action!"
msgstr "Você deve colocar um e-mail de parceiro para utilizar esta ação!"
@@ -3728,8 +3589,6 @@ msgstr ""
#. module: crm
#: view:crm.case:0
-#: view:crm.fundraising:0
-#: view:crm.opportunity:0
msgid "Estimates"
msgstr "Estimativas"
@@ -3741,6 +3600,10 @@ msgstr "Usuário Responsável"
#. module: crm
#: code:addons/crm/crm.py:0
#: view:crm.case:0
+#: selection:crm.case,state:0
+#: selection:crm.case.rule,act_state:0
+#: selection:crm.case.rule,trg_state_from:0
+#: selection:crm.case.rule,trg_state_to:0
#, python-format
msgid "Close"
msgstr "Fechar"
@@ -3798,14 +3661,9 @@ msgid "% = The '%' Character"
msgstr ""
#. module: crm
-#: view:crm.case:0
#: field:crm.case,name:0
#: field:crm.case.history,description:0
#: field:crm.case.history,note:0
-#: view:crm.job:0
-#: view:crm.meeting:0
-#: view:crm.opportunity:0
-#: view:crm.phonecall:0
#: field:crm.segmentation,description:0
msgid "Description"
msgstr "Descrição"
@@ -3855,14 +3713,6 @@ msgstr ""
#. module: crm
#: code:addons/crm/crm.py:0
#: field:crm.case.log,case_id:0
-#: field:crm.claim,inherit_case_id:0
-#: field:crm.fundraising,inherit_case_id:0
-#: field:crm.helpdesk,inherit_case_id:0
-#: field:crm.job,inherit_case_id:0
-#: field:crm.lead,inherit_case_id:0
-#: field:crm.meeting,inherit_case_id:0
-#: field:crm.opportunity,inherit_case_id:0
-#: field:crm.phonecall,inherit_case_id:0
#: model:ir.model,name:crm.model_crm_case
#: model:res.request.link,name:crm.req_link_case
#, python-format
@@ -3986,7 +3836,6 @@ msgstr ""
#. module: crm
#: field:crm.case.rule,sequence:0
#: field:crm.case.section,sequence:0
-#: field:crm.case.stage,sequence:0
msgid "Sequence"
msgstr "Sequência"
@@ -4166,8 +4015,21 @@ msgstr ""
#~ msgid "Mail to watchers (Cc)"
#~ msgstr "Correio para observadors (cc)"
-#~ msgid "crm.case.section.open"
-#~ msgstr "crm.case.section.open"
+#~ msgid "New "
+#~ msgstr "Novo "
#~ msgid "Form View"
#~ msgstr "Visualização de formulário"
+
+#~ msgid ""
+#~ "You may want to create a new parent menu to put all the created menus in."
+#~ msgstr ""
+#~ "Pode ser que você queira criar um novo menu principal para agregar todos os "
+#~ "menus criados."
+
+#~ msgid "this wizard will create all sub-menus, within the selected menu."
+#~ msgstr "este wizard cria todos os sub-menus, dentro de um menu selecionado"
+
+#~ msgid "Deadline Date is automatically computed from Start Date + Duration"
+#~ msgstr ""
+#~ "Data limite é calculada automaticamente pela soma da Data Inicial + Duração"
diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py
index 50cfc922104..aaa26c438b6 100644
--- a/addons/crm/wizard/crm_forward_to_partner.py
+++ b/addons/crm/wizard/crm_forward_to_partner.py
@@ -203,11 +203,11 @@ class crm_lead_forward_to_partner(osv.osv_memory):
body = []
lead_proxy = self.pool.get('crm.lead')
lead = lead_proxy.browse(cr, uid, lead_id, context=context)
- if not lead.type or lead.type == 'lead':
+ if not lead.type or lead.type == 'lead' or not lead.partner_address_id:
field_names = [
- 'partner_name', 'title', 'function', 'street', 'street2',
- 'zip', 'city', 'country_id', 'state_id', 'email_from',
- 'phone', 'fax', 'mobile'
+ 'partner_name', 'title', 'function', 'street', 'street2',
+ 'zip', 'city', 'country_id', 'state_id', 'email_from',
+ 'phone', 'fax', 'mobile', 'categ_id', 'description',
]
for field_name in field_names:
@@ -218,7 +218,7 @@ class crm_lead_forward_to_partner(osv.osv_memory):
if hasattr(field_definition.selection, '__call__'):
key = field_definition.selection(lead_proxy, cr, uid, context=context)
else:
- key = field.definition.selection
+ key = field_definition.selection
value = dict(key).get(lead[field_name], lead[field_name])
elif field_definition._type == 'many2one':
if lead[field_name]:
@@ -230,22 +230,22 @@ class crm_lead_forward_to_partner(osv.osv_memory):
elif lead.type == 'opportunity':
pa = lead.partner_address_id
body = [
- "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]),
- "Contact: %s" % (pa.name or ''),
- "Title: %s" % (pa.title or ''),
- "Function: %s" % (pa.function or ''),
- "Street: %s" % (pa.street or ''),
- "Street2: %s" % (pa.street2 or ''),
- "Zip: %s" % (pa.zip or ''),
- "City: %s" % (pa.city or ''),
- "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''),
- "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''),
- "Email: %s" % (pa.email or ''),
- "Phone: %s" % (pa.phone or ''),
- "Fax: %s" % (pa.fax or ''),
- "Mobile: %s" % (pa.mobile or ''),
- "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''),
- "Details: %s" % (lead.description or ''),
+ "Partner: %s" % (lead.partner_id and lead.partner_id.name_get()[0][1]),
+ "Contact: %s" % (pa.name or ''),
+ "Title: %s" % (pa.title or ''),
+ "Function: %s" % (pa.function or ''),
+ "Street: %s" % (pa.street or ''),
+ "Street2: %s" % (pa.street2 or ''),
+ "Zip: %s" % (pa.zip or ''),
+ "City: %s" % (pa.city or ''),
+ "Country: %s" % (pa.country_id and pa.country_id.name_get()[0][1] or ''),
+ "State: %s" % (pa.state_id and pa.state_id.name_get()[0][1] or ''),
+ "Email: %s" % (pa.email or ''),
+ "Phone: %s" % (pa.phone or ''),
+ "Fax: %s" % (pa.fax or ''),
+ "Mobile: %s" % (pa.mobile or ''),
+ "Lead Category: %s" % (lead.categ_id and lead.categ_id.name or ''),
+ "Details: %s" % (lead.description or ''),
]
return "\n".join(body + ['---'])
diff --git a/addons/hr_timesheet_invoice/i18n/sl.po b/addons/hr_timesheet_invoice/i18n/sl.po
index b2b2f8cc19e..387535c1a36 100644
--- a/addons/hr_timesheet_invoice/i18n/sl.po
+++ b/addons/hr_timesheet_invoice/i18n/sl.po
@@ -1,19 +1,19 @@
# Translation of OpenERP Server.
# This file contains the translation of the following modules:
-# * hr_timesheet_invoice
+# * hr_timesheet_invoice
#
msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-01-27 14:46+0000\n"
+"PO-Revision-Date: 2010-07-28 12:25+0000\n"
"Last-Translator: Simon Vidmar \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-22 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: hr_timesheet_invoice
@@ -157,7 +157,7 @@ msgstr "Izberite"
#. module: hr_timesheet_invoice
#: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0
msgid "Debit"
-msgstr "V breme"
+msgstr "Breme"
#. module: hr_timesheet_invoice
#: wizard_button:account.analytic.profit,init,report:0
@@ -490,119 +490,119 @@ msgstr "Strošek"
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_analytic_account_close
msgid "Analytic account to close"
-msgstr "Zapreti analitični konto"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,quantity_max:0
msgid "Max. Quantity"
-msgstr "Najv. količina"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,name:0
msgid "Analytic account"
-msgstr "Analitični konto"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,state:0
msgid "State"
-msgstr "Stanje"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,date_deadline:0
msgid "Deadline"
-msgstr "Rok"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
msgid "Analytic Account Reporting"
-msgstr "Poročanje po analitičnih kontih"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,partner_id:0
msgid "Partner"
-msgstr "Partner"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_analytic_account_tree
#: model:ir.ui.menu,name:hr_timesheet_invoice.menu_action_analytic_account_tree
#: view:report.analytic.account.close:0
msgid "Expired analytic accounts"
-msgstr "Neveljavni analitični konti"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.analytic.account.close,quantity:0
msgid "Quantity"
-msgstr "Količina"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
msgid "Lines to Invoice"
-msgstr "Vrstice za fakturiranje"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:hr_timesheet_invoice.action_account_analytic_line_to_invoice
#: model:ir.ui.menu,name:hr_timesheet_invoice.account_analytic_lines_to_invoice_report
#: view:report.account.analytic.line.to.invoice:0
msgid "Analytic Lines to Invoice"
-msgstr "Analitične vrstice za fakturiranje"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,sale_price:0
msgid "Sale price"
-msgstr "Prodajna cena"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information
msgid "Analytic lines - Reporting"
-msgstr "Analitične vrstice - Poročanje"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,name:0
msgid "Month"
-msgstr "Mesec"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,amount:0
msgid "Amount"
-msgstr "Znesek"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice
msgid "Analytic lines to invoice report"
-msgstr "Analitične vrstice za poročilo fakturiranja"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report.account.analytic.line.to.invoice,product_uom_id:0
msgid "UoM"
-msgstr "ME"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_my
msgid "My daily timesheets by account"
-msgstr "Moje dnevne časovnice po strankah"
+msgstr ""
#. module: hr_timesheet_invoice
#: view:report_timesheet.user:0
msgid "Timesheet by user"
-msgstr "Časovnice po uporabnikih"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_all
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_all
msgid "Timesheet by Account"
-msgstr "Časovnice po kontih"
+msgstr ""
#. module: hr_timesheet_invoice
#: view:report_timesheet.account:0
msgid "Timesheet by account"
-msgstr "Časovnice po kontih"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_invoice
#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_invoice
msgid "Costs to invoice"
-msgstr "Zaračunavanje stroškov"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_my
@@ -619,54 +619,54 @@ msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.act_account_analytic_account_2_report_timehsheet_account
msgid "Timesheets"
-msgstr "Časovnice"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timehsheet_account
msgid "Timesheets per account"
-msgstr "Časovnice po strankah"
+msgstr ""
#. module: hr_timesheet_invoice
#: view:report_timesheet.invoice:0
msgid "Timesheets to invoice"
-msgstr "Zaračunavanje po časovnicah"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.act_res_users_2_report_timesheet_user
msgid "Timesheets per day"
-msgstr "Časovnice po dneh"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_all
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_account_date_all
msgid "Daily Timesheet by Account"
-msgstr "Dnevna časovnica po stranki"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0
msgid "Description"
-msgstr "Opis"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account
#: view:report_timesheet.account:0
msgid "Timesheet per account"
-msgstr "Časovnica po stranki"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.module.module,shortdesc:report_timesheet.module_meta_information
msgid "Timesheet - Reporting"
-msgstr "Časovnice - poročanje"
+msgstr ""
#. module: hr_timesheet_invoice
#: view:report_timesheet.invoice:0
msgid "Timesheet by invoice"
-msgstr "Časovnica po računu"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69
msgid "This Month"
-msgstr "Ta mesec"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my
@@ -687,7 +687,7 @@ msgstr ""
#: field:report_timesheet.invoice,user_id:0
#: field:report_timesheet.user,user_id:0
msgid "User"
-msgstr "Uporabnik"
+msgstr ""
#. module: hr_timesheet_invoice
#: view:report.random.timesheet:0
@@ -707,12 +707,12 @@ msgstr ""
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,account_id:0
msgid "Project"
-msgstr "Projekt"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,amount_invoice:0
msgid "To invoice"
-msgstr "Za zaračunavanje"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat_all
@@ -724,7 +724,7 @@ msgstr ""
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_invoice_stat_all
#: model:ir.ui.menu,name:report_timesheet_invoice.menu_report_timesheet_invoice_all
msgid "Timesheet by Invoice"
-msgstr "Časovnica po računu"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_random_timesheet_board
@@ -734,7 +734,7 @@ msgstr ""
#. module: hr_timesheet_invoice
#: field:random.timesheet.lines,general_account_id:0
msgid "General Account"
-msgstr "Splošni konto"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_user
@@ -766,12 +766,12 @@ msgstr ""
#: field:report_timesheet.account,account_id:0
#: field:report_timesheet.account.date,account_id:0
msgid "Analytic Account"
-msgstr "Analitični konto"
+msgstr ""
#. module: hr_timesheet_invoice
#: field:report_timesheet.invoice,manager_id:0
msgid "Manager"
-msgstr "Upravitelj"
+msgstr ""
#. module: hr_timesheet_invoice
#: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat
diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
index 7d24e8c26ec..de46463bb12 100644
--- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml
+++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml
@@ -57,8 +57,7 @@
tree,graph
[('state','=','open')]
-
-
+
report.account.analytic.line.to.invoice
@@ -109,20 +108,20 @@
-
+
report.account.analytic.line.to.invoice.select
report.account.analytic.line.to.invoice
search
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -135,7 +134,7 @@
tree,graph
-
+
diff --git a/addons/product_expiry/i18n/sl.po b/addons/product_expiry/i18n/sl.po
new file mode 100644
index 00000000000..bca1d702534
--- /dev/null
+++ b/addons/product_expiry/i18n/sl.po
@@ -0,0 +1,161 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-06-30 15:09+0000\n"
+"PO-Revision-Date: 2010-07-28 12:28+0000\n"
+"Last-Translator: Simon Vidmar \n"
+"Language-Team: Slovenian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_expiry
+#: field:product.product,life_time:0
+msgid "Product lifetime"
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_from_product_template
+msgid "Ham"
+msgstr "Šunka"
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_lait_product_template
+msgid "Cow milk"
+msgstr "Kravje mleko"
+
+#. module: product_expiry
+#: model:ir.module.module,shortdesc:product_expiry.module_meta_information
+msgid "Products date of expiry"
+msgstr ""
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr "Napaka: Privzeta EM in nabavna EM morata biti v isti kategoriji."
+
+#. module: product_expiry
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: product_expiry
+#: help:stock.production.lot,life_date:0
+msgid "The date the lot may become dangerous and should not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,removal_date:0
+msgid "Removal Date"
+msgstr ""
+
+#. module: product_expiry
+#: model:ir.module.module,description:product_expiry.module_meta_information
+msgid ""
+"Track different dates on products and production lots:\n"
+" - end of life\n"
+" - best before date\n"
+" - removal date\n"
+" - alert date\n"
+"Used, for example, in food industries."
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_pain_product_template
+msgid "Bread"
+msgstr "Kruh"
+
+#. module: product_expiry
+#: model:product.uom,name:product_expiry.product_uom_ltr
+#: model:product.uom.categ,name:product_expiry.product_uom_categ_vol
+msgid "LTR"
+msgstr ""
+
+#. module: product_expiry
+#: view:product.product:0
+#: view:stock.production.lot:0
+msgid "Dates"
+msgstr "Datumi"
+
+#. module: product_expiry
+#: constraint:product.template:0
+msgid "Error: UOS must be in a different category than the UOM"
+msgstr "Napaka: Prodajna EM mora biti v drugi kategoriji, kot je EM"
+
+#. module: product_expiry
+#: field:stock.production.lot,life_date:0
+msgid "End of Life Date"
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,use_date:0
+msgid "Best before Date"
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,use_date:0
+msgid "The date the lot starts deteriorating without becoming dangerous."
+msgstr ""
+
+#. module: product_expiry
+#: model:product.template,name:product_expiry.product_product_jambon_product_template
+msgid "French cheese Camenbert"
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,removal_time:0
+msgid "The number of days before a production lot should be removed."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,use_time:0
+msgid "Product usetime"
+msgstr ""
+
+#. module: product_expiry
+#: field:stock.production.lot,alert_date:0
+msgid "Alert Date"
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,removal_time:0
+msgid "Product removal time"
+msgstr ""
+
+#. module: product_expiry
+#: help:product.product,use_time:0
+msgid ""
+"The number of days before a production lot starts deteriorating without "
+"becoming dangerous."
+msgstr ""
+
+#. module: product_expiry
+#: constraint:product.product:0
+msgid "Error: Invalid ean code"
+msgstr "Napaka: neveljavna EAN črtna koda"
+
+#. module: product_expiry
+#: help:product.product,life_time:0
+msgid ""
+"The number of days before a production lot may become dangerous and should "
+"not be consumed."
+msgstr ""
+
+#. module: product_expiry
+#: help:stock.production.lot,removal_date:0
+msgid "The date the lot should be removed."
+msgstr ""
+
+#. module: product_expiry
+#: field:product.product,alert_time:0
+msgid "Product alert time"
+msgstr ""
diff --git a/addons/product_manufacturer/i18n/sl.po b/addons/product_manufacturer/i18n/sl.po
new file mode 100644
index 00000000000..7b374fb4fc8
--- /dev/null
+++ b/addons/product_manufacturer/i18n/sl.po
@@ -0,0 +1,106 @@
+# Slovenian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-25 13:27+0000\n"
+"PO-Revision-Date: 2010-07-28 12:29+0000\n"
+"Last-Translator: Simon Vidmar \n"
+"Language-Team: Slovenian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: product_electronic
+#: model:ir.module.module,description:product_electronic.module_meta_information
+msgid "A module that add manufacturers and attributes on the product form"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pref:0
+msgid "Manufacturer product code"
+msgstr ""
+
+#. module: product_electronic
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: product_electronic
+#: view:product.electronic.attribute:0
+msgid "Product Template Name"
+msgstr ""
+
+#. module: product_electronic
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
+#. module: product_electronic
+#: model:ir.model,name:product_electronic.model_product_electronic_attribute
+msgid "Product attributes"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product reference"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.electronic.attribute,name:0
+msgid "Attribute"
+msgstr "Lastnost"
+
+#. module: product_electronic
+#: field:product.electronic.attribute,product_id:0
+msgid "Product"
+msgstr "Proizvod"
+
+#. module: product_electronic
+#: field:product.electronic.attribute,value:0
+msgid "Value"
+msgstr "Vrednost"
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Manufacturing Data"
+msgstr ""
+
+#. module: product_electronic
+#: view:product.product:0
+msgid "Product name"
+msgstr "Ime proizvoda"
+
+#. module: product_electronic
+#: view:product.product:0
+#: field:product.product,attribute_ids:0
+msgid "Attributes"
+msgstr "Lastnosti"
+
+#. module: product_electronic
+#: model:ir.module.module,shortdesc:product_electronic.module_meta_information
+msgid "Products Attributes & Manufacturers"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer_pname:0
+msgid "Manufacturer product name"
+msgstr ""
+
+#. module: product_electronic
+#: field:product.product,manufacturer:0
+msgid "Manufacturer"
+msgstr "Proizvajalec"
diff --git a/addons/sale_mrp/i18n/sl.po b/addons/sale_mrp/i18n/sl.po
new file mode 100644
index 00000000000..4c27df121ed
--- /dev/null
+++ b/addons/sale_mrp/i18n/sl.po
@@ -0,0 +1,73 @@
+# Slovenian 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: 2010-06-28 09:21+0000\n"
+"PO-Revision-Date: 2010-07-28 12:42+0000\n"
+"Last-Translator: Simon Vidmar \n"
+"Language-Team: Slovenian \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-07-29 03:34+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_mrp
+#: help:mrp.production,sale_ref:0
+msgid "Indicate the Customer Reference from sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: help:mrp.production,sale_name:0
+msgid "Indicate the name of sale order."
+msgstr ""
+
+#. module: sale_mrp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda!"
+
+#. module: sale_mrp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov!"
+
+#. module: sale_mrp
+#: field:mrp.production,sale_name:0
+msgid "Sale Name"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.model,name:sale_mrp.model_mrp_production
+msgid "Manufacturing Order"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,description:sale_mrp.module_meta_information
+msgid ""
+"\n"
+" This module provides facility to the user to install mrp and sale "
+"modules\n"
+" at a time. It is basically used when we want to keep track of "
+"production\n"
+" orders generated from sale orders.\n"
+" It adds sale name and sale Reference on production order\n"
+" "
+msgstr ""
+
+#. module: sale_mrp
+#: field:mrp.production,sale_ref:0
+msgid "Sale Reference"
+msgstr ""
+
+#. module: sale_mrp
+#: model:ir.module.module,shortdesc:sale_mrp.module_meta_information
+msgid "Sales and MRP Management"
+msgstr ""