diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 61f701026c2..4e3759713c4 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,15 +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-12-04 23:19+0000\n" +"PO-Revision-Date: 2012-12-05 22:09+0000\n" "Last-Translator: Thorsten Vocks (OpenBig.org) \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:19+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -1949,6 +1949,14 @@ 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 "" +"Bei Auswahl 'Runden pro Zeile': Die Steuern werden je Zeile berechnet und " +"gerundet, um abschließend die Steuer des Auftrags über die Summe der " +"einzelnen Auftragszeilen zu berechnen. Bei Auswahl 'Global Runden': Die " +"Steuern werden je Zeile berechnet, summiert und abschließend global für den " +"gesamten Auftrag gerundet. Falls Sie zu Brutto Preisen inklusive Steuern " +"verkaufen möchten, sollten Sie 'Runden pro Zeile' einstellen, um " +"sicherzustellen dass der Gesamtbetrag des Auftrags der Summe aller einzelnen " +"Auftragszeilen entspricht." #. module: account #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all @@ -2213,7 +2221,7 @@ msgstr "Betrag Haben" #: field:account.bank.statement,message_ids:0 #: field:account.invoice,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Mitteilungen" #. module: account #: view:account.vat.declaration:0 @@ -2444,7 +2452,7 @@ msgstr "Gültig" #: field:account.bank.statement,message_follower_ids:0 #: field:account.invoice,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Followers" #. module: account #: model:ir.actions.act_window,name:account.action_account_print_journal @@ -5858,7 +5866,7 @@ msgstr "" #: code:addons/account/account_invoice.py:1335 #, python-format msgid "%s paid." -msgstr "" +msgstr "%s bezahlt." #. module: account #: view:account.financial.report:0 @@ -7493,7 +7501,7 @@ msgstr "" #: code:addons/account/account_invoice.py:1321 #, python-format msgid "Customer invoice" -msgstr "" +msgstr "Ausgangsrechnung" #. module: account #: selection:account.account.type,report_type:0 @@ -9267,6 +9275,8 @@ msgid "" "You cannot use this general account in this journal, check the tab 'Entry " "Controls' on the related journal." msgstr "" +"Sie können dieses Sachkonto nicht in diesem Journal buchen, prüfen Sie den " +"Aktenreiter 'Kontierungsrichtlinie'." #. module: account #: view:account.payment.term.line:0 @@ -9327,6 +9337,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie um ein Journal hinzuzufügen.\n" +"

\n" +" In einem Journal werden alle Geschäftsvorfälle in " +"chronologischer Reihenfolge aufgezeichnet und gebucht.\n" +"

\n" +" Ein typisches Unternehmen hat dazu jeweils ein Journal je " +"Zahlungsmethode (Barkasse, Bank, Scheck), ein\n" +" Journal für alle Eingangsrechnungen und Ausgangsrechnungen " +"und ein Journal für sonstige Buchungen auf Sachkonten.\n" +"

\n" +" " #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close_state @@ -9460,6 +9482,9 @@ msgid "" "computed. Because it is space consuming, we do not allow to use it while " "doing a comparison." msgstr "" +"Diese Erweiterung bietet Ihnen weitere Details Ihrer berechneten Salden. " +"Aufgrund der Speicherintensität ist dieses nicht während der Durchführung " +"von vergleichenden Auswertungen erlaubt." #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close @@ -9476,6 +9501,8 @@ msgstr "Die Kurzbezeichnung muss eindeutig sein für jedes Unternehmen." #: help:product.template,property_account_expense:0 msgid "This account will be used to value outgoing stock using cost price." msgstr "" +"Dieses Konto wird gebucht zur Bewertung der Ausgangslieferungen mit dem " +"Standardpreis." #. module: account #: view:account.invoice:0 @@ -9513,7 +9540,7 @@ msgstr "Erlaubte Finanzkonten (leer = alle)" #. module: account #: field:account.config.settings,sale_tax_rate:0 msgid "Sales tax (%)" -msgstr "" +msgstr "Umsatzsteuer (%)" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2 @@ -9538,6 +9565,17 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie zur Definition von wiederkehrenden Buchungen.\n" +"

\n" +" Eine wiederkehrende Buchung erfolgt immer regelmässig " +"ausgehend von einem bestimmten\n" +" Datum, z.B. dem Datum der Vertragsunterzeichnung oder dem " +"vereinbarten Vertragsbeginn. \n" +" Sie können durch wiederkehrende Buchungen automatisch " +"buchen.\n" +"

\n" +" " #. module: account #: view:account.journal:0 @@ -9579,6 +9617,8 @@ msgid "" "This allows you to check writing and printing.\n" " This installs the module account_check_writing." msgstr "" +"Erstellen und drucken Sie Scheckformulare.\n" +" Hierdurch wird das Modul account_check_writing installiert." #. module: account #: model:res.groups,name:account.group_account_invoice @@ -9619,6 +9659,7 @@ msgstr "" #, python-format msgid "The account move (%s) for centralisation has been confirmed." msgstr "" +"Der Buchungssatz (%s) für die zusammengefasste Gegenbuchung wurde bestätigt." #. module: account #: report:account.analytic.account.journal:0 @@ -9657,6 +9698,9 @@ msgid "" "created. If you leave that field empty, it will use the same journal as the " "current invoice." msgstr "" +"Wählen Sie das Journal für die Buchung der Gutschriften. Wenn Sie das Feld " +"frei lassen, wird das gleiche Journal wie für die korrespondierende Rechnung " +"genutzt." #. module: account #: help:account.bank.statement.line,sequence:0 @@ -9685,7 +9729,7 @@ msgstr "Falsches Modell!" #: view:account.tax.code.template:0 #: view:account.tax.template:0 msgid "Tax Template" -msgstr "" +msgstr "Steuern Vorlage" #. module: account #: field:account.invoice.refund,period:0 @@ -9705,6 +9749,10 @@ msgid "" "some non legal fields or you must unreconcile first.\n" "%s." msgstr "" +"Sie können einen bereits ausgeglichenen Beleg nicht mehr modifizieren. " +"Entweder können Sie nur die unkritischen Daten anpassen oder den " +"vorgenommenen Ausgleich vorher stornieren. \n" +"%s" #. module: account #: help:account.financial.report,sign:0 @@ -9748,7 +9796,7 @@ msgstr "Rechnungen im Entwurf werden geprüft, gebucht und gedruckt." #: field:account.bank.statement,message_is_follower:0 #: field:account.invoice,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Ist ein Follower" #. module: account #: view:account.move:0 @@ -9764,11 +9812,14 @@ msgid "" "You cannot select an account type with a deferral method different of " "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"." msgstr "" +"Konfigurationsfehler !\n" +"Sie können für Konten mit der Kontoart Debitor / Kreditor nur den Kontotyp " +"\"nicht beglichen\" für die Jahreswechsel Methode auswählen." #. module: account #: field:account.config.settings,has_fiscal_year:0 msgid "Company has a fiscal year" -msgstr "" +msgstr "Das Unternehmen hat ein Geschäftsjahr" #. module: account #: help:account.tax,child_depend:0 @@ -9784,7 +9835,7 @@ msgstr "" #: code:addons/account/account.py:633 #, python-format msgid "You cannot deactivate an account that contains journal items." -msgstr "" +msgstr "Sie können kein Konto mit vorhandenen Buchungssätzen deaktivieren." #. module: account #: selection:account.tax,applicable_type:0 @@ -9863,6 +9914,10 @@ msgid "" "chart\n" " of accounts." msgstr "" +"Sobald Sie eine Rechnung buchen, können Sie keine Änderungen\n" +" vornehmen. Den gebuchten Rechnungen wird eine " +"eindeutige\n" +" Nummer zugewiesen und Buchungssätze werden generiert." #. module: account #: model:process.node,note:account.process_node_bankstatement0 @@ -9877,7 +9932,7 @@ msgstr "Beende Status für Geschäftsjahr und Perioden" #. module: account #: field:account.config.settings,purchase_refund_journal_id:0 msgid "Purchase refund journal" -msgstr "" +msgstr "Lieferantengutschrift Journal" #. module: account #: view:account.analytic.line:0 @@ -9901,7 +9956,7 @@ msgstr "Erzeuge Rechnung" #. module: account #: model:ir.actions.act_window,name:account.action_account_configuration_installer msgid "Configure Accounting Data" -msgstr "" +msgstr "Konfiguration Buchhaltung" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax_rate:0 @@ -9921,6 +9976,8 @@ msgid "" "Please check that the field 'Internal Transfers Account' is set on the " "payment method '%s'." msgstr "" +"Bitte überprüfen Sie, ob ein 'durchlaufender Posten' für die Zahlungsmethode " +"'%s' hinterlegt wurde." #. module: account #: field:account.vat.declaration,display_detail:0 @@ -10233,11 +10290,14 @@ msgid "" "The period is invalid. Either some periods are overlapping or the period's " "dates are not matching the scope of the fiscal year." msgstr "" +"Fehler !\n" +"Die Periode wurde nicht korrekt angelegt. Entweder überschneiden sich " +"Perioden, oder der Zeitraum passt zeitlich nicht in dieses Geschäftsjahr." #. module: account #: report:account.overdue:0 msgid "There is nothing due with this customer." -msgstr "" +msgstr "Es gibt keine fälligen Rechnungen für den Kunden." #. module: account #: help:account.tax,account_paid_id:0 @@ -10260,7 +10320,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Source" -msgstr "" +msgstr "Herkunft" #. module: account #: selection:account.model.line,date_maturity:0 @@ -10283,11 +10343,13 @@ msgid "" "This field contains the information related to the numbering of the journal " "entries of this journal." msgstr "" +"In diesem Feld finden Sie die Nummernfolge, die dann für die Nummerierung " +"der Buchungszeilen in diesem Journal angewendet wird." #. module: account #: field:account.invoice,sent:0 msgid "Sent" -msgstr "" +msgstr "Gesendet" #. module: account #: view:account.unreconcile.reconcile:0 @@ -10303,7 +10365,7 @@ msgstr "Allgemeine Auswertung" #: field:account.config.settings,default_sale_tax:0 #: field:account.config.settings,sale_tax:0 msgid "Default sale tax" -msgstr "" +msgstr "Standard Umsatzsteuer" #. module: account #: report:account.overdue:0 @@ -10315,6 +10377,7 @@ msgstr "Saldo:" #, python-format msgid "Cannot create moves for different companies." msgstr "" +"Es können keine Buchungen für verschiedene Unternehmen generiert werden." #. module: account #: view:account.invoice.report:0 @@ -10390,7 +10453,7 @@ msgstr "Ende der Periode" #. module: account #: model:account.account.type,name:account.account_type_expense_view1 msgid "Expense View" -msgstr "" +msgstr "Aufwendungen Ansicht" #. module: account #: field:account.move.line,date_maturity:0 diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index e35ba6b56a0..1e822b5817e 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.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-02 23:01+0000\n" +"PO-Revision-Date: 2012-12-06 00:09+0000\n" "Last-Translator: Sergio Corato \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:23+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -205,6 +205,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Click per aggiungere una periodo fiscale.\n" +"

\n" +" Un periodo contabile è tipicamente un mese o un " +"quadrimestre.\n" +" Di solito corrisponde ai periodi di liquidazione IVA.\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -479,7 +487,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "Periodo :" #. module: account #: field:account.account.template,chart_template_id:0 @@ -1008,6 +1016,8 @@ msgid "" " opening/closing fiscal " "year process." msgstr "" +"Non è possibile annullare le registrazioni del sezionale se sono state " +"generate dal processo di apertura/chiusura dell'anno fiscale." #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -1214,6 +1224,8 @@ msgid "" "Check this box if you don't want any tax related to this tax code to appear " "on invoices" msgstr "" +"Selezionare questa casella per non far apparire alcuna imposta collegata a " +"questo codice imposta nelle fatture" #. module: account #: field:report.account.receivable,name:0 @@ -1341,7 +1353,7 @@ msgstr "Centralizzazione del credito" #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "Template di codici tasse" +msgstr "Template di codici imposte" #. module: account #: constraint:account.move.line:0 @@ -1349,6 +1361,9 @@ msgid "" "The amount expressed in the secondary currency must be positif when journal " "item are debit and negatif when journal item are credit." msgstr "" +"L'importo espresso nella valuta secondaria deve essere positivo quando la " +"voce del sezionale è un debito e positivo quando la voce del sezionale è un " +"credito." #. module: account #: view:account.invoice.cancel:0 @@ -1597,7 +1612,7 @@ msgstr "Conto di credito" #: code:addons/account/account.py:767 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (copia)" #. module: account #: selection:account.balance.report,display_account:0 @@ -1876,6 +1891,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 Globale': 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.actions.act_window,name:account.action_report_account_type_sales_tree_all @@ -2030,6 +2056,9 @@ msgid "" "Select a configuration package to setup automatically your\n" " taxes and chart of accounts." msgstr "" +"Selezionare un pacchetto di configurazione per configurare automaticamente " +"le\n" +" imposte e il piano dei conti." #. module: account #: view:account.analytic.account:0 @@ -2127,7 +2156,7 @@ msgstr "Registrazione in 'Bozza'" #. module: account #: field:account.config.settings,module_account_check_writing:0 msgid "Pay your suppliers by check" -msgstr "" +msgstr "Pagamento dei fornitori tramite assegno" #. module: account #: field:account.move.line.reconcile,credit:0 @@ -2150,6 +2179,13 @@ msgid "" "useful because it enables you to preview at any time the tax that you owe at " "the start and end of the month or quarter." msgstr "" +"Questo menu stampa una dichiarazione delle imposte basata sulle fatture o " +"sui pagamenti. Selezionare uno o più periodi dell'anno fiscale. " +"L'informazione richiesta per una dichiarazione delle imposte è creata " +"automaticamente da OpenERP dalle fatture (o dai pagamenti, in alcuni paesi). " +"Questi dati sono aggiornati in tempo reale. E' molto utile perchè permette " +"di verificare in ogni momento le imposte che sono dovute all'inizio e alla " +"fine del mese o quadrimestre." #. module: account #: code:addons/account/account.py:408 @@ -2353,6 +2389,8 @@ msgid "" "You cannot change the type of account to '%s' type as it contains journal " "items!" msgstr "" +"Non è possibile cambiare il tipo di conto al tipo '%s' perchè contiene " +"registrazioni nel sezionale!" #. module: account #: model:ir.model,name:account.model_account_aged_trial_balance @@ -3352,7 +3390,7 @@ msgstr "Linea 2:" #. module: account #: field:wizard.multi.charts.accounts,only_one_chart_template:0 msgid "Only One Chart Template Available" -msgstr "" +msgstr "Solo Un Piano dei Conti Disponibile" #. module: account #: view:account.chart.template:0 @@ -3365,7 +3403,7 @@ msgstr "Bilancio spese" #: field:account.bank.statement,message_summary:0 #: field:account.invoice,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Riepilogo" #. module: account #: help:account.invoice,period_id:0 @@ -3487,7 +3525,7 @@ msgstr "Seleziona l'Anno Fiscale" #: view:account.config.settings:0 #: view:account.installer:0 msgid "Date Range" -msgstr "" +msgstr "Intervallo date" #. module: account #: view:account.period:0 @@ -3539,7 +3577,7 @@ msgstr "" #: code:addons/account/account.py:2620 #, python-format msgid "There is no parent code for the template account." -msgstr "" +msgstr "Manca il codice padre del template del conto." #. module: account #: help:account.chart.template,code_digits:0 @@ -3567,6 +3605,8 @@ msgstr "Sempre" msgid "" "Full accounting features: journals, legal statements, chart of accounts, etc." msgstr "" +"Complete funzionalità contabili: sezionali, stampe fiscali, piano dei conti, " +"ecc." #. module: account #: view:account.analytic.line:0 @@ -3623,7 +3663,7 @@ msgstr "File elettronico" #. module: account #: field:account.config.settings,has_chart_of_accounts:0 msgid "Company has a chart of accounts" -msgstr "" +msgstr "L'azienda ha un piano dei conti" #. module: account #: view:account.payment.term.line:0 @@ -3639,12 +3679,12 @@ msgstr "Mastrino partner" #: code:addons/account/account_invoice.py:1330 #, python-format msgid "%s created." -msgstr "" +msgstr "%s creato." #. module: account #: view:account.period:0 msgid "Account Period" -msgstr "" +msgstr "Periodo Contabile" #. module: account #: help:account.account,currency_id:0 @@ -3673,7 +3713,7 @@ msgstr "Template di piano dei conti" #. module: account #: view:account.bank.statement:0 msgid "Transactions" -msgstr "" +msgstr "Movimenti" #. module: account #: model:ir.model,name:account.model_account_unreconcile_reconcile @@ -3774,7 +3814,7 @@ msgstr "Configurazione Modulo di Contabilià" #. module: account #: model:ir.actions.act_window,name:account.action_account_vat_declaration msgid "Account Tax Declaration" -msgstr "" +msgstr "Dichiarazione Imposte" #. module: account #: view:account.payment.term.line:0 @@ -3789,6 +3829,9 @@ msgid "" "centralized counterpart box in the related journal from the configuration " "menu." msgstr "" +"Non è possibile creare una fattura su un sezionale centralizzato. " +"Deselezionare la casella di contropartita centralizzata nel relativo " +"sezionale dal menu di configurazione." #. module: account #: field:account.bank.statement,balance_start:0 @@ -3813,7 +3856,7 @@ msgstr "Chiudi un periodo" #: view:account.bank.statement:0 #: field:account.cashbox.line,subtotal_opening:0 msgid "Opening Subtotal" -msgstr "" +msgstr "Subtotale di Apertura" #. module: account #: constraint:account.move.line:0 @@ -3821,6 +3864,8 @@ msgid "" "You cannot create journal items with a secondary currency without recording " "both 'currency' and 'amount currency' field." msgstr "" +"Non è possibile creare registrazioni nel sezionale con una valuta secondaria " +"senza registrazione sia il campo 'valuta' che quello 'importo valuta'." #. module: account #: field:account.financial.report,display_detail:0 @@ -3848,6 +3893,10 @@ msgid "" "quotations with a button \"Pay with Paypal\" in automated emails or through " "the OpenERP portal." msgstr "" +"Un conto Paypal (email) per ricevere pagamenti online (carta di credito, " +"ecc.) Se selezionato, il cliente potrà pagare le fatture o i preventivo con " +"un tasto \"Paga con Paypal\" con email automatiche o tramite il portale " +"OpenERP." #. module: account #: code:addons/account/account_move_line.py:535 @@ -3925,6 +3974,8 @@ msgid "" "You have not supplied enough arguments to compute the initial balance, " "please select a period and a journal in the context." msgstr "" +"Non sono stati forniti abbastanza argomenti per calcolare il saldo iniziale, " +"è necessario selezionare un periodo e un sezionale nel contesto." #. module: account #: model:ir.actions.report.xml,name:account.account_transfers @@ -3934,7 +3985,7 @@ msgstr "Trasferimenti" #. module: account #: field:account.config.settings,expects_chart_of_accounts:0 msgid "This company has its own chart of accounts" -msgstr "" +msgstr "Questa azienda ha il proprio piano dei conti" #. module: account #: view:account.chart:0 @@ -3945,7 +3996,7 @@ msgstr "Piano dei conti" #: view:cash.box.out:0 #: model:ir.actions.act_window,name:account.action_cash_box_out msgid "Take Money Out" -msgstr "" +msgstr "Preleva Contanti" #. module: account #: report:account.vat.declaration:0 @@ -4042,6 +4093,7 @@ msgstr "Crea conto" #, python-format msgid "The entries to reconcile should belong to the same company." msgstr "" +"Le registrazioni da riconciliare dovrebbero appartenere alla stessa azienda." #. module: account #: field:account.invoice.tax,tax_amount:0 @@ -4062,6 +4114,7 @@ msgstr "Dettaglio" #: help:account.config.settings,default_purchase_tax:0 msgid "This purchase tax will be assigned by default on new products." msgstr "" +"Questa imposta sugli acquisti sarà assegnata di default sui nuovi prodotti." #. module: account #: report:account.invoice:0 @@ -4090,7 +4143,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_journal_cashbox_line msgid "account.journal.cashbox.line" -msgstr "" +msgstr "account.journal.cashbox.line" #. module: account #: model:ir.model,name:account.model_account_partner_reconcile_process @@ -4230,7 +4283,7 @@ msgstr "" #. module: account #: field:account.config.settings,group_check_supplier_invoice_total:0 msgid "Check the total of supplier invoices" -msgstr "" +msgstr "Verifica il totale sulle fatture dei fornitori" #. module: account #: view:account.tax:0 @@ -4244,6 +4297,8 @@ msgid "" "When monthly periods are created. The status is 'Draft'. At the end of " "monthly period it is in 'Done' status." msgstr "" +"Quando i periodo mensili sono creati. Lo stato è 'Bozza'. Alla fine del " +"periodo mensile è nello stato 'Completato'." #. module: account #: view:account.invoice.report:0 @@ -4270,7 +4325,7 @@ msgstr "Conto di debito" #: code:addons/account/wizard/account_fiscalyear_close.py:88 #, python-format msgid "The periods to generate opening entries cannot be found." -msgstr "" +msgstr "Mancano i periodi per creare le registrazioni di apertura." #. module: account #: model:process.node,name:account.process_node_supplierpaymentorder0 @@ -4314,7 +4369,7 @@ msgstr "Fattore di Moltiplicazione del codice tassa" #. module: account #: field:account.config.settings,complete_tax_set:0 msgid "Complete set of taxes" -msgstr "" +msgstr "Set completo di imposte" #. module: account #: field:account.account,name:0 @@ -4332,7 +4387,7 @@ msgstr "Nome" #: code:addons/account/installer.py:94 #, python-format msgid "No unconfigured company !" -msgstr "" +msgstr "Nessuna azienda non configurata !" #. module: account #: field:res.company,expects_chart_of_accounts:0 @@ -4375,7 +4430,7 @@ msgstr "" #: help:account.bank.statement,message_ids:0 #: help:account.invoice,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Storico messaggi e comunicazioni" #. module: account #: help:account.journal,analytic_journal_id:0 @@ -4410,13 +4465,15 @@ msgid "" "Check this box if you don't want any tax related to this tax Code to appear " "on invoices." msgstr "" +"Selezionare questa casella per non far apparire alcuna imposta relativa a " +"questo Codice imposta nelle fatture." #. module: account #: code:addons/account/account_move_line.py:1048 #: code:addons/account/account_move_line.py:1131 #, python-format msgid "You cannot use an inactive account." -msgstr "" +msgstr "Non è possibile utilizzare un conto disattivo." #. module: account #: model:ir.actions.act_window,name:account.open_board_account @@ -4447,7 +4504,7 @@ msgstr "Sottoconti consolidati" #: code:addons/account/wizard/account_invoice_refund.py:146 #, python-format msgid "Insufficient Data!" -msgstr "" +msgstr "Dati Insufficienti!" #. module: account #: help:account.account,unrealized_gain_loss:0 @@ -4484,7 +4541,7 @@ msgstr "titolo" #. module: account #: selection:account.invoice.refund,filter_refund:0 msgid "Create a draft credit note" -msgstr "" +msgstr "Creare una bozza di nota di credito" #. module: account #: view:account.invoice:0 @@ -4516,7 +4573,7 @@ msgstr "Patrimonio" #. module: account #: view:account.config.settings:0 msgid "Accounting & Finance" -msgstr "" +msgstr "Contabilità & Finanza" #. module: account #: view:account.invoice.confirm:0 @@ -4543,7 +4600,7 @@ msgstr "(Bisogna annullare la riconciliazione per aprire la fattura)" #. module: account #: field:account.tax,account_analytic_collected_id:0 msgid "Invoice Tax Analytic Account" -msgstr "" +msgstr "Conto Analitico Imposte Fattura" #. module: account #: field:account.chart,period_from:0 @@ -4581,6 +4638,8 @@ msgid "" "If you put \"%(year)s\" in the prefix, it will be replaced by the current " "year." msgstr "" +"Se viene inserito \"%(year)s\" nel prefisso, sarà sostituito dal corrente " +"anno." #. module: account #: help:account.account,active:0 @@ -4618,6 +4677,9 @@ msgid "" "9.99 EUR, whereas a decimal precision of 4 will allow journal entries like: " "0.0231 EUR." msgstr "" +"Per esempio, una precisione decimale di 2 permette registrazioni contabili " +"come: 9,99 EURO, mentre una precisione decimale di 4 permette registrazioni " +"contabili come: 0,0231 EURO." #. module: account #: view:account.payment.term.line:0 @@ -4693,6 +4755,8 @@ msgid "" "Error!\n" "You cannot create recursive Tax Codes." msgstr "" +"Errore!\n" +"Non è possibile creare Conti Imposta ricorsivi." #. module: account #: constraint:account.period:0 @@ -4700,6 +4764,8 @@ msgid "" "Error!\n" "The duration of the Period(s) is/are invalid." msgstr "" +"Errore!\n" +"La durata del Periodo/i non è valida." #. module: account #: field:account.entries.report,month:0 @@ -4717,11 +4783,13 @@ msgstr "Mese" #, python-format msgid "You cannot change the code of account which contains journal items!" msgstr "" +"Non è possibile cambiare un codice conto che contiene registrazioni " +"contabili!" #. module: account #: field:account.config.settings,purchase_sequence_prefix:0 msgid "Supplier invoice sequence" -msgstr "" +msgstr "Sequenza delle fatture fornitori" #. module: account #: code:addons/account/account_invoice.py:571 @@ -4731,13 +4799,15 @@ msgid "" "Cannot find a chart of account, you should create one from Settings\\" "Configuration\\Accounting menu." msgstr "" +"Non è possibile trovare un piano dei conti, è consigliabile crearne uno dal " +"menu Configurazione\\Configurazione\\Contabilità." #. module: account #: field:account.entries.report,product_uom_id:0 #: view:analytic.entries.report:0 #: field:analytic.entries.report,product_uom_id:0 msgid "Product Unit of Measure" -msgstr "" +msgstr "Unità di Misura Prodotto" #. module: account #: field:res.company,paypal_account:0 @@ -4775,7 +4845,7 @@ msgstr "Lasciare vuoto per utilizzare la data corrente" #: view:account.bank.statement:0 #: field:account.cashbox.line,subtotal_closing:0 msgid "Closing Subtotal" -msgstr "" +msgstr "Subtotale di Chiusura" #. module: account #: field:account.tax,base_code_id:0 @@ -4788,6 +4858,8 @@ msgstr "Conto imponibile" msgid "" "You have to provide an account for the write off/exchange difference entry." msgstr "" +"E' necessario fornire un conto per le registrazioni di storni/differenze di " +"cambio." #. module: account #: help:res.company,paypal_account:0 @@ -4829,14 +4901,14 @@ msgstr "Spunta se volete visualizzare anche i Conti con salto a zero." #. module: account #: field:account.move.reconcile,opening_reconciliation:0 msgid "Opening Entries Reconciliation" -msgstr "" +msgstr "Riconciliazione Apertura Contabile" #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24 #, python-format msgid "Last Reconciliation:" -msgstr "" +msgstr "Ultima Riconciliazione:" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing @@ -4860,11 +4932,13 @@ msgid "" "There is currently no company without chart of account. The wizard will " "therefore not be executed." msgstr "" +"Non c'è alcuna azienda senza un piano dei conti. La procedura non verrà " +"quindi eseguita." #. module: account #: model:ir.actions.act_window,name:account.action_wizard_multi_chart msgid "Set Your Accounting Options" -msgstr "" +msgstr "Imposta Configurazioni Contabili" #. module: account #: model:ir.model,name:account.model_account_chart @@ -4945,7 +5019,7 @@ msgstr "Note di credito" #: model:ir.actions.act_window,name:account.action_account_manual_reconcile #: model:ir.ui.menu,name:account.menu_manual_reconcile_bank msgid "Journal Items to Reconcile" -msgstr "" +msgstr "Voci Sezionale da Riconciliare" #. module: account #: sql_constraint:account.period:0 @@ -4955,12 +5029,12 @@ msgstr "Nell'azienda il nome del periodo deve essere univoco!" #. module: account #: help:wizard.multi.charts.accounts,currency_id:0 msgid "Currency as per company's country." -msgstr "" +msgstr "Valute per paese dell'azienda." #. module: account #: view:account.tax:0 msgid "Tax Computation" -msgstr "" +msgstr "Calcolo Imposte" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -4997,6 +5071,8 @@ msgid "" "Error!\n" "You cannot create an account which has parent account of different company." msgstr "" +"Errore!\n" +"Non è possibile creare un conto con un conto-padre di un'altra azienda." #. module: account #: code:addons/account/account_invoice.py:615 @@ -5032,7 +5108,7 @@ msgstr "Modelli per operazioni periodiche" #. module: account #: view:account.tax:0 msgid "Children/Sub Taxes" -msgstr "" +msgstr "Imposte Figlie/Sottoimposte" #. module: account #: xsl:account.transfer:0 @@ -5057,7 +5133,7 @@ msgstr "Funziona come default account per la rilevazione del credito" #. module: account #: view:cash.box.out:0 msgid "Describe why you take money from the cash register:" -msgstr "" +msgstr "Descrivere la causale di prelievo dal registro di cassa:" #. module: account #: selection:account.invoice,state:0 @@ -5074,12 +5150,12 @@ msgstr "Esempio" #. module: account #: help:account.config.settings,group_proforma_invoices:0 msgid "Allows you to put invoices in pro-forma state." -msgstr "" +msgstr "Permette di impostare fatture nello stato proforma." #. module: account #: view:account.journal:0 msgid "Unit Of Currency Definition" -msgstr "" +msgstr "Definizione dell'Unita della Valuta" #. module: account #: view:account.tax.template:0 @@ -5093,6 +5169,8 @@ msgid "" "It adds the currency column on report if the currency differs from the " "company currency." msgstr "" +"Aggiunge la colonna della valuta nel report se la valuta è diversa da quella " +"aziendale." #. module: account #: code:addons/account/account.py:3336 @@ -5132,7 +5210,7 @@ msgstr "Fattura annullata" #. module: account #: view:account.invoice:0 msgid "My Invoices" -msgstr "" +msgstr "Mie Fatture" #. module: account #: selection:account.bank.statement,state:0 @@ -5142,7 +5220,7 @@ msgstr "Nuovo" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Sale Tax" -msgstr "" +msgstr "Imposta sulle Vendite" #. module: account #: field:account.tax,ref_tax_code_id:0 @@ -5167,6 +5245,9 @@ msgid "" "printed it comes to 'Printed' status. When all transactions are done, it " "comes in 'Done' status." msgstr "" +"Al momento della creazione dei periodi del sezionale. Lo stato è 'Bozza'. Se " +"un report viene stampato lo stato diventa 'Stampato'. Quando tutte le " +"transazioni sono fatte, lo stato diventa 'Completato'." #. module: account #: code:addons/account/account.py:3147 @@ -5201,6 +5282,7 @@ msgstr "Fatture" #: help:account.config.settings,expects_chart_of_accounts:0 msgid "Check this box if this company is a legal entity." msgstr "" +"Selezionare questa casella se l'azienda ha una personalità giuridica." #. module: account #: model:account.account.type,name:account.conf_account_type_chk @@ -5246,7 +5328,7 @@ msgstr "Controllo" #: view:validate.account.move:0 #: view:validate.account.move.lines:0 msgid "or" -msgstr "" +msgstr "o" #. module: account #: view:account.invoice.report:0 @@ -5316,6 +5398,8 @@ msgid "" "Set the account that will be set by default on invoice tax lines for " "invoices. Leave empty to use the expense account." msgstr "" +"Imposta il conto che sarà usato di default nelle righe imposta nelle " +"fatture. Lasciare vuoto per usare il conto di costo." #. module: account #: code:addons/account/account.py:889 @@ -5331,7 +5415,7 @@ msgstr "Scritture da rivedere" #. module: account #: selection:res.company,tax_calculation_rounding_method:0 msgid "Round Globally" -msgstr "" +msgstr "Arrotonda Globalmente" #. module: account #: field:account.bank.statement,message_comment_ids:0 @@ -5339,7 +5423,7 @@ msgstr "" #: field:account.invoice,message_comment_ids:0 #: help:account.invoice,message_comment_ids:0 msgid "Comments and emails" -msgstr "" +msgstr "Commenti ed Email" #. module: account #: view:account.bank.statement:0 @@ -5359,6 +5443,8 @@ msgid "" "Please verify the price of the invoice !\n" "The encoded total does not match the computed total." msgstr "" +"Verificare il prezzo sulla fattura !\n" +"Il totale inserito non corrisponde con il totale calcolato." #. module: account #: field:account.account,active:0 @@ -5773,7 +5859,7 @@ msgstr "" #: field:account.tax,child_depend:0 #: field:account.tax.template,child_depend:0 msgid "Tax on Children" -msgstr "Calcolo su tasse figlie" +msgstr "Calcolo su imposte figlie" #. module: account #: help:res.partner,last_reconciliation_date:0 @@ -6198,7 +6284,7 @@ msgstr "Genera scritture di apertura" #: help:account.tax,type:0 #: help:account.tax.template,type:0 msgid "The computation method for the tax amount." -msgstr "Il metodo di calcolo per l'importo delle tasse" +msgstr "Il metodo di calcolo per l'importo delle imposte" #. module: account #: view:account.payment.term.line:0 @@ -6404,7 +6490,7 @@ msgstr "L'espressione \"%(...)s\" nel modello è errata!" #. module: account #: view:account.tax.template:0 msgid "Compute Code for Taxes Included Prices" -msgstr "Codice per il calcolo delle tasse incluse nel prezzo" +msgstr "Codice per il calcolo delle imposte incluse nel prezzo" #. module: account #: help:account.bank.statement,balance_end:0 @@ -6915,10 +7001,10 @@ msgid "" "higher ones. The order is important if you have a tax that has several tax " "children. In this case, the evaluation order is important." msgstr "" -"Il campo sequenza è usato per ordinare le linee delle tasse dalla più " -"piccola alla più grande. Questo ordinamento è importante se hai delle tasse " -"che hanno tasse \"figlio\". In questo caso, l'ordine con cui vendono " -"valutate è importante." +"Il campo sequenza è usato per ordinare le linee delle imposte dalla più " +"piccola alla più grande. Questo ordinamento è importante se hai delle " +"imposte che hanno imposte \"figlio\". In questo caso, l'ordine con cui " +"vendono valutate è importante." #. module: account #: code:addons/account/account.py:1405 @@ -7562,7 +7648,7 @@ msgstr "Vendite" #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 msgid "Done" -msgstr "Fatto" +msgstr "Completato" #. module: account #: code:addons/account/account.py:1278 @@ -7636,7 +7722,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Taxes:" -msgstr "Imposte" +msgstr "Imposte:" #. module: account #: code:addons/account/account_invoice.py:440 @@ -8365,9 +8451,10 @@ msgid "" "to the higher ones. The order is important if you have a tax with several " "tax children. In this case, the evaluation order is important." msgstr "" -"Il campo delle sequenze è usato per ordinare le linee delle tasse dalla più " -"bassa alla più alta. L'ordine è importante se si ha una tassa con differenti " -"sottotasse figlie. in questo caso, l'ordine di valutazione è importante." +"Il campo delle sequenze è usato per ordinare le linee delle imposte dalla " +"più bassa alla più alta. L'ordine è importante se si ha un'imposta con " +"differenti sotto-imposte figlie. in questo caso, l'ordine di valutazione è " +"importante." #. module: account #: model:ir.model,name:account.model_account_cashbox_line @@ -8624,8 +8711,8 @@ msgid "" "Set if the amount of tax must be included in the base amount before " "computing the next taxes." msgstr "" -"Selezionare se l'importo della tassa debba essere incluso nell'importo base " -"prima di calcolare le prossime tasse" +"Selezionare se l'importo dell'imposta debba essere incluso nell'importo base " +"prima di calcolare le prossime imposte" #. module: account #: code:addons/account/account.py:3138 @@ -8760,7 +8847,7 @@ msgstr "int.Tipo" #. module: account #: field:account.move.line,tax_amount:0 msgid "Tax/Base Amount" -msgstr "Tassa/Imponibile" +msgstr "Imponibile" #. module: account #: view:account.payment.term.line:0 @@ -9224,7 +9311,7 @@ msgstr "" #: model:account.account.type,name:account.data_account_type_expense #: model:account.financial.report,name:account.account_financial_report_expense0 msgid "Expense" -msgstr "Costo" +msgstr "Costi" #. module: account #: help:account.chart,fiscalyear:0 diff --git a/addons/account_accountant/i18n/es.po b/addons/account_accountant/i18n/es.po index 0239523d2ba..ffedffdd81e 100644 --- a/addons/account_accountant/i18n/es.po +++ b/addons/account_accountant/i18n/es.po @@ -8,20 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:51+0000\n" -"PO-Revision-Date: 2010-12-26 08:18+0000\n" -"Last-Translator: Jordi Esteve (www.zikzakmedia.com) " -"\n" +"PO-Revision-Date: 2012-12-05 19:57+0000\n" +"Last-Translator: Santi (Pexego) \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-25 06:28+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_accountant #: model:ir.actions.client,name:account_accountant.action_client_account_menu msgid "Open Accounting Menu" -msgstr "" +msgstr "Abrir menú de contabilidad" #~ msgid "Accountant" #~ msgstr "Contable" diff --git a/addons/account_analytic_analysis/i18n/es.po b/addons/account_analytic_analysis/i18n/es.po index ff45dbbc367..cc070a99890 100644 --- a/addons/account_analytic_analysis/i18n/es.po +++ b/addons/account_analytic_analysis/i18n/es.po @@ -7,39 +7,39 @@ 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 19:59+0000\n" -"Last-Translator: Ana Juaristi Olalde \n" +"PO-Revision-Date: 2012-12-05 20:15+0000\n" +"Last-Translator: Santi (Pexego) \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-06 04:40+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "No order to invoice, create" -msgstr "" +msgstr "No hay órdenes para facturar, cree una" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Group By..." -msgstr "Agrupado por ..." +msgstr "Agrupar por..." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "To Invoice" -msgstr "" +msgstr "A facturar" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Remaining" -msgstr "" +msgstr "Restante" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts in progress" -msgstr "Contratos en progreso" +msgstr "Contratos en proceso" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_invoiced_date:0 @@ -73,7 +73,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "⇒ Invoice" -msgstr "" +msgstr "⇒ factura" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 @@ -88,7 +88,7 @@ msgstr "Fecha del último coste facturado" #. module: account_analytic_analysis #: help:account.analytic.account,fix_price_to_invoice:0 msgid "Sum of quotations for this contract." -msgstr "" +msgstr "Suma de presupuestos para este contrato" #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 @@ -99,6 +99,7 @@ msgstr "Importe total facturado al cliente para esta cuenta." #: help:account.analytic.account,timesheet_ca_invoiced:0 msgid "Sum of timesheet lines invoiced for this contract." msgstr "" +"Suma de las líneas de las hojas de servicios facturadas para este contrato" #. module: account_analytic_analysis #: help:account.analytic.account,revenue_per_hour:0 @@ -108,12 +109,12 @@ msgstr "Calculado utilizando la fórmula: Importe facturado / Tiempo total" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts not assigned" -msgstr "" +msgstr "Contratos no asignados" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Partner" -msgstr "" +msgstr "Empresa" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -156,12 +157,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 "Calculado usando la fórmula: Tiempo máximo - Tiempo total facturado" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Expected" -msgstr "" +msgstr "Previsto" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -174,7 +175,7 @@ msgstr "Cuenta analítica" #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 msgid "Computed using the formula: Theoretical Revenue - Total Costs" -msgstr "" +msgstr "Calculado usando la fórmula: Ingreso teórico - Costes totales" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 @@ -204,7 +205,7 @@ msgstr "Tasa de margen real (%)" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours:0 msgid "Computed using the formula: Maximum Time - Total Worked Time" -msgstr "" +msgstr "Calculado usando la fórmula: Tiempo máximo - Tiempo total trabajado" #. module: account_analytic_analysis #: help:account.analytic.account,hours_quantity:0 @@ -218,23 +219,23 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Nothing to invoice, create" -msgstr "" +msgstr "Nada que facturar, crear" #. module: account_analytic_analysis #: 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 "Plantilla de contrato" #. module: account_analytic_analysis #: model:res.groups,name:account_analytic_analysis.group_template_required msgid "Mandatory use of templates in contracts" -msgstr "" +msgstr "Uso obligatorio de plantillas en contratos" #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 msgid "Total Worked Time" -msgstr "" +msgstr "Tiempo total trabajado" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin:0 @@ -254,7 +255,7 @@ msgstr "Calcula utilizando la fórmula: (Margen real / Costes totales) * 100." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "or view" -msgstr "" +msgstr "o ver" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -271,7 +272,7 @@ msgstr "Mes" #: 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 "Tiempo y materiales a facturar" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all @@ -282,12 +283,12 @@ msgstr "Contratos" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Start Date" -msgstr "" +msgstr "Fecha de inicio" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Invoiced" -msgstr "" +msgstr "Facturado" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -306,13 +307,13 @@ msgstr "Contratos pendientes para renovar con el cliente" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Timesheets" -msgstr "" +msgstr "Hojas de servicios" #. module: account_analytic_analysis #: code:addons/account_analytic_analysis/account_analytic_analysis.py:461 #, python-format msgid "Sale Order Lines of %s" -msgstr "" +msgstr "Líneas de pedidos de venta de %s" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -327,7 +328,7 @@ msgstr "Cantidad sobrepasada" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Status" -msgstr "" +msgstr "Estado" #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 @@ -349,7 +350,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order msgid "Sales Orders" -msgstr "" +msgstr "Pedidos de venta" #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 @@ -403,6 +404,8 @@ msgid "" "Allows you to set the template field as required when creating an analytic " "account or a contract." msgstr "" +"Le permite marcar el campo plantilla como obligatorio al crear una cuenta " +"analítica o contrato" #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_invoiced:0 @@ -437,12 +440,12 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,toinvoice_total:0 msgid "Total to Invoice" -msgstr "" +msgstr "Total a facturar" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Sale Orders" -msgstr "" +msgstr "Pedidos de venta" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -452,7 +455,7 @@ msgstr "Abrir" #. module: account_analytic_analysis #: field:account.analytic.account,invoiced_total:0 msgid "Total Invoiced" -msgstr "" +msgstr "Total facturado" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_ca:0 @@ -463,7 +466,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Responsible" -msgstr "" +msgstr "Responsable" #. module: account_analytic_analysis #: field:account.analytic.account,last_invoice_date:0 @@ -506,6 +509,9 @@ msgid "" "remaining subtotals which, in turn, are computed as the maximum between " "'(Estimation - Invoiced)' and 'To Invoice' amounts" msgstr "" +"Ingresos restantes esperados para este contrato. Calculado como la suma de " +"los subtotales restantes que, a su vez, se calcula como el máximo entre las " +"cantidades '(Estimación - facturado)' y 'A facturar'" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue @@ -516,7 +522,7 @@ msgstr "Contratos a renovar" #. module: account_analytic_analysis #: help:account.analytic.account,toinvoice_total:0 msgid " Sum of everything that could be invoiced for this contract." -msgstr "" +msgstr " Suma de todo lo que podría ser facturado para este contrato" #. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 @@ -526,7 +532,7 @@ msgstr "Márgen teórico" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_total:0 msgid "Total Remaining" -msgstr "" +msgstr "Total restante" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 @@ -536,12 +542,12 @@ msgstr "Calculado utilizando la fórmula: Importe facturado - Costes totales." #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_est:0 msgid "Estimation of Hours to Invoice" -msgstr "" +msgstr "Estimación de horas a facturar" #. module: account_analytic_analysis #: field:account.analytic.account,fix_price_invoices:0 msgid "Fixed Price" -msgstr "" +msgstr "Precio fijo" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_date:0 @@ -556,12 +562,12 @@ msgstr "" #. module: account_analytic_analysis #: field:sale.config.settings,group_template_required:0 msgid "Mandatory use of templates." -msgstr "" +msgstr "Uso obligatorio de plantillas" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts Having a Partner" -msgstr "" +msgstr "Contratos que tienen una empresa" #. module: account_analytic_analysis #: help:account.analytic.account,total_cost:0 @@ -601,7 +607,7 @@ msgstr "Tiempo total" #: model:res.groups,comment:account_analytic_analysis.group_template_required msgid "" "the field template of the analytic accounts and contracts will be required." -msgstr "" +msgstr "el campo plantilla de las cuentas analíticas será obligatorio." #. module: account_analytic_analysis #: field:account.analytic.account,invoice_on_timesheets:0 diff --git a/addons/account_analytic_default/i18n/es.po b/addons/account_analytic_default/i18n/es.po index d9de0a9804e..390bea9a0db 100644 --- a/addons/account_analytic_default/i18n/es.po +++ b/addons/account_analytic_default/i18n/es.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-02-08 17:37+0000\n" -"Last-Translator: Ana Juaristi Olalde \n" +"PO-Revision-Date: 2012-12-05 20:17+0000\n" +"Last-Translator: Santi (Pexego) \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-06 04:40+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 @@ -31,7 +31,7 @@ msgstr "Agrupar por..." #. module: account_analytic_default #: help:account.analytic.default,date_stop:0 msgid "Default end date for this Analytic Account." -msgstr "" +msgstr "Fecha de fin por defecto para esta cuenta analítica" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_stock_picking diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po index 3f5526caad6..633a0547097 100644 --- a/addons/account_analytic_plans/i18n/fr.po +++ b/addons/account_analytic_plans/i18n/fr.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-02-18 23:19+0000\n" -"Last-Translator: t.o \n" +"PO-Revision-Date: 2012-12-05 09:24+0000\n" +"Last-Translator: WANTELLET Sylvain \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-06 04:40+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account4_ids:0 @@ -48,7 +48,7 @@ msgstr "Taux (%)" #: code:addons/account_analytic_plans/account_analytic_plans.py:234 #, python-format msgid "The total should be between %s and %s." -msgstr "" +msgstr "Le total devrait se situer entre %s et %s." #. module: account_analytic_plans #: view:account.analytic.plan:0 @@ -144,7 +144,7 @@ msgstr "Identifiant du Compte3" #: view:account.crossovered.analytic:0 #: view:analytic.plan.create.model:0 msgid "or" -msgstr "" +msgstr "ou" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_line @@ -283,7 +283,7 @@ msgstr "Ligne de relevé bancaire" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "Error!" -msgstr "" +msgstr "Erreur !" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -299,7 +299,7 @@ msgstr "Imprimer l'analytique croisé" #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 #, python-format msgid "User Error!" -msgstr "" +msgstr "Erreur utilisateur !" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account6_ids:0 @@ -317,7 +317,7 @@ msgstr "Journal analytique" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:38 #, python-format msgid "Please put a name and a code before saving the model." -msgstr "" +msgstr "Indiquez un nom et un code avant d'enregistrer le modèle." #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -377,7 +377,7 @@ msgstr "Ligne de facture" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "There is no analytic plan defined." -msgstr "" +msgstr "Aucun plan analytique n'a été défini." #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_bank_statement @@ -404,7 +404,7 @@ msgstr "Distribution analytique" #: code:addons/account_analytic_plans/account_analytic_plans.py:221 #, python-format msgid "A model with this name and code already exists." -msgstr "" +msgstr "Un modèle existe déjà avec ce nom et ce code." #. module: account_analytic_plans #: help:account.analytic.plan.line,root_analytic_id: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 (). +# +# 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 . +# +############################################################################## + +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 (). +# +# 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 . +# +############################################################################## + +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 @@ + + + + + + account.check.form + account.check.write + +
+ + + +
+
+
+ + + + + + + diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po index ae6c763b081..2fc3c38da2f 100644 --- a/addons/account_voucher/i18n/fr.po +++ b/addons/account_voucher/i18n/fr.po @@ -7,15 +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:01+0000\n" -"PO-Revision-Date: 2012-12-03 21:05+0000\n" -"Last-Translator: Frederic Clementi - Camptocamp.com " -"\n" +"PO-Revision-Date: 2012-12-05 09:22+0000\n" +"Last-Translator: Numérigraphe \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:41+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -278,6 +277,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Cliquez pour enregistrer un reçu de vente. \n" +"

\n" +" Quand le reçu de vente sera confirmé, vous pourrez " +"enregistrer\n" +" les paiements clients en rapport avec ce reçu de vente.\n" +"

\n" +" " #. module: account_voucher #: help:account.voucher,message_unread:0 diff --git a/addons/analytic_contract_hr_expense/i18n/es.po b/addons/analytic_contract_hr_expense/i18n/es.po new file mode 100644 index 00000000000..a2f83a7c929 --- /dev/null +++ b/addons/analytic_contract_hr_expense/i18n/es.po @@ -0,0 +1,72 @@ +# Spanish translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-03 16:02+0000\n" +"PO-Revision-Date: 2012-12-05 20:20+0000\n" +"Last-Translator: Santi (Pexego) \n" +"Language-Team: Spanish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "or view" +msgstr "o ver" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "Nothing to invoice, create" +msgstr "Nada que facturar, crear" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "expenses" +msgstr "gastos" + +#. module: analytic_contract_hr_expense +#: model:ir.model,name:analytic_contract_hr_expense.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: analytic_contract_hr_expense +#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:134 +#, python-format +msgid "Expenses to Invoice of %s" +msgstr "Gastos a facturar de %s" + +#. module: analytic_contract_hr_expense +#: code:addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py:119 +#, python-format +msgid "Expenses of %s" +msgstr "Gastos de %s" + +#. module: analytic_contract_hr_expense +#: field:account.analytic.account,expense_invoiced:0 +#: field:account.analytic.account,expense_to_invoice:0 +#: field:account.analytic.account,remaining_expense:0 +msgid "unknown" +msgstr "desconocido" + +#. module: analytic_contract_hr_expense +#: field:account.analytic.account,est_expenses:0 +msgid "Estimation of Expenses to Invoice" +msgstr "Estimación de gastos a facturar" + +#. module: analytic_contract_hr_expense +#: field:account.analytic.account,charge_expenses:0 +msgid "Charge Expenses" +msgstr "" + +#. module: analytic_contract_hr_expense +#: view:account.analytic.account:0 +msgid "⇒ Invoice" +msgstr "⇒ factura" diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po index 594365a3ea8..6003ac76e79 100644 --- a/addons/audittrail/i18n/ru.po +++ b/addons/audittrail/i18n/ru.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-11-24 02:52+0000\n" -"PO-Revision-Date: 2010-10-16 09:06+0000\n" -"Last-Translator: Nikolay Chesnokov \n" +"PO-Revision-Date: 2012-12-05 09:24+0000\n" +"Last-Translator: Эдуард \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-11-25 06:14+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: audittrail #: view:audittrail.log:0 @@ -55,13 +55,13 @@ msgstr "" #: view:audittrail.rule:0 #: model:ir.model,name:audittrail.model_audittrail_rule msgid "Audittrail Rule" -msgstr "" +msgstr "Правило аудита" #. module: audittrail #: view:audittrail.rule:0 #: field:audittrail.rule,state:0 msgid "Status" -msgstr "" +msgstr "Статус" #. module: audittrail #: view:audittrail.view.log:0 @@ -224,7 +224,7 @@ msgstr "Выберите объект, для которого вы хотите #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_audit msgid "Audit" -msgstr "" +msgstr "Аудит" #. module: audittrail #: field:audittrail.rule,log_workflow:0 @@ -305,7 +305,7 @@ msgstr "Журналировать удаление" #: view:audittrail.log:0 #: view:audittrail.rule:0 msgid "Model" -msgstr "" +msgstr "Модель" #. module: audittrail #: field:audittrail.log.line,field_description:0 @@ -356,7 +356,7 @@ msgstr "Логи проведения аудита" #. module: audittrail #: view:audittrail.rule:0 msgid "Draft Rule" -msgstr "" +msgstr "Черновое правило" #. module: audittrail #: view:audittrail.log:0 @@ -399,7 +399,7 @@ msgstr "Строка протокола" #. module: audittrail #: view:audittrail.view.log:0 msgid "or" -msgstr "" +msgstr "или" #. module: audittrail #: field:audittrail.rule,log_action:0 diff --git a/addons/auth_anonymous/static/src/js/auth_anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js index 6768bc63ff9..ac9feeed0b6 100644 --- a/addons/auth_anonymous/static/src/js/auth_anonymous.js +++ b/addons/auth_anonymous/static/src/js/auth_anonymous.js @@ -33,7 +33,7 @@ openerp.auth_anonymous = function(instance) { am.do_action({ type:'ir.actions.client', tag:'login', - target: 'new', + target: 'current', params: { login_successful: function() { am.do_action("reload"); diff --git a/addons/auth_anonymous/static/src/xml/auth_anonymous.xml b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml index 79d7efcbdc8..5ab84c281c7 100644 --- a/addons/auth_anonymous/static/src/xml/auth_anonymous.xml +++ b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml @@ -6,7 +6,6 @@ diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 4c7c5377184..f461a675a47 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -62,7 +62,9 @@ class OAuthController(oeweb.Controller): u = registry.get('res.users') credentials = u.auth_oauth(cr, SUPERUSER_ID, provider, kw, context=context) cr.commit() - return login_and_redirect(req, *credentials) + action = state.get('a', None) + url = '/#action=' + action if action else '/' + return login_and_redirect(req, *credentials, redirect_url=url) except AttributeError: # auth_signup is not installed _logger.error("auth_signup not installed on database %s: oauth sign up cancelled." % (dbname,)) 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 @@ + + + {'reset_password': True} + + user.form.state res.users diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index d225c3f90d9..4c4e7a16876 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -384,9 +384,26 @@ property or property parameter."), 'cutype': 'individual', } + def copy(self, cr, uid, id, default=None, context=None): raise osv.except_osv(_('Warning!'), _('You cannot duplicate a calendar attendee.')) - + + def onchange_partner_id(self, cr, uid, ids, partner_id,context=None): + """ + Make entry on email and availbility on change of partner_id field. + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param ids: list of calendar attendee's IDs + @param partner_id: changed value of partner id + @param context: a standard dictionary for contextual values + @return: dictionary of values which put value in email and availability fields + """ + + if not partner_id: + return {'value': {'email': ''}} + partner = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) + return {'value': {'email': partner.email}} + def get_ics_file(self, cr, uid, event_obj, context=None): """ Returns iCalendar file for the event invitation. diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index 84c03d68dbd..77018898c84 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -171,10 +171,10 @@ - + - +