[MERGE] with trunk

bzr revid: fka@tinyerp.com-20121207044936-2wh9gdjltd2isdjm

61 files changed, 3994 insertions, 928 deletions

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index 4e3759713c4..dc3291fc9da 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-05 22:09+0000\n"
+"PO-Revision-Date: 2012-12-06 10:40+0000\n"
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
@@ -9891,7 +9891,7 @@ msgstr "Gültig ab"
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Unit of Currency"
-msgstr ""
+msgstr "Währungseinheit"
 
 #. module: account
 #: code:addons/account/account.py:3137
@@ -10019,6 +10019,16 @@ msgid ""
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
+" * Der \"Entwurf\"-Status wird verwendet, wenn ein Benutzer eine Rechnung "
+"erstellt, aber noch nicht gebucht hat.\n"
+"* Der \"Pro-forma\" Status wird nach dessen Auswahl  angezeigt, es wird aber "
+"noch keine Rechnungsnummer vergeben. \n"
+"* Die Rechnung ist im \"Offen\" Status, wenn Sie gebucht wurde, dadurch eine "
+"Rechnungsnummer bekommen hat, aber noch nicht vom Kunden bezahlt wurde. \n"
+"* Der\"Bezahlt\"-Status wird automatisch vergeben, wenn die offene Rechnung "
+"vom Kunden bezahlt wurde.\n"
+"* Eine Anzeige im \"Abgebrochen\"-Status erfolgt immer dann, wenn die "
+"Rechnung storniert wurde."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -10038,7 +10048,7 @@ msgstr "Finanz Reports"
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "Passiva Ansicht"
 
 #. module: account
 #: report:account.account.balance:0
@@ -10086,7 +10096,7 @@ msgstr "Firmenreferenzen Partner"
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "Gutschrift anfragen"
 
 #. module: account
 #: view:account.move.line:0
@@ -10127,12 +10137,12 @@ msgstr "Forderungskonten"
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Nummernfolge Lieferantengutschrift"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_next:0
 msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Nächste Eingangsrechnung"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -10144,6 +10154,12 @@ msgid ""
 "payments.\n"
 "                This installs the module account_payment."
 msgstr ""
+"Sie können Zahlungsaufträge erstellen und verwalten , um\n"
+"                     * diese als Grundlage für externe Erweiterungen zur "
+"Automatisierung von Zahlungen zu nutzen. \n"
+"                     * dadurch den Rechnungsausgleich von Lieferanten und "
+"andere Kreditoren durchzuführen.\n"
+"                 Es erfolgt eine Installation des Moduls account_payment."
 
 #. module: account
 #: xsl:account.transfer:0
@@ -10162,6 +10178,7 @@ msgstr "Bankauszüge"
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
+"Das Unternehmen sollte für alle auszugleichenden Buchungen identisch sein."
 
 #. module: account
 #: field:account.account,balance:0
@@ -10241,7 +10258,7 @@ msgstr "Filter nach"
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "Stückzahl"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -10266,12 +10283,12 @@ msgstr "Buchung"
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Diese Aktion ist fehlerhaft!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Date / Period"
-msgstr ""
+msgstr "Datum / Periode"
 
 #. module: account
 #: report:account.central.journal:0
@@ -10464,7 +10481,7 @@ msgstr "Fälligkeitsdatum"
 #: code:addons/account/account.py:1459
 #, python-format
 msgid " Centralisation"
-msgstr ""
+msgstr " Zusammenfassung"
 
 #. module: account
 #: help:account.journal,type:0
@@ -10548,7 +10565,7 @@ msgstr "Rechnungsentwürfe"
 #: view:cash.box.in:0
 #: model:ir.actions.act_window,name:account.action_cash_box_in
 msgid "Put Money In"
-msgstr ""
+msgstr "Zahle Geld ein"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -10609,7 +10626,7 @@ msgstr "Abrechnen von Analyt. Buchungen"
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Konfiguration Geschäftsjahr"
 
 #. module: account
 #: field:account.period,name:0
@@ -10623,6 +10640,8 @@ msgid ""
 "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state."
 msgstr ""
+"Die ausgewählten Rechnungen können im Status \"abgebrochen\" oder "
+"\"bezahlt\" nicht mehr storniert werden."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -10657,6 +10676,10 @@ msgid ""
 "some non legal fields or you must unconfirm the journal entry first.\n"
 "%s."
 msgstr ""
+"Sie können keine Änderung bereits erfolgter Buchungen vornehmen. Lediglich "
+"unkritische Informationen können ohne weiteres geändert werden, ansonsten "
+"ist zunächst die zugrunde liegende Buchung zu stornieren.\n"
+"%s."
 
 #. module: account
 #: help:account.config.settings,module_account_budget:0
@@ -10667,6 +10690,15 @@ msgid ""
 "analytic account.\n"
 "                This installs the module account_budget."
 msgstr ""
+"Definieren Sie Ihre Kostenstellen und budgetieren Sie die dort relevanten "
+"Erfolgskonten.\n"
+"                 Sobald Sie die Vorlagen für Ihre anstehenden "
+"Budgetplanungen erstellt haben ,\n"
+"                 können Ihre verantwortlichen Projektmanager  die geplante "
+"Beträge für Ihre Kostenstellen\n"
+"                 differenziert nach Erfolgs- und Kostenkonten aufteilen.\n"
+"                 Zu diesem Zweck installieren Sie hier das Modul "
+"account_budget."
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -10721,12 +10753,12 @@ msgstr "Haben"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Invoice "
-msgstr ""
+msgstr "Entwurf Rechnung "
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create credit note and reconcile"
-msgstr ""
+msgstr "Abbrechen: Erstelle Gutschrift und Ausgleich"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
@@ -10827,7 +10859,7 @@ msgstr "Gewinn & Verlust Übertrag"
 #: code:addons/account/account_invoice.py:368
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Es wurde noch kein Journal für Verkauf / Einkauf angelegt."
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -10905,7 +10937,7 @@ msgstr "Kontotyp"
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Buchungspositionen vorab erstellen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -11005,6 +11037,8 @@ msgstr "Status"
 #: help:product.template,property_account_income:0
 msgid "This account will be used to value outgoing stock using sale price."
 msgstr ""
+"Dieses Konto wird für abgehende Bestände mit dem Verkaufspreis bewertet und "
+"gebucht."
 
 #. module: account
 #: field:account.invoice,check_total:0
@@ -11027,12 +11061,12 @@ msgstr "Bruttobetrag"
 #: code:addons/account/wizard/account_invoice_refund.py:109
 #, python-format
 msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Entwurf / Proforma / Abgebrochen Rechnungen können nicht %s werden."
 
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Kostenstelle für Steuer der Gutschrift"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -11099,7 +11133,7 @@ msgstr "Fälligkeitsdatum"
 #: field:cash.box.in,name:0
 #: field:cash.box.out,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Begründung"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -11157,7 +11191,7 @@ msgstr "Konten ohne Buchung? "
 #: code:addons/account/account_move_line.py:1046
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "Eine Änderung der Steuer ist nicht möglich"
 
 #. module: account
 #: constraint:account.bank.statement:0
@@ -11189,6 +11223,9 @@ msgid ""
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"Durch diesen Bericht erhalten Sie einen Überblick über die Abrechnungen "
+"Ihrer Kunden. Das Suche + Filter Tool kann zur weiteren auf Ihre Bedürfnisse "
+"angepassten Analyse angepasst werden."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
@@ -11209,7 +11246,7 @@ msgstr "Status der Rechnung ist 'Erledigt'"
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Verwalten Sie Zahlungserinnerungen"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -11285,7 +11322,7 @@ msgstr "Debitoren"
 #: code:addons/account/account_move_line.py:776
 #, python-format
 msgid "Already reconciled."
-msgstr ""
+msgstr "Bereits ausgeglichen."
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -11361,6 +11398,7 @@ msgstr "Gruppiere je Monat des Rechnungsdatums"
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Es wurde kein Ertragskonto für dieses Produkt definiert: \"%s\" (Kürzel: %d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -11423,6 +11461,8 @@ msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
 "the product."
 msgstr ""
+"Die ausgewählte Mengeneinheit ist nicht mit derjenigen für das Produkt "
+"kompatibel."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -11446,6 +11486,17 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Klicken Sie um neue Steuern zu definieren.\n"
+"               </ p>\n"
+"                 Je nach Land, ist eine Steuer in der Regel ein Wert in "
+"Ihrer \n"
+"                 Umsatzsteuererklärung. OpenERP ermöglicht die Definition\n"
+"                 von Steuerstrukturen,  damit sämtliche Steuerberechnungen \n"
+"                 und Buchungen dann in einer oder mehrerer Positionen für \n"
+"                 die Voranmeldung bzw. Steuererklärung auftauchen.\n"
+"               </ p>\n"
+"            "
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11472,6 +11523,22 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                 Wählen Sie Periode und Journal für Ihre Buchungen.\n"
+"               </ p>\n"
+"                 Diese Ansicht kann von Wirtschaftsprüfern und "
+"Steuerberatern genutzt werden, \n"
+"                 um schnellstmöglich Buchungen in  OpenERP von außen "
+"einzugeben. Wenn Sie eine \n"
+"                 Lieferantenrechnung erfassen, beginnen Sie normalerweise "
+"mit der Eingabe des \n"
+"                 Aufwandskontos für eine Rechnung. OpenERP wird Ihnen aus "
+"dem Kontext des\n"
+"                 Produkts dann automatisch eine Steuer vorschlagen sowie das "
+"Gegenkonto für die  \n"
+"                 \"Kreditoren\".\n"
+"               </ p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -11481,7 +11548,7 @@ msgstr "Aufwand- und Erlöskonto des Produktes"
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "Installieren Sie weitere Kontenpläne"
 
 #. module: account
 #: report:account.general.journal:0
@@ -11529,6 +11596,8 @@ msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
 "supplier."
 msgstr ""
+"Sie können keine Konten deaktivieren, die bereits einem Kunden oder "
+"Lieferanten zugewiesen wurden."
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -11540,6 +11609,8 @@ msgstr "Verbuche Buchungszeilen"
 msgid ""
 "The fiscal position will determine taxes and accounts used for the partner."
 msgstr ""
+"Die Steuerzuordnung steuert die zu benutzenden Steuern und Konten für den "
+"Partner."
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -11573,6 +11644,7 @@ msgstr "Manuelle Berechnung Steuer"
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
 msgstr ""
+"Die Zahlungsbedingung für die Lieferantenrechnung hat keine Zahlungsposition."
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -11585,7 +11657,7 @@ msgstr "Oberkonto Rechts"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:80
 #, python-format
 msgid "Never"
-msgstr ""
+msgstr "Niemals"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -11606,7 +11678,7 @@ msgstr "Partner"
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne Hinweise"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -11639,7 +11711,7 @@ msgstr "Buchungsvorlage"
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Verlust"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11665,7 +11737,7 @@ msgstr ""
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_closing:0
 msgid "Closing Unit Numbers"
-msgstr ""
+msgstr "Abschluss Bankauszug"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -11731,7 +11803,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr ""
+msgstr "Runden per  Zeile"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 1e822b5817e..6bc1a0ac2bc 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-06 00:09+0000\n"
+"PO-Revision-Date: 2012-12-06 21:42+0000\n"
 "Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
@@ -305,6 +305,9 @@ msgid ""
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Include tutte le funzioni basilari per le registrazioni dei pagamenti per "
+"banca, cassa, vendite, acquisti, costi, contra, ecc.\n"
+"                Installa il modulo account_voucher."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -481,6 +484,14 @@ msgid ""
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Permette di gestire le immobilizzazioni possedute da un'azienda o da una "
+"persona.\n"
+"               Tiene traccia del deprezzamento di queste immobilizzazioni, e "
+"crea movimenti contabili per queste righe di ammortamento.\n"
+"               Installa il modulo account_asset. Se non viene selezionata "
+"questa casella, sarà possibile effettuare fatture e pagamenti,\n"
+"               ma non contabilizzarli (Registrazioni nel Sezionale, Piano "
+"dei Conti, ...)"
 
 #. module: account
 #. openerp-web
@@ -509,6 +520,17 @@ msgid ""
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Se è selezionato 'Arrotondamento per Riga' : per ogni imposta, l'ammontare "
+"dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine "
+"d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati "
+"saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è "
+"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale "
+"dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di "
+"vendita/fattura, poi questi ammontari saranno sommati e infine questo somma "
+"totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta "
+"compresa, sarebbe meglio selezionare 'Arrotondamento per riga' perchè "
+"l'ammontare totale dei sub-totali delle righe compreso l'imposta sarà uguale "
+"al totale imposte comprese."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1895,7 +1917,7 @@ msgstr ""
 "dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine "
 "d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati "
 "saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è "
-"selezionato 'Arrotondamento Globale': per ogni imposta, il totale "
+"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale "
 "dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di "
 "vendita/fattura, poi questi ammontari saranno sommati e infine questo somma "
 "totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta "
@@ -2039,6 +2061,108 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"\\n\n"
+"<div style=\\\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \\\">\\n\n"
+"\\n\n"
+"    <p>Buongiorno${object.partner_id.name and ' ' or "
+"''}${object.partner_id.name or ''},</p>\\n\n"
+"\\n\n"
+"    <p>E' disponibile una nuova fattura: </p>\\n\n"
+"    \\n\n"
+"    <p style=\\\"border-left: 1px solid #8e0000; margin-left: 30px;\\\">\\n\n"
+"       &nbsp;&nbsp;<strong>RIFERIMENTO</strong><br />\\n\n"
+"       &nbsp;&nbsp;Numero fattura: <strong>${object.number}</strong><br />\\"
+"n\n"
+"       &nbsp;&nbsp;Totale fattura: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\\n\n"
+"       &nbsp;&nbsp;Data fattura: ${object.date_invoice}<br />\\n\n"
+"       % if object.origin:\\n\n"
+"       &nbsp;&nbsp;Rif. ordine: ${object.origin}<br />\\n\n"
+"       % endif\\n\n"
+"       % if object.user_id:\\n\n"
+"       &nbsp;&nbsp;Vs. contatto: <a href=\\\"mailto:${object.user_id.email "
+"or ''}?subject=Invoice%20${object.number}\\\">${object.user_id.name}</a>\\n\n"
+"       % endif\\n\n"
+"    </p>  \\n\n"
+"    \\n\n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\\n\n"
+"    <% \\n\n"
+"    comp_name = quote(object.company_id.name)\\n\n"
+"    inv_number = quote(object.number)\\n\n"
+"    paypal_account = quote(object.company_id.paypal_account)\\n\n"
+"    inv_amount = quote(str(object.residual))\\n\n"
+"    cur_name = quote(object.currency_id.name)\\n\n"
+"    paypal_url = \\\"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\\\" \\\\\\n\n"
+"                 \\"
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\\\" % \\\\\\n\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\\n\n"
+"    %>\\n\n"
+"    <br/>\\n\n"
+"    <p>E' possibile anche pagare direttamente con Paypal:</p>\\n\n"
+"        <a style=\\\"margin-left: 120px;\\\" href=\\\"${paypal_url}\\\">\\n\n"
+"            <img class=\\\"oe_edi_paypal_button\\\" src=\\"
+"\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\\\"/>\\n\n"
+"        </a>\\n\n"
+"    % endif\\n\n"
+"    \\n\n"
+"    <br/>\\n\n"
+"    <p>Per qualsiasi informazione, non  esitate a contattarci.</p>\\n\n"
+"    <p>Grazie per aver scelto ${object.company_id.name or 'us'}!</p>\\n\n"
+"    <br/>\\n\n"
+"    <br/>\\n\n"
+"    <div style=\\\"width: 375px; margin: 0px; padding: 0px; background-"
+"color: #8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: "
+"5px 5px; background-repeat: repeat no-repeat;\\\">\\n\n"
+"        <h3 style=\\\"margin: 0px; padding: 2px 14px; font-size: 12px; "
+"color: #FFF;\\\">\\n\n"
+"            <strong style=\\\"text-transform:uppercase;\\"
+"\">${object.company_id.name}</strong></h3>\\n\n"
+"    </div>\\n\n"
+"    <div style=\\\"width: 347px; margin: 0px; padding: 5px 14px; line-"
+"height: 16px; background-color: #F2F2F2;\\\">\\n\n"
+"        <span style=\\\"color: #222; margin-bottom: 5px; display: block; \\"
+"\">\\n\n"
+"        % if object.company_id.street:\\n\n"
+"            ${object.company_id.street}<br/>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.street2:\\n\n"
+"            ${object.company_id.street2}<br/>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.city or object.company_id.zip:\\n\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.country_id:\\n\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\\n\n"
+"        % endif\\n\n"
+"        </span>\\n\n"
+"        % if object.company_id.phone:\\n\n"
+"            <div style=\\\"margin-top: 0px; margin-right: 0px; margin-"
+"bottom: 0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-"
+"bottom: 0px; padding-left: 0px; \\\">\\n\n"
+"                Tel.:&nbsp; ${object.company_id.phone}\\n\n"
+"            </div>\\n\n"
+"        % endif\\n\n"
+"        % if object.company_id.website:\\n\n"
+"            <div>\\n\n"
+"                Web :&nbsp;<a href=\\\"${object.company_id.website}\\"
+"\">${object.company_id.website}</a>\\n\n"
+"            </div>\\n\n"
+"        %endif\\n\n"
+"        <p></p>\\n\n"
+"    </div>\\n\n"
+"</div>\\n\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -2407,7 +2531,7 @@ msgstr "Chiusura Anno Fiscale"
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Sezionale :"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -3272,12 +3396,14 @@ msgid ""
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"La fattura(/e) selezionata non possono essere confermate perché non sono in "
+"stato 'Bozza' o 'Proforma'."
 
 #. module: account
 #: code:addons/account/account.py:1056
 #, python-format
 msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "I periodi dovrebbero appartenere alla stessa azienda."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -3290,7 +3416,7 @@ msgstr "Vendite per conto"
 #: code:addons/account/account.py:1406
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Non è possibile cancellare una registrazione contabilizzata \"%s\"."
 
 #. module: account
 #: view:account.invoice:0
@@ -3317,6 +3443,8 @@ msgid ""
 "This journal already contains items, therefore you cannot modify its company "
 "field."
 msgstr ""
+"Questo sezionale contiene già registrazioni, perciò non è possibile "
+"modificare i campi aziendali."
 
 #. module: account
 #: code:addons/account/account.py:408
@@ -3325,6 +3453,8 @@ msgid ""
 "You need an Opening journal with centralisation checked to set the initial "
 "balance."
 msgstr ""
+"E' necessario un Sezionale di apertura configurato con la centralizzazione "
+"per configurare il saldo iniziale."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3362,7 +3492,7 @@ msgstr "Agosto"
 #. module: account
 #: field:accounting.report,debit_credit:0
 msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Visualizza colonne Debito/Credito"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -4057,6 +4187,10 @@ msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Non è possibile modificare una registrazione contabilizzata in questo "
+"sezionale.\n"
+"Prima è necessario configurare il sezionale per permettere l'eliminazione "
+"delle registrazioni."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -4081,6 +4215,8 @@ msgid ""
 "There is no fiscal year defined for this date.\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Non c'è alcun anno fiscale definito per questa data.\n"
+"Crearne uno dalla configurazione del menu contabilità."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4392,12 +4528,12 @@ msgstr "Nessuna azienda non configurata !"
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Necessario un Piano dei Conti"
 
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "paid"
-msgstr ""
+msgstr "pagato"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4408,7 +4544,7 @@ msgstr "Data effettiva"
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account."
-msgstr ""
+msgstr "Il sezionale deve avere un conto di credito e di debito di default."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
@@ -4420,11 +4556,13 @@ msgstr "Configurazione conti bancari"
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create credit note, reconcile and create a new draft invoice"
 msgstr ""
+"Modificare: crea una nota di credito, riconcilia e crea una nuova bozza di "
+"fattura"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Partner ID"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
@@ -5415,7 +5553,7 @@ msgstr "Scritture da rivedere"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr "Arrotonda Globalmente"
+msgstr "Arrotondamento sul Totale"
 
 #. module: account
 #: field:account.bank.statement,message_comment_ids:0
@@ -5510,7 +5648,7 @@ msgstr ""
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Manager Finanziario"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5544,6 +5682,9 @@ msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
 "but not accounting (Journal Items, Chart of  Accounts, ...)"
 msgstr ""
+"Se questa casella non è selezionata, sarà possibile creare fatture e "
+"pagamenti, ma non contabilizzarli (Registrazioni nel sezionale, Piani dei "
+"Conti, ...)"
 
 #. module: account
 #: view:account.period:0
@@ -5577,6 +5718,8 @@ msgid ""
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Non c'è alcun periodo definito per questa data: %s.\n"
+"Crearne uno."
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5705,7 +5848,7 @@ msgstr "Anno"
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Indica che la fattura è stata spedita."
 
 #. module: account
 #: view:account.payment.term.line:0
@@ -5725,11 +5868,14 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Non è possibile creare una sequenza automatica per questo codice.\n"
+"Inserire una sequenza nella configurazione del sezionale per la numerazione "
+"automatica o creare una sequenza manualmente per questo codice."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Fattura Proforma "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5795,6 +5941,8 @@ msgstr "Codice calcolo (se tipo=codice)"
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
 msgstr ""
+"Non è possibile trovare un piano dei conti per questa azienda, è necessario "
+"crearne uno."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5854,6 +6002,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è "
+"direttamente in html così da poter essere inserito nelle viste kanban."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5917,13 +6067,15 @@ msgstr "account.installer"
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Ricalcola imposte e totale"
 
 #. module: account
 #: code:addons/account/account.py:1097
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
 msgstr ""
+"Non è possibile modificare/eliminare un sezionale che ha registrazioni in "
+"questo periodo."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5933,7 +6085,7 @@ msgstr "Incluso nell'imponibile"
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Numero Fattura Fornitore"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5955,6 +6107,8 @@ msgstr "Calcolo ammontare"
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"Non è possibile aggiungere/modificare registrazioni in un periodo chiuso %s "
+"del sezionale %s."
 
 #. module: account
 #: view:account.journal:0
@@ -5979,7 +6133,7 @@ msgstr "Inizio Periodo"
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Vista Immobilizzazioni"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -6055,12 +6209,12 @@ msgstr "Registrazioni di sezionale di fine anno"
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Bozza Rimborso "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Compilare questo form se viene immesso contante nel registro cassa:"
 
 #. module: account
 #: field:account.payment.term.line,value_amount:0
@@ -6143,7 +6297,7 @@ msgstr "Importo valuta"
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Arrotondamento per Riga"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -6200,7 +6354,7 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "E' necessario impostare una durata del periodo maggiore di 0."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -6211,7 +6365,7 @@ msgstr "Modelli di \"posizioni fiscali\""
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Bozza Rimborso"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -6249,6 +6403,8 @@ msgstr "Riconcilia Con Storno"
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
 msgstr ""
+"Non è possibile creare registrazioni nel sezionale con un conto di tipo "
+"vista."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -6262,6 +6418,8 @@ msgstr "Importo fissato"
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
+"Non è possibile cambiare l'imposta, è necessario rimuoverla e ricreare le "
+"righe."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
@@ -6386,7 +6544,7 @@ msgstr "Corrispondenza imposte"
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Selezionare Azienda"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6460,7 +6618,7 @@ msgstr "# di Linee"
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(aggiornare)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6587,7 +6745,7 @@ msgstr "Azienda collegata a questo sezionale."
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Permette una gestione multivaluta"
 
 #. module: account
 #: view:account.subscription:0
@@ -6670,7 +6828,7 @@ msgstr "Voce conto analitico"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modelli"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1090
@@ -6679,6 +6837,8 @@ msgid ""
 "You cannot cancel an invoice which is partially paid. You need to "
 "unreconcile related payment entries first."
 msgstr ""
+"Non è possibile eliminare una fattura che è parzialmente pagata. E' "
+"necessario prima annullare la riconciliazione dei relativi pagamenti."
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -6763,7 +6923,7 @@ msgstr "Mostra semplicemente i sottoconti"
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Banca e Cassa"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
@@ -6849,13 +7009,15 @@ msgstr "Crediti"
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Non è possibile creare registrazioni contabili su conti chiusi."
 
 #. module: account
 #: code:addons/account/account_invoice.py:594
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
+"Il conto dell'azienda delle righe della fattura non coincide con l'azienda "
+"emittente la fattura."
 
 #. module: account
 #: view:account.invoice:0
@@ -6876,7 +7038,7 @@ msgstr "La valuta del conto non e' eguale a quella dell'azienda."
 #: code:addons/account/installer.py:48
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Personalizzazioni"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6887,7 +7049,7 @@ msgstr "Correnti"
 #: code:addons/account/account_invoice.py:1305
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "La fattura '%s' è parzialmente pagata: %s%s di %s%s (%s%s residuo)."
 
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
@@ -6903,7 +7065,7 @@ msgstr "Capitale"
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Conto Trasferimenti Interni"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:33
@@ -6920,7 +7082,7 @@ msgstr "Percentuale"
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Arrotondamento sul Totale"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6952,7 +7114,7 @@ msgstr "Numero fattura"
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Differenza"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -7021,12 +7183,12 @@ msgstr ""
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Errore Utente!"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Annulla"
 
 #. module: account
 #: selection:account.account,type:0
@@ -7044,7 +7206,7 @@ msgstr "Voci Giornale Analitico"
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Ha un'azienda di default"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -7193,6 +7355,8 @@ msgid ""
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"Le percentuali delle Righe delle Condizioni di Pagamento devono essere "
+"comprese tra 0 e 1, esempio: 0.02 per 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -7213,7 +7377,7 @@ msgstr "Conto Categoria Costi"
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Il nome dell'imposta deve essere unico per azienda!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7253,12 +7417,14 @@ msgid ""
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
 msgstr ""
+"Non è possibile indicare una valuta secondaria se è la stessa di quella "
+"principale."
 
 #. module: account
 #: code:addons/account/account_invoice.py:1321
 #, python-format
 msgid "Customer invoice"
-msgstr ""
+msgstr "Fattura cliente"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -7343,13 +7509,13 @@ msgstr "Conto Economico"
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "Transazioni Totali"
 
 #. module: account
 #: code:addons/account/account.py:635
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Non è possibile eliminare un conto con registrazioni contabili."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1095
@@ -7393,7 +7559,7 @@ msgstr "Manuale"
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "E' necessario impostare una data iniziale."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7442,7 +7608,7 @@ msgstr "Registrazioni Sezionale"
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "Nessun periodo trovato nella fattura."
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7488,6 +7654,8 @@ msgstr "Tutte le registrazioni"
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
 msgstr ""
+"E' possibile solo riconciliare registrazioni contabili con lo stesso "
+"partnere."
 
 #. module: account
 #: view:account.journal.select:0
@@ -7601,7 +7769,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Gestione pagamenti clienti"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7620,6 +7788,8 @@ msgid ""
 "Error!\n"
 "The start date of a fiscal year must precede its end date."
 msgstr ""
+"Errore!\n"
+"La data iniziale di un anno fiscale deve precedere quella finale."
 
 #. module: account
 #: view:account.tax.template:0
@@ -7635,7 +7805,7 @@ msgstr "Fatture Clienti"
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Varie"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7700,6 +7870,7 @@ msgstr "Documento di origine"
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Non c'è un conto di costo definito per questo prodotto: \"%s\" (id:%d)."
 
 #. module: account
 #: constraint:account.account:0
@@ -7717,7 +7888,7 @@ msgstr "Report contabile"
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Conto Valuta"
 
 #. module: account
 #: report:account.invoice:0
@@ -7731,6 +7902,8 @@ msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
 "instead."
 msgstr ""
+"Non è possibile eliminare una fattura che non è annullata. E' necessario "
+"creare invece una nota di credito."
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7782,7 +7955,7 @@ msgstr "Movimenti aperti su conto di spesa"
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Riferimento cliente"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -7905,7 +8078,7 @@ msgstr "Movimenti Aperti Conto di Ricavo"
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Consentire fatture proforma"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7936,12 +8109,12 @@ msgstr "Crea registrazioni"
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Valuta principale di questa azienda."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -7969,7 +8142,7 @@ msgstr "Sezionale Contabile"
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Metodo di arrotondamento delle imposte"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -8021,6 +8194,8 @@ msgid ""
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Non c'è un conto di credito di default definito \n"
+"nel sezionale \"%s\"."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -8278,7 +8453,7 @@ msgstr "Codice"
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Sequenza note di credito"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8292,7 +8467,7 @@ msgstr "Conferma le scritture contabili"
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralised Counterpart"
-msgstr ""
+msgstr "Contropartita Centralizzata"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -8348,7 +8523,7 @@ msgstr "Sequenza"
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Conto Paypal"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
@@ -8367,11 +8542,13 @@ msgid ""
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Errore!\n"
+"Non è possibile creare conti ricorsivi."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
@@ -8381,7 +8558,7 @@ msgstr "Collegamento alle voci del sezionale generate automaticamente."
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -8404,7 +8581,7 @@ msgstr "Saldo Calcolato"
 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
 #, python-format
 msgid "You must choose at least one record."
-msgstr ""
+msgstr "E' necessario selezionare almeno un record."
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -8479,7 +8656,7 @@ msgstr "Mastro del partner"
 #: code:addons/account/account_invoice.py:1340
 #, python-format
 msgid "%s <b>cancelled</b>."
-msgstr ""
+msgstr "%s <b>annullato</b>."
 
 #. module: account
 #: code:addons/account/account.py:652
@@ -8493,12 +8670,12 @@ msgstr "Attenzione !"
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione"
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Metodo di Arrotondamento calcolo Imposte"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
@@ -8693,7 +8870,7 @@ msgstr "Registro Costi"
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Nessun Anno Fiscale Definito per Questa Azienda"
 
 #. module: account
 #: view:account.invoice:0
@@ -10480,7 +10657,7 @@ msgstr "Utile (Perdita) da visualizzare"
 #: code:addons/account/account_invoice.py:368
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "Non c'è un Sezionale(/i) di Vendita/Acquisto definito."
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -11396,7 +11573,7 @@ msgstr ""
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round per line"
-msgstr "Arrotonda per riga"
+msgstr "Arrotondamento per Riga"
 
 #. module: account
 #: help:account.move.line,amount_residual_currency:0
diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po
index 77efde5acd5..7a4d62d5876 100644
--- a/addons/account/i18n/zh_CN.po
+++ b/addons/account/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 16:27+0000\n"
+"PO-Revision-Date: 2012-12-06 14:09+0000\n"
 "Last-Translator: ccdos <ccdos@163.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: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1137,7 +1137,7 @@ msgstr "科目名称"
 #. module: account
 #: field:account.journal,with_last_closing_balance:0
 msgid "Opening With Last Closing Balance"
-msgstr "用末期的期终余额打开"
+msgstr "用上个期末余额作期初"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -1959,7 +1959,7 @@ msgstr "Pending Accounts"
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Cancel Fiscal Year Opening Entries"
-msgstr ""
+msgstr "取消财务年度未结案分录"
 
 #. module: account
 #: report:account.journal.period.print.sale.purchase:0
diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po
index 5f1fd8a54e8..0b0894681b8 100644
--- a/addons/account_analytic_analysis/i18n/de.po
+++ b/addons/account_analytic_analysis/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-08 08:41+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 21:29+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -24,17 +25,17 @@ msgstr ""
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Group By..."
-msgstr "Gruppiere nach..."
+msgstr "Gruppierung ..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Abrechenbar"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "Verbleibend"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -58,7 +59,7 @@ msgstr "vorheriger Arbeitstag"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_to_invoice:0
 msgid "Uninvoiced Amount"
-msgstr "Nicht berechnete Beträge"
+msgstr "Abrechenbarer Betrag"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -69,56 +70,58 @@ msgid ""
 "to\n"
 "                            define the customer invoice price rate."
 msgstr ""
+"Die abzurechnenden Arbeitsstunden werden gemäß der Preisliste des Vertrags "
+"für das beim Mitarbeiter hinterlegte Produkt berechnet."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "=> Rechnung"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
 msgid "Invoiced Amount"
-msgstr "Rechnungsbetrag"
+msgstr "Abgerechnet"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_invoiced_date:0
 msgid "Date of Last Invoiced Cost"
-msgstr "Datum letzte Berechnung"
+msgstr "Datum der letzten Abrechnung"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
-msgstr ""
+msgstr "Summe abzurechnende Beträge"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
-msgstr "Gesamtbetrag Kundenrechnungen für dieses Konto"
+msgstr "Bereits abgerechnete Beträge"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
+msgstr "Summe abgerechneter Arbeitszeiten"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr "Berechnet als: Verrechneter Betrag / Gesamt Zeit"
+msgstr "Berechnungsformel:  Abgerechnete Beträge / Abgerechnete Stunden"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts not assigned"
-msgstr ""
+msgstr "Nicht unterzeichnete Verträge"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "Kunde"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr "Verträge, die keinem Account Manager zugeordnet sind."
+msgstr "Verträge ohne verantwortlichen Mitarbeiter"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -138,11 +141,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klicken Sie um neuen Vertrag anzulegen.\n"
+"              </p><p>\n"
+"                Sie finden hier die zu verlängernden Verträge, bei denen "
+"entweder das terminierte Vertragsende\n"
+"                bereits überschritten wurde oder die geleistete Arbeitszeit "
+"nicht mehr durch die vertraglich vereinbarte   abrechenbare Arbeitszeit "
+"abgedeckt wird.\n"
+"              </p><p>\n"
+"                OpenERP versetzt automatisch die zu erneuernden Verträge in "
+"den Status Wiedervorlage. Nach der Erneuerung einer Vereinbarung sollte der "
+"Verkäufer den alten Vertrag entweder abschließen oder erneuern. \n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "End Date"
-msgstr "Enddatum"
+msgstr "Ende Datum"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
@@ -156,12 +173,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
-msgstr ""
+msgstr "Berechnungsformel: Maximale Zeit - Abgerechnete Zeit"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "Geplant"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -174,7 +191,7 @@ msgstr "Analytisches Konto"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Berechnungsformel: Geplanter Umsatz - Gesamte Kosten"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
@@ -204,7 +221,7 @@ msgstr "Marge (%)"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Berechnungsformel: Maximale Zeit - Geleistete Zeit"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
@@ -224,17 +241,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action
 msgid "Template of Contract"
-msgstr ""
+msgstr "Vertragsvorlage"
 
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Vertragsvorlage ist verbindlich"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Gesamte Arbeitszeit"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -244,18 +261,17 @@ msgstr "Realisierte Marge"
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
-msgstr "Stundenanzahl pro Monat"
+msgstr "Stunden pro Monat"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
-msgstr ""
-"Berechnung nutzt diese Formel: (absolute Gewinnspanne / Gesamtkosten) * 100"
+msgstr "Berechnungsformel: (Marge / Gesamte Kosten) * 100"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "oder Ansicht"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -272,7 +288,7 @@ msgstr "Monat"
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Abrechenbare Zeiten &  Sachaufwendungen"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
@@ -283,12 +299,12 @@ msgstr "Verträge"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
+msgstr "Start Datum"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Abgerechnet"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -296,8 +312,8 @@ msgid ""
 "The contracts to be renewed because the deadline is passed or the working "
 "hours are higher than the allocated hours"
 msgstr ""
-"Der Vertrag muss erneuert werden, das die Frist abgelaufen ist oder die "
-"geplanten Stunden überschritten sind"
+"Zu erneuernde Verträge, aufgrund Laufzeitende oder Überschreitung der "
+"vereinbarten Stunden"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -307,7 +323,7 @@ msgstr "Verträge, die zu erneuern sind"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Stundenzettel"
 
 #. module: account_analytic_analysis
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:461
@@ -328,7 +344,7 @@ msgstr "Überfällige Mengen"
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -349,13 +365,12 @@ msgstr "Ein Vertrag ist ein Analyse Konto mit Partner"
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Aufträge"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
-msgstr ""
-"Wenn Kosten verrechnet werden, dann ist dies das Datum der letzten Rechnung."
+msgstr "Letztmaliges Datum der Kostenabrechnung"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -364,9 +379,8 @@ msgid ""
 "if all these costs have been invoiced at the normal sale price provided by "
 "the pricelist."
 msgstr ""
-"Ausgehend von den entstandenen Projektkosten. Welcher Erlös wäre erzielt "
-"worden, wenn diese Kosten auf der Basis der normalen Preisliste des Verkaufs "
-"abgerechnet worden wären."
+"Theoretischer Erlös, wenn alle Kosten auf Basis der \"Allgemeinen "
+"Preisliste\" abgerechnet worden wären."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,user_ids:0
@@ -387,6 +401,16 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Klicken Sie zur Erstellung einer Vertragsvorlage.\n"
+"                </p><p>\n"
+"                    Vorlagen sind vordefinierte Verträge für Projekte, aus "
+"denen zur schnellen\n"
+"und einfachen Erstellung neuer Vereinbarungen, die zugrundeliegenden "
+"Einstellungen und Konditionen\n"
+"übernommen werden.\n"
+"                </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -404,6 +428,8 @@ msgid ""
 "Allows you to set the template field as required when creating an analytic "
 "account or a contract."
 msgstr ""
+"Bei Erstellung eines Vertrags oder Projekt ist die Verwendung einer Vorlage "
+"verpflichtend."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -434,16 +460,28 @@ msgid ""
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Klicken Sie zur Erstellung eines Vertrags.\n"
+"                </p><p>\n"
+"                    Setzen Sie Verträge ein, um hierüber Aufgaben, Vorfälle, "
+"Stundenzettel oder Abrechnungen \n"
+"                    geleisteter Arbeitszeiten, Personalspesen und/oder "
+"Verkaufsaufträge zu verfolgen. OpenERP\n"
+"                    überwacht dabei automatisch, ob Verträge erneuert werden "
+"müssen und benachrichtigt den\n"
+"                    zugewiesenen Verkäufer.\n"
+"                </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,toinvoice_total:0
 msgid "Total to Invoice"
-msgstr ""
+msgstr "Gesamt Abrechnungsbetrag"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Sale Orders"
-msgstr ""
+msgstr "Verkaufsaufträge"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -453,18 +491,18 @@ msgstr "Offen"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoiced_total:0
 msgid "Total Invoiced"
-msgstr ""
+msgstr "Abgerechneter Betrag"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_ca:0
 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount."
 msgstr ""
-"Berechnet auf Basis der Formel: Max. Einkaufspreis - Abgerechneter Betrag"
+"Berechnungsformel: Geplanter Abrechnungsbetrag - Abgerechneter Betrag"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Responsible"
-msgstr ""
+msgstr "Projektleiter"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_invoice_date:0
@@ -484,16 +522,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Sie finden hier die aufgezeichneten Stundenzettel und "
+"eingekauften Sachmittel, \n"
+"                die für diesen Vertrag abgerechnet werden können. Für neue "
+"abzurechnende\n"
+"                Arbeitszeiten sollten Sie das Menü für die Stundenzettel "
+"benutzen.\n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_non_invoiced:0
 msgid "Uninvoiced Time"
-msgstr "nicht verrechnete Zeit"
+msgstr "Nicht abgerechnete Zeit"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Invoicing"
-msgstr "Eingangsrechnung"
+msgstr "Abrechnung"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,total_cost:0
@@ -507,6 +554,10 @@ msgid ""
 "remaining subtotals which, in turn, are computed as the maximum between "
 "'(Estimation - Invoiced)' and 'To Invoice' amounts"
 msgstr ""
+"Insgesamt verbleibender Abrechnungsbetrag für diesen Vertrag. Der Betrag "
+"errechnet sich aus der Summe der Einzelpositionen, sowie im Umkehrschluss "
+"aus dem Maximalbetrag der Differenz 'Geplant - Abgerechnet' und "
+"'Abzurechnen'."
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue
@@ -517,7 +568,7 @@ msgstr "Zu erneuernde Verträge"
 #. module: account_analytic_analysis
 #: help:account.analytic.account,toinvoice_total:0
 msgid " Sum of everything that could be invoiced for this contract."
-msgstr ""
+msgstr " Summe abzurechnender Beträge für diesen Vertrag"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,theorical_margin:0
@@ -527,22 +578,22 @@ msgstr "Theoretische Marge"
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_total:0
 msgid "Total Remaining"
-msgstr ""
+msgstr "Summe verbleibende Abrechnung"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,real_margin:0
 msgid "Computed using the formula: Invoiced Amount - Total Costs."
-msgstr "Berechnet durch die Formel: Rechnungsbetrag - Gesamt Kosten."
+msgstr "Berechnungsformel: Rechnungsbetrag - Gesamt Kosten."
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_est:0
 msgid "Estimation of Hours to Invoice"
-msgstr ""
+msgstr "Geplante abzurechnende Stunden"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_invoices:0
 msgid "Fixed Price"
-msgstr ""
+msgstr "Festpreis"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_worked_date:0
@@ -557,12 +608,12 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:sale.config.settings,group_template_required:0
 msgid "Mandatory use of templates."
-msgstr ""
+msgstr "Zwingende Nutzung von Vorlagen"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts Having a Partner"
-msgstr ""
+msgstr "Verträge mit Kunden"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,total_cost:0
@@ -577,7 +628,7 @@ msgstr ""
 #. module: account_analytic_analysis
 #: field:account.analytic.account,est_total:0
 msgid "Total Estimation"
-msgstr ""
+msgstr "Erwartete Gesamtabrechnung"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,remaining_ca:0
@@ -605,16 +656,18 @@ msgstr "Gesamtzeit"
 msgid ""
 "the field template of the analytic accounts and contracts will be required."
 msgstr ""
+"ein Auswahl für die Projekt  Vorlage und Vertragseinstellungen sind "
+"erforderlich"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,invoice_on_timesheets:0
 msgid "On Timesheets"
-msgstr ""
+msgstr "auf Stundenzettel"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Total"
-msgstr ""
+msgstr "Gesamt"
 
 #~ msgid ""
 #~ "Number of hours that can be invoiced plus those that already have been "
diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po
index fa4c27ef43f..c97598df0fe 100644
--- a/addons/account_analytic_default/i18n/de.po
+++ b/addons/account_analytic_default/i18n/de.po
@@ -7,31 +7,32 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-01-13 19:25+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 22:26+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user
 msgid "Analytic Rules"
-msgstr "Analytische Kontierungsrichtlinie"
+msgstr "Kostenstellen Kontierungsregeln"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr "Gruppierung..."
+msgstr "Gruppierung ..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytic Account."
-msgstr ""
+msgstr "Vorgabe für Ende Datum der Kostenstelle"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_stock_picking
@@ -50,6 +51,9 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytic account)"
 msgstr ""
+"Wählen Sie einen Partner aus, der bereits eine spezifizierte Kostenstelle "
+"hat (z.B. durch neu definierte Ausgangsrechnung oder einen Verkaufsauftrag  "
+"bei einer Auswahl des  unterzuordnenden Partners)"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -60,7 +64,7 @@ msgstr "Produkt"
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_analytic_default
 msgid "Analytic Distribution"
-msgstr "Analytische Verrechnung"
+msgstr "Kostenstellen Distribution"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -86,18 +90,21 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytic account)"
 msgstr ""
+"Wählen Sie ein Produkt mit hinterlegter Standard Kostenstelle (z.B. bei der "
+"Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der Auswahl "
+"des Produkts eine automatische Erkennung der Kostenstelle gestartet)."
 
 #. module: account_analytic_default
 #: field:account.analytic.default,date_stop:0
 msgid "End Date"
-msgstr "Endedatum"
+msgstr "Ende Datum"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list
 #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list
 msgid "Analytic Defaults"
-msgstr "Analytische Buchungsvorlage"
+msgstr "Kostenstellen Buchungsvorlage"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
@@ -111,12 +118,16 @@ msgid ""
 "default (e.g. create new customer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytic account)"
 msgstr ""
+"Wählen Sie ein Unternehmen mit hinterlegter Standard Kostenstelle (z.B. bei "
+"der Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der "
+"Auswahl des Unternehmens eine automatische Erkennung der Kostenstelle "
+"gestartet)."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,user_id:0
 msgid ""
 "Select a user which will use analytic account specified in analytic default."
-msgstr ""
+msgstr "Wählen Sie einen Benutzer mit der hinterlegten Standard Kostenstelle"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_account_invoice_line
@@ -127,17 +138,17 @@ msgstr "Rechnungszeile"
 #: view:account.analytic.default:0
 #: field:account.analytic.default,analytic_id:0
 msgid "Analytic Account"
-msgstr "Analytische Konten"
+msgstr "Kostenstelle"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytic Account."
-msgstr ""
+msgstr "Standard Start Datum für Kostenstelle"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Accounts"
-msgstr "Konten"
+msgstr "Kostenstellen"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -154,9 +165,7 @@ msgstr "Start Datum"
 #: help:account.analytic.default,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of analytic distribution"
-msgstr ""
-"Zeigt eine Liste analytischer Konten, in der Reihenfolge wie von Ihnen "
-"festgelegt."
+msgstr "Zeigt eine Liste mit Kostenstellen"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po
index 44a0658b311..20f5dd70abc 100644
--- a/addons/account_analytic_plans/i18n/de.po
+++ b/addons/account_analytic_plans/i18n/de.po
@@ -7,14 +7,15 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-10-12 23:19+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 22:38+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:34+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account4_ids:0
@@ -48,7 +49,7 @@ msgstr "Anteil (%)"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:234
 #, python-format
 msgid "The total should be between %s and %s."
-msgstr ""
+msgstr "Die Summe sollte zwischen %s und %s sein."
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan:0
@@ -131,7 +132,7 @@ msgstr "Zeige keine leeren Zeilen"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "There are no analytic lines related to account %s."
-msgstr ""
+msgstr "Es gibt keine Kostenstellen Buchungen für das Konto %s."
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account3_ids:0
@@ -142,7 +143,7 @@ msgstr "Konto3 ID"
 #: view:account.crossovered.analytic:0
 #: view:analytic.plan.create.model:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_analytic_line
@@ -281,7 +282,7 @@ msgstr "Bankauszug Buchungen"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fehler !"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -297,7 +298,7 @@ msgstr "Druck Kreuzanalyse"
 #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Benutzerfehler !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account6_ids:0
@@ -316,6 +317,7 @@ msgstr "Analytisches Journal"
 #, python-format
 msgid "Please put a name and a code before saving the model."
 msgstr ""
+"Bitte tragen Sie eine Bezeichnung und ein Kürzel vor dem Speichern ein."
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -347,7 +349,7 @@ msgstr "Journal"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:486
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal."
-msgstr ""
+msgstr "Sie müssen eine Kostenstelle für das Journal '%s' eintragen"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:342
@@ -375,7 +377,7 @@ msgstr "Rechnungszeile"
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41
 #, python-format
 msgid "There is no analytic plan defined."
-msgstr ""
+msgstr "Es existieren Kostenstellen und ein Plan"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
@@ -402,7 +404,7 @@ msgstr "Analytische Verrechnung"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:221
 #, python-format
 msgid "A model with this name and code already exists."
-msgstr ""
+msgstr "Ein Modul mit ähnlichem Name und Kürzel existiert bereits."
 
 #. module: account_analytic_plans
 #: help:account.analytic.plan.line,root_analytic_id:0
diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po
index 0fa2625a99e..d299ad86c07 100755
--- a/addons/account_asset/i18n/de.po
+++ b/addons/account_asset/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-05-10 17:36+0000\n"
-"Last-Translator: Ferdinand-camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 23:48+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -156,7 +157,7 @@ msgstr "Abschreibungs Datum"
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You cannot create recursive assets."
-msgstr ""
+msgstr "Fehler ! Sie können keine rekursiven Anlagengegenstände definieren."
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
@@ -201,7 +202,7 @@ msgstr "# der Abschreibungsbuchungen"
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
 msgid "Number of Months in a Period"
-msgstr ""
+msgstr "Anzahl Monate in Perioden"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -389,7 +390,7 @@ msgstr "Zeit Methode"
 #: view:asset.depreciation.confirmation.wizard:0
 #: view:asset.modify:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_asset
 #: field:account.asset.asset,note:0
@@ -446,12 +447,17 @@ msgid ""
 "You can manually close an asset when the depreciation is over. If the last "
 "line of depreciation is posted, the asset automatically goes in that status."
 msgstr ""
+"Wenn eine Anlage angelegt wird, ist der Status \"Entwurf\". Nach Bestätigung "
+"der Anlage wird dies aktiv und Abschreibungen können verbucht werden. Sie "
+"können die Anlage automatisch schließen, wenn die Abschreibungen vorbei "
+"sind.  Nach Verbuchung der letzen Abschreibung wird die Anlage automatisch "
+"geschlossen."
 
 #. module: account_asset
 #: field:account.asset.asset,state:0
 #: field:asset.asset.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -498,7 +504,7 @@ msgstr "Berechnen"
 #. module: account_asset
 #: view:account.asset.history:0
 msgid "Asset History"
-msgstr ""
+msgstr "Historie Anlagegegüter"
 
 #. module: account_asset
 #: field:asset.asset.report,name:0
@@ -619,7 +625,7 @@ msgstr "Abzuschreibender Betrag"
 #. module: account_asset
 #: field:account.asset.asset,name:0
 msgid "Asset Name"
-msgstr ""
+msgstr "Anlagegut Bezeichnung"
 
 #. module: account_asset
 #: field:account.asset.category,open_asset:0
@@ -670,11 +676,16 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"Über diesen Report erhalten Sie einen Überblick über alle Abschreibungen. "
+"Die Suche kann auch zur \n"
+"individuellen und persönlichen Auswertung über das Anlagevermögen benutzt "
+"werden.\n"
+"        "
 
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross Value"
-msgstr ""
+msgstr "Brutto Erlös"
 
 #. module: account_asset
 #: field:account.asset.category,name:0
diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po
index 53fda3a1501..f6bc79de2b7 100644
--- a/addons/account_bank_statement_extensions/i18n/de.po
+++ b/addons/account_bank_statement_extensions/i18n/de.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-02-09 15:02+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 23:53+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -59,7 +60,7 @@ msgstr "Storniere ausgewählte Buchungszeilen"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,val_date:0
 msgid "Value Date"
-msgstr ""
+msgstr "Datum Wertstellung"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -104,7 +105,7 @@ msgstr "Batch Zahlungs Info"
 #. module: account_bank_statement_extensions
 #: field:account.bank.statement.line,state:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_bank_statement_extensions
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
@@ -113,11 +114,13 @@ msgid ""
 "Delete operation not allowed.             Please go to the associated bank "
 "statement in order to delete and/or modify bank statement line."
 msgstr ""
+"Lösche Operation ist nicht erlaubt. Bitte wechseln Sie zum angebundenen "
+"Bankauszug Beleg, um dort die Zahlungsvorschläge zu  beurteilen."
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
 msgid "or"
-msgstr ""
+msgstr "oder"
 
 #. module: account_bank_statement_extensions
 #: view:confirm.statement.line:0
@@ -219,7 +222,7 @@ msgstr "Manuell"
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
 msgid "Bank Transaction"
-msgstr ""
+msgstr "Bank Auszug"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line:0
@@ -326,7 +329,7 @@ msgstr "Buchungszeilen"
 #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Warnung !"
 
 #. module: account_bank_statement_extensions
 #: view:account.bank.statement.line.global:0
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index fd4ab89ce0f..72995709663 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-25 20:59+0000\n"
+"PO-Revision-Date: 2012-12-06 11:57+0000\n"
 "Last-Translator: Erwin van der Ploeg (Endian Solutions) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: account_budget
 #: view:account.budget.analytic:0
@@ -367,6 +367,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Een budget is een prognose van uw bedrijfs inkomsten en "
+"uitgaven,\n"
+"                welke wordt verwacht in een bepaalde periode in de toekomst. "
+"Een budget\n"
+"                wordt gedefinieerd op grootboekrekeningen en/of "
+"kostenplaatsen (welke \n"
+"                projecten, afdelingen, productcategorieën, etc. "
+"vertegenwoordigen)\n"
+"              </p><p>\n"
+"                Door deze geldstromen bij te houden is het waarschijnlijk, "
+"dat u niet\n"
+"                te veel uitgeeft en u een grotere kans heeft u financieel "
+"doelen te\n"
+"                realiseren. Definieer een budget door de verwachte opbrengst "
+"in\n"
+"                te geven per kostenplaats en volg de voortgang, gebaseerd op "
+"werkelijke\n"
+"                gerealiseerde gegevens, gedurende die periode.\n"
+"              </p>\n"
+"            "
 
 #. module: account_budget
 #: report:account.budget:0
diff --git a/addons/account_check_writing/__openerp__.py b/addons/account_check_writing/__openerp__.py
index f5a2355b002..e01c17d66a7 100644
--- a/addons/account_check_writing/__openerp__.py
+++ b/addons/account_check_writing/__openerp__.py
@@ -30,6 +30,7 @@ Module for the Check Writing and Check Printing.
     'website': 'http://www.openerp.com',
     'depends' : ['account_voucher'],
     'data': [
+        'wizard/account_check_batch_printing_view.xml',
         'account_check_writing_report.xml',
         'account_view.xml',
         'account_voucher_view.xml',
diff --git a/addons/account_check_writing/wizard/__init__.py b/addons/account_check_writing/wizard/__init__.py
new file mode 100644
index 00000000000..d39c8716122
--- /dev/null
+++ b/addons/account_check_writing/wizard/__init__.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import account_check_batch_printing
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_check_writing/wizard/account_check_batch_printing.py b/addons/account_check_writing/wizard/account_check_batch_printing.py
new file mode 100644
index 00000000000..76489dee901
--- /dev/null
+++ b/addons/account_check_writing/wizard/account_check_batch_printing.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from tools.translate import _
+
+from osv import fields, osv
+
+class account_check_write(osv.osv_memory):
+    _name = 'account.check.write'
+    _description = 'Prin Check in Batch'
+
+    _columns = {
+        'check_number': fields.integer('Next Check Number', required=True, help="The number of the next check number to be printed."),
+    }
+
+    def _get_next_number(self, cr, uid, context=None):
+        dummy, sequence_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_check_writing', 'sequence_check_number')
+        return self.pool.get('ir.sequence').read(cr, uid, sequence_id, ['number_next'])['number_next']
+
+    _defaults = {
+        'check_number': _get_next_number,
+   }
+
+    def print_check_write(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        voucher_obj = self.pool.get('account.voucher')
+        ir_sequence_obj = self.pool.get('ir.sequence')
+
+        #update the sequence to number the checks from the value encoded in the wizard
+        dummy, sequence_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_check_writing', 'sequence_check_number')
+        increment = ir_sequence_obj.read(cr, uid, sequence_id, ['number_increment'])['number_increment']
+        new_value = self.browse(cr, uid, ids[0], context=context).check_number
+        ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
+
+        #validate the checks so that they get a number
+        voucher_ids = context.get('active_ids', [])
+        for check in voucher_obj.browse(cr, uid, voucher_ids, context=context):
+            new_value += increment
+            if check.number:
+                raise osv.except_osv(_('Error!'),_("One of the printed check already got a number."))
+        voucher_obj.proforma_voucher(cr, uid, voucher_ids, context=context)
+
+        #update the sequence again (because the assignation using next_val was made during the same transaction of
+        #the first update of sequence)
+        ir_sequence_obj.write(cr, uid, sequence_id, {'number_next': new_value})
+
+        #print the checks
+        check_layout_report = {
+            'top' : 'account.print.check.top',
+            'middle' : 'account.print.check.middle',
+            'bottom' : 'account.print.check.bottom',
+        }
+        check_layout = voucher_obj.browse(cr, uid, voucher_ids[0], context=context).company_id.check_layout
+        if not check_layout:
+            check_layout = 'top'
+        return {
+            'type': 'ir.actions.report.xml', 
+            'report_name':check_layout_report[check_layout],
+            'datas': {
+                'model':'account.voucher',
+                'ids': voucher_ids,
+                'report_type': 'pdf'
+                },
+            'nodestroy': True
+            }
+
+account_check_write()
+
diff --git a/addons/account_check_writing/wizard/account_check_batch_printing_view.xml b/addons/account_check_writing/wizard/account_check_batch_printing_view.xml
new file mode 100644
index 00000000000..ea81c444d91
--- /dev/null
+++ b/addons/account_check_writing/wizard/account_check_batch_printing_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="0">
+
+        <record id="view_account_check_write" model="ir.ui.view">
+            <field name="name">account.check.form</field>
+            <field name="model">account.check.write</field>
+            <field name="arch" type="xml">
+                <form string="Check" version="7.0">
+                    <group col="4">
+                        <field name="check_number"/>
+                    </group>
+                    <footer>
+                        <button name="print_check_write" string="Print Check" type="object" class="oe_highlight"/> or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <act_window id="action_account_check_write"
+            multi="True"
+            name="Print Check in Batch"
+            res_model="account.check.write" src_model="account.voucher"
+            view_mode="form" target="new" view_type="form" /> 
+
+    </data>
+</openerp>
diff --git a/addons/account_test/__init__.py b/addons/account_test/__init__.py
new file mode 100644
index 00000000000..106682f4a12
--- /dev/null
+++ b/addons/account_test/__init__.py
@@ -0,0 +1,2 @@
+import account_test
+import report
diff --git a/addons/account_test/__openerp__.py b/addons/account_test/__openerp__.py
new file mode 100644
index 00000000000..cfd4007fed0
--- /dev/null
+++ b/addons/account_test/__openerp__.py
@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2011 CCI Connect asbl (http://www.cciconnect.be) All Rights Reserved.
+#                       Philmer <philmer@cciconnect.be>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#
+##############################################################################
+{
+    'name' : 'Accounting Consistency Tests',
+    'version' : '1.0',
+    'author' : 'OpenERP',
+    'category' : 'Accounting & Finance',
+    'website': 'http://www.openerp.com',
+    'description': """
+Asserts on accounting.
+======================
+With this module you can manually check consistencies and inconsistencies of accounting module from menu Reporting/Accounting/Accounting Tests.
+
+You can write a query in order to create Consistency Test and you will get the result of the test 
+in PDF format which can be accessed by Menu Reporting -> Accounting Tests, then select the test 
+and print the report from Print button in header area.
+""",
+    'depends' : ['account'],
+    'data' : [
+        'security/ir.model.access.csv',
+        'account_test_view.xml',
+        'account_test_report.xml',
+        'account_test_data.xml',
+    ],
+    'active': False,
+    'installable': True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
new file mode 100644
index 00000000000..bf925e8236a
--- /dev/null
+++ b/addons/account_test/account_test.py
@@ -0,0 +1,65 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2005-2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
+#
+# $Id: product_expiry.py 4304 2006-10-25 09:54:51Z ged $
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from osv import fields,osv
+import pooler
+import netsvc
+import time
+from xml import dom
+
+
+CODE_EXEC_DEFAULT = '''\
+res = []
+cr.execute("select id, code from account_journal")
+for record in cr.dictfetchall():
+    res.append(record['code'])
+result = res
+'''
+
+class accounting_assert_test(osv.osv):
+    _name = "accounting.assert.test"
+    _order = "sequence"
+
+    _columns = {
+        'name': fields.char('Test Name', size=256, required=True, select=True, translate=True),
+        'desc': fields.text('Test Description', select=True, translate=True),
+        'code_exec': fields.text('Python code', required=True),
+        'active': fields.boolean('Active'),
+        'sequence': fields.integer('Sequence'),
+    }
+
+    _defaults = {
+        'code_exec': CODE_EXEC_DEFAULT,
+        'active': True,
+        'sequence': 10,
+    }
+
+accounting_assert_test()
+
diff --git a/addons/account_test/account_test_data.xml b/addons/account_test/account_test_data.xml
new file mode 100644
index 00000000000..4970bef6a0d
--- /dev/null
+++ b/addons/account_test/account_test_data.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+
+    <record model="accounting.assert.test" id="account_test_01">
+        <field name="sequence">1</field>
+        <field name="name">Test 1: General balance</field>
+        <field name="desc">Check the balance: Debit sum = Credit sum</field>
+        <field name="code_exec"><![CDATA[sql="""SELECT
+sum(debit)-sum(credit) as balance
+FROM  account_move_line 
+"""
+cr.execute(sql)
+result=[]
+res= cr.dictfetchall()
+if res[0]['balance']!=0.0 and res[0]['balance'] is not None:
+  result.append(_('* The difference of the balance is: '))
+  result.append(res)
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_02">
+        <field name="sequence">2</field>
+        <field name="name">Test 2: Opening a fiscal year</field>
+        <field name="desc">Check if the balance of the new opened fiscal year matches with last year's balance</field>
+        <field name="code_exec"><![CDATA[result = []
+cr.execute("select coalesce(sum(debit),0) as debit_new_fyear,coalesce(sum(credit),0) as credit_new_fyear from account_move_line where period_id in (select id from account_period where state='draft' and special order by id desc limit 1);")
+rec =  cr.dictfetchall()
+cr.execute("select coalesce(sum(debit),0) as debit_last_fyear,coalesce(sum(credit),0) as credit_last_fyear from account_move_line where period_id in (select period_id from account_fiscalyear where state='done' order by id desc limit 1);")
+rec2= cr.dictfetchall()
+if (rec2[0]['credit_last_fyear']-rec[0]['credit_new_fyear']!=0) or (rec2[0]['debit_last_fyear']-rec[0]['debit_new_fyear']!=0) :
+   result.append(_('* New fiscalyear debit and credit are:'))
+   result.append(rec[0])
+   result.append(_('* Last year debit and credit are:'))
+   result.append(rec2[0])
+
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_03">
+        <field name="sequence">3</field>
+        <field name="name">Test 3: Movement lines</field>
+        <field name="desc">Check if movement lines are balanced and have the same date and period</field>
+        <field name="code_exec"><![CDATA[order_columns=['am_date','ml_date','am.period_id','ml.period_id','am.id']
+sql="""SELECT
+  am.id as move_id,
+  sum(debit)-sum(credit) as balance,
+  am.period_id,
+  ml.period_id,
+  am.date as am_date,
+  ml.date as ml_date
+FROM account_move am, account_move_line ml
+WHERE
+  ml.move_id = am.id
+GROUP BY am.name, am.id, am.state, am.period_id, ml.period_id,am.period_id, ml.period_id,am.date, ml.date
+HAVING abs(sum(ml.debit-ml.credit)) <> 0 or am.period_id!=ml.period_id or (am.date!=ml.date)
+"""
+cr.execute(sql)
+res = cr.dictfetchall()
+if res:
+    res.insert(0,_('* The test failed for these movement lines:'))
+result = res
+
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_04">
+        <field name="sequence">4</field>
+        <field name="name">Test 4: Totally reconciled mouvements</field>
+        <field name="desc">Check if the totally reconciled movements are balanced</field>
+        <field name="code_exec"><![CDATA[res = []
+cr.execute("SELECT distinct reconcile_id from account_move_line where reconcile_id is not null")
+rec_ids = cr.dictfetchall()
+for record in rec_ids :
+  cr.execute("SELECT distinct r.name,r.id from account_journal j,account_period p, account_move_reconcile r,account_move m, account_move_line ml where m.journal_id=j.id and m.period_id=p.id and ml.reconcile_id=%s and ml.move_id=m.id and ml.reconcile_id=r.id group by r.id,r.name having sum(ml.debit)-sum(ml.credit)<>0", (record['reconcile_id'],))
+  reconcile_ids=cr.dictfetchall()
+  if reconcile_ids:
+    res.append(', '.join(["Reconcile name: %(name)s, id=%(id)s " % r for r in reconcile_ids]))
+result = res
+if result:
+    result.insert(0,_('* The test failed for these reconciled items(id/name):'))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_05">
+        <field name="sequence">5</field>
+        <field name="name">Test 5.1 : Payable and Receivable accountant lines of reconciled invoices</field>
+        <field name="desc">Check that reconciled invoice for Sales/Purchases has reconciled entries for Payable and Receivable Accounts</field>
+        <field name="code_exec"><![CDATA[res = []
+cr.execute("SELECT distinct inv.number,inv.id from account_invoice inv, account_move m, account_move_line ml, account_account a where m.id=ml.move_id and ml.account_id=a.id and a.type in ('receivable','payable') and inv.move_id=m.id and ml.reconcile_id is not null;")
+records= cr.dictfetchall()
+rec = [r['id'] for r in records]
+res = reconciled_inv()
+invoices = set(rec).difference(set(res))
+result = [rec for rec in records if rec['id'] in invoices]
+if result:
+    result.insert(0,_('* Invoices that need to be checked: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_05_2">
+        <field name="sequence">6</field>
+        <field name="name">Test 5.2 : Reconcilied invoices and Payable/Receivable accounts</field>
+        <field name="desc">Check that reconciled account moves, that define Payable and Receivable accounts, are belonging to reconciled invoices</field>
+        <field name="code_exec"><![CDATA[res = reconciled_inv()
+result=[]
+if res:
+    cr.execute("SELECT distinct inv.number,inv.id from account_invoice inv, account_move_line ml, account_account a, account_move m where m.id=ml.move_id and inv.move_id=m.id and inv.id=inv.move_id and ml.reconcile_id is null and a.type in ('receivable','payable') and ml.account_id=a.id and inv.id in %s",(tuple(res),))
+    records = cr.dictfetchall()
+    result = [rec for rec in records]
+    if result:
+        result.insert(0,_('* Invoices that need to be checked: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_06">
+        <field name="sequence">7</field>
+        <field name="name">Test 6 : Invoices status</field>
+        <field name="desc">Check that paid/reconciled invoices are not in 'Open' state</field>
+        <field name="code_exec"><![CDATA[
+res = []
+column_order = ['number','id','name','state']
+if reconciled_inv():
+  cr.execute("select inv.name,inv.state,inv.id,inv.number from account_invoice inv where inv.state!='paid' and id in %s", (tuple(reconciled_inv()),))
+  res = cr.dictfetchall()
+result = res
+if result:
+    result.insert(0,_('* Invoices that need to be checked: '))
+]]></field>
+    </record>
+
+
+    <record model="accounting.assert.test" id="account_test_06_1">
+        <field name="sequence">8</field>
+        <field name="name">Test 7: « View  » account type</field>
+        <field name="desc">Check that there's no move for any account with « View » account type</field>
+        <field name="code_exec"><![CDATA[column_order=['name','ref','id','date']
+sql = "select id, name, ref, date from account_move_line where account_id in (select id from account_account where type = 'view')"
+cr.execute(sql)
+result = cr.dictfetchall()
+if result:
+    result.insert(0,_('* Movement lines that need to be checked: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_07">
+        <field name="sequence">9</field>
+        <field name="name">Test 8 : Closing balance on bank statements</field>
+        <field name="desc">Check on bank statement that the Closing Balance = Starting Balance + sum of statement lines</field>
+        <field name="code_exec"><![CDATA[column_order = ['name','difference']
+cr.execute("SELECT s.balance_start+sum(m.amount)-s.balance_end_real as difference, s.name from account_bank_statement s inner join account_bank_statement_line m on m.statement_id=s.id group by s.id, s.balance_start, s.balance_end_real,s.name having abs(s.balance_start+sum(m.amount)-s.balance_end_real) > 0.000000001;")
+result = cr.dictfetchall()
+if result:
+    result.insert(0,_('* Unbalanced bank statement that need to be checked: '))
+]]></field>
+    </record>
+
+    <record model="accounting.assert.test" id="account_test_08">
+        <field name="sequence">10</field>
+        <field name="name">Test 9 : Accounts and partners on account moves</field>
+        <field name="desc">Check that general accounts and partners on account moves are active</field>
+        <field name="code_exec"><![CDATA[column_order=['partner_name','partner_active','account_name','move_line_id','period']
+res = []
+cr.execute("SELECT l.id as move_line_id,a.name as account_name,a.code as account_code,r.name as partner_name,r.active as partner_active,p.name as period from account_period p,res_partner r, account_account a,account_move_line l where l.account_id=a.id and l.partner_id=r.id and (not r.active or not a.active) and l.period_id=p.id")
+res = cr.dictfetchall()
+result = res
+if result:
+  result.insert(0,_('* Here is the list of inactive partners and movement lines that are not correct: '))
+]]></field>
+    </record>
+</data>
+</openerp>
diff --git a/addons/account_test/account_test_report.xml b/addons/account_test/account_test_report.xml
new file mode 100644
index 00000000000..480507b6072
--- /dev/null
+++ b/addons/account_test/account_test_report.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+
+    <report
+        id="account_assert_test_report"
+        model="accounting.assert.test"
+        name="account.test.assert.print"
+        rml="account_test/report/account_test.rml"
+        header="False"
+        string="Accounting Tests"/>
+
+</data>
+</openerp>
diff --git a/addons/account_test/account_test_view.xml b/addons/account_test/account_test_view.xml
new file mode 100644
index 00000000000..43a67edcc6c
--- /dev/null
+++ b/addons/account_test/account_test_view.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <record model="ir.ui.view" id="account_assert_tree">
+            <field name="name">Tests</field>
+            <field name="model">accounting.assert.test</field>
+            <field name="arch" type="xml">
+                <tree string="Tests">
+                    <field name="sequence"/>
+                    <field name="name"/>
+                    <field name="desc"/>
+                </tree>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="account_assert_form">
+            <field name="name">Tests</field>
+            <field name="model">accounting.assert.test</field>
+            <field name="arch" type="xml">
+                <form string="Tests" version="7.0">
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="sequence"/>
+                            </group>
+                            <group>
+                                <field name="active"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Description">
+                                <field name="desc" nolabel="1"/>
+                            </page>
+                            <page string="Expression">
+                                <group string="Python Code">
+                                    <field colspan="4" name="code_exec" nolabel="1"/>
+                                </group>
+                                <group string="Code Help">
+                                    <pre>
+Code should always set a variable named `result` with the result of your test, that can be a list or
+a dictionary. If `result` is an empty list, it means that the test was succesful. Otherwise it will
+try to translate and print what is inside `result`.
+
+If the result of your test is a dictionary, you can set a variable named `column_order` to choose in
+what order you want to print `result`'s content.
+
+Should you need them, you can also use the following variables into your code:
+    * cr: cursor to the database
+    * uid: ID of the current user
+
+In any ways, the code must be legal python statements with correct indentation (if needed).
+
+Example: 
+    sql = '''SELECT id, name, ref, date
+             FROM account_move_line 
+             WHERE account_id IN (SELECT id FROM account_account WHERE type = 'view')
+          '''
+    cr.execute(sql)
+    result = cr.dictfetchall()
+                                    </pre>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_accounting_assert">
+            <field name="name">Accounting Tests</field>
+            <field name="res_model">accounting.assert.test</field>
+            <field name="view_mode">tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to create Accounting Test.
+              </p>
+            </field>
+        </record>
+
+        <menuitem name="Accounting Tests" parent="account.menu_finance_reporting" id="menu_action_license" action="action_accounting_assert"/>
+
+    </data>
+</openerp>
diff --git a/addons/account_test/report/__init__.py b/addons/account_test/report/__init__.py
new file mode 100644
index 00000000000..0e4fbf07082
--- /dev/null
+++ b/addons/account_test/report/__init__.py
@@ -0,0 +1,3 @@
+import account_test_report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/report/account_test.rml b/addons/account_test/report/account_test.rml
new file mode 100644
index 00000000000..1efa12fd5cb
--- /dev/null
+++ b/addons/account_test/report/account_test.rml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,1" stop="1,1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,1" stop="1,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="Heading">Accouting tests on [[ datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") ]]</para>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <section>
+        <para style="Standard">[[repeatIn(objects,'o')]]</para>
+        <blockTable colWidths="482.0" style="Table1">
+          <tr>
+            <td>
+              <para style="Table Contents">[[ o.name ]]</para>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <para style="Table Contents"><i>[[ o.desc or '' ]]</i></para>
+            </td>
+          </tr>
+        </blockTable>
+        <blockTable colWidths="482.0" style="Tableau1">
+          <tr>
+            <td>
+              <para style="Table Contents">[[ repeatIn(execute_code(o.code_exec), 'test_result') ]]</para>
+              <para style="Table Contents">[[ test_result ]] </para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="Standard">
+            <font color="white"> </font>
+        </para>
+    </section>
+
+  </story>
+</document>
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
new file mode 100644
index 00000000000..ab683e18688
--- /dev/null
+++ b/addons/account_test/report/account_test_report.py
@@ -0,0 +1,87 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import datetime
+import time
+from report import report_sxw
+from tools.translate import _
+#
+# Use period and Journal for selection or resources
+#
+class report_assert_account(report_sxw.rml_parse):
+    def __init__(self, cr, uid, name, context):
+        super(report_assert_account, self).__init__(cr, uid, name, context=context)
+        self.localcontext.update( {
+            'time': time,
+            'datetime': datetime,
+            'execute_code': self.execute_code,
+        })
+
+    def execute_code(self, code_exec):
+        def reconciled_inv():
+            """
+            returns the list of invoices that are set as reconciled = True
+            """
+            return self.pool.get('account.invoice').search(self.cr, self.uid, [('reconciled','=',True)])
+
+        def order_columns(item, cols=None):
+            """
+            This function is used to display a dictionary as a string, with its columns in the order chosen.
+
+            :param item: dict
+            :param cols: list of field names
+            :returns: a list of tuples (fieldname: value) in a similar way that would dict.items() do except that the
+                returned values are following the order given by cols
+            :rtype: [(key, value)]
+            """
+            if cols is None:
+                cols = item.keys()
+            return [(col, item.get(col)) for col in cols if col in item.keys()]
+
+        localdict = {
+            'cr': self.cr,
+            'uid': self.uid,
+            'reconciled_inv': reconciled_inv, #specific function used in different tests
+            'result': None, #used to store the result of the test
+            'column_order': None, #used to choose the display order of columns (in case you are returning a list of dict)
+        }
+        exec code_exec in localdict
+        result = localdict['result']
+        column_order = localdict.get('column_order', None)
+
+        if not isinstance(result, (tuple, list, set)):
+            result = [result]
+        if not result:
+            result = [_('The test was passed successfully')]
+        else:
+            def _format(item):
+                if isinstance(item, dict):
+                    return ', '.join(["%s: %s" % (tup[0], tup[1]) for tup in order_columns(item, column_order)])
+                else:
+                    return item
+            result = [_(_format(rec)) for rec in result]
+
+        return result
+
+report_sxw.report_sxw('report.account.test.assert.print', 'accounting.assert.test', 'addons/account_test/report/account_test.rml', parser=report_assert_account, header=False)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_test/security/ir.model.access.csv b/addons/account_test/security/ir.model.access.csv
new file mode 100644
index 00000000000..cf7e93b6baa
--- /dev/null
+++ b/addons/account_test/security/ir.model.access.csv
@@ -0,0 +1,3 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_accounting_assert_test","accounting.assert.test","model_accounting_assert_test",base.group_system,1,0,0,1
+"access_accounting_assert_test_manager","accounting.assert.test","model_accounting_assert_test",account.group_account_manager,1,0,0,0
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py
index d2429e8dfd2..baf1a8f0b28 100644
--- a/addons/auth_signup/controllers/main.py
+++ b/addons/auth_signup/controllers/main.py
@@ -57,18 +57,17 @@ class Controller(openerp.addons.web.http.Controller):
     def signup(self, req, dbname, token, name, login, password):
         """ sign up a user (new or existing)"""
         values = {'name': name, 'login': login, 'password': password}
-        return self._signup_with_values(req, dbname, token, values)
+        try:
+            self._signup_with_values(req, dbname, token, values)
+        except SignupError, e:
+            return {'error': openerp.tools.exception_to_unicode(e)}
+        return {}
 
     def _signup_with_values(self, req, dbname, token, values):
         registry = RegistryManager.get(dbname)
         with registry.cursor() as cr:
             res_users = registry.get('res.users')
-            try:
-                res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
-            except SignupError, e:
-                return {'error': openerp.tools.exception_to_unicode(e)}
-            cr.commit()
-        return {}
+            res_users.signup(cr, openerp.SUPERUSER_ID, values, token)
 
     @openerp.addons.web.http.httprequest
     def reset_password(self, req, dbname, login):
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py
index 8380cd8b23f..5fd7917f444 100644
--- a/addons/auth_signup/res_users.py
+++ b/addons/auth_signup/res_users.py
@@ -254,6 +254,6 @@ class res_users(osv.Model):
         # overridden to automatically invite user to sign up
         user_id = super(res_users, self).create(cr, uid, values, context=context)
         user = self.browse(cr, uid, user_id, context=context)
-        if user.email:
+        if context and context.get('reset_password') and user.email:
             user.action_reset_password()
         return user_id
diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml
index 90729c54285..f7bfdd8eeb5 100644
--- a/addons/auth_signup/res_users_view.xml
+++ b/addons/auth_signup/res_users_view.xml
@@ -2,6 +2,11 @@
 <openerp>
     <data>
 
+        <!-- add context in action to enable automatic reset password -->
+        <record id="base.action_res_users" model="ir.actions.act_window">
+            <field name="context">{'reset_password': True}</field>
+        </record>
+
         <record id="res_users_form_view" model="ir.ui.view">
             <field name="name">user.form.state</field>
             <field name="model">res.users</field>
diff --git a/addons/base_gengo/i18n/nb.po b/addons/base_gengo/i18n/nb.po
new file mode 100644
index 00000000000..935f150894c
--- /dev/null
+++ b/addons/base_gengo/i18n/nb.po
@@ -0,0 +1,256 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-06 10:25+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Comments for Translator"
+msgstr "Kommentarer til oversetter."
+
+#. module: base_gengo
+#: field:ir.translation,job_id:0
+msgid "Gengo Job ID"
+msgstr "Gengo jobb ID."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "This language is not supported by the Gengo translation services."
+msgstr "Dette språket er ikke støttet av Gengo oversettings tjenester."
+
+#. module: base_gengo
+#: field:res.company,gengo_comment:0
+msgid "Comments"
+msgstr "Kommentarer."
+
+#. module: base_gengo
+#: field:res.company,gengo_private_key:0
+msgid "Gengo Private Key"
+msgstr "Gengo privat nøkkel."
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_base_gengo_translations
+msgid "base.gengo.translations"
+msgstr "Base.Gengo.Oversettelser."
+
+#. module: base_gengo
+#: help:res.company,gengo_auto_approve:0
+msgid "Jobs are Automatically Approved by Gengo."
+msgstr "Jobber godkjennes automatisk ved Gengo."
+
+#. module: base_gengo
+#: field:base.gengo.translations,lang_id:0
+msgid "Language"
+msgstr "Språk."
+
+#. module: base_gengo
+#: field:ir.translation,gengo_comment:0
+msgid "Comments & Activity Linked to Gengo"
+msgstr "Kommentarer og aktivitet knyttet til Gengo."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:124
+#, python-format
+msgid "Gengo Sync Translation (Response)"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:72
+#, python-format
+msgid ""
+"Gengo `Public Key` or `Private Key` are missing. Enter your Gengo "
+"authentication parameters under `Settings > Companies > Gengo Parameters`."
+msgstr ""
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Translation By Machine"
+msgstr "Oversetting av maskin."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:155
+#, python-format
+msgid ""
+"%s\n"
+"\n"
+"--\n"
+" Commented on %s by %s."
+msgstr ""
+"%s\n"
+"\n"
+"--\n"
+"Kommentarer på %s by %s."
+
+#. module: base_gengo
+#: field:ir.translation,gengo_translation:0
+msgid "Gengo Translation Service Level"
+msgstr "Gengo Oversettelse tjeneste nivå."
+
+#. module: base_gengo
+#: constraint:ir.translation:0
+msgid ""
+"The Gengo translation service selected is not supported for this language."
+msgstr ""
+"Den Gengo oversettelses tjeneste som er valgt støttes ikke for dette språket."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Standard"
+msgstr "Standard"
+
+#. module: base_gengo
+#: help:ir.translation,gengo_translation:0
+msgid ""
+"You can select here the service level you want for an automatic translation "
+"using Gengo."
+msgstr ""
+"Du kan velge her tjenestenivået du ønsker for en automatisk oversettelse ved "
+"hjelp av Gengo."
+
+#. module: base_gengo
+#: field:base.gengo.translations,restart_send_job:0
+msgid "Restart Sending Job"
+msgstr ""
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "To Approve In Gengo"
+msgstr "Slik godkjenner du I Gengo."
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Private Key"
+msgstr "Privat nøkkel."
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Public Key"
+msgstr "Offentlig nøkkel."
+
+#. module: base_gengo
+#: field:res.company,gengo_public_key:0
+msgid "Gengo Public Key"
+msgstr "Gengo offentlig nøkkel."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:123
+#, python-format
+msgid "Gengo Sync Translation (Request)"
+msgstr "Gengo synkronisering oversettelse (Forespørsel)"
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Translations"
+msgstr "Oversettelser."
+
+#. module: base_gengo
+#: field:res.company,gengo_auto_approve:0
+msgid "Auto Approve Translation ?"
+msgstr "Automatisk godkjenning oversettelse."
+
+#. module: base_gengo
+#: model:ir.actions.act_window,name:base_gengo.action_wizard_base_gengo_translations
+#: model:ir.ui.menu,name:base_gengo.menu_action_wizard_base_gengo_translations
+msgid "Gengo: Manual Request of Translation"
+msgstr "Gengo: Manuell forespørsel av oversetting."
+
+#. module: base_gengo
+#: code:addons/base_gengo/ir_translation.py:62
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:109
+#, python-format
+msgid "Gengo Authentication Error"
+msgstr ""
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_res_company
+msgid "Companies"
+msgstr "Firmaer."
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid ""
+"Note: If the translation state is 'In Progress', it means that the "
+"translation has to be approved to be uploaded in this system. You are "
+"supposed to do that directly by using your Gengo Account"
+msgstr ""
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:82
+#, python-format
+msgid ""
+"Gengo connection failed with this message:\n"
+"``%s``"
+msgstr ""
+
+#. module: base_gengo
+#: view:res.company:0
+msgid "Gengo Parameters"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Send"
+msgstr "Send."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Ultra"
+msgstr "Ultra."
+
+#. module: base_gengo
+#: model:ir.model,name:base_gengo.model_ir_translation
+msgid "ir.translation"
+msgstr "Ir.Oversettelse."
+
+#. module: base_gengo
+#: view:ir.translation:0
+msgid "Gengo Translation Service"
+msgstr "Gengo oversettelse tjeneste."
+
+#. module: base_gengo
+#: selection:ir.translation,gengo_translation:0
+msgid "Pro"
+msgstr "Profesjonell."
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Gengo Request Form"
+msgstr "Gengo forespørsel form."
+
+#. module: base_gengo
+#: code:addons/base_gengo/wizard/base_gengo_translations.py:114
+#, python-format
+msgid "Warning"
+msgstr "Advarsel."
+
+#. module: base_gengo
+#: help:res.company,gengo_comment:0
+msgid ""
+"This comment will be automatically be enclosed in each an every request sent "
+"to Gengo"
+msgstr ""
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "Cancel"
+msgstr "Avbryt."
+
+#. module: base_gengo
+#: view:base.gengo.translations:0
+msgid "or"
+msgstr "Eller."
diff --git a/addons/crm/i18n/pt_BR.po b/addons/crm/i18n/pt_BR.po
index 66f0b5c3767..877d87a19a5 100644
--- a/addons/crm/i18n/pt_BR.po
+++ b/addons/crm/i18n/pt_BR.po
@@ -7,20 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: renato.lima@akretion.com\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-07-28 18:57+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 16:43+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "# Leads"
-msgstr "Nº Prospecções"
+msgstr "Nº de Prospectos"
 
 #. module: crm
 #: help:sale.config.settings,fetchmail_lead:0
@@ -28,6 +27,8 @@ msgid ""
 "Allows you to configure your incoming mail server, and create leads from "
 "incoming emails."
 msgstr ""
+"Permite configurar seu servidor de recebimento de mensagens, e criar "
+"prospectos para e-mails recebidos."
 
 #. module: crm
 #: selection:crm.case.stage,type:0
@@ -36,12 +37,12 @@ msgstr ""
 #: view:crm.lead.report:0
 #: selection:crm.lead.report,type:0
 msgid "Lead"
-msgstr "Prospecção"
+msgstr "Prospecto"
 
 #. module: crm
 #: field:crm.lead,title:0
 msgid "Title"
-msgstr "Título"
+msgstr "Tratamento"
 
 #. module: crm
 #: field:crm.lead2partner,action:0
@@ -58,29 +59,31 @@ msgid ""
 "Phonecall linked to the opportunity <em>%s</em> has been <b>created</b> and "
 "<b>scheduled</b> on <em>%s</em>."
 msgstr ""
+"Chamada Telefônica relacionada à oportunidade <em>%s</em> foi <b>criada</b> "
+"e <b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: model:res.groups,name:crm.group_fund_raising
 #: field:sale.config.settings,group_fund_raising:0
 msgid "Manage Fund Raising"
-msgstr ""
+msgstr "Gerenciar Captação de Recursos"
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Convert to Opportunities"
-msgstr ""
+msgstr "Converter para Oportunidades"
 
 #. module: crm
 #: view:crm.lead.report:0
 #: field:crm.phonecall.report,delay_close:0
 msgid "Delay to close"
-msgstr "Adiar o fechamento"
+msgstr "Espera para concluir"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:888
 #, python-format
 msgid "Lead has been <b>converted to an opportunity</b>."
-msgstr ""
+msgstr "Prospecto foi <b>convertido para uma oportunidade</b>."
 
 #. module: crm
 #: view:crm.lead:0
@@ -88,7 +91,7 @@ msgstr ""
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead_report
@@ -98,7 +101,7 @@ msgstr "Análise das Prospecções do CRM"
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_customer_lead
 msgid "Reminder on Lead: [[object.id ]]"
-msgstr ""
+msgstr "Lembrete no Prospecto: [[object.id ]]"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -110,18 +113,18 @@ msgstr "Dia"
 #. module: crm
 #: view:crm.lead:0
 msgid "Company Name"
-msgstr ""
+msgstr "Nome da Empresa"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Training"
-msgstr ""
+msgstr "Treinamento"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_lead_categ_action
 #: model:ir.ui.menu,name:crm.menu_crm_lead_categ
 msgid "Sales Tags"
-msgstr ""
+msgstr "Marcadores de Vendas"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -133,7 +136,7 @@ msgstr "Exp. Fechamento"
 #: help:crm.lead,message_unread:0
 #: help:crm.phonecall,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens requerem sua atenção"
 
 #. module: crm
 #: help:crm.lead.report,creation_day:0
@@ -173,6 +176,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:552
@@ -212,17 +218,17 @@ msgstr "Ligação Telefônica"
 #. module: crm
 #: field:crm.lead,opt_out:0
 msgid "Opt-Out"
-msgstr "Opt-Out"
+msgstr "Desistência"
 
 #. module: crm
 #: field:crm.case.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Oculto em Visões se Vazio"
 
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_lead
 msgid "Reminder to User"
-msgstr ""
+msgstr "Lembrete para Usuário"
 
 #. module: crm
 #: field:crm.segmentation,segmentation_line:0
@@ -244,13 +250,13 @@ msgstr "Sessões"
 #: model:ir.actions.act_window,name:crm.action_report_crm_lead
 #: model:ir.ui.menu,name:crm.menu_report_crm_leads_tree
 msgid "Leads Analysis"
-msgstr "Analisar Prospecções"
+msgstr "Análise de Prospecções"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:878
 #, python-format
 msgid "<b>%s a call</b> for the <em>%s</em>."
-msgstr ""
+msgstr "<b>%s realizou uma chamada</b> para <em>%s</em>."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -281,13 +287,13 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
-"If opt-out é marcado, este contato será recusado para receber emails ou "
-"inscrições para uma campanha."
+"Se desistência é marcado, este contato recusou receber e-mails ou inscrições "
+"para uma campanha."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
 msgid "Prospect Partner"
-msgstr "Prospectar Parceiro"
+msgstr "Parceiro de Prospecção"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:811
@@ -322,6 +328,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir uma nova segmentação de cliente.\n"
+"              </p><p>\n"
+"                Crie categorias específicas que você pode atribuir a seus\n"
+"                contatos para melhor gerenciar suas interações com eles. A\n"
+"                ferramenta de segmentação pode atribuir categorias a "
+"contatos\n"
+"                de acordo com os critérios que você definir.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: field:crm.opportunity2phonecall,contact_name:0
@@ -335,6 +351,7 @@ msgstr "Contato"
 msgid ""
 "When escalating to this team override the salesman with the team leader."
 msgstr ""
+"Se escalar para esta equipe o vendedor será sobrescrito pelo líder da equipe."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_opportunitymeeting0
@@ -350,12 +367,12 @@ msgstr "Número de Dias para concluir o caso"
 #. module: crm
 #: model:process.node,note:crm.process_node_opportunities0
 msgid "When a real project/opportunity is detected"
-msgstr "Quando um projeto/oportunidade é detectada"
+msgstr "Quando um projeto/oportunidade real é detectado"
 
 #. module: crm
 #: field:res.partner,opportunity_ids:0
 msgid "Leads and Opportunities"
-msgstr "Prospecções e Oportunidades"
+msgstr "Prospectos e Oportunidades"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.relate_partner_opportunities
@@ -374,11 +391,27 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para criar uma oportunidade relacionada a este "
+"cliente.\n"
+"              </p><p>\n"
+"                Utilize oportunidades para monitorar suas vendas, "
+"acompanhando\n"
+"                vendas em potencial e prevendo melhor seus lucros futuros.\n"
+"              </p><p>\n"
+"                Você poderá planejar encontros e chamadas telefônicas a "
+"partir\n"
+"                destas oportunidades, convertendo as mesmas em cotações, "
+"anexando\n"
+"                documentos relacionados, rastreando todas as discussões e "
+"muito mais.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead7
 msgid "Dead"
-msgstr ""
+msgstr "Morta"
 
 #. module: crm
 #: field:crm.case.section,message_unread:0
@@ -386,7 +419,7 @@ msgstr ""
 #: field:crm.lead,message_unread:0
 #: field:crm.phonecall,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Mensagens Não Lidas"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,action:0
@@ -394,7 +427,7 @@ msgstr ""
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Link to an existing customer"
-msgstr ""
+msgstr "Conectar a um cliente existente"
 
 #. module: crm
 #: field:crm.lead,write_date:0
@@ -404,7 +437,7 @@ msgstr "Data de Atualização"
 #. module: crm
 #: field:crm.case.section,user_id:0
 msgid "Team Leader"
-msgstr "Líder do time"
+msgstr "Lider da Equipe"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -412,7 +445,7 @@ msgid ""
 "This percentage depicts the default/average probability of the Case for this "
 "stage to be a success"
 msgstr ""
-"Esse percentual representa a probabilidade média padrão do caso, para que "
+"Esse percentual representa a probabilidade média/padrão do caso, para que "
 "este estágio seja um sucesso."
 
 #. module: crm
@@ -435,12 +468,14 @@ msgstr "Nº de Oportunidades"
 #: view:crm.lead:0
 msgid "Leads that are assigned to one of the sale teams I manage, or to me"
 msgstr ""
+"Prospectos que foram atribuídos a alguém das equipes de vendas que eu "
+"gerencio, ou para mim."
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,name:0
 #: field:crm.lead2opportunity.partner.mass,name:0
 msgid "Conversion Action"
-msgstr ""
+msgstr "Ação de Conversão"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_section_act
@@ -454,6 +489,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir uma nova equipe de vendas.\n"
+"              </p><p>\n"
+"                Utilize as equipes de vendas para organizar os vendedores "
+"ou\n"
+"                departmentos em equipes separadas. Cada equipe irá "
+"trabalhar\n"
+"                em sua própria lista de oportunidades.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_opportunitymeeting0
@@ -501,7 +546,7 @@ msgstr "Mala Direta"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "To Do"
-msgstr "Tarefa"
+msgstr "A Fazer"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -523,7 +568,7 @@ msgstr "Receita Planejada"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_read
 msgid "CRM Phonecall: Mark read"
-msgstr ""
+msgstr "Chamada Telefônica: Marcar como Lida"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -535,7 +580,7 @@ msgstr "Outubro"
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Included Answers :"
-msgstr "Respostas incluídas :"
+msgstr "Respostas Incluídas :"
 
 #. module: crm
 #: help:crm.phonecall,state:0
@@ -546,6 +591,10 @@ msgid ""
 "                       If the call needs to be done then the status is set "
 "to 'Not Held'."
 msgstr ""
+"A situação é definida como 'A Fazer' quando o caso é criado. Se o caso está "
+"em progresso, a situação é definida como 'Aberto'. Quando a chamada acaba, a "
+"situação é definida como 'Realizada'. Se uma chamada deve ser feita, então a "
+"situação é definida como 'Não Realizada'."
 
 #. module: crm
 #: field:crm.case.section,message_summary:0
@@ -557,12 +606,12 @@ msgstr "Resumo"
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge"
-msgstr ""
+msgstr "Mesclar"
 
 #. module: crm
 #: view:crm.case.categ:0
 msgid "Case Category"
-msgstr "Categoria dos Casos"
+msgstr "Categoria do Caso"
 
 #. module: crm
 #: field:crm.lead,partner_address_name:0
@@ -572,7 +621,7 @@ msgstr "Nome de Contato do Parceiro"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_phonecall_unread
 msgid "CRM Phonecall: Mark unread"
-msgstr ""
+msgstr "Chamada Telefônica: Marcar como Não Lida"
 
 #. module: crm
 #: model:ir.actions.server,subject:crm.action_email_reminder_lead
@@ -580,16 +629,18 @@ msgid ""
 "Reminder on Lead: [[object.id ]] [[object.partner_id and 'of ' "
 "+object.partner_id.name or '']]"
 msgstr ""
+"Lembrete no Prospecto: [[object.id ]] [[object.partner_id and 'of ' "
+"+object.partner_id.name or '']]"
 
 #. module: crm
 #: view:crm.segmentation:0
 msgid "Profiling Options"
-msgstr "Filtrando Opções"
+msgstr "Opções de Categorização"
 
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "#Phone calls"
-msgstr "#Ligações Telefônicas"
+msgstr "Nº de Chamadas Telefônicas"
 
 #. module: crm
 #: sql_constraint:crm.case.section:0
@@ -615,6 +666,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para adicionar uma nova categoria.\n"
+"          </p><p>\n"
+"            Crie categorias específicas para chamadas telefônicas para "
+"melhor classificar os\n"
+"            tipode de chamada monitorados pelo sistema.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
@@ -622,8 +681,8 @@ msgid ""
 "The email address put in the 'Reply-To' of all emails sent by OpenERP about "
 "cases in this sales team"
 msgstr ""
-"O endereço de email colocado em 'Responder para' de todos os emails enviados "
-"pelo OpenERP sobre casos na equipe de vendas"
+"O endereço de e-mail colocado em 'Responder para' de todos os e-mails "
+"enviados pelo OpenERP sobre casos desta equipe de vendas"
 
 #. module: crm
 #: field:crm.lead.report,creation_month:0
@@ -634,12 +693,12 @@ msgstr "Mês de Criação"
 #: field:crm.case.section,resource_calendar_id:0
 #: model:ir.ui.menu,name:crm.menu_action_resource_calendar_form
 msgid "Working Time"
-msgstr "Tempo de Trabalho"
+msgstr "Tempo Trabalhado"
 
 #. module: crm
 #: view:crm.segmentation.line:0
 msgid "Partner Segmentation Lines"
-msgstr "Linhas da segmentação de Parceiro"
+msgstr "Linhas de Segmentação do Parceiro"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_report_crm_phonecall
@@ -676,22 +735,22 @@ msgstr "Mês de criação"
 #. module: crm
 #: help:crm.segmentation,name:0
 msgid "The name of the segmentation."
-msgstr "O nome da seguimentação."
+msgstr "O nome da segmentação."
 
 #. module: crm
 #: model:ir.filters,name:crm.filter_usa_lead
 msgid "Leads from USA"
-msgstr ""
+msgstr "Prospectos dos USA"
 
 #. module: crm
 #: sql_constraint:crm.lead:0
 msgid "The probability of closing the deal should be between 0% and 100%!"
-msgstr ""
+msgstr "A probabilidade de fechamento do acordo deve ser entre 0% e 100%!"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr "Geração de Propecções"
+msgstr "Geração de Propectos"
 
 #. module: crm
 #: view:board.board:0
@@ -702,7 +761,7 @@ msgstr "Painel de Estatísticas"
 #: code:addons/crm/crm_lead.py:853
 #, python-format
 msgid "Stage changed to <b>%s</b>."
-msgstr ""
+msgstr "Estágio alterado para <b>%s</b>."
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:755
@@ -722,7 +781,7 @@ msgstr "Oportunidade"
 #: code:addons/crm/crm_meeting.py:62
 #, python-format
 msgid "A meeting has been <b>scheduled</b> on <em>%s</em>."
-msgstr ""
+msgstr "Uma reunião foi <b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead7
@@ -732,12 +791,12 @@ msgstr "Televisão"
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_crm_send_mass_convert
 msgid "Convert to opportunities"
-msgstr ""
+msgstr "Converter para oportunidades"
 
 #. module: crm
 #: model:ir.model,name:crm.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -747,18 +806,20 @@ msgstr "Parar Processo"
 #. module: crm
 #: field:crm.case.section,alias_id:0
 msgid "Alias"
-msgstr ""
+msgstr "Apelido"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Search Phonecalls"
-msgstr "Procurar Ligação"
+msgstr "Pesquisar Chamadas Telefônicas"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid ""
 "Leads/Opportunities that are assigned to one of the sale teams I manage"
 msgstr ""
+"Prospectos/Oportunidades que foram atribuídos a alguém das equipes de vendas "
+"que eu gerencio"
 
 #. module: crm
 #: field:crm.partner2opportunity,name:0
@@ -769,7 +830,7 @@ msgstr "Nome da Oportunidade"
 #. module: crm
 #: field:base.action.rule,act_section_id:0
 msgid "Set Team to"
-msgstr "Definir Time para"
+msgstr "Definir Equipe para"
 
 #. module: crm
 #: field:calendar.attendee,categ_id:0
@@ -803,7 +864,7 @@ msgstr "Ano de Criação"
 #: view:crm.phonecall2partner:0
 #: view:crm.phonecall2phonecall:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -814,7 +875,7 @@ msgstr "Data de Criação"
 #. module: crm
 #: field:crm.lead,ref2:0
 msgid "Reference 2"
-msgstr "2 Referência"
+msgstr "Referência 2"
 
 #. module: crm
 #: help:crm.case.stage,section_ids:0
@@ -822,6 +883,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Conexão entre estágios e equipes de vendas. Quando definido, ele limita o "
+"estágio atual às equipes de vendas selecionadas."
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_lead
@@ -837,6 +900,16 @@ msgid ""
 "Thanks,\n"
 "            "
 msgstr ""
+"Olá [[object.user_id.name]], \n"
+"você pode verificar o seguinte prospecto, ele não está aberto a 5 dias ?\n"
+"\n"
+"Prospecto: [[object.id ]]\n"
+"Descrição:\n"
+"\n"
+"    [[object.description]]\n"
+"\n"
+"Obrigado,\n"
+"            "
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -852,7 +925,7 @@ msgstr "Converter para Oportunidade "
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Unassigned Phonecalls"
-msgstr "Ligações não Atribuídas"
+msgstr "Chamadas Telefônicas não Atribuídas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -904,7 +977,7 @@ msgstr "Perdemos"
 #. module: crm
 #: model:ir.filters,name:crm.filter_draft_lead
 msgid "Draft Leads"
-msgstr ""
+msgstr "Prospectos Não Analisados"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -916,7 +989,7 @@ msgstr "Março"
 #. module: crm
 #: view:crm.lead:0
 msgid "Send Email"
-msgstr ""
+msgstr "Enviar E-mail"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
@@ -944,7 +1017,7 @@ msgstr "Celular"
 #: code:addons/crm/crm_phonecall.py:270
 #, python-format
 msgid "Phonecall has been <b>reset and set as open</b>."
-msgstr ""
+msgstr "A chamada telefônica foi <b>reiniciada e definida como aberta</b>."
 
 #. module: crm
 #: field:crm.lead,ref:0
@@ -957,6 +1030,8 @@ msgid ""
 "Opportunities that are assigned to either me or one of the sale teams I "
 "manage"
 msgstr ""
+"Oportunidades que foram atribuídas a mim ou a alguém das equipes de vendas "
+"que eu gerencio"
 
 #. module: crm
 #: help:crm.case.section,resource_calendar_id:0
@@ -1014,6 +1089,8 @@ msgid ""
 "Allows you to track your customers/suppliers claims and grievances.\n"
 "                    This installs the module crm_claim."
 msgstr ""
+"Permite rastrear as reclamações e queixas de seus clientes/fornecedores.\n"
+"                    O módulo crm_claim será instalado."
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead6
@@ -1023,7 +1100,7 @@ msgstr "Ganhamos"
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr "Prazo Superado"
+msgstr "Prazo Ultrapassado"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1049,7 +1126,7 @@ msgstr "Calcular Segmentação"
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Lowest"
-msgstr "Nenhuma"
+msgstr "Mais Baixa"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:59
@@ -1058,6 +1135,8 @@ msgid ""
 "Meeting linked to the phonecall <em>%s</em> has been <b>created</b> and "
 "<b>scheduled</b> on <em>%s</em>."
 msgstr ""
+"A reunião conectada à chamada telefônica <em>%s</em> foi <b>criada</b> e "
+"<b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: field:crm.lead,create_date:0
@@ -1071,7 +1150,7 @@ msgstr "Data de Criação"
 #: code:addons/crm/crm_lead.py:862
 #, python-format
 msgid "%s has been <b>created</b>."
-msgstr ""
+msgstr "%s foi <b>criada</b>."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1081,7 +1160,7 @@ msgstr "Total da Compra"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Year of call"
-msgstr "Ano da Ligação"
+msgstr "Ano da Chamada"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1095,7 +1174,7 @@ msgstr "Estágio"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone Calls that are assigned to me"
-msgstr ""
+msgstr "Chamadas Telefônicas que foram atribuídas a mim"
 
 #. module: crm
 #: field:crm.lead,user_login:0
@@ -1105,7 +1184,7 @@ msgstr "Login do Usuário"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Phone calls which are in pending state"
-msgstr "Ligações Pendentes"
+msgstr "Chamadas Telefônicas que estão em estado pendente"
 
 #. module: crm
 #: view:crm.case.section:0
@@ -1123,11 +1202,13 @@ msgid ""
 "Allows you to communicate with Customer,  process Customer query, and "
 "provide better help and support. This installs the module crm_helpdesk."
 msgstr ""
+"Permite a comunicação com o cliente, processar suas questões e fornecer uma "
+"melhor ajuda e suporte. O módulo crm_helpdesk será instalado."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Delete"
-msgstr ""
+msgstr "Excluir"
 
 #. module: crm
 #: field:crm.lead,planned_revenue:0
@@ -1139,13 +1220,13 @@ msgstr "Receita Esperada"
 #. module: crm
 #: view:crm.lead:0
 msgid "í"
-msgstr ""
+msgstr "í"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:867
 #, python-format
 msgid "Opportunity has been <b>lost</b>."
-msgstr ""
+msgstr "A oportunidade foi <b>perdida</b>."
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1157,7 +1238,7 @@ msgstr "Setembro"
 #. module: crm
 #: help:crm.lead,email_from:0
 msgid "Email address of the contact"
-msgstr ""
+msgstr "Endereço de e-mail do contato"
 
 #. module: crm
 #: field:crm.segmentation,partner_id:0
@@ -1170,18 +1251,18 @@ msgid ""
 "Setting this stage will change the probability automatically on the "
 "opportunity."
 msgstr ""
-"A definição dessa fase vai mudar a probabilidade automaticamente a "
+"A definição dessa fase vai mudar a probabilidade automaticamente na "
 "oportunidade."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: crm
 #: model:ir.ui.menu,name:crm.menu_crm_payment_mode_act
 msgid "Payment Modes"
-msgstr ""
+msgstr "Formas de Pagamento"
 
 #. module: crm
 #: field:crm.lead.report,opening_date:0
@@ -1192,7 +1273,7 @@ msgstr "Data de Abertura"
 #. module: crm
 #: field:crm.lead,company_currency:0
 msgid "Currency"
-msgstr ""
+msgstr "Moeda"
 
 #. module: crm
 #: field:crm.case.channel,name:0
@@ -1226,7 +1307,7 @@ msgid ""
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
 "Se você marcar este campo, esta etapa será proposta por padrão em cada "
-"equipe de vendas. Não irá atribuir esta fase as equipes já existentes."
+"equipe de vendas. Não irá atribuir esta fase às equipes já existentes."
 
 #. module: crm
 #: help:crm.case.stage,type:0
@@ -1234,6 +1315,9 @@ msgid ""
 "This field is used to distinguish stages related to Leads from stages "
 "related to Opportunities, or to specify stages available for both types."
 msgstr ""
+"Este campo é usado para distinguir estágios relacionados a Prospectos de "
+"estágios relacionados a Oportunidades, ou para especificar estágios "
+"disponíveis para ambos."
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
@@ -1260,7 +1344,7 @@ msgstr "Situação da Execução"
 #. module: crm
 #: view:crm.opportunity2phonecall:0
 msgid "Log call"
-msgstr "Registrar Ligação"
+msgstr "Registrar chamada"
 
 #. module: crm
 #: field:crm.lead,day_close:0
@@ -1278,6 +1362,8 @@ msgid ""
 "Followers of this salesteam follow automatically all opportunities related "
 "to this salesteam."
 msgstr ""
+"Seguidores desta equipe de vendas seguem automaticamente todas as "
+"oportunidades relacionadas a ela."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_partner2opportunity
@@ -1297,12 +1383,12 @@ msgstr "Data"
 #: field:crm.lead,message_is_follower:0
 #: field:crm.phonecall,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "É um Seguidor"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_4
 msgid "Online Support"
-msgstr ""
+msgstr "Suporte Online"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1328,6 +1414,10 @@ msgid ""
 "set to 'Done'. If the case needs to be reviewed then the Status is  set to "
 "'Pending'."
 msgstr ""
+"A Situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a Situação muda para 'Aberto'. Quando o caso termina, a "
+"Situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"Situação é definida como 'Pendente'."
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_1
@@ -1337,7 +1427,7 @@ msgstr "Departamento de Vendas/Marketing"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Date of call"
-msgstr "Data da ligação"
+msgstr "Data da chamada"
 
 #. module: crm
 #: help:crm.lead,section_id:0
@@ -1354,18 +1444,18 @@ msgstr "Descrição da Segmentação"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead Description"
-msgstr ""
+msgstr "Descrição do Prospecto"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:491
 #, python-format
 msgid "Merged opportunities"
-msgstr "Mesclar oportunidades"
+msgstr "Oportunidades mescladas"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor7
 msgid "Consulting"
-msgstr ""
+msgstr "Consultoria"
 
 #. module: crm
 #: field:crm.case.section,code:0
@@ -1375,12 +1465,12 @@ msgstr "Código"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Características"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
 msgid "Child Teams"
-msgstr "Time Filho"
+msgstr "Equipes filhas"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1390,7 +1480,7 @@ msgstr "Chamadas Telefônicas que estão com situação em aberto"
 #. module: crm
 #: field:crm.lead2opportunity.partner.mass,user_ids:0
 msgid "Salesmen"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1415,17 +1505,17 @@ msgstr "Cancelar"
 #. module: crm
 #: view:crm.lead:0
 msgid "Opportunities Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Oportunidades Atribuídas a Mim ou às minhas Equipes"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor4
 msgid "Information"
-msgstr ""
+msgstr "Informação"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in pending state"
-msgstr "Prospecções/Oportunidades com situação pendente"
+msgstr "Prospectos/Oportunidades com situação pendente"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_merge_opportunity
@@ -1435,7 +1525,7 @@ msgstr "Mesclar duas Oportunidades"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2partner
 msgid "Phonecall to Partner"
-msgstr "Ligação Telefônica para Parceiro"
+msgstr "Chamada Telefônica para Parceiro"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor8
@@ -1446,18 +1536,18 @@ msgstr "Outros"
 #: field:crm.phonecall,opportunity_id:0
 #: model:ir.model,name:crm.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr "Prospecção/Oportunidade"
+msgstr "Prospecto/Oportunidade"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.action_merge_opportunities
 #: model:ir.actions.act_window,name:crm.merge_opportunity_act
 msgid "Merge leads/opportunities"
-msgstr ""
+msgstr "Mesclar prospectos/oportunidades"
 
 #. module: crm
 #: help:crm.case.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Usado para ordenar estágios. Mais baixo é melhor."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1467,12 +1557,12 @@ msgstr "Categorias de Chamada Telefônica"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in open state"
-msgstr "Prospecções/Oportunidades com situação em aberto"
+msgstr "Prospectos/Oportunidades com situação em aberto"
 
 #. module: crm
 #: model:ir.model,name:crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: crm
 #: constraint:crm.case.section:0
@@ -1483,7 +1573,7 @@ msgstr "Erro! Você não pode criar uma Equipe de Vendas recursiva."
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Log a call"
-msgstr "Registrar a Ligação"
+msgstr "Registrar uma Chamada"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1494,7 +1584,7 @@ msgstr "Valor da Venda"
 #: view:crm.phonecall.report:0
 #: model:ir.actions.act_window,name:crm.act_crm_opportunity_crm_phonecall_new
 msgid "Phone calls"
-msgstr "Ligações Telefônicas"
+msgstr "Chamadas Telefônicas"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_opportunity
@@ -1521,7 +1611,7 @@ msgstr "Nome"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities that are assigned to me"
-msgstr ""
+msgstr "Prospectos/Oportunidades que foram atribuídas a mim"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1533,12 +1623,12 @@ msgstr "Meu(s) Caso(s)"
 #: help:crm.lead,message_ids:0
 #: help:crm.phonecall,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Histórico de mensagens e comunicação"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Show Countries"
-msgstr ""
+msgstr "Mostrar Países"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1563,22 +1653,24 @@ msgstr "Converter do prospecto para parceiro de negócio"
 #: code:addons/crm/crm_lead.py:871
 #, python-format
 msgid "Opportunity has been <b>won</b>."
-msgstr ""
+msgstr "A oportunidade foi <b>ganha</b>."
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls that are assigned to me or to my team(s)"
 msgstr ""
+"Chamadas Telefônicas que foram atribuídas a mim ou às minhas equipes de "
+"vendas."
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_payment_mode
 msgid "CRM Payment Mode"
-msgstr ""
+msgstr "Forma de Pagamento"
 
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in done state"
-msgstr "Prospecções/Oportunidades com o situação concluído"
+msgstr "Prospectos/Oportunidades com o situação concluído"
 
 #. module: crm
 #: field:crm.lead.report,delay_close:0
@@ -1596,7 +1688,7 @@ msgstr "Agrupar Por..."
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Merge Leads/Opportunities"
-msgstr ""
+msgstr "Mesclar Prospectos/Oportunidades"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
@@ -1607,12 +1699,12 @@ msgstr "Equipe Pai"
 #: selection:crm.lead2opportunity.partner,action:0
 #: selection:crm.lead2opportunity.partner.mass,action:0
 msgid "Do not link to a customer"
-msgstr ""
+msgstr "Não conecte a um cliente"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr "Próxima Data de Ação"
+msgstr "Data da Próxima Ação"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1626,11 +1718,15 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"A situação do documento será automaticamente alterada de acordo com o "
+"estágio selecionado. Por exemplo, se um estágio é relacionado à situação "
+"'Fechado', e seu documento muda para este estágio, ele é automaticamente "
+"fechado."
 
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Assign opportunities to"
-msgstr ""
+msgstr "Atribuir oportunidades a"
 
 #. module: crm
 #: field:crm.lead,zip:0
@@ -1645,18 +1741,18 @@ msgstr "Recebidas"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "Month of call"
-msgstr "Mês da Ligação"
+msgstr "Mês da chamada"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:289
 #, python-format
 msgid "Partner has been <b>created</b>."
-msgstr ""
+msgstr "O parceiro foi <b>criado</b>."
 
 #. module: crm
 #: field:sale.config.settings,module_crm_claim:0
 msgid "Manage Customer Claims"
-msgstr ""
+msgstr "Gerenciar Reclamações de Clientes"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.action_report_crm_lead
@@ -1665,11 +1761,15 @@ msgid ""
 "the treatment delays or number of leads per state. You can sort out your "
 "leads analysis by different groups to get accurate grained analysis."
 msgstr ""
+"A Análise de Prospecções permite a você verificar diferentes informações de "
+"CRM como atrasos de tratamento ou o número de prospecto por estado. Você "
+"pode classificar sua análise de prospectos em diferentes grupos para obter "
+"uma análise mais precisa."
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor3
 msgid "Services"
-msgstr ""
+msgstr "Serviços"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -1677,7 +1777,7 @@ msgstr ""
 #: selection:crm.phonecall,priority:0
 #: selection:crm.phonecall.report,priority:0
 msgid "Highest"
-msgstr "Urgente"
+msgstr "Mais Alto"
 
 #. module: crm
 #: help:crm.lead.report,creation_year:0
@@ -1689,7 +1789,7 @@ msgstr "Ano de criação"
 #: view:crm.lead:0
 #: field:crm.lead,description:0
 msgid "Notes"
-msgstr "Observações"
+msgstr "Notas"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_value:0
@@ -1714,7 +1814,7 @@ msgstr "Responder-Para"
 #. module: crm
 #: view:crm.lead:0
 msgid "Display"
-msgstr ""
+msgstr "Exibir"
 
 #. module: crm
 #: view:board.board:0
@@ -1729,7 +1829,7 @@ msgstr "Prospecto convertido em parceiro de negócio"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_unread
 msgid "CRM Lead: Mark unread"
-msgstr ""
+msgstr "Prospecto: Marcar como Não Lido"
 
 #. module: crm
 #: view:crm.case.channel:0
@@ -1755,12 +1855,12 @@ msgstr "Informações Adicionais"
 #. module: crm
 #: view:crm.lead:0
 msgid "Fund Raising"
-msgstr ""
+msgstr "Captação de Recursos"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Edit..."
-msgstr ""
+msgstr "Editar..."
 
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead5
@@ -1786,19 +1886,20 @@ msgstr "Prioridade"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner
 msgid "Lead To Opportunity Partner"
-msgstr "Prospecção para Oportunidade de Parceiro"
+msgstr "Prospecto para Oportunidade de Parceiro"
 
 #. module: crm
 #: help:crm.lead,partner_id:0
 msgid "Linked partner (optional). Usually created when converting the lead."
 msgstr ""
+"Parceiro conectado (opcional). Normalmente criado na conversão de prospecto."
 
 #. module: crm
 #: field:crm.lead,payment_mode:0
 #: view:crm.payment.mode:0
 #: model:ir.actions.act_window,name:crm.action_crm_payment_mode
 msgid "Payment Mode"
-msgstr ""
+msgstr "Forma de Pagamento"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
@@ -1808,19 +1909,19 @@ msgstr "Prospectos para Oportunidades  em lote"
 #. module: crm
 #: view:sale.config.settings:0
 msgid "On Mail Server"
-msgstr ""
+msgstr "No Servidor de E-mail"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.open_board_statistical_dash
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_segmentation_tree-act
 #: model:ir.ui.menu,name:crm.menu_crm_segmentation-act
 msgid "Contacts Segmentation"
-msgstr ""
+msgstr "Segmentação de Contatos"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
@@ -1835,7 +1936,7 @@ msgstr "Televendas"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Prospectos Atribuídos a Mim ou a Minhas Equipes"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_segmentation_line
@@ -1856,20 +1957,19 @@ msgstr "Receitas Esperadas"
 #. module: crm
 #: view:crm.lead:0
 msgid "Referrer"
-msgstr "Referenciador"
+msgstr "Referência"
 
 #. module: crm
 #: help:crm.lead,type:0
 #: help:crm.lead.report,type:0
 msgid "Type is used to separate Leads and Opportunities"
-msgstr "Tipo é utilizado para separar Prospecções e Oportunidades"
+msgstr "Tipo é utilizado para separar Prospectos e Oportunidades"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
 msgid "Are you sure you want to create a partner based on this Phonecall ?"
 msgstr ""
-"Tem certeza que você quer criar uma parceiro baseado nesta chamada "
-"telefônica?"
+"Tem certeza que você quer criar um parceiro baseado nesta chamada telefônica?"
 
 #. module: crm
 #: selection:crm.lead.report,creation_month:0
@@ -1881,12 +1981,12 @@ msgstr "Julho"
 #. module: crm
 #: view:crm.lead:0
 msgid "Lead / Customer"
-msgstr "Prospecção / Cliente"
+msgstr "Prospecto / Cliente"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_2
 msgid "Support Department"
-msgstr ""
+msgstr "Departamento de Suporte"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1903,7 +2003,7 @@ msgstr "Equipe de Vendas"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2partner
 msgid "Lead to Partner"
-msgstr "Prospecção para Parceiro"
+msgstr "Prospecto para Parceiro"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1920,13 +2020,13 @@ msgstr "Equipe"
 #. module: crm
 #: view:crm.lead.report:0
 msgid "Leads/Opportunities which are in New state"
-msgstr "Prospecções/Oportunidades com situação Novo"
+msgstr "Prospectos/Oportunidades com situação Novo"
 
 #. module: crm
 #: code:addons/crm/crm_lead.py:883
 #, python-format
 msgid "%s <b>partner</b> is now set to <em>%s</em>."
-msgstr ""
+msgstr "%s <b>parceiro</b> foi definido para <em>%s</em>."
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -1963,13 +2063,13 @@ msgstr "Prospectos"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor5
 msgid "Design"
-msgstr ""
+msgstr "Desenho"
 
 #. module: crm
 #: selection:crm.lead2opportunity.partner,name:0
 #: selection:crm.lead2opportunity.partner.mass,name:0
 msgid "Merge with existing opportunities"
-msgstr ""
+msgstr "Mesclar com uma oportunidade existente"
 
 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_category_act_oppor11
@@ -1986,12 +2086,24 @@ msgid ""
 "            </p>\n"
 "          "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"              Clique para criar uma nova oportunidade.\n"
+"            </p><p>\n"
+"              O OpenERP auxilia você a monitorar suas vendas para "
+"acompanhar\n"
+"              vendas em potencial e prever melhor suas futuras receitas.\n"
+"            </p><p>\n"
+"              Você poderá planejar reuniões e chamadas telefônicas a partir\n"
+"              de oportunidades, convertê-las em cotações, anexar documentos\n"
+"              relacionados, rastrear todas as discussões e muito mais.\n"
+"            </p>\n"
+"          "
 
 #. module: crm
 #: view:crm.phonecall.report:0
 #: selection:crm.phonecall.report,state:0
 msgid "Todo"
-msgstr "Por fazer"
+msgstr "A Fazer"
 
 #. module: crm
 #: field:crm.lead,user_email:0
@@ -2004,12 +2116,14 @@ msgid ""
 "The name of the future partner company that will be created while converting "
 "the lead into opportunity"
 msgstr ""
+"O nome da futura empresa parceira que será criada quando o prospecto for "
+"convertido para oportunidade"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,note:0
 #: field:crm.phonecall2phonecall,note:0
 msgid "Note"
-msgstr "Observação"
+msgstr "Notas"
 
 #. module: crm
 #: selection:crm.lead,priority:0
@@ -2037,7 +2151,7 @@ msgstr "Oportunidades em Aberto"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead2
 msgid "Email Campaign - Services"
-msgstr ""
+msgstr "Campanha po E-mail - Serviços"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2070,6 +2184,23 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para criar um prospecto não qualificado. \n"
+"          </p><p>\n"
+"            Utilize prospectos se você necessita de uma etapa de "
+"qualificação\n"
+"            antes de criar uma oportunidade ou um cliente. Pode ser um "
+"cartão\n"
+"            de visitas que você recebeu, um formulário de contato preenchido "
+"em\n"
+"            seu site, um arquivo de prospectos não qualificados que você "
+"importou, etc.\n"
+"          </p><p>\n"
+"            Um vez qualificado, o prospecto pode ser convertido em uma\n"
+"            oportunidade de negócios e/ou um novo cliente em seu livro \n"
+"            de endereços.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: field:crm.lead,email_cc:0
@@ -2083,7 +2214,7 @@ msgstr "CC Global"
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone
 #: model:ir.ui.menu,name:crm.menu_crm_config_phonecall
 msgid "Phone Calls"
-msgstr "Ligações Telefônicas"
+msgstr "Chamadas Telefônicas"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -2124,13 +2255,13 @@ msgstr "Expressão Obrigatória"
 #: selection:crm.lead2partner,action:0
 #: selection:crm.phonecall2partner,action:0
 msgid "Create a new customer"
-msgstr ""
+msgstr "Criar um novo cliente"
 
 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
 #: field:crm.lead2opportunity.partner.mass,action:0
 msgid "Related Customer"
-msgstr ""
+msgstr "Cliente Relacionado"
 
 #. module: crm
 #: field:crm.lead.report,deadline_day:0
@@ -2140,12 +2271,12 @@ msgstr "Fechamento Esperado"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor2
 msgid "Software"
-msgstr ""
+msgstr "Aplicativos"
 
 #. module: crm
 #: field:crm.case.section,change_responsible:0
 msgid "Reassign Escalated"
-msgstr "Reatribuir Encaminhamentos"
+msgstr "Reatribuir Escalados"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -2178,12 +2309,12 @@ msgstr "Cidade"
 #. module: crm
 #: selection:crm.case.stage,type:0
 msgid "Both"
-msgstr ""
+msgstr "Ambos"
 
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Call Done"
-msgstr ""
+msgstr "Chamada Concluída"
 
 #. module: crm
 #: view:crm.phonecall:0
@@ -2194,23 +2325,23 @@ msgstr "Responsável"
 #. module: crm
 #: model:ir.actions.server,name:crm.action_email_reminder_customer_lead
 msgid "Reminder to Customer"
-msgstr ""
+msgstr "Lembrete para Cliente"
 
 #. module: crm
 #: model:crm.case.section,name:crm.crm_case_section_3
 msgid "Direct Marketing"
-msgstr ""
+msgstr "Marketing Direto"
 
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor1
 msgid "Product"
-msgstr ""
+msgstr "Produto"
 
 #. module: crm
 #: code:addons/crm/crm_phonecall.py:284
 #, python-format
 msgid "Phonecall has been <b>created and opened</b>."
-msgstr ""
+msgstr "A Chamada Telefônica foi <b>criada e aberta</b>."
 
 #. module: crm
 #: field:base.action.rule,trg_max_history:0
@@ -2220,12 +2351,12 @@ msgstr "Histórico Máximo de Comunicação"
 #. module: crm
 #: view:crm.lead2opportunity.partner.mass:0
 msgid "Conversion Options"
-msgstr ""
+msgstr "Opções de Conversão"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Endereço"
 
 #. module: crm
 #: help:crm.case.section,alias_id:0
@@ -2233,11 +2364,13 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"O endereço de e-mail associado a esta equipe. Novos e-mails recebidos "
+"criarão automaticamente novos prospectos atribuídos à equipe."
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Opportunities"
-msgstr "Oportunidades não Atribuídas"
+msgstr "Oportunidades Não Atribuídas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2292,13 +2425,13 @@ msgstr "Continuar Processo"
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 #: model:ir.actions.act_window,name:crm.phonecall2opportunity_act
 msgid "Convert to opportunity"
-msgstr ""
+msgstr "Converter para Oportunidade"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
 #: field:crm.phonecall2phonecall,user_id:0
 msgid "Assign To"
-msgstr "Atribuído Para"
+msgstr "Atribuir Para"
 
 #. module: crm
 #: field:crm.lead,date_action_last:0
@@ -2327,6 +2460,19 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para agendar uma chamada \n"
+"          </p><p>\n"
+"            O OpenERP permite definir facilmente todas as chamadas a serem "
+"feitas\n"
+"            pela sua equipe de vendas e acompanhá-las baseando-se no seu "
+"resumo.\n"
+"          </p><p>  \n"
+"            Você pode utilizar o recurso de importação para importar uma "
+"nova lista\n"
+"            de prospectos para qualificar.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: help:crm.case.stage,fold:0
@@ -2334,12 +2480,14 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Este estágio não é visível, por exemplo na barra de status ou visão kanban, "
+"quando não há registros definidos no mesmo para visualizar."
 
 #. module: crm
 #: field:crm.lead.report,nbr:0
 #: field:crm.phonecall.report,nbr:0
 msgid "# of Cases"
-msgstr "# de Casos"
+msgstr "Nº de Casos"
 
 #. module: crm
 #: help:crm.phonecall,section_id:0
@@ -2349,12 +2497,12 @@ msgstr "Equipe de Vendas ao qual pertence o Caso."
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Anúncios em Banners"
 
 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
 msgid "Leads/Opportunities"
-msgstr ""
+msgstr "Prospectos/Oportunidades"
 
 #. module: crm
 #: field:crm.lead,fax:0
@@ -2374,12 +2522,12 @@ msgstr "Empresa"
 #. module: crm
 #: view:base.action.rule:0
 msgid "Conditions on Communication History"
-msgstr ""
+msgstr "Condições no Histórico de Comunicações"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Unassigned Leads"
-msgstr "Propecções não Atribuídas"
+msgstr "Propectos não Atribuídos"
 
 #. module: crm
 #: field:crm.case.categ,object_id:0
@@ -2389,17 +2537,17 @@ msgstr "Nome do Objeto"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Phone Calls Assigned to Me or My Team(s)"
-msgstr ""
+msgstr "Chamadas Telefônicas Atribuídas a Mim ou Minhas Equipes"
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Reset"
-msgstr ""
+msgstr "Reiniciar"
 
 #. module: crm
 #: view:sale.config.settings:0
 msgid "After-Sale Services"
-msgstr ""
+msgstr "Serviços Pós-Venda"
 
 #. module: crm
 #: model:ir.actions.server,message:crm.action_email_reminder_customer_lead
@@ -2415,6 +2563,16 @@ msgid ""
 "Thanks,\n"
 "            "
 msgstr ""
+"Olá [[object.partner_id and object.partner_id.name or '']], \n"
+"o seu prospecto abaixo não está aberto há 5 dias.\n"
+"\n"
+"Prospecto: [[object.id ]]\n"
+"Descrição:\n"
+"\n"
+"    [[object.description]]\n"
+"\n"
+"Atenciosamente,\n"
+"            "
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -2431,13 +2589,13 @@ msgstr "Mensagens"
 #. module: crm
 #: help:crm.lead,channel_id:0
 msgid "Communication channel (mail, direct, phone, ...)"
-msgstr "Canal de comunicação (email, diretamente, telefone, ...)"
+msgstr "Canal de comunicação (e-mail, diretamente, telefone, ...)"
 
 #. module: crm
 #: field:crm.opportunity2phonecall,name:0
 #: field:crm.phonecall2phonecall,name:0
 msgid "Call summary"
-msgstr "Resumo da ligação"
+msgstr "Resumo da chamada"
 
 #. module: crm
 #: selection:crm.case.stage,state:0
@@ -2446,7 +2604,7 @@ msgstr "Resumo da ligação"
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Cancelled"
-msgstr "Cancelado"
+msgstr "Cancelada"
 
 #. module: crm
 #: field:crm.lead,color:0
@@ -2469,12 +2627,12 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Situação Relacionada"
 
 #. module: crm
 #: field:crm.phonecall,name:0
 msgid "Call Summary"
-msgstr "Resumo da Ligação"
+msgstr "Resumo da Chamada"
 
 #. module: crm
 #: field:crm.segmentation.line,expr_operator:0
@@ -2485,12 +2643,12 @@ msgstr "Operador"
 #: view:crm.lead:0
 #: model:ir.actions.act_window,name:crm.opportunity2phonecall_act
 msgid "Schedule/Log Call"
-msgstr "Agendar/Registrar Ligações"
+msgstr "Agendar/Registrar Chamada"
 
 #. module: crm
 #: view:crm.merge.opportunity:0
 msgid "Select Leads/Opportunities"
-msgstr ""
+msgstr "Selecionar Prospetos/Oportunidades"
 
 #. module: crm
 #: selection:crm.phonecall,state:0
@@ -2510,7 +2668,7 @@ msgstr "Confirmar"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Mensagens não lidas"
 
 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@@ -2527,12 +2685,12 @@ msgstr "Expressão Opcional"
 #: field:crm.lead,message_follower_ids:0
 #: field:crm.phonecall,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Seguidores"
 
 #. module: crm
 #: field:sale.config.settings,fetchmail_lead:0
 msgid "Create leads from incoming mails"
-msgstr ""
+msgstr "Criar prospectos a partir de e-mails recebidos"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2560,7 +2718,7 @@ msgstr "Chamada Agendada"
 #: view:crm.lead.report:0
 #: view:crm.phonecall.report:0
 msgid "My Sales Team(s)"
-msgstr "Minha Equipe de Vendas"
+msgstr "Minha(s) Equipe(s) de Vendas"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
@@ -2583,7 +2741,7 @@ msgstr "Criar oportunidades de negócios a partir de prospectos"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Campanha por E-mail - Produtos"
 
 #. module: crm
 #: field:base.action.rule,act_categ_id:0
@@ -2607,16 +2765,27 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Clique para registrar o resumo de sua chamada telefônica. \n"
+"          </p><p>\n"
+"            O OpenERP permite registrar chamadas recebidas para rastrear o\n"
+"            histórico de comunicações com o cliente ou para informar outro\n"
+"            membro da equipe.\n"
+"          </p><p>\n"
+"            Para acompanhar uma chamada, você pode disparar uma solicitação\n"
+"            outra chamada, uma reunião ou uma oportunidade.\n"
+"          </p>\n"
+"        "
 
 #. module: crm
 #: model:process.node,note:crm.process_node_leads0
 msgid "Very first contact with new prospect"
-msgstr "Primeiro contato com a nova prospecção"
+msgstr "O primeiro contato com um novo prospecto"
 
 #. module: crm
 #: view:res.partner:0
 msgid "Calls"
-msgstr ""
+msgstr "Chamadas"
 
 #. module: crm
 #: field:crm.case.stage,on_change:0
@@ -2626,7 +2795,7 @@ msgstr "Mudar Probabilidade Automaticamente"
 #. module: crm
 #: view:crm.phonecall.report:0
 msgid "My Phone Calls"
-msgstr ""
+msgstr "Minhas Chamadas Telefônicas"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead3
@@ -2652,12 +2821,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo marcador de vendas.\n"
+"              </p><p>\n"
+"                Crie marcadores específicos que combinam com as atividades\n"
+"                da empresa para melhor classificar e analisar seus "
+"prospectos\n"
+"                e oportunidades. Estas categorias podem refletir a "
+"estrutura\n"
+"                de seus produtos ou os diferente tipos de venda "
+"disponíveis.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_partner.py:48
 #, python-format
 msgid "A partner is already defined."
-msgstr "O parceiro já foi definido"
+msgstr "Um parceiro já foi definido."
 
 #. module: crm
 #: view:sale.config.settings:0
@@ -2705,12 +2886,12 @@ msgstr "Agendar Reunião"
 #. module: crm
 #: field:crm.lead.report,deadline_year:0
 msgid "Ex. Closing Year"
-msgstr "Ex Fechamento Anual"
+msgstr "Expectativa de Fechamento Anual"
 
 #. module: crm
 #: model:ir.actions.client,name:crm.action_client_crm_menu
 msgid "Open Sale Menu"
-msgstr ""
+msgstr "Abrir Menu de Venda"
 
 #. module: crm
 #: field:crm.lead,date_open:0
@@ -2728,7 +2909,7 @@ msgstr "Membros da Equipe"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr "Agendar/Registrar uma Ligação"
+msgstr "Agendar/Registrar uma Chamada"
 
 #. module: crm
 #: field:crm.lead,planned_cost:0
@@ -2738,7 +2919,7 @@ msgstr "Custos Planejados"
 #. module: crm
 #: help:crm.lead,date_deadline:0
 msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Estimativa de data em que a oportunidade será ganha."
 
 #. module: crm
 #: help:crm.lead,email_cc:0
@@ -2747,15 +2928,15 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
-"Estes endereços de email serão adicionados para o campo CC de todas entradas "
-"e saídas de emails para este registro antes de ser enviado. Separe múltiplos "
-"endereços de email com vírgula."
+"Estes endereços de e-mail serão adicionados no campo CC de todas as entradas "
+"e saídas de e-mails para este registro antes de serem enviados. Separe "
+"múltiplos endereços de e-mail com vírgula."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Logged Calls"
-msgstr "Ligações Registradas"
+msgstr "Chamadas Registradas"
 
 #. module: crm
 #: field:crm.partner2opportunity,probability:0
@@ -2768,7 +2949,7 @@ msgstr "Probabilidade de Sucesso"
 #: selection:crm.phonecall,state:0
 #: selection:crm.phonecall.report,state:0
 msgid "Draft"
-msgstr "Provisório"
+msgstr "Rascunho"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@@ -2815,7 +2996,7 @@ msgstr "Complemento"
 #. module: crm
 #: field:sale.config.settings,module_crm_helpdesk:0
 msgid "Manage Helpdesk and Support"
-msgstr ""
+msgstr "Gerenciar Helpdesk e Suporte"
 
 #. module: crm
 #: view:crm.phonecall2partner:0
@@ -2848,7 +3029,7 @@ msgstr "Novembro"
 #: field:crm.phonecall,message_comment_ids:0
 #: help:crm.phonecall,message_comment_ids:0
 msgid "Comments and emails"
-msgstr ""
+msgstr "Comentários e e-mails"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead5
@@ -2881,7 +3062,7 @@ msgstr "Anúncios Twitter"
 #. module: crm
 #: field:crm.case.stage,case_default:0
 msgid "Common to All Teams"
-msgstr "Comum a todas as equipes"
+msgstr "Comum a Todas as Equipes"
 
 #. module: crm
 #: field:crm.lead.report,creation_day:0
@@ -2896,12 +3077,12 @@ msgstr "Receitas Programadas"
 #. module: crm
 #: model:ir.actions.server,name:crm.actions_server_crm_lead_read
 msgid "CRM Lead: Mark read"
-msgstr ""
+msgstr "Prospecto: Marcar como Lido"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall2phonecall
 msgid "Phonecall To Phonecall"
-msgstr "Ligação para Ligação"
+msgstr "Chamada Telefônica para Chamada Telefônica"
 
 #. module: crm
 #: help:crm.lead.report,deadline_year:0
@@ -2911,13 +3092,13 @@ msgstr "Ano esperado para fechamento"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_case_stage
 msgid "Stage of case"
-msgstr "Estágio do Caso"
+msgstr "Estágio do caso"
 
 #. module: crm
 #: selection:crm.opportunity2phonecall,action:0
 #: selection:crm.phonecall2phonecall,action:0
 msgid "Schedule a call"
-msgstr "Agendar a Ligação"
+msgstr "Agendar uma chamada"
 
 #. module: crm
 #: view:crm.lead:0
@@ -2928,7 +3109,7 @@ msgstr "Categorização"
 #: view:crm.lead:0
 #: view:crm.phonecall2phonecall:0
 msgid "Log Call"
-msgstr "Registrar Ligação"
+msgstr "Registrar Chamada"
 
 #. module: crm
 #: model:ir.model,name:crm.model_base_action_rule
@@ -2939,6 +3120,7 @@ msgstr "Regras de Ação"
 #: help:sale.config.settings,group_fund_raising:0
 msgid "Allows you to trace and manage your activities for fund raising."
 msgstr ""
+"Permite rastrear e gerenciar suas atividades de captação de recursos."
 
 #. module: crm
 #: field:crm.meeting,phonecall_id:0
@@ -2950,6 +3132,8 @@ msgstr "Chamada Telefônica"
 #: view:crm.phonecall.report:0
 msgid "Phone calls that are assigned to one of the sale teams I manage"
 msgstr ""
+"Chamadas telefônicas que foram atribuídas a alguém das equipes de vendas que "
+"gerencio."
 
 #. module: crm
 #: view:crm.lead:0
@@ -2960,7 +3144,7 @@ msgstr "Data de Criação"
 #: view:crm.lead:0
 #: view:crm.phonecall2opportunity:0
 msgid "at"
-msgstr ""
+msgstr "em"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead1
@@ -3027,11 +3211,25 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo canal.\n"
+"              </p><p>\n"
+"                Utilize canais para rastrear a fonte de seus prospectos e "
+"oportunidades.\n"
+"                Canais são mais usados em relatórios para analisar o "
+"desempenho de vendas\n"
+"                relacionado aos esforços de marketing.\n"
+"              </p><p>\n"
+"                Alguns exemplos de canais: website da empresa, campanha por "
+"telefone,\n"
+"                revenda, etc.\n"
+"              </p>\n"
+"            "
 
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Notas Internas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3056,7 +3254,7 @@ msgstr "Indicado por"
 #. module: crm
 #: view:crm.phonecall:0
 msgid "Reset to Todo"
-msgstr "Voltar para Pendente"
+msgstr "Devolver para A Fazer"
 
 #. module: crm
 #: field:crm.case.section,working_hours:0
@@ -3067,7 +3265,7 @@ msgstr "Horas Trabalhadas"
 #: view:crm.phonecall:0
 #: field:res.partner,phonecall_ids:0
 msgid "Phonecalls"
-msgstr "Ligações Telefônicas"
+msgstr "Chamadas Telefônicas"
 
 #. module: crm
 #: view:crm.lead:0
@@ -3095,13 +3293,14 @@ msgstr "Agendar uma Reunião"
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead8
 msgid "Lost"
-msgstr "Perda"
+msgstr "Perdido"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:100
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
+"Prospectos fechados/cancelados não podem ser convertidos para oportunidades."
 
 #. module: crm
 #: field:crm.lead,country_id:0
@@ -3143,7 +3342,7 @@ msgstr "Avaliação"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_phonecall_report
 msgid "Phone calls by user and section"
-msgstr "Ligações Telefônicas por usuário e seção"
+msgstr "Chamada telefônicas por usuário e seção"
 
 #. module: crm
 #: code:addons/crm/crm_meeting.py:55
@@ -3152,6 +3351,8 @@ msgid ""
 "Meeting linked to the opportunity <em>%s</em> has been <b>created</b> and "
 "<b>scheduled</b> on <em>%s</em>."
 msgstr ""
+"Uma reunião relacionada à oportunidade <em>%s</em> foi <b>criada</b> e "
+"<b>agendada</b> em <em>%s</em>."
 
 #. module: crm
 #: view:crm.lead:0
@@ -3203,6 +3404,16 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para definir um novo estágio de "
+"prospecto/oportunidade.\n"
+"              </p><p>\n"
+"                Os estágios permitirão aos vendedores determinar facilmente "
+"como\n"
+"                um prospecto ou oportunidade específica está posicionado no\n"
+"                ciclo de vendas.\n"
+"              </p>\n"
+"            "
 
 #, python-format
 #~ msgid ""
diff --git a/addons/crm_partner_assign/i18n/nb.po b/addons/crm_partner_assign/i18n/nb.po
new file mode 100644
index 00000000000..56497c83f58
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/nb.po
@@ -0,0 +1,931 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-03 16:03+0000\n"
+"PO-Revision-Date: 2012-12-06 10:55+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr "Forsinkelse til lukking."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,author_id:0
+msgid "Author"
+msgstr "Forfatter."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Planlagt omsetning."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,type:0
+msgid ""
+"Message type: email for email message, notification for system message, "
+"comment for other messages such as user replies"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# av Saker."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Group By..."
+msgstr "Grupper etter ..."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,body:0
+msgid "Automatically sanitized HTML contents"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Forward"
+msgstr "Fremover."
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo lokalisert."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Body"
+msgstr "Kropp."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_from:0
+msgid ""
+"Email address of the sender. This field is set when no matching partner is "
+"found for incoming emails."
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Date Partnership"
+msgstr "Dato Partnerskap."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "Fører."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr "Forsinket til lukking."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history_mode:0
+msgid "Whole Story"
+msgstr "Hele historien."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "Firma."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,notification_ids:0
+msgid "Notifications"
+msgstr "Varsling."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_assign:0
+msgid "Partner Date"
+msgstr "Partner dato."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+#: view:res.partner:0
+msgid "Salesperson"
+msgstr "Salgsman."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "Høyest."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "Dag."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,message_id:0
+msgid "Message unique identifier"
+msgstr "Unik melding identifikator."
+
+#. module: crm_partner_assign
+#: field:res.partner,date_review_next:0
+msgid "Next Partner Review"
+msgstr "Neste partner anmeldelse."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,favorite_user_ids:0
+msgid "Favorite"
+msgstr "Favoritt."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history_mode:0
+msgid "Latest email"
+msgstr "Siste e-posten."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "Kansellert."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Email composition wizard"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,turnover:0
+msgid "Turnover"
+msgstr "Omsetning."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "Lukkingsdato."
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Partner Activation"
+msgstr "Partner Aktivisering."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,type:0
+msgid "System notification"
+msgstr "System varsling."
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
+#, python-format
+msgid "Lead forward"
+msgstr "Fører framover."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Forrige."
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:36
+#, python-format
+msgid "Network error"
+msgstr "Nettverks feil."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "Fra."
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Section"
+msgstr "Seksjon."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send"
+msgstr "Send."
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "Neste."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "Prioritet."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,author_id:0
+msgid ""
+"Author of the message. If not set, email_from may hold an email address that "
+"did not match any partner."
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,favorite_user_ids:0
+msgid "Users that set this message in their favorites"
+msgstr "Brukere som setter denne meldingen i sine favoritter."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr "Passert frist."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,type:0
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "Type."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,type:0
+msgid "Email"
+msgstr "E-post."
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr "Partner, denne saken har blitt videresendt / tildelt."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "Laveste."
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Date Invoice"
+msgstr "Faktura dato."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,template_id:0
+msgid "Template"
+msgstr "Mal."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Assign Date"
+msgstr "Tildel dato."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "Fører analyse."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "Opprettelses dato."
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_activation
+msgid "res.partner.activation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,parent_id:0
+msgid "Parent Message"
+msgstr "Partner melding."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,res_id:0
+msgid "Related Document ID"
+msgstr "Relatert dokument ID."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "Venter."
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "Typen brukes til å skille fører og muligheter."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "Juli."
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Date Review"
+msgstr "Anmeldelse dato."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr "Fase."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "Status"
+msgstr "Status."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,to_read:0
+msgid "To read"
+msgstr "Å lese."
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77
+#, python-format
+msgid "Fwd"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo lokalisering."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: view:crm.partner.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "Tilordnet muligheter analyse."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "Avbryt."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history_mode:0
+msgid "Send history"
+msgstr "Send historie."
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr "Lukk."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "Mars."
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Antall dager til sak lukkes."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,notified_partner_ids:0
+msgid ""
+"Partners that have a notification pushing this message in their mailboxes"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,type:0
+msgid "Comment"
+msgstr "Kommentar."
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr "Vekt."
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "April."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,grade_id:0
+msgid "Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "Desember."
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,vote_user_ids:0
+msgid "Users that voted for this message"
+msgstr "Brukere som stemte på denne beskjeden."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "Måned."
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "Åpningsdato."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,child_ids:0
+msgid "Child Messages"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,date_review:0
+#: field:res.partner,date_review:0
+msgid "Latest Partner Review"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "Emne."
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "or"
+msgstr "Eller."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Contents"
+msgstr "Innhold."
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,vote_user_ids:0
+msgid "Votes"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,date_partnership:0
+#: field:res.partner,date_partnership:0
+msgid "Partnership Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Team"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward
+msgid "Mass forward to partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,record_name:0
+msgid "Name get of the related document."
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,user_id:0
+#: field:crm.partner.report.assign,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,opp:0
+msgid "# of Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Lead Assign"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Send Mail"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,date:0
+msgid "Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Partner Review"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.partner.report.assign,period_id:0
+msgid "Invoice Period"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,message_id:0
+msgid "Message-Id"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "Attachments"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,record_name:0
+msgid "Message Record Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.activation,sequence:0
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:37
+#, python-format
+msgid ""
+"Cannot contact geolocation servers. Please make sure that your internet "
+"connection is up and running (%s)."
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subtype_id:0
+msgid "Subtype"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "Lead/Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,notified_partner_ids:0
+msgid "Notified partners"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+#: field:crm.partner.report.assign,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,activation:0
+#: view:res.partner:0
+#: field:res.partner,activation:0
+#: view:res.partner.activation:0
+msgid "Activation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner,grade_id:0
+msgid "Partner Level"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.activation,name:0
+msgid "Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act
+#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi
+msgid "Partner Activations"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,year:0
+msgid "Year"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree
+msgid "Partnership Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,notification_ids:0
+msgid ""
+"Technical field holding the message notifications. Use notified_partner_ids "
+"to access notified partners."
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.partner.report.assign:0
+msgid "Partner assigned Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,composition_mode:0
+msgid "Composition mode"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,model:0
+msgid "Related Document Model"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history_mode:0
+msgid "Case Information"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,to_read:0
+msgid "Functional field to search for messages the current user has to read"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
+msgid "CRM Partner Report"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,partner_ids:0
+msgid "Additional contacts"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,parent_id:0
+msgid "Initial thread message."
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,filter_id:0
+msgid "Filters"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: view:crm.partner.report.assign:0
+#: field:crm.partner.report.assign,partner_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr ""
diff --git a/addons/crm_todo/i18n/pt_BR.po b/addons/crm_todo/i18n/pt_BR.po
index 03e62a86157..eb001f1426c 100644
--- a/addons/crm_todo/i18n/pt_BR.po
+++ b/addons/crm_todo/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-02-16 14:02+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 13:12+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_project_task
@@ -30,7 +30,7 @@ msgstr "Período de Tempo"
 #. module: crm_todo
 #: view:crm.lead:0
 msgid "Lead"
-msgstr ""
+msgstr "Prospecto"
 
 #. module: crm_todo
 #: view:crm.lead:0
@@ -67,12 +67,12 @@ msgstr "Cancelar"
 #. module: crm_todo
 #: model:ir.model,name:crm_todo.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Prospecto/Oportunidade"
 
 #. module: crm_todo
 #: field:project.task,lead_id:0
 msgid "Lead / Opportunity"
-msgstr "Prospecção / Oportunidade"
+msgstr "Prospecto / Oportunidade"
 
 #. module: crm_todo
 #: view:crm.lead:0
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 66c7e5a7f5c..6202701714c 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -117,7 +117,7 @@
       <act_window
             context="{'search_default_server_id': active_id, 'default_fetchmail_server_id': active_id}"
             id="act_server_history" name="Messages" domain="[('email_from', '!=', False), ('fetchmail_server_id', '=', active_id)]"
-            res_model="mail.message" src_model="fetchmail.server"/>
+            res_model="mail.mail" src_model="fetchmail.server"/>
 
     </data>
 </openerp>
diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py
index 3a40e7dfc0a..f1e0d1a8580 100644
--- a/addons/fleet/__openerp__.py
+++ b/addons/fleet/__openerp__.py
@@ -52,7 +52,7 @@ Main Features
         'fleet_data.xml',
         'fleet_board_view.xml',
     ],
-    'update_xml' : ['security/ir.model.access.csv'],
+    'update_xml' : ['security/fleet_security.xml','security/ir.model.access.csv'],
 
     'demo': ['fleet_cars.xml','fleet_demo.xml'],
 
diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index e74ac4839f4..db999d41d12 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -66,8 +66,8 @@ class fleet_vehicle_cost(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.vehicle_id.name
-            if record.cost_subtype.name:
-                name += ' / '+ record.cost_subtype.name
+            if record.cost_subtype_id.name:
+                name += ' / '+ record.cost_subtype_id.name
             if record.date:
                 name += ' / '+ record.date
             res[record.id] = name
@@ -76,7 +76,7 @@ class fleet_vehicle_cost(osv.Model):
     _columns = {
         'name': fields.function(_cost_name_get_fnc, type="char", string='Name', store=True),
         'vehicle_id': fields.many2one('fleet.vehicle', 'Vehicle', required=True, help='Vehicle concerned by this log'),
-        'cost_subtype': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
+        'cost_subtype_id': fields.many2one('fleet.service.type', 'Type', help='Cost type purchased with this cost'),
         'amount': fields.float('Total Price'),
         'cost_type': fields.selection([('contract', 'Contract'), ('services','Services'), ('fuel','Fuel'), ('other','Other')], 'Category of the cost', help='For internal purpose only', required=True),
         'parent_id': fields.many2one('fleet.vehicle.cost', 'Parent', help='Parent cost to this current cost'),
@@ -104,7 +104,7 @@ class fleet_vehicle_cost(osv.Model):
         if 'contract_id' in data and data['contract_id']:
             contract = self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, data['contract_id'], context=context)
             data['vehicle_id'] = contract.vehicle_id.id
-            data['cost_subtype'] = contract.cost_subtype.id
+            data['cost_subtype_id'] = contract.cost_subtype_id.id
             data['cost_type'] = contract.cost_type
         if 'odometer' in data and not data['odometer']:
             #if received value for odometer is 0, then remove it from the data as it would result to the creation of a
@@ -135,8 +135,8 @@ class fleet_vehicle_model(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.modelname
-            if record.brand.name:
-                name = record.brand.name + ' / ' + name
+            if record.brand_id.name:
+                name = record.brand_id.name + ' / ' + name
             res[record.id] = name
         return res
 
@@ -157,11 +157,11 @@ class fleet_vehicle_model(osv.Model):
     _columns = {
         'name': fields.function(_model_name_get_fnc, type="char", string='Name', store=True),
         'modelname': fields.char('Model name', size=32, required=True), 
-        'brand': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
+        'brand_id': fields.many2one('fleet.vehicle.model.brand', 'Model Brand', required=True, help='Brand of the vehicle'),
         'vendors': fields.many2many('res.partner', 'fleet_vehicle_model_vendors', 'model_id', 'partner_id', string='Vendors'),
-        'image': fields.related('brand', 'image', type="binary", string="Logo"),
-        'image_medium': fields.related('brand', 'image_medium', type="binary", string="Logo"),
-        'image_small': fields.related('brand', 'image_small', type="binary", string="Logo"),
+        'image': fields.related('brand_id', 'image', type="binary", string="Logo"),
+        'image_medium': fields.related('brand_id', 'image_medium', type="binary", string="Logo"),
+        'image_small': fields.related('brand_id', 'image_small', type="binary", string="Logo"),
     }
 
 
@@ -210,7 +210,7 @@ class fleet_vehicle(osv.Model):
     def _vehicle_name_get_fnc(self, cr, uid, ids, prop, unknow_none, context=None):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
-            res[record.id] = record.model_id.brand.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
+            res[record.id] = record.model_id.brand_id.name + '/' + record.model_id.modelname + ' / ' + record.license_plate
         return res
 
     def return_action_to_open(self, cr, uid, ids, context=None):
@@ -308,7 +308,7 @@ class fleet_vehicle(osv.Model):
                         ids = self.pool.get('fleet.vehicle.log.contract').search(cr,uid,[('vehicle_id', '=', record.id), ('state', 'in', ('open', 'toclose'))], limit=1, order='expiration_date asc')
                         if len(ids) > 0:
                             #we display only the name of the oldest overdue/due soon contract
-                            name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype.name)
+                            name=(self.pool.get('fleet.vehicle.log.contract').browse(cr, uid, ids[0], context=context).cost_subtype_id.name)
 
             res[record.id] = {
                 'contract_renewal_overdue': overdue,
@@ -333,14 +333,14 @@ class fleet_vehicle(osv.Model):
         'company_id': fields.many2one('res.company', 'Company'),
         'license_plate': fields.char('License Plate', size=32, required=True, help='License plate number of the vehicle (ie: plate number for a car)'),
         'vin_sn': fields.char('Chassis Number', size=32, help='Unique number written on the vehicle motor (VIN/SN number)'),
-        'driver': fields.many2one('res.partner', 'Driver', help='Driver of the vehicle'),
-        'model_id': fields.many2one('fleet.vehicle.model', 'Model', required=True, help='Model of the vehicle'),
-        'log_fuel': fields.one2many('fleet.vehicle.log.fuel', 'vehicle_id', 'Fuel Logs'),
+        'driver_id': fields.many2one('res.partner', 'Driver', _idhelp='Driver of the vehicle'),
+        'model_id': fields.many2one('fleet.vehicle.model', 'Model', requ_idired=True, help='Model of the vehicle'),
+        'log_fuel': fields.one2many('fleet.vehicle.log.f_iduel', 'vehicle_id', 'Fuel Logs'),
         'log_services': fields.one2many('fleet.vehicle.log.services', 'vehicle_id', 'Services Logs'),
         'log_contracts': fields.one2many('fleet.vehicle.log.contract', 'vehicle_id', 'Contracts'),
         'acquisition_date': fields.date('Acquisition Date', required=False, help='Date when the vehicle has been bought'),
         'color': fields.char('Color', size=32, help='Color of the vehicle'),
-        'state': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
+        'state_id': fields.many2one('fleet.vehicle.state', 'State', help='Current state of the vehicle', ondelete="set null"),
         'location': fields.char('Location', size=128, help='Location of the vehicle (garage, ...)'),
         'seats': fields.integer('Seats Number', help='Number of seats of the vehicle'),
         'doors': fields.integer('Doors Number', help='Number of doors of the vehicle'),
@@ -366,7 +366,7 @@ class fleet_vehicle(osv.Model):
     _defaults = {
         'doors': 5,
         'odometer_unit': 'kilometers',
-        'state': _get_default_state,
+        'state_id': _get_default_state,
     }
 
     def copy(self, cr, uid, id, default=None, context=None):
@@ -408,13 +408,13 @@ class fleet_vehicle(osv.Model):
                 value = self.pool.get('fleet.vehicle.model').browse(cr,uid,vals['model_id'],context=context).name
                 oldmodel = vehicle.model_id.name or _('None')
                 changes.append(_("Model: from '%s' to '%s'") %(oldmodel, value))
-            if 'driver' in vals and vehicle.driver.id != vals['driver']:
-                value = self.pool.get('res.partner').browse(cr,uid,vals['driver'],context=context).name
-                olddriver = (vehicle.driver.name) or _('None')
+            if 'driver_id' in vals and vehicle.driver_id.id != vals['driver_id']:
+                value = self.pool.get('res.partner').browse(cr,uid,vals['driver_id'],context=context).name
+                olddriver = (vehicle.driver_id.name) or _('None')
                 changes.append(_("Driver: from '%s' to '%s'") %(olddriver, value))
-            if 'state' in vals and vehicle.state.id != vals['state']:
-                value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state'],context=context).name
-                oldstate = vehicle.state.name or _('None')
+            if 'state_id' in vals and vehicle.state_id.id != vals['state_id']:
+                value = self.pool.get('fleet.vehicle.state').browse(cr,uid,vals['state_id'],context=context).name
+                oldstate = vehicle.state_id.name or _('None')
                 changes.append(_("State: from '%s' to '%s'") %(oldstate, value))
             if 'license_plate' in vals and vehicle.license_plate != vals['license_plate']:
                 old_license_plate = vehicle.license_plate or _('None')
@@ -548,7 +548,7 @@ class fleet_vehicle_log_fuel(osv.Model):
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'date': fields.date.context_today,
-        'cost_subtype': _get_default_service_type,
+        'cost_subtype_id': _get_default_service_type,
         'cost_type': 'fuel',
     }
 
@@ -585,7 +585,7 @@ class fleet_vehicle_log_services(osv.Model):
     _defaults = {
         'purchaser_id': lambda self, cr, uid, ctx: uid,
         'date': fields.date.context_today,
-        'cost_subtype': _get_default_service_type,
+        'cost_subtype_id': _get_default_service_type,
         'cost_type': 'services'
     }
 
@@ -630,7 +630,7 @@ class fleet_vehicle_log_contract(osv.Model):
                     'amount': contract.cost_generated,
                     'date': startdate.strftime(tools.DEFAULT_SERVER_DATE_FORMAT),
                     'vehicle_id': contract.vehicle_id.id,
-                    'cost_subtype': contract.cost_subtype.id,
+                    'cost_subtype_id': contract.cost_subtype_id.id,
                     'contract_id': contract.id,
                     'auto_generated': True
                 }
@@ -664,8 +664,8 @@ class fleet_vehicle_log_contract(osv.Model):
         res = {}
         for record in self.browse(cr, uid, ids, context=context):
             name = record.vehicle_id.name
-            if record.cost_subtype.name:
-                name += ' / '+ record.cost_subtype.name
+            if record.cost_subtype_id.name:
+                name += ' / '+ record.cost_subtype_id.name
             if record.date:
                 name += ' / '+ record.date
             res[record.id] = name
@@ -789,7 +789,7 @@ class fleet_vehicle_log_contract(osv.Model):
         'state':'open',
         'expiration_date': lambda self, cr, uid, ctx: self.compute_next_year_date(fields.date.context_today(self, cr, uid, context=ctx)),
         'cost_frequency': 'no',
-        'cost_subtype': _get_default_contract_type,
+        'cost_subtype_id': _get_default_contract_type,
         'cost_type': 'contract',
     }
 
diff --git a/addons/fleet/fleet_board_view.xml b/addons/fleet/fleet_board_view.xml
index 760fc1cf583..41093d2c283 100644
--- a/addons/fleet/fleet_board_view.xml
+++ b/addons/fleet/fleet_board_view.xml
@@ -135,17 +135,20 @@
     <menuitem id="menu_fleet_dashboard" 
               parent="base.menu_reporting_dashboard" 
               action="open_board_fleet" 
-              sequence="50"/>
+              sequence="50"
+              groups="group_fleet_user"/>
     
-    <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" />
+    <menuitem name="Fleet" parent="base.menu_reporting" id="menu_fleet_reporting" sequence="50" groups="group_fleet_manager"/>
 
     <menuitem id="menu_fleet_reporting_costs" 
               parent="menu_fleet_reporting" 
               action="action_fleet_reporting_costs" 
-              sequence="1"/>
+              sequence="1"
+              groups="group_fleet_manager"/>
     <menuitem id="menu_fleet_reporting_indicative_costs" 
               parent="menu_fleet_reporting" 
               action="action_fleet_reporting_costs_non_effective" 
-              sequence="2"/>
+              sequence="2"
+              groups="group_fleet_manager"/>
 </data>
 </openerp>
diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml
index 4760e336dd1..d70943f4beb 100644
--- a/addons/fleet/fleet_demo.xml
+++ b/addons/fleet/fleet_demo.xml
@@ -3,227 +3,227 @@
     <data>
       <record id="model_corsa" model="fleet.vehicle.model">
           <field name="modelname">Corsa</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astra" model="fleet.vehicle.model">
           <field name="modelname">Astra</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_agila" model="fleet.vehicle.model">
           <field name="modelname">Agila</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_combotour" model="fleet.vehicle.model">
           <field name="modelname">Combo Tour</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_meriva" model="fleet.vehicle.model">
           <field name="modelname">Meriva</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_astragtc" model="fleet.vehicle.model">
           <field name="modelname">AstraGTC</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafira" model="fleet.vehicle.model">
           <field name="modelname">Zafira</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_zafiratourer" model="fleet.vehicle.model">
           <field name="modelname">Zafira Tourer</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_insignia" model="fleet.vehicle.model">
           <field name="modelname">Insignia</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_mokka" model="fleet.vehicle.model">
           <field name="modelname">Mokka</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_antara" model="fleet.vehicle.model">
           <field name="modelname">Antara</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_ampera" model="fleet.vehicle.model">
           <field name="modelname">Ampera</field>
-          <field name="brand" ref="brand_opel" />
+          <field name="brand_id" ref="brand_opel" />
       </record>
 
       <record id="model_a1" model="fleet.vehicle.model">
           <field name="modelname">A1</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a3" model="fleet.vehicle.model">
           <field name="modelname">A3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a4" model="fleet.vehicle.model">
           <field name="modelname">A4</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a5" model="fleet.vehicle.model">
           <field name="modelname">A5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a6" model="fleet.vehicle.model">
           <field name="modelname">A6</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a7" model="fleet.vehicle.model">
           <field name="modelname">A7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_a8" model="fleet.vehicle.model">
           <field name="modelname">A8</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q3" model="fleet.vehicle.model">
           <field name="modelname">Q3</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q5" model="fleet.vehicle.model">
           <field name="modelname">Q5</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_q7" model="fleet.vehicle.model">
           <field name="modelname">Q7</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_tt" model="fleet.vehicle.model">
           <field name="modelname">TT</field>
-          <field name="brand" ref="brand_audi" />
+          <field name="brand_id" ref="brand_audi" />
       </record>
 
       <record id="model_serie1" model="fleet.vehicle.model">
           <field name="modelname">Serie 1</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie3" model="fleet.vehicle.model">
           <field name="modelname">Serie 3</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie5" model="fleet.vehicle.model">
           <field name="modelname">Serie 5</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie6" model="fleet.vehicle.model">
           <field name="modelname">Serie 6</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_serie7" model="fleet.vehicle.model">
           <field name="modelname">Serie 7</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriex" model="fleet.vehicle.model">
           <field name="modelname">Serie X</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriez4" model="fleet.vehicle.model">
           <field name="modelname">Serie Z4</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriem" model="fleet.vehicle.model">
           <field name="modelname">Serie M</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_seriehybrid" model="fleet.vehicle.model">
           <field name="modelname">Serie Hybrid</field>
-          <field name="brand" ref="brand_bmw" />
+          <field name="brand_id" ref="brand_bmw" />
       </record>
 
       <record id="model_classa" model="fleet.vehicle.model">
           <field name="modelname">Class A</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classb" model="fleet.vehicle.model">
           <field name="modelname">Class B</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classc" model="fleet.vehicle.model">
           <field name="modelname">Class C</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcl" model="fleet.vehicle.model">
           <field name="modelname">Class CL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classcls" model="fleet.vehicle.model">
           <field name="modelname">Class CLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classe" model="fleet.vehicle.model">
           <field name="modelname">Class E</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classm" model="fleet.vehicle.model">
           <field name="modelname">Class M</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classgl" model="fleet.vehicle.model">
           <field name="modelname">Class GL</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classglk" model="fleet.vehicle.model">
           <field name="modelname">Class GLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classr" model="fleet.vehicle.model">
           <field name="modelname">Class R</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classs" model="fleet.vehicle.model">
           <field name="modelname">Class S</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classslk" model="fleet.vehicle.model">
           <field name="modelname">Class SLK</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="model_classsls" model="fleet.vehicle.model">
           <field name="modelname">SLS</field>
-          <field name="brand" ref="brand_mercedes" />
+          <field name="brand_id" ref="brand_mercedes" />
       </record>
 
       <record id="vehicle_state_inshop" model="fleet.vehicle.state">
@@ -253,7 +253,7 @@
           <field name="color">Black</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">5</field>
-          <field name="driver" ref="base.res_partner_address_18" />
+          <field name="driver_id" ref="base.res_partner_address_18" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -268,7 +268,7 @@
           <field name="color">Red</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">5</field>
-          <field name="driver" ref="base.res_partner_address_19" />
+          <field name="driver_id" ref="base.res_partner_address_19" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_inactive"/>
           <field name="odometer_unit">kilometers</field>
@@ -283,7 +283,7 @@
           <field name="color">Titanium Grey</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">3</field>
-          <field name="driver" ref="base.res_partner_address_17" />
+          <field name="driver_id" ref="base.res_partner_address_17" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -298,7 +298,7 @@
           <field name="color">White</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">3</field>
-          <field name="driver" ref="base.res_partner_address_16" />
+          <field name="driver_id" ref="base.res_partner_address_16" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -313,7 +313,7 @@
           <field name="color">Brown</field>
           <field name="location">Grand-Rosiere</field>
           <field name="doors">5</field>
-          <field name="driver" ref="base.res_partner_address_15" />
+          <field name="driver_id" ref="base.res_partner_address_15" />
           <field name="acquisition_date" eval="time.strftime('%Y-%m-%d 2:00:00')" />
           <field name="state" ref="vehicle_state_active"/>
           <field name="odometer_unit">kilometers</field>
@@ -862,7 +862,7 @@
       <record id="log_service_1" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">650</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-09-02</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">4586</field>
@@ -873,7 +873,7 @@
       <record id="services_cost_11" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_7"/>
+        <field name="cost_subtype_id" ref="type_service_7"/>
         <field name="date">2012-09-02</field>
         <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
       </record>
@@ -881,7 +881,7 @@
       <record id="services_cost_12" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_8"/>
         <field name="date">2012-09-02</field>
         <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
       </record>
@@ -889,7 +889,7 @@
       <record id="services_cost_13" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_service_9"/>
+        <field name="cost_subtype_id" ref="type_service_9"/>
         <field name="date">2012-09-02</field>
         <field name="parent_id" ref="log_service_1_fleet_vehicle_cost" />
       </record>
@@ -897,7 +897,7 @@
       <record id="log_service_2" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">350</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-11-02</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">4814</field>
@@ -908,7 +908,7 @@
       <record id="services_cost_21" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_service_10"/>
+        <field name="cost_subtype_id" ref="type_service_10"/>
         <field name="date">2012-11-02</field>
         <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
       </record>
@@ -916,7 +916,7 @@
       <record id="services_cost_22" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">150</field>
-        <field name="cost_subtype" ref="type_service_11"/>
+        <field name="cost_subtype_id" ref="type_service_11"/>
         <field name="date">2012-11-02</field>
         <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
       </record>
@@ -924,7 +924,7 @@
       <record id="services_cost_23" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_service_12"/>
+        <field name="cost_subtype_id" ref="type_service_12"/>
         <field name="date">2012-11-02</field>
         <field name="parent_id" ref="log_service_2_fleet_vehicle_cost" />
       </record>
@@ -932,7 +932,7 @@
       <record id="log_service_3" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">513</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-10-15</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">124</field>
@@ -943,7 +943,7 @@
       <record id="log_service_4" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">412</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-10-08</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">20984</field>
@@ -954,7 +954,7 @@
       <record id="log_service_5" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">275</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-09-25</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">241</field>
@@ -965,7 +965,7 @@
       <record id="log_service_6" model="fleet.vehicle.log.services" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">302</field>
-        <field name="cost_subtype" ref="type_service_service_8"/>
+        <field name="cost_subtype_id" ref="type_service_service_8"/>
         <field name="date">2012-09-15</field>
         <field name="purchaser_id" ref="base.res_partner_address_18" />
         <field name="inv_ref">22513</field>
@@ -978,7 +978,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">20</field>
         <field name="cost_frequency">daily</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')" />
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="(DateTime.now() + timedelta(5)).strftime('%Y-%m-%d')" />
@@ -990,7 +990,7 @@
       <record id="contract_cost_11" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
       </record>
@@ -998,7 +998,7 @@
       <record id="contract_cost_12" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
       </record>
@@ -1006,7 +1006,7 @@
       <record id="contract_cost_13" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_2" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_1_fleet_vehicle_cost" />
       </record>
@@ -1016,7 +1016,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">150</field>
         <field name="cost_frequency">weekly</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')" />
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="(DateTime.now() + timedelta(-1)).strftime('%Y-%m-%d')" />
@@ -1028,7 +1028,7 @@
       <record id="contract_cost_21" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
       </record>
@@ -1036,7 +1036,7 @@
       <record id="contract_cost_22" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
       </record>
@@ -1044,7 +1044,7 @@
       <record id="contract_cost_23" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_1" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_2_fleet_vehicle_cost" />
       </record>
@@ -1054,7 +1054,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">400</field>
         <field name="cost_frequency">monthly</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')"/>
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@@ -1066,7 +1066,7 @@
       <record id="contract_cost_31" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
       </record>
@@ -1074,7 +1074,7 @@
       <record id="contract_cost_32" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
       </record>
@@ -1082,7 +1082,7 @@
       <record id="contract_cost_33" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_3" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_3_fleet_vehicle_cost" />
       </record>
@@ -1092,7 +1092,7 @@
         <field name="amount">0</field>
         <field name="cost_generated">4000</field>
         <field name="cost_frequency">yearly</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('%Y-01-01')" />
         <field name="start_date" eval="time.strftime('%Y-01-01')" />
         <field name="expiration_date" eval="time.strftime('%Y-12-31')" />
@@ -1104,7 +1104,7 @@
       <record id="contract_cost_41" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
       </record>
@@ -1112,7 +1112,7 @@
       <record id="contract_cost_42" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
       </record>
@@ -1120,7 +1120,7 @@
       <record id="contract_cost_43" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_4" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_4_fleet_vehicle_cost" />
       </record>
@@ -1130,7 +1130,7 @@
         <field name="amount">17000</field>
         <field name="cost_generated">0</field>
         <field name="cost_frequency">no</field>
-        <field name="cost_subtype" ref="type_contract_leasing"/>
+        <field name="cost_subtype_id" ref="type_contract_leasing"/>
         <field name="date" eval="time.strftime('2012-01-01')" />
         <field name="start_date" eval="time.strftime('2012-01-01')" />
         <field name="expiration_date" eval="time.strftime('2016-12-31')" />
@@ -1142,7 +1142,7 @@
       <record id="contract_cost_51" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">50</field>
-        <field name="cost_subtype" ref="type_service_service_2"/>
+        <field name="cost_subtype_id" ref="type_service_service_2"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
       </record>
@@ -1150,7 +1150,7 @@
       <record id="contract_cost_52" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">25</field>
-        <field name="cost_subtype" ref="type_service_service_3"/>
+        <field name="cost_subtype_id" ref="type_service_service_3"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
       </record>
@@ -1158,7 +1158,7 @@
       <record id="contract_cost_53" model="fleet.vehicle.cost" >
         <field name="vehicle_id" ref="vehicle_5" />
         <field name="amount">100</field>
-        <field name="cost_subtype" ref="type_contract_omnium"/>
+        <field name="cost_subtype_id" ref="type_contract_omnium"/>
         <field name="date">2012-01-01</field>
         <field name="parent_id" ref="log_contract_5_fleet_vehicle_cost" />
       </record>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 416ca191a6e..1810cc5a938 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -10,7 +10,7 @@
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/>
                         <group col="2">
                             <group>
-                                <field name="brand" on_change="on_change_brand(brand)"/>
+                                <field name="brand_id" on_change="on_change_brand(brand_id)"/>
                             </group>
                             <group>
                                 <field name="modelname" />   
@@ -30,7 +30,7 @@
             <field name="model">fleet.vehicle.model</field>
             <field name="arch" type="xml">
                 <tree string="Models" version="7.0">
-                    <field name="brand" />
+                    <field name="brand_id" />
                     <field name="modelname" />
                 </tree>
             </field>
@@ -135,7 +135,7 @@
         </record>
 
         <record model='ir.actions.act_window' id='fleet_vehicle_state_act'>
-            <field name="name">States of Vehicle</field>
+            <field name="name">Vehicle Status</field>
             <field name="res_model">fleet.vehicle.state</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -149,11 +149,11 @@
             </field>
         </record>
 
-        <menuitem name="Fleet" id="menu_root" sequence="110" />
-        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" />
+        <menuitem name="Fleet" id="menu_root" sequence="110" groups="group_fleet_user"/>
+        <menuitem name="Configuration" parent="menu_root" id="fleet_configuration" sequence="3" groups="group_fleet_manager"/>
         <menuitem action="fleet_vehicle_model_act" parent="fleet_configuration" id="fleet_vehicle_model_menu" groups="base.group_no_one"/>
         <menuitem action="fleet_vehicle_model_brand_act" parent="fleet_configuration" id="fleet_vehicle_model_brand_menu" groups="base.group_no_one"/>
-        <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" />
+        <menuitem action="fleet_vehicle_state_act" parent="fleet_configuration" id="fleet_vehicle_state_menu" groups="group_fleet_manager"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_form'>
             <field name="name">fleet.vehicle.form</field>
@@ -161,7 +161,7 @@
             <field name="arch" type="xml">
                 <form string="Vehicle" version="7.0">
                     <header>
-                        <field name="state"  widget="statusbar" clickable="True" />
+                        <field name="state_id"  widget="statusbar" clickable="True" />
                     </header>
                     <sheet> 
                         <field name="image_medium" widget='image' class="oe_left oe_avatar"/> 
@@ -179,14 +179,14 @@
                         </div>
                         <div class="oe_right oe_button_box">
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_contract_act'}" string="Contracts" help="show the contract for this vehicle" />
-                            <button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" />
+                            <button name="act_show_log_cost" type="object" string="Costs" help="show all the costs for this vehicle" groups="fleet.group_fleet_manager"/>
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_services_act'}" string="Services" help="show the services logs for this vehicle" />
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_log_fuel_act'}" string="Fuel Logs" help="show the fuel logs for this vehicle" />
                             <button name="return_action_to_open" type="object" context="{'xml_id':'fleet_vehicle_odometer_act'}" string="Odometer Logs" help="show the odometer logs for this vehicle" />
                         </div> 
                         <group col="2" string="General Properties">
                             <group >
-                                <field name="driver" />
+                                <field name="driver_id" />
                                 <field name="location" />
                                 <field name="vin_sn" />
                                 <field name="company_id" groups="base.group_multi_company"/>
@@ -231,10 +231,10 @@
                 <tree string="Vehicle" version="7.0" colors="orange:contract_renewal_due_soon and not contract_renewal_overdue;red:contract_renewal_overdue">
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="vin_sn" />
                     <field name="acquisition_date" />
-                    <field name="state"/>
+                    <field name="state_id"/>
                     <field name="odometer" />
                     <field name="odometer_unit" />
                     <field name="contract_renewal_due_soon" invisible="1"/>
@@ -250,11 +250,10 @@
             <field name="arch" type="xml">
                 <search string="All vehicles">
                     <field name="name" filter_domain="['|', ('name','ilike',self), ('license_plate','ilike',self)]" string="Vehicle"/>
-                    <field name="driver"/>
+                    <field name="driver_id"/>
                     <field name="tag_ids"/>
                     <field name="location"/>
-                    <field name="state" />
-                    <field name="state" />
+                    <field name="state_id" />
                     <filter name="alert_true" domain="['|',('contract_renewal_due_soon','=',True),('contract_renewal_overdue','=',True)]" string="Has Alert(s)"/>
                </search>
             </field>
@@ -268,9 +267,9 @@
                 <kanban>
                     <field name="license_plate" />
                     <field name="model_id" />
-                    <field name="driver" />
+                    <field name="driver_id" />
                     <field name="location" />
-                    <field name="state" />
+                    <field name="state_id" />
 
                     <field name="image" />
                     <field name="tag_ids" />
@@ -310,7 +309,7 @@
                                     
                                     <ul>
                                         <li>
-                                            <t t-if="record.driver.raw_value"><field name="driver"/></t>
+                                            <t t-if="record.driver_id.raw_value"><field name="driver_id"/></t>
                                         </li>
                                         <li>
                                             <t t-if="record.location.raw_value"><field name="location"/></t>
@@ -347,8 +346,8 @@
             </field>
         </record>
 
-        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" />
-        <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" />
+        <menuitem name="Vehicles" parent="menu_root" id="fleet_vehicles" sequence="2" groups="group_fleet_user"/>
+        <menuitem action="fleet_vehicle_act" parent="fleet_vehicles" id="fleet_vehicle_menu" groups="group_fleet_user"/>
 
 
 
@@ -358,17 +357,17 @@
             <field name="arch" type="xml">
                 <form string="Contract logs" version="7.0">
                     <header>
-                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract"/>
-                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" type="object" class="oe_highlight" string="Terminate Contract"/>
-                        <button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress"/>
-                        <button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" />
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="open" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
+                        <button modifiers="{'invisible': [['state', '=', 'closed']]}" name="contract_close" states="toclose" type="object" class="oe_highlight" string="Terminate Contract" groups="fleet.group_fleet_manager"/>
+                        <button modifiers="{'invisible': [['state', 'not in', ['closed']]]}" name="contract_open" states="closed" type="object" class="oe_highlight" string="Set Contract In Progress" groups="fleet.group_fleet_manager"/>
+                        <button class="oe_highlight" name="act_renew_contract" type="object" string="Renew Contract" help="Create a new contract automatically with all the same informations except for the date that will start at the end of current contract" groups="fleet.group_fleet_manager"/>
                         <field name="state" widget="statusbar" />
                     </header>
                     <sheet>
                         <group col="2">
                             <group string="Contract details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                <field name="cost_subtype" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
+                                <field name="cost_subtype_id" required="1" domain="['|',('category','=','contract'),('category','=','both')]"/>
                                 <field name="amount" string="Activation Cost"/>
                                 <label for="cost_generated"/>
                                 <div>
@@ -401,7 +400,7 @@
                                 <group>
                                     <field name="cost_ids" context="{'vehicle_id': vehicle_id}" nolabel="1" on_change="on_change_indic_cost(cost_ids)">
                                         <tree version="7.0" editable="bottom">
-                                            <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                            <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
                                             <field name="amount" sum="Price" string="Indicative Cost" />
                                         </tree>
                                     </field>
@@ -449,7 +448,7 @@
                     <field name="expiration_date" />
                     <field name="days_left" invisible="1"/>
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="insurer_id" />
                     <field name="amount" string="Activation Cost"/>
                     <field name="cost_generated"/>
@@ -491,7 +490,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" />
+        <menuitem action="fleet_vehicle_log_contract_act" parent="fleet_vehicles" id="fleet_vehicle_log_contract_menu" groups="group_fleet_user"/>
 
        <record model='ir.ui.view' id='fleet_vehicle_odometer_form'>
             <field name="name">fleet.vehicle.odometer.form</field>
@@ -568,7 +567,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" />
+        <menuitem action="fleet_vehicle_odometer_act" parent="fleet_vehicles" id="fleet_vehicle_odometer_menu" groups="group_fleet_user"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_log_fuel_form'>
             <field name="name">fleet.vehicle.log.fuel.form</field>
@@ -657,7 +656,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" />
+        <menuitem action="fleet_vehicle_log_fuel_act" parent="fleet_vehicles" id="fleet_vehicle_log_fuel_menu" groups="group_fleet_user"/>
 
 
         <record model='ir.ui.view' id='fleet_vehicle_log_services_form'>
@@ -669,7 +668,7 @@
                         <group col="2">
                             <group string="Services Details">
                                 <field name="vehicle_id" on_change="on_change_vehicle(vehicle_id)"/>
-                                <field name="cost_subtype" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
+                                <field name="cost_subtype_id" string="Service Type" domain="['|',('category','=','service'),('category','=','both')]" required="1"/>
                                 <field name="amount" string="Price"/>
                             </group>
                             <group string="Odometer Details">
@@ -691,7 +690,7 @@
                         <group string="Included Services">
                             <field name="cost_ids" nolabel="1">
                                 <tree string="Included Services" version="7.0" editable="bottom">
-                                    <field name="cost_subtype" string="Service" domain="[('category','=','service')]"/>
+                                    <field name="cost_subtype_id" string="Service" domain="[('category','=','service')]"/>
                                     <field name="amount" sum="Price" string="Cost"/>
                                 </tree>
                             </field>
@@ -711,7 +710,7 @@
                 <tree string="Services Logs">
                     <field name="date" />
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="purchaser_id"/>
                     <field name="vendor_id" />
                     <field name="inv_ref" />
@@ -749,7 +748,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" />
+        <menuitem action="fleet_vehicle_log_services_act" parent="fleet_vehicles" id="fleet_vehicle_log_services_menu" groups="group_fleet_user"/>
 
         <record model='ir.ui.view' id='fleet_vehicle_service_types_tree'>
             <field name="name">fleet.service.type.tree</field>
@@ -787,7 +786,7 @@
                     <field name="date"/>
                     <field name="vehicle_id" />
                     <field name="cost_type"/>
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="amount" sum="Total Cost"/>
                     <field name="parent_id" invisible="1" />
                     <field name="year" invisible="1"/>
@@ -801,7 +800,7 @@
             <field name="arch" type="xml">
                 <search string="Vehicles costs" >
                     <field name="vehicle_id" />
-                    <field name="cost_subtype"/>
+                    <field name="cost_subtype_id"/>
                     <field name="year"/>
                     <field name="date"/>
                     <field name="parent_id"/>
@@ -811,7 +810,7 @@
                         <filter name="groupby_year" context="{'group_by' : 'year'}" string="Year"/>
                         <filter name="groupby_date" context="{'group_by' : 'date'}" string="Date"/>
                         <filter name="groupby_cost_type" context="{'group_by' : 'cost_type'}" string="Cost Type"/>
-                        <filter name="groupby_cost_subtype" context="{'group_by' : 'cost_subtype'}" string="Cost Subtype"/>
+                        <filter name="groupby_cost_subtype_id" context="{'group_by' : 'cost_subtype_id'}" string="Cost Subtype"/>
                         <filter name="groupby_vehicle_id" context="{'group_by' : 'vehicle_id'}" string="Vehicle"/>
                         <filter name="groupby_parent_id" context="{'group_by' : 'parent_id'}" string="Parent"/>
                     </group>
@@ -828,7 +827,7 @@
                         <group col="2" string="Cost Details">
                             <group>
                                 <field name="vehicle_id" />
-                                <field name="cost_subtype"/>
+                                <field name="cost_subtype_id"/>
                                 <field name="amount"/>
                             </group>
                             <group>
@@ -870,7 +869,7 @@
             </field>
         </record>
 
-        <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" />
+        <menuitem action="fleet_vehicle_costs_act" parent="fleet_vehicles" id="fleet_vehicle_costs_menu" groups="group_fleet_manager"/>
 <!--    
         <record model='ir.ui.view' id='fleet_hr_employee_form'>
             <field name="name">fleet.hr.employee.form</field>
diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po
index deb6b1cac2f..660ab4702c1 100644
--- a/addons/fleet/i18n/zh_CN.po
+++ b/addons/fleet/i18n/zh_CN.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-30 11:52+0000\n"
+"PO-Revision-Date: 2012-12-06 13:05+0000\n"
 "Last-Translator: ccdos <ccdos@163.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-01 05:09+0000\n"
-"X-Generator: Launchpad (build 16319)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: fleet
 #: selection:fleet.vehicle,fuel_type:0
@@ -553,7 +553,7 @@ msgstr "合同状态"
 #. module: fleet
 #: field:fleet.vehicle,contract_renewal_total:0
 msgid "Total of contracts due or overdue minus one"
-msgstr ""
+msgstr "到期或逾期合同汇总"
 
 #. module: fleet
 #: field:fleet.vehicle.cost,cost_subtype:0
@@ -1804,6 +1804,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                单击创建一个服务入口。\n"
+"              </p><p>\n"
+"                OpenERP 帮你跟踪所有汽车上完成的服务的。\n"
+"                服务有多种类型：偶然维修，定期维护保养，等等。\n"
+"              </p>\n"
+"            "
 
 #. module: fleet
 #: field:fleet.vehicle,co2:0
diff --git a/addons/fleet/security/fleet_security.xml b/addons/fleet/security/fleet_security.xml
new file mode 100644
index 00000000000..daaa0b0cba7
--- /dev/null
+++ b/addons/fleet/security/fleet_security.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" ?>
+<openerp>
+    <data>
+        <record model="ir.module.category" id="module_fleet_category">
+            <field name="name">Fleet</field>
+            <field name="sequence">17</field>
+        </record>
+        <record id="group_fleet_user" model="res.groups">
+            <field name="name">User</field>
+            <field name="category_id" ref="module_fleet_category"/>
+        </record>
+        <record id="group_fleet_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="implied_ids" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="category_id" ref="module_fleet_category"/>
+        </record>
+        <record id="fleet_user_contract_visibility" model="ir.rule">
+            <field name="name">User can only see his/her contracts</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_contract"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_cost_visibility" model="ir.rule">
+            <field name="name">User can only see his/her costs</field>
+            <field name="model_id" ref="model_fleet_vehicle_cost"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_service_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle's services</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_services"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_odometer_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle's odometer</field>
+            <field name="model_id" ref="model_fleet_vehicle_odometer"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+            <field name="domain_force">[('vehicle_id.driver_id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_fuel_log_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle's fuel log</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_fuel"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="True"/>
+            <field name="perm_unlink" eval="True"/>
+            <field name="domain_force">[('cost_id.vehicle_id.driver_id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_vehicle_visibility" model="ir.rule">
+            <field name="name">User can only see his/her vehicle</field>
+            <field name="model_id" ref="model_fleet_vehicle"/>
+            <field name="groups" eval="[(4, ref('group_fleet_user'))]"/>
+            <field name="perm_read" eval="True"/>
+            <field name="perm_write" eval="True"/>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+            <field name="domain_force">[('driver_id','=',user.partner_id.id)]</field>
+        </record>
+        <record id="fleet_user_contract_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's contracts</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_contract"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_cost_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's costs</field>
+            <field name="model_id" ref="model_fleet_vehicle_cost"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_service_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's services</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_services"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_odometer_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's vehicle's odometer</field>
+            <field name="model_id" ref="model_fleet_vehicle_odometer"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_fuel_log_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle's fuel log</field>
+            <field name="model_id" ref="model_fleet_vehicle_log_fuel"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+        <record id="fleet_user_vehicle_visibility_manager" model="ir.rule">
+            <field name="name">Manager has all rights on vehicle</field>
+            <field name="model_id" ref="model_fleet_vehicle"/>
+            <field name="groups" eval="[(4, ref('group_fleet_manager'))]"/>
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/fleet/security/ir.model.access.csv b/addons/fleet/security/ir.model.access.csv
index 823b3cb2945..ecb8ec307b4 100644
--- a/addons/fleet/security/ir.model.access.csv
+++ b/addons/fleet/security/ir.model.access.csv
@@ -1,13 +1,23 @@
 id,name,model_id/id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
-fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,,1,1,1,1
-fleet_vehicle_tag_access_right,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,,1,1,1,1
-fleet_vehicle_state_access_right,fleet_vehicle_state_access_right,model_fleet_vehicle_state,,1,1,1,1
-fleet_vehicle_odometer_access_right,fleet_vehicle_odometer_access_right,model_fleet_vehicle_odometer,,1,1,1,1
-fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,,1,1,1,1
-fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,,1,1,1,1
-fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,,1,1,1,1
-fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,,1,1,1,1
-fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,,1,1,1,1
-fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,,1,1,1,1
-access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,,1,1,1,1
-access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,,1,1,1,1
+fleet_vehicle_model_access_right_user,fleet_vehicle_model_access_right,model_fleet_vehicle_model,group_fleet_user,1,0,0,0
+fleet_vehicle_tag_access_right_user,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,group_fleet_user,1,0,0,0
+fleet_vehicle_state_access_right_user,fleet_vehicle_state_access_right,model_fleet_vehicle_state,group_fleet_user,1,0,0,0
+fleet_vehicle_model_brand_access_right_user,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,group_fleet_user,1,0,0,0
+fleet_vehicle_access_right_user,fleet_vehicle_access_right",model_fleet_vehicle,group_fleet_user,1,1,0,0
+fleet_vehicle_log_services_access_right_user,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,group_fleet_user,1,0,0,0
+fleet_vehicle_log_contract_access_right_user,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,group_fleet_user,1,0,0,0
+fleet_service_type_access_right_user,fleet_service_type_access_right,model_fleet_service_type,group_fleet_user,1,0,0,0
+access_fleet_vehicle_cost_user,access_fleet_vehicle_cost,model_fleet_vehicle_cost,group_fleet_user,1,1,1,0
+access_fleet_contract_state_user,access_fleet_contract_state,model_fleet_contract_state,group_fleet_user,1,0,0,0
+fleet_vehicle_model_access_right,fleet_vehicle_model_access_right,model_fleet_vehicle_model,group_fleet_manager,1,1,1,1
+fleet_vehicle_tag_access_right,fleet_vehicle_tag_access_right,model_fleet_vehicle_tag,group_fleet_manager,1,1,1,1
+fleet_vehicle_state_access_right,fleet_vehicle_state_access_right,model_fleet_vehicle_state,group_fleet_manager,1,1,1,1
+fleet_vehicle_odometer_access_right,fleet_vehicle_odometer_access_right,model_fleet_vehicle_odometer,group_fleet_user,1,1,1,1
+fleet_vehicle_model_brand_access_right,fleet_vehicle_model_brand_access_right,model_fleet_vehicle_model_brand,group_fleet_manager,1,1,1,1
+fleet_vehicle_access_right,fleet_vehicle_access_right,model_fleet_vehicle,group_fleet_manager,1,1,1,1
+fleet_vehicle_log_fuel_access_right,fleet_vehicle_log_fuel_access_right,model_fleet_vehicle_log_fuel,group_fleet_user,1,1,1,1
+fleet_vehicle_log_services_access_right,fleet_vehicle_log_services_access_right,model_fleet_vehicle_log_services,group_fleet_manager,1,1,1,1
+fleet_vehicle_log_contract_access_right,fleet_vehicle_log_contract_access_right,model_fleet_vehicle_log_contract,group_fleet_manager,1,1,1,1
+fleet_service_type_access_right,fleet_service_type_access_right,model_fleet_service_type,group_fleet_manager,1,1,1,1
+access_fleet_vehicle_cost,access_fleet_vehicle_cost,model_fleet_vehicle_cost,group_fleet_manager,1,1,1,1
+access_fleet_contract_state,access_fleet_contract_state,model_fleet_contract_state,group_fleet_manager,1,1,1,1
\ No newline at end of file
diff --git a/addons/hr/i18n/zh_CN.po b/addons/hr/i18n/zh_CN.po
index 73ae9ff29c1..f0589308cb7 100644
--- a/addons/hr/i18n/zh_CN.po
+++ b/addons/hr/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr
diff --git a/addons/hr_holidays/i18n/zh_CN.po b/addons/hr_holidays/i18n/zh_CN.po
index ac24ea47bd7..0cfbe531066 100644
--- a/addons/hr_holidays/i18n/zh_CN.po
+++ b/addons/hr_holidays/i18n/zh_CN.po
@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
 "X-Generator: Launchpad (build 16341)\n"
 
 #. module: hr_holidays
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 9e6ef1b8f05..f5d05c9e705 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-12-04 15:13+0000\n"
+"PO-Revision-Date: 2012-12-06 16:47+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: knowledge
 #: view:knowledge.config.settings:0
@@ -25,7 +25,7 @@ msgstr "Documentos"
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_knowledge_config_settings
 msgid "knowledge.config.settings"
-msgstr ""
+msgstr "knowledge.config.settings"
 
 #. module: knowledge
 #: help:knowledge.config.settings,module_document_webdav:0
@@ -65,6 +65,11 @@ msgid ""
 "and a document dashboard.\n"
 "                This installs the module document."
 msgstr ""
+"Este é um sistema de gerenciamento de documentos completo, com: autenticação "
+"de usuários,\n"
+"                pesquisa completa de documentos (pptx e docx não são "
+"suportados), e um painel de documentos.\n"
+"                O módulo document será instalado."
 
 #. module: knowledge
 #: field:knowledge.config.settings,module_document_page:0
diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po
index f68fb4599dc..37dff92a21f 100644
--- a/addons/mail/i18n/fr.po
+++ b/addons/mail/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:01+0000\n"
-"PO-Revision-Date: 2012-12-04 11:00+0000\n"
+"PO-Revision-Date: 2012-12-06 17:21+0000\n"
 "Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: mail
 #: field:res.partner,notification_email_send:0
@@ -1490,7 +1490,7 @@ msgstr ""
 #: model:ir.ui.menu,name:mail.mail_feeds
 #: model:ir.ui.menu,name:mail.mail_feeds_main
 msgid "Messaging"
-msgstr ""
+msgstr "Messagerie"
 
 #. module: mail
 #: view:mail.alias:0
diff --git a/addons/note/i18n/pt_BR.po b/addons/note/i18n/pt_BR.po
index 9fc11184337..31164a9ba2b 100644
--- a/addons/note/i18n/pt_BR.po
+++ b/addons/note/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-11-14 04:29+0000\n"
-"Last-Translator: Guilherme R. Santos <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 12:58+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: note
 #: field:note.note,memo:0
@@ -31,7 +31,7 @@ msgstr "Estágio das Notas"
 #: model:note.stage,name:note.demo_note_stage_04
 #: model:note.stage,name:note.note_stage_02
 msgid "This Week"
-msgstr ""
+msgstr "Esta Semana"
 
 #. module: note
 #: model:ir.model,name:note.model_base_config_settings
@@ -41,7 +41,7 @@ msgstr "base.config.settings"
 #. module: note
 #: model:ir.model,name:note.model_note_tag
 msgid "Note Tag"
-msgstr "Tag da Nota"
+msgstr "Marcador da Nota"
 
 #. module: note
 #: model:res.groups,name:note.group_note_fancy
@@ -123,7 +123,7 @@ msgstr "Estágios das Notas"
 #. module: note
 #: field:note.note,message_unread:0
 msgid "Unread Messages"
-msgstr "Mensagens não lidas"
+msgstr "Mensagens Não Lidas"
 
 #. module: note
 #: field:note.note,current_partner_id:0
@@ -133,7 +133,7 @@ msgstr "desconhecido"
 #. module: note
 #: view:note.note:0
 msgid "By sticky note Category"
-msgstr ""
+msgstr "Por Categoria de lembrete"
 
 #. module: note
 #: help:note.note,message_unread:0
@@ -148,7 +148,7 @@ msgstr "Nome do Estágio"
 #. module: note
 #: field:note.note,message_is_follower:0
 msgid "Is a Follower"
-msgstr "É um seguidor"
+msgstr "É um Seguidor"
 
 #. module: note
 #: model:note.stage,name:note.demo_note_stage_02
@@ -175,12 +175,12 @@ msgstr "Categorias"
 #: field:note.note,message_comment_ids:0
 #: help:note.note,message_comment_ids:0
 msgid "Comments and emails"
-msgstr "Comentários e emails"
+msgstr "Comentários e e-mails"
 
 #. module: note
 #: field:note.tag,name:0
 msgid "Tag Name"
-msgstr "Nome da Tag"
+msgstr "Nome do Marcador"
 
 #. module: note
 #: field:note.note,message_ids:0
@@ -257,7 +257,7 @@ msgstr "Sequencia"
 #. module: note
 #: field:note.note,tag_ids:0
 msgid "Tags"
-msgstr "Tags"
+msgstr "Marcadores"
 
 #. module: note
 #: view:note.note:0
@@ -275,6 +275,9 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: note
 #: field:base.config.settings,group_note_fancy:0
diff --git a/addons/note_pad/i18n/pt_BR.po b/addons/note_pad/i18n/pt_BR.po
new file mode 100644
index 00000000000..30a66801956
--- /dev/null
+++ b/addons/note_pad/i18n/pt_BR.po
@@ -0,0 +1,28 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-06 13:00+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: note_pad
+#: model:ir.model,name:note_pad.model_note_note
+msgid "Note"
+msgstr "Nota"
+
+#. module: note_pad
+#: field:note.note,note_pad_url:0
+msgid "Pad Url"
+msgstr "Url do Pad"
diff --git a/addons/pad/i18n/pt_BR.po b/addons/pad/i18n/pt_BR.po
index fe4c8062dd5..65f6e824e97 100644
--- a/addons/pad/i18n/pt_BR.po
+++ b/addons/pad/i18n/pt_BR.po
@@ -8,31 +8,31 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-01-19 19:50+0000\n"
-"Last-Translator: Emerson <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 13:03+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: pad
 #. openerp-web
 #: code:addons/pad/static/src/xml/pad.xml:27
 #, python-format
 msgid "&Ntilde;"
-msgstr ""
+msgstr "Ñ"
 
 #. module: pad
 #: model:ir.model,name:pad.model_pad_common
 msgid "pad.common"
-msgstr ""
+msgstr "pad.common"
 
 #. module: pad
 #: help:res.company,pad_key:0
 msgid "Etherpad lite api key."
-msgstr ""
+msgstr "chave da api do Etherpad lite."
 
 #. module: pad
 #: model:ir.model,name:pad.model_res_company
@@ -47,26 +47,28 @@ msgid ""
 "You must configure the etherpad through the menu Setting > Companies > "
 "Companies, in the configuration tab of your company."
 msgstr ""
+"Você deve configurar o etherpad através do menu Configuração > Empresas > "
+"Empresas, na aba de configuração da sua empresa."
 
 #. module: pad
 #: view:res.company:0
 msgid "Pads"
-msgstr ""
+msgstr "Pads"
 
 #. module: pad
 #: field:res.company,pad_server:0
 msgid "Pad Server"
-msgstr ""
+msgstr "Servidor Pad"
 
 #. module: pad
 #: field:res.company,pad_key:0
 msgid "Pad Api Key"
-msgstr ""
+msgstr "Chave da Api Pad"
 
 #. module: pad
 #: help:res.company,pad_server:0
 msgid "Etherpad lite server. Example: beta.primarypad.com"
-msgstr ""
+msgstr "Servidor Etherpad lite. Exemplo: beta.primarypad.com"
 
 #, python-format
 #~ msgid "Write"
diff --git a/addons/pad_project/i18n/pt_BR.po b/addons/pad_project/i18n/pt_BR.po
index 4237a4de38e..176293a343c 100644
--- a/addons/pad_project/i18n/pt_BR.po
+++ b/addons/pad_project/i18n/pt_BR.po
@@ -8,24 +8,24 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-08-13 03:40+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-12-06 13:08+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:32+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: pad_project
 #: constraint:project.task:0
 msgid "Error ! Task end-date must be greater then task start-date"
-msgstr "Erro ! A data final deve ser maior do que a data inicial"
+msgstr "Erro ! A data final da tarefa deve ser maior do que a data inicial"
 
 #. module: pad_project
 #: field:project.task,description_pad:0
 msgid "Description PAD"
-msgstr ""
+msgstr "Descrição do Pad"
 
 #. module: pad_project
 #: model:ir.model,name:pad_project.model_project_task
diff --git a/addons/portal/i18n/fr.po b/addons/portal/i18n/fr.po
index 6c3ab1ed8e0..252fb6924d2 100644
--- a/addons/portal/i18n/fr.po
+++ b/addons/portal/i18n/fr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2011-09-26 12:28+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 17:21+0000\n"
+"Last-Translator: Quentin THEURET <Unknown>\n"
 "Language-Team: French <fr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: portal
 #: view:portal.payment.acquirer:0
@@ -304,7 +304,7 @@ msgstr "Courriel requis"
 #. module: portal
 #: model:ir.ui.menu,name:portal.portal_messages
 msgid "Messaging"
-msgstr ""
+msgstr "Messagerie"
 
 #. module: portal
 #: code:addons/portal/wizard/portal_wizard.py:195
diff --git a/addons/portal_claim/i18n/pt_BR.po b/addons/portal_claim/i18n/pt_BR.po
new file mode 100644
index 00000000000..2969563a759
--- /dev/null
+++ b/addons/portal_claim/i18n/pt_BR.po
@@ -0,0 +1,44 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-11-24 02:53+0000\n"
+"PO-Revision-Date: 2012-12-06 13:10+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
+
+#. module: portal_claim
+#: model:ir.actions.act_window,help:portal_claim.crm_case_categ_claim0
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to register a new claim. \n"
+"              </p><p>\n"
+"                You can track your claims from this menu and the action we\n"
+"                will take.\n"
+"              </p>\n"
+"            "
+msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para registrar uma nova reclamação. \n"
+"              </p><p>\n"
+"                Você pode acompanhar suas reclamações através deste menu e a "
+"ação\n"
+"                que tomaremos.\n"
+"              </p>\n"
+"            "
+
+#. module: portal_claim
+#: model:ir.actions.act_window,name:portal_claim.crm_case_categ_claim0
+#: model:ir.ui.menu,name:portal_claim.portal_after_sales_claims
+msgid "Claims"
+msgstr "Reclamações"
diff --git a/addons/portal_sale/i18n/pt_BR.po b/addons/portal_sale/i18n/pt_BR.po
index 65598ecb25e..51625447fc5 100644
--- a/addons/portal_sale/i18n/pt_BR.po
+++ b/addons/portal_sale/i18n/pt_BR.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-04 21:39+0000\n"
+"PO-Revision-Date: 2012-12-06 17:05+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.portal_action_invoices
 msgid "We haven't sent you any invoice."
-msgstr "Não foi enviada nenhuma fatura."
+msgstr "Não foi enviada nenhuma fatura para você."
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.action_orders_portal
 msgid "We haven't sent you any sale order."
-msgstr "Não foi enviado nenhum pedido de venda."
+msgstr "Não foi enviado nenhum pedido de venda para você."
 
 #. module: portal_sale
 #: model:res.groups,name:portal_sale.group_payment_options
@@ -48,11 +48,13 @@ msgid ""
 "${object.company_id.name} ${object.state in ('draft', 'sent') and "
 "'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 msgstr ""
+"${object.company_id.name} ${object.state in ('draft', 'sent') and "
+"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })"
 
 #. module: portal_sale
 #: model:ir.actions.act_window,help:portal_sale.action_quotations_portal
 msgid "We haven't sent you any quotation."
-msgstr "Não foi enviada nenhuma cotação."
+msgstr "Não foi enviada nenhuma cotação para você."
 
 #. module: portal_sale
 #: model:ir.ui.menu,name:portal_sale.portal_sales_orders
@@ -183,6 +185,129 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},</p>\n"
+"\n"
+"    <p>Uma nova fatura está disponível para você: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERÊNCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Número da Fatura: <strong>${object.number}</strong><br "
+"/>\n"
+"       &nbsp;&nbsp;Total Faturado: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data de Faturamento: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Pedido de Referência: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.portal_action_invoices'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Você pode acessar o documento da fatura e pagar online através do nosso "
+"Portal de Atendimento:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">Ver Fatura</a>\n"
+"    % endif\n"
+"    \n"
+"    % if object.company_id.paypal_account and object.type in ('out_invoice', "
+"'in_refund'):\n"
+"    <% \n"
+"    comp_name = quote(object.company_id.name)\n"
+"    inv_number = quote(object.number)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    inv_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Invoice%%20%s&amp;"
+"\" \\\n"
+"                 "
+"\"invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=services&a"
+"mp;no_note=1&amp;bn=OpenERP_Invoice_PayNow_%s\" % \\\n"
+"                 "
+"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)"
+"\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/pt_BR/BR/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Se você possui alguma dúvida ou sugestão, entre em contato "
+"conosco.</p>\n"
+"    <p>Obrigado por escolher ${object.company_id.name or 'nossa "
+"empresa'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Telefone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: portal_sale
 #: model:res.groups,comment:portal_sale.group_payment_options
@@ -203,11 +328,13 @@ msgid ""
 "Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
 "and 'draft' or ''}"
 msgstr ""
+"Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' "
+"and 'draft' or ''}"
 
 #. module: portal_sale
 #: model:email.template,subject:portal_sale.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
-msgstr ""
+msgstr "${object.company_id.name} Invoice (Ref ${object.number or 'n/a' })"
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_mail_mail
@@ -381,6 +508,134 @@ msgid ""
 "</div>\n"
 "            "
 msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: rgb(255, "
+"255, 255); \">\n"
+"\n"
+"    <p>Olá${object.partner_id.name and ' ' or ''}${object.partner_id.name or "
+"''},</p>\n"
+"    \n"
+"    <p>Esta é sua ${object.state in ('draft', 'sent') and 'quotation' or "
+"'order confirmation'} de ${object.company_id.name}: </p>\n"
+"\n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERÊNCIAS</strong><br />\n"
+"       &nbsp;&nbsp;Número do Pedido: <strong>${object.name}</strong><br />\n"
+"       &nbsp;&nbsp;Valor Total do Pedido: <strong>${object.amount_total} "
+"${object.pricelist_id.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Data do Pedido: ${object.date_order}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Referência do Pedido: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.client_order_ref:\n"
+"       &nbsp;&nbsp;Sua referência: ${object.client_order_ref}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Seu contato: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Order%20${object.name}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>\n"
+"\n"
+"    <%\n"
+"    action = 'portal_sale.action_quotations_portal' if object.state in "
+"('draft', 'sent') else 'portal_sale.action_orders_portal'\n"
+"    object.partner_id.signup_prepare()\n"
+"    signup_url = "
+"object.partner_id._get_signup_url_for_action(action=action,view_type='form',r"
+"es_id=object.id)[object.partner_id.id]\n"
+"    %>\n"
+"    % if signup_url:\n"
+"    <p>\n"
+"    Você pode acessar o documento e pagar online através do nosso Portal de "
+"Atendimento:\n"
+"    </p>\n"
+"        <a style=\"display:block; width: 150px; height:20px; margin-left: "
+"120px; color: #DDD; font-family: 'Lucida Grande', Helvetica, Arial, sans-"
+"serif; font-size: 13px; font-weight: bold; text-align: center; text-"
+"decoration: none !important; line-height: 1; padding: 5px 0px 0px 0px; "
+"background-color: #8E0000; border-radius: 5px 5px; background-repeat: repeat "
+"no-repeat;\"\n"
+"           href=\"${signup_url}\">View ${object.state in ('draft', 'sent') "
+"and 'Quotation' or 'Order'}</a>\n"
+"    % endif\n"
+"\n"
+"    % if object.order_policy in ('prepaid','manual') and "
+"object.company_id.paypal_account and object.state != 'draft':\n"
+"    <%\n"
+"    comp_name = quote(object.company_id.name)\n"
+"    order_name = quote(object.name)\n"
+"    paypal_account = quote(object.company_id.paypal_account)\n"
+"    order_amount = quote(str(object.residual))\n"
+"    cur_name = quote(object.pricelist_id.currency_id.name)\n"
+"    paypal_url = \"https://www.paypal.com/cgi-"
+"bin/webscr?cmd=_xclick&amp;business=%s&amp;item_name=%s%%20Order%%20%s\" \\\n"
+"       "
+"\"&amp;invoice=%s&amp;amount=%s&amp;currency_code=%s&amp;button_subtype=servi"
+"ces&amp;no_note=1\" \\\n"
+"       \"&amp;bn=OpenERP_Order_PayNow_%s\" % \\\n"
+"       "
+"(paypal_account,comp_name,order_name,order_name,order_amount,cur_name,cur_nam"
+"e)\n"
+"    %>\n"
+"    <br/>\n"
+"    <p>Também é possível pagar diretamente pelo Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/pt_BR/BR/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"\n"
+"    <br/>\n"
+"    <p>Se você possui alguma dúvida ou sugestão, entre em contato "
+"conosco.</p>\n"
+"    <p>Obrigado por escolher ${object.company_id.name or 'nossa "
+"empresa'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#FFF;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Telefone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Site :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
 
 #. module: portal_sale
 #: model:ir.model,name:portal_sale.model_account_invoice
@@ -398,3 +653,5 @@ msgid ""
 "${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
 "'draft' or ''}"
 msgstr ""
+"${(object.name or '').replace('/','_')}_${object.state == 'draft' and "
+"'draft' or ''}"
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index cdc9fb60ac4..7a01ea56051 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 14:58+0000\n"
+"PO-Revision-Date: 2012-12-06 18:51+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:18+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project
 #: view:project.project:0
@@ -262,7 +262,7 @@ msgstr "Contrato/Analítico"
 #. module: project
 #: view:project.config.settings:0
 msgid "Project Management"
-msgstr "Gerência de Projeto"
+msgstr "Gerenciamento de Projetos"
 
 #. module: project
 #: model:ir.actions.act_window,name:project.action_project_task_delegate
@@ -452,7 +452,7 @@ msgstr "Validar tempo planejado"
 #. module: project
 #: field:project.config.settings,module_pad:0
 msgid "Use integrated collaborative note pads on task"
-msgstr ""
+msgstr "Utilizar as notas colaborativas pads nas tarefas"
 
 #. module: project
 #: model:process.node,note:project.process_node_opentask0
@@ -467,7 +467,7 @@ msgstr "Apelido"
 #. module: project
 #: view:project.task:0
 msgid "oe_kanban_text_red"
-msgstr ""
+msgstr "oe_kanban_text_red"
 
 #. module: project
 #: view:project.task:0
@@ -669,7 +669,7 @@ msgstr ""
 "Você pode definir\n"
 "                  projetos internos (R&amp;D, Melhoria no Processo de "
 "Vendas),\n"
-"                  projetos pessoais (Meus A Fazer) ou ou para clientes.\n"
+"                  projetos pessoais (Meus A Fazer) ou para clientes.\n"
 "                </p><p>\n"
 "                  Você poderá colaborar com os projetos de usuários "
 "internos\n"
@@ -823,7 +823,7 @@ msgstr "Tarefas delegadas"
 #. module: project
 #: model:ir.model,name:project.model_project_task_work
 msgid "Project Task Work"
-msgstr "Tarefa de Projeto em Andamento"
+msgstr "Trabalho da Tarefa do Projeto"
 
 #. module: project
 #: code:addons/project/wizard/project_task_delegate.py:81
@@ -877,7 +877,7 @@ msgstr "Filtros Extendidos..."
 #. module: project
 #: model:ir.ui.menu,name:project.menu_tasks_config
 msgid "GTD"
-msgstr ""
+msgstr "GTD"
 
 #. module: project
 #: help:project.task,state:0
@@ -888,6 +888,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
 
 #. module: project
 #: model:ir.model,name:project.model_res_company
@@ -928,7 +932,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "10"
-msgstr ""
+msgstr "10"
 
 #. module: project
 #: code:addons/project/project.py:566
@@ -1109,7 +1113,7 @@ msgstr "Reabrir projeto"
 #. module: project
 #: help:project.project,priority:0
 msgid "Gives the sequence order when displaying the list of projects"
-msgstr "Fornece a ordem sequencial ao exibir a lista de projectos"
+msgstr "Fornece a ordem sequencial ao exibir a lista de projetos"
 
 #. module: project
 #: constraint:project.project:0
@@ -1143,7 +1147,7 @@ msgstr "Tarefas Pai"
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_read
 msgid "Project: Mark read"
-msgstr "Projeto: Marcar Lido"
+msgstr "Projeto: Marcar como Lido"
 
 #. module: project
 #: model:process.node,name:project.process_node_opentask0
@@ -1205,6 +1209,10 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"A situação do seu documento é automaticamente alterada de acordo com o "
+"estágio selecionado. Por exemplo, se um estágio é relacionado à situação "
+"'Fechado', e seu documento muda para este estágio, ele é automaticamente "
+"fechado."
 
 #. module: project
 #: view:project.task:0
@@ -1380,7 +1388,7 @@ msgstr "Unidade de Tempo de Trabalho"
 #. module: project
 #: view:project.project:0
 msgid "Projects in which I am a member."
-msgstr "Projetos nos quais eu sou um membro."
+msgstr "Projetos dos quais eu sou um membro."
 
 #. module: project
 #: selection:project.task,priority:0
@@ -1442,7 +1450,7 @@ msgstr "Ativo"
 #. module: project
 #: model:ir.model,name:project.model_project_category
 msgid "Category of project's task, issue, ..."
-msgstr "Categoria da tarefa ou incidente do projeto"
+msgstr "Categoria da tarefa do projeto, incidente, ..."
 
 #. module: project
 #: help:project.project,resource_calendar_id:0
@@ -1574,7 +1582,7 @@ msgstr "Horas Totais"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project
 #: view:project.project:0
@@ -1613,6 +1621,11 @@ msgid ""
 "                (by default, http://ietherpad.com/).\n"
 "                This installs the module pad."
 msgstr ""
+"Permite à empresa personalizar qual instalação de Pad (bloco de notas) deve "
+"ser utilizada\n"
+"                para conectar novos pads (por padrão, "
+"http://ietherpad.com/).\n"
+"                O módulo pad será instalado."
 
 #. module: project
 #: field:project.task,id:0
@@ -1722,6 +1735,12 @@ msgid ""
 "                editing and deleting either ways.\n"
 "                This installs the module project_timesheet."
 msgstr ""
+"Permite transferir as entradas dentro de tarefas definidas no Gerenciamento "
+"de Projetos\n"
+"                para entradas de planilha de horas com uma data e usuário "
+"específicos, com o\n"
+"                efeito de criar, editar e excluir de várias formas.\n"
+"                O módulo project_timesheet será instalado."
 
 #. module: project
 #: field:project.config.settings,module_project_issue:0
@@ -1999,6 +2018,13 @@ msgid ""
 "'Manufacture'.\n"
 "                This installs the module project_mrp."
 msgstr ""
+"Este recurso cria automaticamente tarefas de projeto a partir de serviços em "
+"um pedido de venda.\n"
+"                Mais precisamente, tarefas são criadas para linhas de "
+"obtenção com o produto do tipo 'Serviço',\n"
+"                método de obtenção 'Fazer pedido' e método de fornecimento "
+"'Fabricação'.\n"
+"                O módulo project_mrp será instalado."
 
 #. module: project
 #: help:project.task.delegate,planned_hours:0
@@ -2099,7 +2125,7 @@ msgstr "Janeiro"
 #. module: project
 #: model:ir.actions.server,name:project.actions_server_project_unread
 msgid "Project: Mark unread"
-msgstr "Projeto: Marcar não lido"
+msgstr "Projeto: Marcar como não lido"
 
 #. module: project
 #: field:project.task.delegate,prefix:0
@@ -2173,6 +2199,9 @@ msgid ""
 "resource allocation.\n"
 "                This installs the module project_long_term."
 msgstr ""
+"Um módulo de gerenciamento de projetos a longo prazo que rastreia o "
+"planejamento, agendamento e alocação de recursos.\n"
+"                O módulo project_long_term será instalado."
 
 #. module: project
 #: selection:report.project.task.user,month:0
@@ -2200,17 +2229,20 @@ msgid ""
 "Provides timesheet support for the issues/bugs management in project.\n"
 "                This installs the module project_issue_sheet."
 msgstr ""
+"Fornece suporte a planilha de horas para o gerenciamento de "
+"incidentes/problemas em um projeto.\n"
+"                O módulo project_issue_sheet será instalado."
 
 #. module: project
 #: selection:project.project,privacy_visibility:0
 msgid "Followers Only"
-msgstr ""
+msgstr "Somente Seguidores"
 
 #. module: project
 #: view:board.board:0
 #: field:project.project,task_count:0
 msgid "Open Tasks"
-msgstr ""
+msgstr "Tarefas Abertas"
 
 #. module: project
 #: field:project.project,priority:0
diff --git a/addons/project_gtd/i18n/pt_BR.po b/addons/project_gtd/i18n/pt_BR.po
index acc789c6945..fff929d7eec 100644
--- a/addons/project_gtd/i18n/pt_BR.po
+++ b/addons/project_gtd/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-01-16 14:06+0000\n"
-"Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+"PO-Revision-Date: 2012-12-06 17:34+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:37+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_gtd
 #: view:project.task:0
@@ -81,7 +81,7 @@ msgstr "Hoje"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Timeframe"
-msgstr ""
+msgstr "Período"
 
 #. module: project_gtd
 #: model:project.gtd.timebox,name:project_gtd.timebox_lt
@@ -194,7 +194,7 @@ msgstr "project.gtd.timebox"
 #: code:addons/project_gtd/wizard/project_gtd_empty.py:52
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Erro!"
 
 #. module: project_gtd
 #: model:ir.actions.act_window,name:project_gtd.open_gtd_timebox_tree
@@ -224,7 +224,7 @@ msgstr "Seleção de tarefas"
 #. module: project_gtd
 #: view:project.task:0
 msgid "Display"
-msgstr ""
+msgstr "Exibir"
 
 #. module: project_gtd
 #: model:project.gtd.context,name:project_gtd.context_office
@@ -297,7 +297,7 @@ msgstr "Para reabrir as tarefas"
 #. module: project_gtd
 #: view:project.timebox.fill.plan:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
diff --git a/addons/project_issue/i18n/pt_BR.po b/addons/project_issue/i18n/pt_BR.po
index c271005eca0..3bafb098d83 100644
--- a/addons/project_issue/i18n/pt_BR.po
+++ b/addons/project_issue/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-04 16:20+0000\n"
+"PO-Revision-Date: 2012-12-06 19:01+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_03
@@ -45,7 +45,7 @@ msgstr "Agrupar Por..."
 #. module: project_issue
 #: field:project.issue,working_hours_open:0
 msgid "Working Hours to Open the Issue"
-msgstr "Horas Trabalhadas para Abrir o Caso"
+msgstr "Horas Trabalhadas para Abrir o Incidente"
 
 #. module: project_issue
 #: field:project.issue,date_open:0
@@ -82,7 +82,7 @@ msgstr "<b>escalado</b>."
 #. module: project_issue
 #: model:ir.actions.server,name:project_issue.actions_server_project_issue_unread
 msgid "Issue: Mark unread"
-msgstr "Incidente: Marcar não lido"
+msgstr "Incidente: Marcar como não lido"
 
 #. module: project_issue
 #: field:project.issue,email_cc:0
@@ -111,7 +111,7 @@ msgid ""
 "You cannot escalate this issue.\n"
 "The relevant Project has not configured the Escalation Project!"
 msgstr ""
-"Você não pode escalonar este caso.\n"
+"Você não pode escalonar este incidente.\n"
 "O Projeto em questão não foi configurado como Projeto Escalonado!"
 
 #. module: project_issue
@@ -210,7 +210,7 @@ msgstr "Data do Fechamento"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Search"
-msgstr "Rastreador de Incidentes"
+msgstr "Pesquisar no Rastreador de Incidentes"
 
 #. module: project_issue
 #: field:project.issue,color:0
@@ -248,8 +248,8 @@ msgid ""
 "If any issue is escalated from the current Project, it will be listed under "
 "the project selected here."
 msgstr ""
-"Se esta questão for escalonada do Projeto atual, ela será listada abaixo do "
-"projeto selecionado aqui."
+"Se qualquer incidente for escalonado do Projeto atual, ele será listado "
+"abaixo do projeto selecionado aqui."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -264,10 +264,11 @@ msgid ""
 "analyse the time required to open or close an issue, the number of email to "
 "exchange and the time spent on average by issues."
 msgstr ""
-"Este relatório nos casos do projeto te permitem analisar a qualidade do seu "
-"suporte ou do pós-venda. Você pode rastrear as questões por período. Você "
-"pode analisar o tempo necessário para abrir ou fechar uma questão, o número "
-"de emails trocados e o tempo gasto em média por questão."
+"Este relatório nos incidentes de projeto permite analisar a qualidade do seu "
+"suporte ou dos serviços pós-venda. Você pode rastrear os incidentes por "
+"período. Você pode analisar o tempo necessário para abrir ou fechar um "
+"incidente, o número de e-mails trocados e o tempo gasto em média por "
+"incidente."
 
 #. module: project_issue
 #: view:project.issue:0
@@ -354,7 +355,7 @@ msgstr "%s (cópia)"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Unassigned Issues"
-msgstr "Questões não atribuídas"
+msgstr "Incidentes não atribuídos"
 
 #. module: project_issue
 #: field:project.issue,create_date:0
@@ -372,7 +373,7 @@ msgstr "Versões"
 #. module: project_issue
 #: view:project.issue:0
 msgid "To Do Issues"
-msgstr "Questões a Serem Feitas"
+msgstr "Incidentes A Serem Feitos"
 
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_issue_version
@@ -414,7 +415,7 @@ msgstr "Fase"
 #: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree
 #: view:project.issue.report:0
 msgid "Issues Analysis"
-msgstr "Análise de Questões"
+msgstr "Análise de Incidentes"
 
 #. module: project_issue
 #: code:addons/project_issue/project_issue.py:493
@@ -425,7 +426,7 @@ msgstr "Sem Assunto"
 #. module: project_issue
 #: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree
 msgid "My Project Issues"
-msgstr "Minhas Questões do Projeto"
+msgstr "Meus Incidentes do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -460,7 +461,7 @@ msgstr "Nº de Incidentes"
 #. module: project_issue
 #: model:ir.actions.server,name:project_issue.actions_server_project_issue_read
 msgid "Issue: Mark read"
-msgstr "Incidente: Marcar lido"
+msgstr "Incidente: Marcar como lido"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -475,7 +476,7 @@ msgstr "Marcadores"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Issue Tracker Tree"
-msgstr "Árvore de Rastreamento de Questões"
+msgstr "Árvore do Rastreador de Incidentes"
 
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_01
@@ -532,7 +533,7 @@ msgstr "E-mail do Usuário"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Number of Project Issues"
-msgstr "#Número de Questões de Projeto"
+msgstr "Número de Incidentes do Projeto"
 
 #. module: project_issue
 #: help:project.issue,channel_id:0
@@ -589,7 +590,7 @@ msgstr "Status"
 #. module: project_issue
 #: view:project.issue.report:0
 msgid "#Project Issues"
-msgstr "#Questões do Projeto"
+msgstr "Nº de Incidentes do Projeto"
 
 #. module: project_issue
 #: selection:project.issue.report,month:0
@@ -625,7 +626,7 @@ msgstr "Histórico de mensagens e comunicação"
 #. module: project_issue
 #: view:project.issue:0
 msgid "New Issues"
-msgstr "Novas Questões"
+msgstr "Novos Incidentes"
 
 #. module: project_issue
 #: field:project.issue,day_close:0
@@ -646,6 +647,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"A situação é definida como 'Rascunho' quando o caso é criado. Se o caso está "
+"em progresso, a situação muda para 'Aberto'. Quando o caso termina, a "
+"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a "
+"situação é definida como 'Pendente'."
 
 #. module: project_issue
 #: field:project.issue,active:0
@@ -693,7 +698,7 @@ msgstr "Janeiro"
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Tree"
-msgstr "Árvore de Recursos"
+msgstr "Árvore do Rastreador de Recursos"
 
 #. module: project_issue
 #: help:project.issue,email_from:0
@@ -778,7 +783,7 @@ msgstr "A fazer"
 #: model:ir.model,name:project_issue.model_project_issue
 #: view:project.issue.report:0
 msgid "Project Issue"
-msgstr "Questões do Projeto"
+msgstr "Incidente do Projeto"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -820,12 +825,12 @@ msgstr "Estágio alterado para <b>%s</b>."
 #. module: project_issue
 #: model:project.category,name:project_issue.project_issue_category_02
 msgid "PBCK"
-msgstr ""
+msgstr "PBCK"
 
 #. module: project_issue
 #: view:project.issue:0
 msgid "Feature Tracker Search"
-msgstr "Procurar Recurso"
+msgstr "Pesquisar no Rastreador de Recursos"
 
 #. module: project_issue
 #: view:project.issue:0
@@ -845,7 +850,7 @@ msgstr "Maio"
 #. module: project_issue
 #: model:ir.model,name:project_issue.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"
 
 #. module: project_issue
 #: view:project.issue.report:0
@@ -925,7 +930,7 @@ msgstr "Referências"
 #. module: project_issue
 #: field:project.issue,working_hours_close:0
 msgid "Working Hours to Close the Issue"
-msgstr "Horas de Trabalho para Concluir a Questão"
+msgstr "Horas de Trabalho para Concluir o Incidente"
 
 #. module: project_issue
 #: field:project.issue,id:0
@@ -940,7 +945,7 @@ msgstr "project.issue.report"
 #. module: project_issue
 #: help:project.issue.report,delay_close:0
 msgid "Number of Days to close the project issue"
-msgstr "Número de dias para fechar a questão do projeto."
+msgstr "Número de dias para fechar o incidente do projeto."
 
 #. module: project_issue
 #: field:project.issue.report,working_hours_close:0
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d73ca3e288e..5ed8bb2ab2f 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -200,12 +200,12 @@
                     <filter string="Unassigned Issues" domain="[('user_id','=',False)]"  help="Unassigned Issues" icon="terp-personal-" />
                     <field name="user_id"/>
                     <field name="project_id"/>
+                    <field name="categ_ids"/>
                     <group expand="0" string="Group By..." >
                         <filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                         <filter string="Contact" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
                         <filter string="Project"  icon="terp-folder-violet" domain="[]" context="{'group_by':'project_id'}"/>
                         <filter string="Version" icon="terp-gtk-jump-to-rtl" domain="[]" context="{'group_by':'version_id'}"/>
-                        <filter string="Category" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'categ_id'}"/>
                         <filter string="Priority" icon="terp-rating-rated" domain="[]" context="{'group_by':'priority'}"/>
                         <filter string="Stage" icon="terp-stage" domain="[]" context="{'group_by':'stage_id'}"/>
                         <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'create_date'}" help="Creation Month"/>
diff --git a/addons/project_issue_sheet/i18n/pt_BR.po b/addons/project_issue_sheet/i18n/pt_BR.po
index be8ee860908..6e3418f9dc8 100644
--- a/addons/project_issue_sheet/i18n/pt_BR.po
+++ b/addons/project_issue_sheet/i18n/pt_BR.po
@@ -8,21 +8,20 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-08-13 03:17+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 17:36+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:49+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
 #, python-format
 msgid "The Analytic Account is pending !"
-msgstr ""
+msgstr "A Conta Analítica está pendente !"
 
 #. module: project_issue_sheet
 #: model:ir.model,name:project_issue_sheet.model_account_analytic_line
@@ -42,7 +41,7 @@ msgstr "Linha da Planilhao de Horas"
 #. module: project_issue_sheet
 #: view:project.issue:0
 msgid "on_change_project(project_id)"
-msgstr ""
+msgstr "on_change_project(project_id)"
 
 #. module: project_issue_sheet
 #: code:addons/project_issue_sheet/project_issue_sheet.py:57
diff --git a/addons/project_timesheet/i18n/pt_BR.po b/addons/project_timesheet/i18n/pt_BR.po
index 52c6c4495a3..2e15734e772 100644
--- a/addons/project_timesheet/i18n/pt_BR.po
+++ b/addons/project_timesheet/i18n/pt_BR.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2011-01-26 00:43+0000\n"
-"Last-Translator: Adriano Prado <adrianojprado@hotmail.com>\n"
+"PO-Revision-Date: 2012-12-06 17:53+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:39+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -43,6 +43,8 @@ msgid ""
 "You cannot delete a partner which is assigned to project, but you can "
 "uncheck the active box."
 msgstr ""
+"Não é possível excluir um parceiro que está atribuído a um projeto, mas você "
+"pode desmarcar a caixa 'Ativo'."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_project_task_work
@@ -55,11 +57,13 @@ msgstr "Tarefa de Projeto em Andamento"
 msgid ""
 "You cannot select a Analytic Account which is in Close or Cancelled state."
 msgstr ""
+"Não é possível selecionar uma Conta Analítica que está nas situações Fechada "
+"ou Cancelada."
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
 msgid "Group By..."
-msgstr "Agrupado Por..."
+msgstr "Agrupar Por..."
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_triggerinvoice0
@@ -76,7 +80,7 @@ msgstr "Outubro"
 #: view:project.project:0
 #, python-format
 msgid "Timesheets"
-msgstr ""
+msgstr "Planilhas de Horas"
 
 #. module: project_timesheet
 #: view:project.project:0
@@ -94,11 +98,19 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Clique para adicionar um contrato de cliente.\n"
+"              </p><p>\n"
+"                Você encontrará aqui os contratos relacionados a\n"
+"                seus projetos de clientes para acompanhar o processo\n"
+"                de faturamento.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
 msgid "Analytic Account/Project"
-msgstr ""
+msgstr "Conta Analítica/Projeto"
 
 #. module: project_timesheet
 #: view:account.analytic.line:0
@@ -118,6 +130,9 @@ msgid ""
 "employee.\n"
 "Fill in the HR Settings tab of the employee form."
 msgstr ""
+"Por favor defina produto e propriedades da conta de produto no colaborador "
+"relacionado.\n"
+"Preencha na aba de Configurações de RH do formulário do colaborador."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_account_analytic_line
@@ -151,6 +166,8 @@ msgid ""
 "Please define journal on the related employee.\n"
 "Fill in the timesheet tab of the employee form."
 msgstr ""
+"Por favor informe o diário no colaborador relacionado\n"
+"Preencha na aba de apontamento de horas no formulário do colaborador."
 
 #. module: project_timesheet
 #: model:ir.ui.menu,name:project_timesheet.menu_hr_timesheet_sign_in
@@ -170,7 +187,7 @@ msgstr "Contratos a Renovar"
 #. module: project_timesheet
 #: view:project.project:0
 msgid "Hours"
-msgstr ""
+msgstr "Horas"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -231,6 +248,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Você encontra aqui planilhas de horas e compras feitas para "
+"contratos que podem ser faturados para o cliente.\n"
+"                Se você deseja registrar novos trabalhos para faturar, você "
+"deve utilizar o menu de planilha de horas.\n"
+"              </p>\n"
+"            "
 
 #. module: project_timesheet
 #: model:process.node,name:project_timesheet.process_node_timesheettask0
@@ -291,7 +315,7 @@ msgstr "Codifique quanto tempo você gastou em sua tarefa"
 #: code:addons/project_timesheet/project_timesheet.py:85
 #, python-format
 msgid "Please define employee for user \"%s\". You must create one."
-msgstr ""
+msgstr "Defina um colaborador para o usuário \"%s\". Você deve criá-lo."
 
 #. module: project_timesheet
 #: model:ir.model,name:project_timesheet.model_res_partner
@@ -339,6 +363,8 @@ msgid ""
 "<p>Timesheets on this project may be invoiced to %s, according to the terms "
 "defined in the contract.</p>"
 msgstr ""
+"<p>Planilhas de horas deste projeto devem ser faturadas para %s, de acordo "
+"com os termos definidos no contrato.</p>"
 
 #. module: project_timesheet
 #: model:process.node,note:project_timesheet.process_node_taskwork0
@@ -371,7 +397,7 @@ msgstr "Depois da tarefa concluída, Criar sua nota fiscal"
 #: code:addons/project_timesheet/project_timesheet.py:266
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ação Inválida!"
 
 #. module: project_timesheet
 #: view:report.timesheet.task.user:0
@@ -386,6 +412,8 @@ msgid ""
 "<p class=\"oe_view_nocontent_create\">Record your timesheets for the project "
 "'%s'.</p>"
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">Registre suas planilhas de horas para "
+"o projeto '%s'.</p>"
 
 #. module: project_timesheet
 #: field:report.timesheet.task.user,timesheet_hrs:0
diff --git a/addons/sale/i18n/es_AR.po b/addons/sale/i18n/es_AR.po
index 6ae6cb1889f..d602a97bc3f 100644
--- a/addons/sale/i18n/es_AR.po
+++ b/addons/sale/i18n/es_AR.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2010-09-21 22:36+0000\n"
-"Last-Translator: Margarita Manterola <ubuntu@marga.com.ar>\n"
+"PO-Revision-Date: 2012-12-06 20:57+0000\n"
+"Last-Translator: Guillermo Bisheimer <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -27,11 +27,13 @@ msgid ""
 "Sale Order Lines that are confirmed, done or in exception state and haven't "
 "yet been invoiced"
 msgstr ""
+"Lineas de orden de venta que están confirmadas, realizadas o con el estado "
+"de excepción y que aún no han sido facturadas"
 
 #. module: sale
 #: view:sale.order:0
 msgid "UoS"
-msgstr ""
+msgstr "UdV"
 
 #. module: sale
 #: report:sale.order:0
@@ -42,21 +44,22 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist for current sales order."
-msgstr ""
+msgstr "Tarifa para la orden de venta actual."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar orden"
 
@@ -64,28 +67,28 @@ msgstr "Cancelar orden"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Datos incorrectos"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "El valor del monto de adelanto debe ser positivo"
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Si está marcado, nuevos mensajes requieren su atención."
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: sale
 #: report:sale.order:0
 msgid "Tax"
-msgstr ""
+msgstr "Impuesto"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -99,6 +102,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -111,17 +115,19 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Guarda el resumen del Chatter (número de mensajes, ...). Este resumen está "
+"en formato HTML para ser insertado directamente en las vistas kanban."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "# de cantidad"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Permite aplicar un descuento por cada línea de una orden de venta."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -129,6 +135,9 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"Permite manejar diferentes precios basados en reglas según categorías de "
+"cliente.\n"
+"Por ejemplo: 10% para revendedores, promoción de 5 EUR en este producto, etc."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -139,17 +148,17 @@ msgstr "Término de pago predeterminado"
 #: code:addons/sale/sale.py:662
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Factura <b>pagada</b>"
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Permitir el uso de diferentes unidades de medida"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentaje"
 
 #. module: sale
 #: report:sale.order:0
@@ -161,6 +170,7 @@ msgstr "Desc.(%)"
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
+"Por favor devina la cuenta de ingresos para este producto: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -171,12 +181,12 @@ msgstr "Precio total"
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
 
 #. module: sale
 #: view:sale.order:0
 msgid "My Sale Orders"
-msgstr ""
+msgstr "Mis pedidos de venta"
 
 #. module: sale
 #: help:sale.config.settings,timesheet:0
@@ -202,47 +212,49 @@ msgstr "Referencia de la orden"
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Otra información"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:109
 #: code:addons/sale/wizard/sale_make_invoice.py:42
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Advertencia!"
 
 #. module: sale
 #: view:sale.config.settings:0
 msgid "Invoicing Process"
-msgstr ""
+msgstr "Proceso de facturación"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order done"
-msgstr ""
+msgstr "Orden de venta lista"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: view:res.partner:0
 msgid "Quotations and Sales"
-msgstr ""
+msgstr "Presupuestos y ventas"
 
 #. module: sale
 #: help:sale.config.settings,group_uom:0
 msgid ""
 "Allows you to select and maintain different units of measure for products."
 msgstr ""
+"Permite seleccionar y mantener diferentes unidades de medida para los "
+"productos."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sales Make Invoice"
-msgstr ""
+msgstr "Ventas. Realizar factura"
 
 #. module: sale
 #: code:addons/sale/sale.py:293
 #, python-format
 msgid "Pricelist Warning!"
-msgstr ""
+msgstr "¡Advertencia de la lista de precios!"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -252,7 +264,7 @@ msgstr "Descuento (%)"
 #. module: sale
 #: view:sale.order.line.make.invoice:0
 msgid "Create & View Invoice"
-msgstr ""
+msgstr "Crear y visualizar factura"
 
 #. module: sale
 #: view:board.board:0
@@ -263,7 +275,7 @@ msgstr "Mis cotizaciones"
 #. module: sale
 #: field:sale.config.settings,module_warning:0
 msgid "Allow configuring alerts by customer or products"
-msgstr ""
+msgstr "Permitir configurar alertas por cliente o productos"
 
 #. module: sale
 #: field:sale.shop,name:0
@@ -288,23 +300,23 @@ msgstr ""
 #. module: sale
 #: view:sale.order:0
 msgid "Quotation "
-msgstr ""
+msgstr "Presupuesto "
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:106
 #, python-format
 msgid "Advance of %s %%"
-msgstr ""
+msgstr "Adelanto del %s %%"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Ventas en excepción"
 
 #. module: sale
 #: help:sale.order.line,address_allotment_id:0
 msgid "A partner to whom the particular product needs to be allotted."
-msgstr ""
+msgstr "Un partner al cual debe asignarse el producto."
 
 #. module: sale
 #: view:sale.order:0
@@ -318,7 +330,7 @@ msgstr "Estado"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: sale
 #: model:ir.actions.act_window,help:sale.action_orders
@@ -334,63 +346,71 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Hacer click para crear un presupuesto que pueda ser "
+"convertido en una orden de venta.\n"
+"              </p><p>\n"
+"                OpenERP le ayudará a manejar eficientemente el flujo de "
+"venta completo:\n"
+"                presupuesto, orden de venta, despacho, facturación y pago.\n"
+"              </p>\n"
+"            "
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Estadísticas de pedidos de venta"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sales order."
-msgstr ""
+msgstr "La cuenta analítica relacionada con una orden de venta."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: sale
 #: field:sale.order,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Resumen"
 
 #. module: sale
 #: view:sale.order:0
 msgid "View Invoice"
-msgstr ""
+msgstr "Ver factura"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:113
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:115
 #, python-format
 msgid "Advance of %s %s"
-msgstr ""
+msgstr "Avance del %s %s"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Presupuestos"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Cantidad"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Dirección de envío para la orden de venta actual."
 
 #. module: sale
 #: report:sale.order:0
@@ -400,7 +420,7 @@ msgstr "IVA :"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Setiembre"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -408,6 +428,7 @@ msgid "Fiscal Position"
 msgstr "Posición fiscal"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "En proceso"
@@ -416,7 +437,7 @@ msgstr "En proceso"
 #: code:addons/sale/sale.py:667
 #, python-format
 msgid "Draft Invoice of %s %s <b>waiting for validation</b>."
-msgstr ""
+msgstr "Borrador de factura %s %s <b>esperando validación</b>."
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -424,12 +445,15 @@ msgid ""
 "The salesman confirms the quotation. The state of the sales order becomes "
 "'In progress' or 'Manual in progress'."
 msgstr ""
+"El vendedor confirma el presupuesto. El estado de la orden de venta se "
+"convierte 'En proceso' o 'Manual en proceso'."
 
 #. module: sale
 #: code:addons/sale/sale.py:843
 #, python-format
 msgid "You cannot cancel a sale order line that has already been invoiced."
 msgstr ""
+"No se puede cancelar una linea de una orden de venta que ya fue facturada."
 
 #. module: sale
 #: report:sale.order:0
@@ -439,7 +463,7 @@ msgstr "Tel. :"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sales order."
-msgstr ""
+msgstr "Dirección de facturación para la orden de venta activa."
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_config_settings
@@ -494,7 +518,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -596,6 +619,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr ""
 
@@ -615,7 +639,6 @@ msgid "Order N°"
 msgstr "Orden Nº"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Líneas de la orden"
@@ -713,6 +736,7 @@ msgstr ""
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr ""
 
@@ -724,7 +748,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -761,7 +784,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -869,6 +892,7 @@ msgid "Your Reference"
 msgstr "Su referencia"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Ctd"
@@ -880,9 +904,10 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -903,10 +928,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Crear factura"
@@ -933,6 +957,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Precio"
 
@@ -1015,7 +1040,7 @@ msgstr "Confirmar cotización"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Order Lines to Invoice"
-msgstr ""
+msgstr "Lineas de pedido a facturar"
 
 #. module: sale
 #: view:sale.order:0
@@ -1068,6 +1093,7 @@ msgid "Sale Order"
 msgstr "Orden de Venta"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1135,6 +1161,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr ""
 
@@ -1239,7 +1266,7 @@ msgstr ""
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Cotización"
@@ -1385,10 +1412,8 @@ msgid "Customer Invoices"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1410,7 +1435,6 @@ msgid "Unit Price"
 msgstr "Precio unitario"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1419,10 +1443,8 @@ msgid "Done"
 msgstr "Realizada"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Factura"
 
@@ -1498,6 +1520,7 @@ msgid "Product UoS"
 msgstr "UdV del producto"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Manual en proceso"
@@ -1642,7 +1665,7 @@ msgid "Invoice Exception"
 msgstr "Excepción de factura"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "¡No se ha definido un cliente!"
@@ -1719,6 +1742,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1742,15 +1766,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr ""
 
@@ -1785,6 +1806,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Líneas de Facturación"
@@ -1796,7 +1818,6 @@ msgid "# of Lines"
 msgstr "# de líneas"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1870,7 +1891,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1890,6 +1911,8 @@ msgid "Weight"
 msgstr "Peso"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Facturas"
@@ -1921,7 +1944,10 @@ msgid "Untaxed Amount"
 msgstr "Importe sin impuestos"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Avanzar factura"
@@ -1962,6 +1988,8 @@ msgid "Email Templates"
 msgstr ""
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Órdenes de venta"
@@ -1999,7 +2027,7 @@ msgid "January"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Órdenes de venta en proceso"
 
@@ -2172,6 +2200,7 @@ msgid "Quotation N°"
 msgstr "Cotización Nº"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Entregada"
diff --git a/addons/sale/i18n/hr.po b/addons/sale/i18n/hr.po
index f4c3dceb198..1bc9fffe042 100644
--- a/addons/sale/i18n/hr.po
+++ b/addons/sale/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-12-03 16:08+0000\n"
+"PO-Revision-Date: 2012-12-06 13:18+0000\n"
 "Last-Translator: Krešimir Jeđud <kresimir.jedud@infokom.hr>\n"
 "Language-Team: Vinteh <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 "Language: hr\n"
 
 #. module: sale
@@ -60,6 +60,7 @@ msgstr "Dan"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Otkaži narudžbu"
 
@@ -102,6 +103,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -300,7 +302,7 @@ msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Prodaje u iznimci"
 
@@ -376,8 +378,8 @@ msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -386,14 +388,13 @@ msgstr "Ponude"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Količina"
 
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Delivery address for current sales order."
-msgstr ""
+msgstr "Adresa dostave za trenutni prodajni nalog"
 
 #. module: sale
 #: report:sale.order:0
@@ -411,6 +412,7 @@ msgid "Fiscal Position"
 msgstr "Porezna pozicija"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "U tijeku"
@@ -501,7 +503,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -603,6 +604,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Stavka prodajnog naloga"
 
@@ -622,7 +624,6 @@ msgid "Order N°"
 msgstr "Narudžba broj"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Stavke narudžbe"
@@ -720,6 +721,7 @@ msgstr "Datum narudžbe"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Otpremljeno"
 
@@ -731,7 +733,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -768,7 +769,7 @@ msgid "You cannot confirm a sale order which has no line."
 msgstr "Ne možete potvrditi prodajni nalog koji nema stavku."
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -878,6 +879,7 @@ msgid "Your Reference"
 msgstr "Vaša referenca"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Količina"
@@ -889,9 +891,10 @@ msgstr "Moje stavke prodajnog naloga"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -912,10 +915,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Napravi fakturu"
@@ -942,6 +944,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Cijena"
 
@@ -1077,6 +1080,7 @@ msgid "Sale Order"
 msgstr "Prodajna narudžba"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1146,6 +1150,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Napravi fakture"
 
@@ -1250,7 +1255,7 @@ msgstr "Analiza prodaje"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Ponuda"
@@ -1399,10 +1404,8 @@ msgid "Customer Invoices"
 msgstr "Izlazni računi"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1424,7 +1427,6 @@ msgid "Unit Price"
 msgstr "Jedinična cijena"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1433,10 +1435,8 @@ msgid "Done"
 msgstr "Završeno"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Faktura"
 
@@ -1512,6 +1512,7 @@ msgid "Product UoS"
 msgstr "Proizvod - jedinica prodaje"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Ručni postupak u tijeku"
@@ -1659,7 +1660,7 @@ msgid "Invoice Exception"
 msgstr "Iznimka fakture"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Nije definiran kupac !"
@@ -1736,6 +1737,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1759,15 +1761,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr "Prodajni nalog"
 
@@ -1802,6 +1801,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Stavke fakture"
@@ -1813,7 +1813,6 @@ msgid "# of Lines"
 msgstr "# linija"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1887,7 +1886,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1911,6 +1910,8 @@ msgid "Weight"
 msgstr "Težina"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Fakture"
@@ -1942,7 +1943,10 @@ msgid "Untaxed Amount"
 msgstr "Iznos bez poreza"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Faktura predujma"
@@ -1983,6 +1987,8 @@ msgid "Email Templates"
 msgstr "Email predlošci"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Prodajni nalozi"
@@ -2020,7 +2026,7 @@ msgid "January"
 msgstr "Siječanj"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Prodajni nalozi u tijeku"
 
@@ -2199,6 +2205,7 @@ msgid "Quotation N°"
 msgstr "Ponuda broj"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Odabran"
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index dacd67b5907..034499bc17f 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/i18n/pt_BR.po
@@ -8,20 +8,19 @@ msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:02+0000\n"
-"PO-Revision-Date: 2012-07-28 16:28+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 18:10+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:31+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale
 #: model:ir.model,name:sale.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -46,7 +45,7 @@ msgstr "UdV"
 #: view:sale.report:0
 #: field:sale.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Vendedor"
 
 #. module: sale
 #: help:sale.order,pricelist_id:0
@@ -61,6 +60,7 @@ msgstr "Dia"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
+#: view:sale.order:0
 msgid "Cancel Order"
 msgstr "Cancelar Pedido"
 
@@ -68,23 +68,23 @@ msgstr "Cancelar Pedido"
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:101
 #, python-format
 msgid "Incorrect Data"
-msgstr ""
+msgstr "Dados Incorretos"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:102
 #, python-format
 msgid "The value of Advance Amount must be positive."
-msgstr ""
+msgstr "O valor da Soma Avançada deve ser positivo."
 
 #. module: sale
 #: help:sale.order,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Se marcado novas mensagens requerem sua atenção"
 
 #. module: sale
 #: view:res.partner:0
 msgid "False"
-msgstr ""
+msgstr "Falso"
 
 #. module: sale
 #: report:sale.order:0
@@ -101,8 +101,15 @@ msgid ""
 "The 'Waiting Schedule' status is set when the invoice is confirmed           "
 "    but waiting for the scheduler to run on the order date."
 msgstr ""
+"Informa a situação da cotação ou pedido de venda.              \n"
+"A situação excepcional é definida automaticamente quando uma operação de "
+"cancelamento ocorre                na validação da fatura (Exceção da "
+"Fatura) ou no processo de lista de separação (Exceção de Envio).\n"
+"A situação 'Aguardando Agendamento' é definida quando a fatura é confirmada  "
+"             mas aguarda pelo processamento na data de pedido."
 
 #. module: sale
+#: field:sale.order,project_id:0
 #: view:sale.report:0
 #: field:sale.report,analytic_account_id:0
 #: field:sale.shop,project_id:0
@@ -115,17 +122,20 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Contém o resumo da conversação (número de mensagens, ...). Este resumo é "
+"gerado diretamente em formato HTML para que possa ser inserido nas visões "
+"kanban."
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr "# de Qtd"
+msgstr "Nº de Qtd"
 
 #. module: sale
 #: help:sale.config.settings,group_discount_per_so_line:0
 msgid "Allows you to apply some discount per sale order line."
-msgstr ""
+msgstr "Permite aplicar algum desconto por linha do pedido de venda."
 
 #. module: sale
 #: help:sale.config.settings,group_sale_pricelist:0
@@ -133,6 +143,9 @@ msgid ""
 "Allows to manage different prices based on rules per category of customers.\n"
 "Example: 10% for retailers, promotion of 5 EUR on this product, etc."
 msgstr ""
+"Permite gerenciar diferentes preços baseado em regras por categoria de "
+"cliente.\n"
+"Exemplo: 10% para varejistas, promoção de R$ 15 neste produto, etc."
 
 #. module: sale
 #: field:sale.shop,payment_default_id:0
@@ -143,17 +156,17 @@ msgstr "Condição de Pagamento Padrão"
 #: code:addons/sale/sale.py:662
 #, python-format
 msgid "Invoice <b>paid</b>."
-msgstr ""
+msgstr "Fatura <b>paga</b>."
 
 #. module: sale
 #: field:sale.config.settings,group_uom:0
 msgid "Allow using different units of measures"
-msgstr ""
+msgstr "Permite utilizar diferentes unidades de medida"
 
 #. module: sale
 #: selection:sale.advance.payment.inv,advance_payment_method:0
 msgid "Percentage"
-msgstr ""
+msgstr "Porcentagem"
 
 #. module: sale
 #: report:sale.order:0
@@ -165,6 +178,7 @@ msgstr "Desc. (%)"
 #, python-format
 msgid "Please define income account for this product: \"%s\" (id:%d)."
 msgstr ""
+"Por favor defina conta de recebimento para este produto: \"%s\" (id:%d)."
 
 #. module: sale
 #: view:sale.report:0
@@ -301,7 +315,7 @@ msgid "Advance of %s %%"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_exception
+#: model:ir.actions.act_window,name:sale.action_order_tree2
 msgid "Sales in Exception"
 msgstr "Vendas em Exceção"
 
@@ -377,8 +391,8 @@ msgid "Advance of %s %s"
 msgstr ""
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_quotations
-#: model:ir.ui.menu,name:sale.menu_sale_quotations
+#: view:board.board:0
+#: model:ir.actions.act_window,name:sale.action_quotation_for_sale
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
@@ -387,7 +401,6 @@ msgstr "Cotações"
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
 #: report:sale.order:0
-#: field:sale.order.line,product_uom_qty:0
 msgid "Quantity"
 msgstr "Quantidade"
 
@@ -412,6 +425,7 @@ msgid "Fiscal Position"
 msgstr "Posição Fiscal"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "In Progress"
 msgstr "Em Progresso"
@@ -501,7 +515,6 @@ msgid "or"
 msgstr ""
 
 #. module: sale
-#: field:sale.order,invoice_exists:0
 #: field:sale.order,invoiced_rate:0
 #: field:sale.order.line,invoiced:0
 msgid "Invoiced"
@@ -603,6 +616,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
+#: field:stock.move,sale_line_id:0
 msgid "Sales Order Line"
 msgstr "Linha de Pedido de Vendas"
 
@@ -622,7 +636,6 @@ msgid "Order N°"
 msgstr "Pedido N°"
 
 #. module: sale
-#: view:sale.order:0
 #: field:sale.order,order_line:0
 msgid "Order Lines"
 msgstr "Itens do Pedido"
@@ -720,6 +733,7 @@ msgstr "Data do Pedido"
 
 #. module: sale
 #: view:sale.order.line:0
+#: field:sale.report,shipped:0
 msgid "Shipped"
 msgstr "Enviado"
 
@@ -731,7 +745,6 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: model:ir.model,name:sale.model_res_partner
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
@@ -770,7 +783,7 @@ msgstr ""
 "pedido."
 
 #. module: sale
-#: code:addons/sale/sale.py:966
+#: code:addons/sale/sale.py:1124
 #, python-format
 msgid ""
 "You have to select a pricelist or a customer in the sales form !\n"
@@ -883,6 +896,7 @@ msgid "Your Reference"
 msgstr "Sua Referência"
 
 #. module: sale
+#: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Qty"
 msgstr "Qtd"
@@ -894,9 +908,10 @@ msgstr "Minhas linhas de Pedido de Venda"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
+#: model:process.transition.action,name:sale.process_transition_action_cancel1
+#: model:process.transition.action,name:sale.process_transition_action_cancel2
 #: view:sale.advance.payment.inv:0
 #: view:sale.make.invoice:0
-#: view:sale.order:0
 #: view:sale.order.line:0
 #: view:sale.order.line.make.invoice:0
 msgid "Cancel"
@@ -917,10 +932,9 @@ msgstr ""
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_invoice0
+#: model:process.transition,name:sale.process_transition_invoiceafterdelivery0
 #: model:process.transition.action,name:sale.process_transition_action_createinvoice0
 #: view:sale.advance.payment.inv:0
-#: view:sale.order:0
-#: field:sale.order,order_policy:0
 #: view:sale.order.line:0
 msgid "Create Invoice"
 msgstr "Criar Nota Fiscal"
@@ -947,6 +961,7 @@ msgstr ""
 
 #. module: sale
 #: report:sale.order:0
+#: view:sale.order.line:0
 msgid "Price"
 msgstr "Preço"
 
@@ -1082,6 +1097,7 @@ msgid "Sale Order"
 msgstr "Pedido de Venda"
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order,amount_tax:0
 #: field:sale.order.line,tax_id:0
 msgid "Taxes"
@@ -1151,6 +1167,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
+#: view:sale.order:0
 msgid "Make Invoices"
 msgstr "Gerar Nota Fiscal"
 
@@ -1255,7 +1272,7 @@ msgstr "Análise de Vendas"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_quotation0
-#: view:sale.order:0
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
 msgstr "Cotação"
@@ -1404,10 +1421,8 @@ msgid "Customer Invoices"
 msgstr "Faturas de Clientes"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.open_board_sales
-#: model:ir.ui.menu,name:sale.menu_dashboard_sales
+#: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
 #: model:process.process,name:sale.process_process_salesprocess0
-#: view:res.partner:0
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Sales"
@@ -1429,7 +1444,6 @@ msgid "Unit Price"
 msgstr "Preço Unitário"
 
 #. module: sale
-#: view:sale.order:0
 #: selection:sale.order,state:0
 #: view:sale.order.line:0
 #: selection:sale.order.line,state:0
@@ -1438,10 +1452,8 @@ msgid "Done"
 msgstr "Concluído"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:123
 #: model:process.node,name:sale.process_node_invoice0
-#: view:sale.order:0
-#, python-format
+#: model:process.node,name:sale.process_node_invoiceafterdelivery0
 msgid "Invoice"
 msgstr "Fatura"
 
@@ -1517,6 +1529,7 @@ msgid "Product UoS"
 msgstr "UdS Produto"
 
 #. module: sale
+#: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Manual In Progress"
 msgstr "Em Andamento Manual"
@@ -1665,7 +1678,7 @@ msgid "Invoice Exception"
 msgstr "Exceção de Faturamento"
 
 #. module: sale
-#: code:addons/sale/sale.py:888
+#: code:addons/sale/sale.py:1017
 #, python-format
 msgid "No Customer Defined !"
 msgstr "Sem Cliente definido!"
@@ -1742,6 +1755,7 @@ msgstr ""
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
 #: field:sale.order,shop_id:0
 #: view:sale.report:0
 #: field:sale.report,shop_id:0
@@ -1765,15 +1779,12 @@ msgid "Contract Features"
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/sale.py:273
-#: code:addons/sale/sale.py:576
 #: model:ir.model,name:sale.model_sale_order
 #: model:process.node,name:sale.process_node_order0
 #: model:process.node,name:sale.process_node_saleorder0
-#: field:res.partner,sale_order_ids:0
 #: model:res.request.link,name:sale.req_link_sale_order
 #: view:sale.order:0
-#, python-format
+#: field:stock.picking,sale_id:0
 msgid "Sales Order"
 msgstr "Pedido de Venda"
 
@@ -1808,6 +1819,7 @@ msgid "Followers"
 msgstr ""
 
 #. module: sale
+#: view:sale.order:0
 #: field:sale.order.line,invoice_lines:0
 msgid "Invoice Lines"
 msgstr "Linhas da Nota Fiscal"
@@ -1819,7 +1831,6 @@ msgid "# of Lines"
 msgstr "# de Linhas"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_line_product_tree
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Sales Order Lines"
@@ -1893,7 +1904,7 @@ msgid ""
 msgstr ""
 
 #. module: sale
-#: code:addons/sale/wizard/sale_line_invoice.py:109
+#: code:addons/sale/wizard/sale_line_invoice.py:111
 #, python-format
 msgid ""
 "Invoice cannot be created for this Sales Order Line due to one of the "
@@ -1917,6 +1928,8 @@ msgid "Weight"
 msgstr "Peso"
 
 #. module: sale
+#: view:sale.open.invoice:0
+#: view:sale.order:0
 #: field:sale.order,invoice_ids:0
 msgid "Invoices"
 msgstr "Notas Fiscais"
@@ -1948,7 +1961,10 @@ msgid "Untaxed Amount"
 msgstr "Total de Mercadorias"
 
 #. module: sale
-#: code:addons/sale/wizard/sale_make_invoice_advance.py:202
+#: code:addons/sale/wizard/sale_make_invoice_advance.py:163
+#: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv
+#: view:sale.advance.payment.inv:0
+#: view:sale.order:0
 #, python-format
 msgid "Advance Invoice"
 msgstr "Avançar Fatura"
@@ -1989,6 +2005,8 @@ msgid "Email Templates"
 msgstr "Modelos de Email"
 
 #. module: sale
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
 #: view:sale.order:0
 msgid "Sales Orders"
 msgstr "Pedidos de Venda"
@@ -2026,7 +2044,7 @@ msgid "January"
 msgstr "Janeiro"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_orders_in_progress
+#: model:ir.actions.act_window,name:sale.action_order_tree4
 msgid "Sales Order in Progress"
 msgstr "Pedido de Venda em Processamento"
 
@@ -2205,6 +2223,7 @@ msgid "Quotation N°"
 msgstr "Cotação N°"
 
 #. module: sale
+#: field:sale.order,picked_rate:0
 #: view:sale.report:0
 msgid "Picked"
 msgstr "Separado"
diff --git a/addons/sale_crm/i18n/pt_BR.po b/addons/sale_crm/i18n/pt_BR.po
index 59f9661f271..9d18e5ea12e 100644
--- a/addons/sale_crm/i18n/pt_BR.po
+++ b/addons/sale_crm/i18n/pt_BR.po
@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-07-28 19:41+0000\n"
-"Last-Translator: Fábio Martinelli - http://zupy.com.br "
-"<webmaster@guaru.net>\n"
+"PO-Revision-Date: 2012-12-06 17:59+0000\n"
+"Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:34+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Dados insuficientes!"
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -32,27 +31,27 @@ msgstr "Converter em Cotação"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Estatísticas das Faturas"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Mark Won"
-msgstr ""
+msgstr "Marcar como Vencido"
 
 #. module: sale_crm
 #: field:res.users,default_section_id:0
 msgid "Default Sales Team"
-msgstr ""
+msgstr "Equipe de Vendas Padrão"
 
 #. module: sale_crm
 #: view:sale.order:0
 msgid "My Sales Team(s)"
-msgstr "Minha Equipe de Vendas"
+msgstr "Minha(s) Equipe(s) de Vendas"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
@@ -65,7 +64,7 @@ msgstr ""
 #. module: sale_crm
 #: field:sale.order,categ_ids:0
 msgid "Categories"
-msgstr ""
+msgstr "Categorias"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:124
@@ -87,12 +86,12 @@ msgstr "_Criar"
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sales"
-msgstr "Criar vendas"
+msgstr "Fazer vendas"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Fatura"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:93
@@ -104,7 +103,7 @@ msgstr "Oportunidade: %s"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:110
 #, python-format
 msgid "Opportunity has been <b>converted</b> to the quotation <em>%s</em>."
-msgstr ""
+msgstr "A oportunidade foi <b>convertida</b> para a cotação <em>%s</em>."
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -115,7 +114,7 @@ msgstr "Estabelecimento"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:90
 #, python-format
 msgid "No addresse(s) defined for this customer."
-msgstr ""
+msgstr "Nenhum endereço definido para o cliente."
 
 #. module: sale_crm
 #: view:account.invoice:0
@@ -129,7 +128,7 @@ msgstr "Equipe de Vendas"
 #. module: sale_crm
 #: view:crm.lead:0
 msgid "Create Quotation"
-msgstr ""
+msgstr "Criar Cotação"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
@@ -149,7 +148,7 @@ msgstr "Pedido de Venda"
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #~ msgid "Crm opportunity quotation"
 #~ msgstr "Cotação da oportunidade de Crm"
diff --git a/addons/share/i18n/pt_BR.po b/addons/share/i18n/pt_BR.po
index 180b2314799..e3b3ef2ce95 100644
--- a/addons/share/i18n/pt_BR.po
+++ b/addons/share/i18n/pt_BR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-03 16:04+0000\n"
-"PO-Revision-Date: 2012-12-04 22:27+0000\n"
+"PO-Revision-Date: 2012-12-06 12:47+0000\n"
 "Last-Translator: Cristiano Korndörfer <codigo.aberto@dorfer.com.br>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n"
-"X-Generator: Launchpad (build 16335)\n"
+"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n"
+"X-Generator: Launchpad (build 16341)\n"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:837
@@ -161,7 +161,7 @@ msgstr "Informações de acesso"
 #. module: share
 #: view:share.wizard:0
 msgid "Share"
-msgstr "Compartilhamento"
+msgstr "Compartilhar"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:566
@@ -192,13 +192,14 @@ msgstr "Próximo"
 #, python-format
 msgid "Action and Access Mode are required to create a shared access."
 msgstr ""
+"Ação e Modo de Acesso são necessários para criar um acesso compartilhado."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:845
 #: code:addons/share/wizard/share_wizard.py:877
 #, python-format
 msgid "Username"
-msgstr "Nome de usuário"
+msgstr "Nome do Usuário"
 
 #. module: share
 #: view:share.wizard:0
@@ -215,7 +216,7 @@ msgstr "Convidar"
 #. module: share
 #: view:share.wizard:0
 msgid "Embedded code options"
-msgstr "Opções de código embutido"
+msgstr "Opções de código incorporado"
 
 #. module: share
 #: view:share.wizard:0
@@ -269,7 +270,7 @@ msgstr ""
 #: code:addons/share/wizard/share_wizard.py:77
 #, python-format
 msgid "Direct link or embed code"
-msgstr "Link direto ou código embutido"
+msgstr "Link direto ou código incorporado"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:851
@@ -280,6 +281,9 @@ msgid ""
 "Sales, HR, etc.)\n"
 "It is open source and can be found on http://www.openerp.com."
 msgstr ""
+"OpenERP é um poderoso e acessível conjunto de Aplicações de Negócios (CRM, "
+"Vendas, RH, etc.)\n"
+"Ele é de código aberto e pode ser encontrado em http://www.openerp.com."
 
 #. module: share
 #: field:share.wizard,action_id:0
@@ -290,6 +294,7 @@ msgstr "Ação para compartilhar"
 #: help:share.wizard,record_name:0
 msgid "Name of the shared record, if sharing a precise record"
 msgstr ""
+"Nome do registro compartilhado, se compartilhando um registro preciso."
 
 #. module: share
 #: field:res.users,share:0
@@ -306,29 +311,31 @@ msgstr "desconhecido"
 #: code:addons/share/wizard/share_wizard.py:652
 #, python-format
 msgid "Sharing access cannot be created."
-msgstr ""
+msgstr "O acesso ao compartilhamento não pode ser criado."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:775
 #, python-format
 msgid "Record id not found"
-msgstr ""
+msgstr "Id do registro não encontrado"
 
 #. module: share
 #: help:res.groups,share:0
 msgid "Group created to set access rights for sharing data with some users."
 msgstr ""
+"Grupo criado para definir direitos de acesso para dados compartilhados com "
+"alguns usuários."
 
 #. module: share
 #: view:res.groups:0
 msgid "Share Groups"
-msgstr ""
+msgstr "Grupos de Compartilhamento"
 
 #. module: share
 #: help:share.wizard,action_id:0
 msgid ""
 "The action that opens the screen containing the data you wish to share."
-msgstr ""
+msgstr "A ação que abre uma tela contendo os dados que deseja compartilhar."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:541
@@ -345,17 +352,23 @@ msgstr "Criado"
 #: help:share.wizard,name:0
 msgid "Title for the share (displayed to users as menu and shortcut name)"
 msgstr ""
+"Título para o compartilhamento (exibido aos usuários como um menu e atalho "
+"para o nome)"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:631
 #, python-format
 msgid "Indirect sharing filter created by user %s (%s) for group %s"
 msgstr ""
+"Filtro de compartilhamento indireto criado pelo usuário %s (%s) para o grupo "
+"%s"
 
 #. module: share
 #: help:share.wizard,share_root_url:0
 msgid "Main access page for users that are granted shared access"
 msgstr ""
+"Página de acesso principal para usuários que possuem acesso a "
+"compartilhamentos"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:206
@@ -364,11 +377,13 @@ msgid ""
 "You must configure your email address in the user preferences before using "
 "the Share button."
 msgstr ""
+"Você deve configurar o seu endereço de e-mail nas preferências de usuário "
+"antes de utilizar o botão Compartilhar."
 
 #. module: share
 #: model:res.groups,name:share.group_share_user
 msgid "User"
-msgstr ""
+msgstr "Usuário"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:653
@@ -378,23 +393,26 @@ msgid ""
 "supported at the moment.\n"
 "You may want to try a simpler filter."
 msgstr ""
+"Desculpe, a tela e filtro atuais que você está tentando compartilhar não são "
+"suportados no momento.\n"
+"Tente um filtro mais simples."
 
 #. module: share
 #: view:share.wizard:0
 msgid "Use this link"
-msgstr ""
+msgstr "Utilize esta ligação"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:847
 #: code:addons/share/wizard/share_wizard.py:879
 #, python-format
 msgid "Database"
-msgstr "Base de Dados"
+msgstr "Banco de Dados"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Share with these People (one email per line)"
-msgstr ""
+msgstr "Compartilhar com estas Pessoas (um e-mail por linha)"
 
 #. module: share
 #: field:share.wizard,domain:0
@@ -404,7 +422,7 @@ msgstr "Domínio"
 #. module: share
 #: view:res.groups:0
 msgid "{'search_default_no_share':1}"
-msgstr ""
+msgstr "{'search_default_no_share':1}"
 
 #. module: share
 #: view:share.wizard:0
@@ -417,6 +435,8 @@ msgstr "Resumo"
 msgid ""
 "Embed this code in your documents to provide a link to the shared document."
 msgstr ""
+"Incorpore este código em seus documentos para fornecer uma ligação para o "
+"documento compartilhado."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:508
@@ -428,17 +448,18 @@ msgstr "Copiado o acesso para o compartilhamento"
 #: code:addons/share/wizard/share_wizard.py:812
 #, python-format
 msgid "Invitation"
-msgstr ""
+msgstr "Convite"
 
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard_step1
 msgid "Share your documents"
-msgstr ""
+msgstr "Compartilhe seus documentos"
 
 #. module: share
 #: view:share.wizard:0
 msgid "Or insert the following code where you want to embed your documents"
 msgstr ""
+"Ou insira o código seguinte onde você pretende incorporar seus documentos"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:881
@@ -447,6 +468,8 @@ msgid ""
 "The documents have been automatically added to your current OpenERP "
 "documents.\n"
 msgstr ""
+"Os documentos foram adicionados automaticamente aos seus documentos do "
+"OpenERP atuais.\n"
 
 #. module: share
 #: model:ir.model,name:share.model_share_wizard_result_line
@@ -456,7 +479,7 @@ msgstr "share.wizard.result.line"
 #. module: share
 #: field:share.wizard,embed_code:0
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #. module: share
 #: help:share.wizard,user_type:0
@@ -472,21 +495,23 @@ msgid ""
 "I have shared %s (%s) with you!\n"
 "\n"
 msgstr ""
+"Eu compartilhei %s (%s) com você!\n"
+"\n"
 
 #. module: share
 #: field:share.wizard,view_type:0
 msgid "Current View Type"
-msgstr ""
+msgstr "Tipo de Visão Atual"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can view"
-msgstr ""
+msgstr "Pode visualizar"
 
 #. module: share
 #: selection:share.wizard,access_mode:0
 msgid "Can edit"
-msgstr ""
+msgstr "Pode editar"
 
 #. module: share
 #: view:share.wizard:0
@@ -499,6 +524,8 @@ msgid ""
 "External user with limited access, created only for the purpose of sharing "
 "data."
 msgstr ""
+"Usuário externo tem acesso limitado, criado apenas com o propósito de "
+"compartilhar dados."
 
 #. module: share
 #: model:ir.actions.act_window,name:share.action_share_wizard
@@ -511,7 +538,7 @@ msgstr "Assistente de Compartilhamento"
 #: code:addons/share/wizard/share_wizard.py:788
 #, python-format
 msgid "Shared access created!"
-msgstr ""
+msgstr "Acesso ao compartilhamento criado!"
 
 #. module: share
 #: model:res.groups,comment:share.group_share_user
@@ -520,6 +547,10 @@ msgid ""
 "Members of this groups have access to the sharing wizard, which allows them "
 "to invite external users to view or edit some of their documents."
 msgstr ""
+"\n"
+"Membros destes grupos tem acesso ao assistente de compartilhamento, que lhes "
+"permite convidar usuários externos para visualizar ou editar alguns de seus "
+"documentos."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:848
@@ -528,11 +559,13 @@ msgid ""
 "The documents have been automatically added to your subscriptions.\n"
 "\n"
 msgstr ""
+"Os documentos foram adicionados automaticamente à sua assinatura.\n"
+"\n"
 
 #. module: share
 #: model:ir.model,name:share.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Usuários"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:871
@@ -541,16 +574,18 @@ msgid ""
 "I've shared %s with you!\n"
 "\n"
 msgstr ""
+"Eu compartilhei %s com você!\n"
+"\n"
 
 #. module: share
 #: model:ir.model,name:share.model_res_groups
 msgid "Access Groups"
-msgstr ""
+msgstr "Grupos de Acesso"
 
 #. module: share
 #: field:share.wizard,invite:0
 msgid "Invite users to OpenSocial record"
-msgstr ""
+msgstr "Convide usuários para registro no OpenSocial"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:846
@@ -565,17 +600,17 @@ msgstr "Senha"
 #: field:share.wizard,new_users:0
 #, python-format
 msgid "Emails"
-msgstr ""
+msgstr "E-mails"
 
 #. module: share
 #: field:share.wizard,embed_option_search:0
 msgid "Display search view"
-msgstr ""
+msgstr "Mostrar a visão de pesquisa"
 
 #. module: share
 #: field:share.wizard,message:0
 msgid "Personal Message"
-msgstr ""
+msgstr "Mensagem Pessoal"
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:830
@@ -585,24 +620,24 @@ msgid ""
 "The current user must have an email address configured in User Preferences "
 "to be able to send outgoing emails."
 msgstr ""
-"O usuário atual deve ter um endereço de email configurado nas Preferências "
-"de Usuário para poder enviar emails."
+"O usuário atual deve ter um endereço de e-mail configurado nas Preferências "
+"de Usuário para poder enviar e-mails."
 
 #. module: share
 #: code:addons/share/wizard/share_wizard.py:205
 #, python-format
 msgid "No email address configured"
-msgstr ""
+msgstr "Nenhum endereço de e-mail configurado."
 
 #. module: share
 #: field:share.wizard.result.line,login:0
 msgid "Login"
-msgstr ""
+msgstr "Entrar"
 
 #. module: share
 #: view:res.users:0
 msgid "Regular users only (no share user)"
-msgstr ""
+msgstr "Somente usuários regulares (sem usuário de compartilhamento)"
 
 #. module: share
 #: field:share.wizard,access_mode:0
@@ -612,7 +647,7 @@ msgstr "Modo de Acesso"
 #. module: share
 #: view:share.wizard:0
 msgid "Sharing: preparation"
-msgstr ""
+msgstr "Compartilhamento: preparação"
 
 #. module: share
 #: model:ir.model,name:share.model_ir_model_access
@@ -622,12 +657,12 @@ msgstr ""
 #. module: share
 #: view:share.wizard:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: share
 #: help:share.wizard,access_mode:0
 msgid "Access rights to be granted on the shared documents."
-msgstr ""
+msgstr "Direitos de acesso a serem aplicados nos documentos compartilhados."
 
 #~ msgid "You can not have two users with the same login !"
 #~ msgstr "Você não pode ter dois usuários com o mesmo login !"