diff --git a/addons/account/account.py b/addons/account/account.py index 971bcec5bb0..98e51d0cf4f 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2304,8 +2304,13 @@ class account_model(osv.osv): if not line.partner_id: raise osv.except_osv(_('Error!'), _("Maturity date of entry line generated by model line '%s' of model '%s' is based on partner payment term!" \ "\nPlease define partner on it!")%(line.name, model.name)) - if line.partner_id.property_payment_term: + + payment_term_id = False + if model.journal_id.type in ('purchase', 'purchase_refund') and line.partner_id.property_supplier_payment_term: + payment_term_id = line.partner_id.property_supplier_payment_term.id + elif line.partner_id.property_payment_term: payment_term_id = line.partner_id.property_payment_term.id + if payment_term_id: pterm_list = pt_obj.compute(cr, uid, payment_term_id, value=1, date_ref=date_maturity) if pterm_list: pterm_list = [l[0] for l in pterm_list] diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index f89f7828269..ec8dd677527 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -217,7 +217,7 @@ class account_invoice(osv.osv): 'date_invoice': fields.date('Invoice Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="Keep empty to use the current date"), 'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}, select=True, help="If you use payment terms, the due date will be computed automatically at the generation "\ - "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."), + "of accounting entries. The payment term may compute several due dates, for example 50% now and 50% in one month, but if you want to force a due date, make sure that the payment term is not set on the invoice. If you keep the payment term and the due date empty, it means direct payment."), 'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}), 'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]}, help="If you use payment terms, the due date will be computed automatically at the generation "\ @@ -294,6 +294,18 @@ class account_invoice(osv.osv): ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'), ] + def _find_partner(self, inv): + ''' + Find the partner for which the accounting entries will be created + ''' + #if the chosen partner is not a company and has a parent company, use the parent for the journal entries + #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait' + part = inv.partner_id + if part.parent_id and not part.is_company: + part = part.parent_id + return part + + def fields_view_get(self, cr, uid, view_id=None, view_type=False, context=None, toolbar=False, submenu=False): journal_obj = self.pool.get('account.journal') if context is None: @@ -443,7 +455,6 @@ class account_invoice(osv.osv): def onchange_partner_id(self, cr, uid, ids, type, partner_id,\ date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False): - invoice_addr_id = False partner_payment_term = False acc_id = False bank_id = False @@ -453,8 +464,6 @@ class account_invoice(osv.osv): if partner_id: opt.insert(0, ('id', partner_id)) - res = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice']) - invoice_addr_id = res['invoice'] p = self.pool.get('res.partner').browse(cr, uid, partner_id) if company_id: if (p.property_account_receivable.company_id and (p.property_account_receivable.company_id.id != company_id)) and (p.property_account_payable.company_id and (p.property_account_payable.company_id.id != company_id)): @@ -480,10 +489,11 @@ class account_invoice(osv.osv): if type in ('out_invoice', 'out_refund'): acc_id = p.property_account_receivable.id + partner_payment_term = p.property_payment_term and p.property_payment_term.id or False else: acc_id = p.property_account_payable.id + partner_payment_term = p.property_supplier_payment_term and p.property_supplier_payment_term.id or False fiscal_position = p.property_account_position and p.property_account_position.id or False - partner_payment_term = p.property_payment_term and p.property_payment_term.id or False if p.bank_ids: bank_id = p.bank_ids[0].id @@ -959,11 +969,7 @@ class account_invoice(osv.osv): date = inv.date_invoice or time.strftime('%Y-%m-%d') - #if the chosen partner is not a company and has a parent company, use the parent for the journal entries - #because you want to invoice 'Agrolait, accounting department' but the journal items are for 'Agrolait' - part = inv.partner_id - if part.parent_id and not part.is_company: - part = part.parent_id + part = self._find_partner(inv) line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x, part.id, date, context=ctx)),iml) @@ -1423,7 +1429,7 @@ class account_invoice_line(osv.osv): res['arch'] = etree.tostring(doc) return res - def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None): + def product_id_change(self, cr, uid, ids, product, uom_id, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, currency_id=False, context=None, company_id=None): if context is None: context = {} company_id = company_id if company_id != None else context.get('company_id',False) @@ -1469,14 +1475,11 @@ class account_invoice_line(osv.osv): result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) result['name'] = res.partner_ref - domain = {} - result['uos_id'] = res.uom_id.id or uom or False + result['uos_id'] = uom_id or res.uom_id.id if res.description: result['name'] += '\n'+res.description - if result['uos_id']: - res2 = res.uom_id.category_id.id - if res2: - domain = {'uos_id':[('category_id','=',res2 )]} + + domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]} res_final = {'value':result, 'domain':domain} @@ -1492,10 +1495,10 @@ class account_invoice_line(osv.osv): new_price = res_final['value']['price_unit'] * currency.rate res_final['value']['price_unit'] = new_price - if uom: - uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context) - if res.uom_id.category_id.id == uom.category_id.id: - new_price = res_final['value']['price_unit'] * uom.factor_inv + if result['uos_id'] != res.uom_id.id: + selected_uom = self.pool.get('product.uom_id').browse(cr, uid, result['uos_id'], context=context) + if res.uom_id.category_id.id == selected_uom.category_id.id: + new_price = res_final['value']['price_unit'] * uom_id.factor_inv res_final['value']['price_unit'] = new_price return res_final @@ -1507,8 +1510,6 @@ class account_invoice_line(osv.osv): context.update({'company_id': company_id}) warning = {} res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, currency_id, context=context) - if 'uos_id' in res['value']: - del res['value']['uos_id'] if not uom: res['value']['price_unit'] = 0.0 if product and uom: diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 6d27630aee0..26fa4632117 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -672,17 +672,24 @@ class account_move_line(osv.osv): return {'value':val} if not date: date = datetime.now().strftime('%Y-%m-%d') + jt = False + if journal: + jt = journal_obj.browse(cr, uid, journal).type part = partner_obj.browse(cr, uid, partner_id) - if part.property_payment_term: - res = payment_term_obj.compute(cr, uid, part.property_payment_term.id, 100, date) + payment_term_id = False + if jt and jt in ('purchase', 'purchase_refund') and part.property_supplier_payment_term: + payment_term_id = part.property_supplier_payment_term.id + elif jt and part.property_payment_term: + payment_term_id = part.property_payment_term.id + if payment_term_id: + res = payment_term_obj.compute(cr, uid, payment_term_id, 100, date) if res: val['date_maturity'] = res[0][0] if not account_id: id1 = part.property_account_payable.id id2 = part.property_account_receivable.id - if journal: - jt = journal_obj.browse(cr, uid, journal).type + if jt: if jt in ('sale', 'purchase_refund'): val['account_id'] = fiscal_pos_obj.map_account(cr, uid, part and part.property_account_position or False, id2) elif jt in ('purchase', 'sale_refund'): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e2c45af8cba..6d3519cc461 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1105,7 +1105,7 @@ - + @@ -1207,12 +1207,6 @@

- + + + + + + + + + + + + + + + + + diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 11688732fdb..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-03 21:51+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-04 05:22+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 @@ -204,6 +204,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie, um eine Periode hinzuzufügen.\n" +"

\n" +" Üblicherweise entspricht eine Periode einem Monat oder einem " +"Quartal. \n" +" Im Normalfall sollte es eine Übereinstimmung mit den " +"Steuerperioden geben.\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -475,6 +484,13 @@ msgid "" "this box, you will be able to do invoicing & payments,\n" " but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +"Verwalten und buchen Sie Ihre betrieblichen oder persönlichen " +"Vermögenswerte.\n" +" Verfolgen Sie die Wertentwicklung Ihres Vermögens und buchen " +"Sie die nutzungsbedingte Abschreibung auf Ihr Anlagevermögen. Es erfolgt " +"eine Installation des Moduls account_asset. Sie können auch einfach nur " +"abrechnen und die Zahlungen managen, und somit keine vollständige " +"Buchhaltung installieren (Buchungssätze im Journal, Kontenpläne, etc.)" #. module: account #. openerp-web @@ -1386,6 +1402,8 @@ msgid "" "The amount expressed in the secondary currency must be positif when journal " "item are debit and negatif when journal item are credit." msgstr "" +"Der Wert, der in der zweiten Währung des Unternehmens dargestellt wird, muß " +"bei Soll-Buchungen positiv sein und negativ bei Buchungen im Haben." #. module: account #: view:account.invoice.cancel:0 @@ -1931,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 @@ -2195,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 @@ -2426,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 @@ -2446,6 +2472,8 @@ msgid "" "You cannot change the type of account to '%s' type as it contains journal " "items!" msgstr "" +"Sie können den Kontotyp nicht einfach auf %s abändern, da es abhängige " +"Buchungszeilen gibt." #. module: account #: model:ir.model,name:account.model_account_aged_trial_balance @@ -2462,7 +2490,7 @@ msgstr "Geschäftsjahr abschließen" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14 #, python-format msgid "Journal :" -msgstr "" +msgstr "Journal:" #. module: account #: sql_constraint:account.fiscal.position.tax:0 @@ -5262,7 +5290,7 @@ msgstr "Wiederkehrende Modelle" #. module: account #: view:account.tax:0 msgid "Children/Sub Taxes" -msgstr "" +msgstr "Steuerverbindung" #. module: account #: xsl:account.transfer:0 @@ -5838,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 @@ -6037,6 +6065,11 @@ msgid "" "entry was reconciled, either the user pressed the button \"Fully " "Reconciled\" in the manual reconciliation process" msgstr "" +"Datum zu dem alle Buchungen beim Partner letztmalig automatisch ausgebucht " +"wurden. Dieses Datum unterscheidet sich zum Datum der letzten Zahlung " +"dadurch, daß danach keine offenen Positionen mehr auszugleichen sind. Dieses " +"ist auf zwei Wegen möglich: Entweder wird durch eine Zahlungseingabe oder " +"durch Klick auf \"Ausgleich von Offenen Posten\" das Konto ausgeglichen." #. module: account #: field:account.journal,update_posted:0 @@ -6090,6 +6123,8 @@ msgstr "Steuern und Gesamtbeträge neu berechnen" #, python-format msgid "You cannot modify/delete a journal with entries for this period." msgstr "" +"Sie können kein Journal löschen oder ändern, wenn bereits Buchungen in " +"dieser Periode existieren." #. module: account #: field:account.tax.template,include_base_amount:0 @@ -6099,7 +6134,7 @@ msgstr "In Grundbetrag einbeziehen" #. module: account #: field:account.invoice,supplier_invoice_number:0 msgid "Supplier Invoice Number" -msgstr "" +msgstr "Eingangsrechnung Nummer" #. module: account #: help:account.payment.term.line,days:0 @@ -6123,6 +6158,8 @@ msgstr "Betragsberechnung" #, python-format msgid "You can not add/modify entries in a closed period %s of journal %s." msgstr "" +"Sie können nicht in eine abgeschlossenen Periode %s des Journals %s buchen " +"oder ändern." #. module: account #: view:account.journal:0 @@ -6147,7 +6184,7 @@ msgstr "Start Periode" #. module: account #: model:account.account.type,name:account.account_type_asset_view1 msgid "Asset View" -msgstr "" +msgstr "Anlagevermögen Ansicht" #. module: account #: model:ir.model,name:account.model_account_common_account_report @@ -6173,6 +6210,10 @@ msgid "" "that you should have your last line with the type 'Balance' to ensure that " "the whole amount will be treated." msgstr "" +"Wählen Sie die Berechnungsform der Position einer Zahlungsbedingung. " +"Berücksichtigen Sie dabei, dass in der letzten Zeile der Typ \"Saldo\" " +"hinterlegt werden muss, damit der komplette Rechnungsbetrag Berücksichtigung " +"findet." #. module: account #: field:account.partner.ledger,initial_balance:0 @@ -6220,12 +6261,12 @@ msgstr "Journal Eröffnungsbuchungen" #. module: account #: view:account.invoice:0 msgid "Draft Refund " -msgstr "" +msgstr "Entwurf Gutschrift " #. module: account #: view:cash.box.in:0 msgid "Fill in this form if you put money in the cash register:" -msgstr "" +msgstr "Füllen Sie dieses Formular aus, wenn Sie Geld in die Kasse einlegen" #. module: account #: field:account.payment.term.line,value_amount:0 @@ -7228,7 +7269,7 @@ msgstr "Benutzerfehler !" #. module: account #: view:account.open.closed.fiscalyear:0 msgid "Discard" -msgstr "" +msgstr "Abbrechen" #. module: account #: selection:account.account,type:0 @@ -7393,6 +7434,8 @@ msgid "" "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for " "2%." msgstr "" +"Die Prozenteinstellung einer Zahlungsbedingung sollte zwischen 0 und 1 " +"sein, z.B. 0,02 für 2%." #. module: account #: report:account.invoice:0 @@ -7458,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 @@ -7542,13 +7585,14 @@ msgstr "Gewinn & Verlust ( Aufwandskonto )" #. module: account #: field:account.bank.statement,total_entry_encoding:0 msgid "Total Transactions" -msgstr "" +msgstr "Gesamtbetrag Transaktionen" #. module: account #: code:addons/account/account.py:635 #, python-format msgid "You cannot remove an account that contains journal items." msgstr "" +"Sie können nicht einfach ein Konto mit existierenden Buchungen löschen" #. module: account #: code:addons/account/account_move_line.py:1095 @@ -7592,7 +7636,7 @@ msgstr "Manuell" #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 #, python-format msgid "You must set a start date." -msgstr "" +msgstr "Definieren Sie ein Startdatum" #. module: account #: view:account.automatic.reconcile:0 @@ -7641,7 +7685,7 @@ msgstr "Buchungssätze" #: code:addons/account/wizard/account_invoice_refund.py:147 #, python-format msgid "No period found on the invoice." -msgstr "" +msgstr "Keine Periode für diese Rechnung gefunden" #. module: account #: help:account.partner.ledger,page_split:0 @@ -7686,7 +7730,7 @@ msgstr "Alle erstellten Buchungen" #. module: account #: constraint:account.move.reconcile:0 msgid "You can only reconcile journal items with the same partner." -msgstr "" +msgstr "Sie können lediglich Buchungssätze des selben Partners ausgleichen" #. module: account #: view:account.journal.select:0 @@ -7746,7 +7790,7 @@ msgstr "Vollständige Liste der Steuern" #, python-format msgid "" "Selected Entry Lines does not have any account move enties in draft state." -msgstr "" +msgstr "Die ausgewählten Buchungen haben keine Buchungszeilen im Entwurf" #. module: account #: view:account.chart.template:0 @@ -7776,6 +7820,8 @@ msgid "" "Configuration error!\n" "The currency chosen should be shared by the default accounts too." msgstr "" +"Konfigurationsfehler !\n" +"Die Währung sollte auch durch die Standard Konten freigegeben werden." #. module: account #: code:addons/account/account.py:2251 @@ -7802,7 +7848,7 @@ msgstr "" #. module: account #: field:account.config.settings,module_account_voucher:0 msgid "Manage customer payments" -msgstr "" +msgstr "Management Kundenzahlungen" #. module: account #: help:report.invoice.created,origin:0 @@ -7821,6 +7867,9 @@ msgid "" "Error!\n" "The start date of a fiscal year must precede its end date." msgstr "" +"Fehler !\n" +"Das Startdatum sollte nach dem Ende Datum des laufenden Geschäftsjahres " +"enden." #. module: account #: view:account.tax.template:0 @@ -7836,7 +7885,7 @@ msgstr "Ausgangsrechnungen" #. module: account #: view:account.tax:0 msgid "Misc" -msgstr "" +msgstr "Verschiedenes" #. module: account #: view:account.analytic.line:0 @@ -7859,6 +7908,10 @@ msgid "" "Make sure you have configured payment terms properly.\n" "The latest payment term line should be of the \"Balance\" type." msgstr "" +"Sie können keine nicht ausgeglichenen Positionen buchen.\n" +"Stellen Sie eine vollständige Konfiguration der Zahlungsbedingungen sicher.\n" +"Die letzte Zeile einer Zahlungsbedingung sollte zwingend vom Typ \"Saldo\" " +"sein." #. module: account #: model:process.transition,note:account.process_transition_invoicemanually0 @@ -7895,7 +7948,7 @@ msgstr "Herkunftsdokument" #: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)." -msgstr "" +msgstr "Es gibt kein Aufwandskonto für dieses Produkt: \"%s (id:%d)." #. module: account #: constraint:account.account:0 @@ -7904,6 +7957,9 @@ msgid "" "You cannot define children to an account with internal type different of " "\"View\"." msgstr "" +"Konfigurationsfehler !\n" +"Sie können kein Sub Konto zu einem Konto mit dem internen Typ \"Ansicht\" " +"zuordnen." #. module: account #: model:ir.model,name:account.model_accounting_report @@ -7913,7 +7969,7 @@ msgstr "Finanzbericht" #. module: account #: field:account.analytic.line,currency_id:0 msgid "Account Currency" -msgstr "" +msgstr "Währung der Fibu" #. module: account #: report:account.invoice:0 @@ -7927,6 +7983,10 @@ msgid "" "You can not delete an invoice which is not cancelled. You should refund it " "instead." msgstr "" +"Sie können keine Rechnung löschen, die noch nicht abgebrochen wurde. Anstatt " +"dessen, \r\n" +"können Sie auch einfach eine Gutschrift erstellen und die offenen Positionen " +"ausgleichen." #. module: account #: help:account.tax,amount:0 @@ -7980,7 +8040,7 @@ msgstr "Eröffnungsbuchungen des Aufwandskontos" #. module: account #: view:account.invoice:0 msgid "Customer Reference" -msgstr "" +msgstr "Kundenreferenz" #. module: account #: field:account.account.template,parent_id:0 @@ -7996,7 +8056,7 @@ msgstr "Preis" #: view:account.bank.statement:0 #: field:account.bank.statement,closing_details_ids:0 msgid "Closing Cashbox Lines" -msgstr "" +msgstr "Abschluss Kassenzeilen" #. module: account #: view:account.bank.statement:0 @@ -8037,7 +8097,7 @@ msgstr "Gruppiere nach Rechnungsjahr" #. module: account #: field:account.config.settings,purchase_tax_rate:0 msgid "Purchase tax (%)" -msgstr "" +msgstr "Vorsteuer (xy%)" #. module: account #: help:res.partner,credit:0 @@ -8052,7 +8112,7 @@ msgstr "Unausgeglichene Buchungen" #. module: account #: model:ir.actions.act_window,name:account.open_account_charts_modules msgid "Chart Templates" -msgstr "" +msgstr "Buchungsvorlagen" #. module: account #: field:account.journal.period,icon:0 @@ -8102,7 +8162,7 @@ msgstr "Eröffnungsbilanz Erlöskonto" #. module: account #: field:account.config.settings,group_proforma_invoices:0 msgid "Allow pro-forma invoices" -msgstr "" +msgstr "Ermöglicht Pro-Form Rechnung" #. module: account #: view:account.bank.statement:0 @@ -8137,7 +8197,7 @@ msgstr "" #. module: account #: help:account.config.settings,currency_id:0 msgid "Main currency of the company." -msgstr "" +msgstr "Hauptwährung des Unternehmens" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reports @@ -8165,7 +8225,7 @@ msgstr "Konto-Journal" #. module: account #: field:account.config.settings,tax_calculation_rounding_method:0 msgid "Tax calculation rounding method" -msgstr "" +msgstr "Rundung für Steuerberechnung" #. module: account #: model:process.node,name:account.process_node_paidinvoice0 @@ -8182,6 +8242,10 @@ msgid "" " with the invoice. You will not be able " "to modify the credit note." msgstr "" +"Verwenden Sie diese Option, wenn Sie eine Rechnung stornieren wollen, die " +"Sie ursprünglich so nicht erstellen wollten. Es wird eine Gutschrift " +"erstellt, gebucht und unmittelbar zusammen mit der falschen Rechnung " +"ausgeglichen. Sie können diese Gutschrift dann nicht mehr modifizieren." #. module: account #: help:account.partner.reconcile.process,next_partner_id:0 @@ -8217,6 +8281,8 @@ msgid "" "There is no default credit account defined \n" "on journal \"%s\"." msgstr "" +"Es wurde noch kein Standard Habenkonto für das Journal\n" +"%s erstellt." #. module: account #: view:account.invoice.line:0 @@ -8255,6 +8321,26 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie zur Erstellung einer Kostenstelle.\n" +"

\n" +" Im Normalfall wird ein Standard Kontenplan durch die " +"Finanzbehörden\n" +" eines Landes empfohlen oder vorgegeben. Der " +"Kostenstellenplan sollte \n" +" ergänzend den Bedarf Ihres Unternehmens für Kosten- und " +"Erlöse \n" +" Auswertungen reflektieren.\n" +"

\n" +" Üblicherweise erfolgt eine Strukturierung nach Verträgen, " +"Projekten, Produkten\n" +" oder Abteilungen. Die meisten OpenERP Geschäftsprozesse " +"(Rechnungen, \n" +" Zeiterfassung, Spesen etc.) generieren " +"Kostenstellenbuchungen auf den \n" +" korrespondierenden Finanzkonten.\n" +"

\n" +" " #. module: account #: model:account.account.type,name:account.data_account_type_view @@ -8380,6 +8466,8 @@ msgid "" "This date will be used as the invoice date for credit note and period will " "be chosen accordingly!" msgstr "" +"Dieses Datum wird als Buchungsdatum für eine Gutschrift verwendet, die " +"Periode wird demgemäß gleichlautend gebucht." #. module: account #: view:product.template:0 @@ -8393,6 +8481,8 @@ msgid "" "You have to set a code for the bank account defined on the selected chart of " "accounts." msgstr "" +"Sie sollten ein Kürzel für ein Bankkonto hinterlegen, möglichst auf Basis " +"eines hinterlegten Kontenplans." #. module: account #: model:ir.ui.menu,name:account.menu_manual_reconcile @@ -8474,7 +8564,7 @@ msgstr "Steuercode Nummer" #. module: account #: field:account.config.settings,sale_refund_sequence_prefix:0 msgid "Credit note sequence" -msgstr "" +msgstr "Gutschrift Belegfolge" #. module: account #: model:ir.actions.act_window,name:account.action_validate_account_move @@ -8488,7 +8578,7 @@ msgstr "Quittiere Buchungen" #. module: account #: field:account.journal,centralisation:0 msgid "Centralised Counterpart" -msgstr "" +msgstr "Zentralisiertes Gegenkonto" #. module: account #: selection:account.bank.statement.line,type:0 @@ -8544,7 +8634,7 @@ msgstr "Sequenz" #. module: account #: field:account.config.settings,paypal_account:0 msgid "Paypal account" -msgstr "" +msgstr "Paypal Konto" #. module: account #: selection:account.print.journal,sort_selection:0 @@ -8563,6 +8653,8 @@ msgid "" "Error!\n" "You cannot create recursive accounts." msgstr "" +"Fehler !\n" +"Sie können keine Konten anlegen, die auf sich selbst referenzieren." #. module: account #: model:ir.model,name:account.model_cash_box_in @@ -8612,7 +8704,7 @@ msgstr "Oberkonto" #: code:addons/account/account_cash_statement.py:292 #, python-format msgid "Profit" -msgstr "" +msgstr "Gewinn" #. module: account #: help:account.payment.term.line,days2:0 @@ -8660,7 +8752,7 @@ msgstr "Barkassenbuchung" #. module: account #: field:account.installer,charts:0 msgid "Accounting Package" -msgstr "" +msgstr "Finanzbuchhaltung" #. module: account #: report:account.third_party_ledger:0 @@ -8675,7 +8767,7 @@ msgstr "Partner Kontoauszug" #: code:addons/account/account_invoice.py:1340 #, python-format msgid "%s cancelled." -msgstr "" +msgstr "%s abgebrochen." #. module: account #: code:addons/account/account.py:652 @@ -8689,12 +8781,12 @@ msgstr "Warnung!" #: help:account.bank.statement,message_unread:0 #: help:account.invoice,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Benachrichtigung erfordert handeln" #. module: account #: field:res.company,tax_calculation_rounding_method:0 msgid "Tax Calculation Rounding Method" -msgstr "" +msgstr "Runden von Steuern" #. module: account #: field:account.entries.report,move_line_state:0 @@ -8813,7 +8905,7 @@ msgstr "Umgekehrter Saldo (Anal.)" #: help:account.move.reconcile,opening_reconciliation:0 msgid "" "Is this reconciliation produced by the opening of a new fiscal year ?." -msgstr "" +msgstr "Wurde dieser Ausgleich durch eine Jahreseröffnung erzeugt ?" #. module: account #: view:account.analytic.line:0 @@ -8847,7 +8939,7 @@ msgstr "Restbetrag" #. module: account #: view:account.bank.statement:0 msgid "Opening Cash Control" -msgstr "" +msgstr "Öffne Kassenprotokoll" #. module: account #: model:process.node,note:account.process_node_invoiceinvoice0 @@ -8887,7 +8979,7 @@ msgstr "Auszug Aufwandsbuchungen" #. module: account #: view:account.config.settings:0 msgid "No Fiscal Year Defined for This Company" -msgstr "" +msgstr "Es ist noch kein Geschäftsjahr für das Unternehmen angelegt" #. module: account #: view:account.invoice:0 @@ -8918,7 +9010,7 @@ msgstr "Journal zu Gutschriften aus Eingangsrechnungen" #: code:addons/account/account.py:1292 #, python-format msgid "Please define a sequence on the journal." -msgstr "" +msgstr "Bitte definieren Sie eine Nummernfolge für das Journal." #. module: account #: help:account.tax.template,amount:0 @@ -8949,6 +9041,9 @@ msgid "" "recalls.\n" " This installs the module account_followup." msgstr "" +"Diese Anwendung ermöglicht den automatischen elektronischen Versand von " +"mehrstufigen Zahlungserinnerungen.\n" +" Es wird das Modul account_followup installiert." #. module: account #: field:account.automatic.reconcile,period_id:0 @@ -8993,12 +9088,12 @@ msgstr "Nettosumme:" #: code:addons/account/wizard/account_report_common.py:153 #, python-format msgid "Select a starting and an ending period." -msgstr "" +msgstr "Wählen Sie eine Start- und Endeperiode." #. module: account #: field:account.config.settings,sale_sequence_next:0 msgid "Next invoice number" -msgstr "" +msgstr "Nächste Rechnungsnummer" #. module: account #: model:ir.ui.menu,name:account.menu_finance_generic_reporting @@ -9055,6 +9150,9 @@ msgid "" "This wizard will remove the end of year journal entries of selected fiscal " "year. Note that you can run this wizard many times for the same fiscal year." msgstr "" +"Dieser Assistent entfernt die Jahresabschlußbuchungen für das ausgewählte " +"Geschäftsjahr. Beachten Sie dass der Assistent für den Jahresabschluß " +"beliebig oft wiederholt werden kann." #. module: account #: report:account.invoice:0 @@ -9137,6 +9235,10 @@ msgid "" "invoice will be created \n" " so that you can edit it." msgstr "" +"Verwenden Sie diese Option wenn Sie eine Rechnung stornieren und eine Neue " +"erstellen wollen. Die Gutschrift wird erstellt, gebucht und zusammen mit der " +"korrespondierenden Rechnung ausgeglichen. Eine neue Rechnung wurde erstellt " +"und steht zu Ihrer weiteren Bearbeitung bereit." #. module: account #: model:process.transition,name:account.process_transition_filestatement0 @@ -9147,7 +9249,7 @@ msgstr "Auto Import Bankauszug" #: code:addons/account/account_invoice.py:370 #, python-format msgid "Unknown Error!" -msgstr "" +msgstr "Unbekannter Fehler !" #. module: account #: model:ir.model,name:account.model_account_move_bank_reconcile @@ -9157,7 +9259,7 @@ msgstr "Abstimmung Bankbuchungen" #. module: account #: view:account.config.settings:0 msgid "Apply" -msgstr "" +msgstr "Anwenden" #. module: account #: field:account.financial.report,account_type_ids:0 @@ -9173,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 @@ -9233,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 @@ -9366,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 @@ -9382,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 @@ -9419,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 @@ -9444,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 @@ -9485,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 @@ -9525,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 @@ -9563,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 @@ -9591,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 @@ -9611,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 @@ -9654,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 @@ -9670,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 @@ -9690,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 @@ -9769,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 @@ -9783,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 @@ -9807,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 @@ -9827,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 @@ -10139,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 @@ -10166,7 +10320,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Source" -msgstr "" +msgstr "Herkunft" #. module: account #: selection:account.model.line,date_maturity:0 @@ -10189,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 @@ -10209,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 @@ -10221,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 @@ -10296,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/es.po b/addons/account/i18n/es.po index 4ba5d3b3976..a42cede8e38 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.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-11-21 18:46+0000\n" -"Last-Translator: Pedro Manuel Baeza \n" +"PO-Revision-Date: 2012-12-04 19:34+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:26+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account @@ -26,6 +26,7 @@ msgstr "Sistema de pagos" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" +"Una posición fiscal solo puede estar definida una vez en las mismas cuentas." #. module: account #: view:account.unreconcile:0 @@ -85,7 +86,7 @@ msgstr "Importar desde factura o pago" #: code:addons/account/account_move_line.py:1198 #, python-format msgid "Bad Account!" -msgstr "" +msgstr "Cuenta erronea." #. module: account #: view:account.move:0 @@ -109,6 +110,8 @@ msgid "" "Error!\n" "You cannot create recursive account templates." msgstr "" +"¡Error!\n" +"No puede crear plantillas de cuentas recursivas." #. module: account #. openerp-web @@ -199,6 +202,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Haga clic para añadir un período fiscal.\n" +"

\n" +" Un período fiscal es habitualmente un mes o un trimestre. \n" +" Normalmente se corresponde con los períodos de presentación " +"de impuestos\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -213,7 +224,7 @@ msgstr "Etiqueta de columna" #. module: account #: help:account.config.settings,code_digits:0 msgid "No. of digits to use for account code" -msgstr "" +msgstr "Cantidad de dígitos a usar para el código de la cuenta" #. module: account #: help:account.analytic.journal,type:0 @@ -233,6 +244,9 @@ msgid "" "lines for invoices. Leave empty if you don't want to use an analytic account " "on the invoice tax lines by default." msgstr "" +"Introduzca la cuenta analítica a usar por defecto en las líneas de impuestos " +"de las facturas. Déjelo vacío si no quiere utilizar cuantas analíticas por " +"defecto en las líneas de impuestos." #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form @@ -263,7 +277,7 @@ msgstr "Informes Belgas" #. module: account #: model:account.account.type,name:account.account_type_income_view1 msgid "Income View" -msgstr "" +msgstr "Vista de ingresos" #. module: account #: help:account.account,user_type:0 @@ -288,6 +302,9 @@ msgid "" "sales, purchase, expense, contra, etc.\n" " This installs the module account_voucher." msgstr "" +"Incluye todos los requisitos básicos para la anotación de comprobantes de " +"banco, efectivo, ventas, compras, gastos, etc.. \n" +" Instala el módulo account_voucher" #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry @@ -337,7 +354,7 @@ msgstr "Desconciliar cuenta" #. module: account #: field:account.config.settings,module_account_budget:0 msgid "Budget management" -msgstr "" +msgstr "Gestión de presupuestos" #. module: account #: view:product.template:0 @@ -358,7 +375,7 @@ msgstr "" #. module: account #: field:account.config.settings,group_multi_currency:0 msgid "Allow multi currencies" -msgstr "" +msgstr "Permitir multi divisa" #. module: account #: code:addons/account/account_invoice.py:73 @@ -379,12 +396,12 @@ msgstr "Junio" #: code:addons/account/wizard/account_automatic_reconcile.py:148 #, python-format msgid "You must select accounts to reconcile." -msgstr "" +msgstr "Debe seleccionar las cuentas a reconciliar" #. module: account #: help:account.config.settings,group_analytic_accounting:0 msgid "Allows you to use the analytic accounting." -msgstr "" +msgstr "Le permite usar la contabilidad analítica" #. module: account #: view:account.invoice:0 @@ -392,7 +409,7 @@ msgstr "" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Comercial" #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -458,7 +475,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "Período :" #. module: account #: field:account.account.template,chart_template_id:0 @@ -494,7 +511,7 @@ msgstr "El importe expresado en otra divisa opcional." #. module: account #: view:account.journal:0 msgid "Available Coins" -msgstr "" +msgstr "Monedas disponibles" #. module: account #: field:accounting.report,enable_filter:0 @@ -547,7 +564,7 @@ msgstr "Destino padre" #. module: account #: help:account.invoice.line,sequence:0 msgid "Gives the sequence of this line when displaying the invoice." -msgstr "" +msgstr "Presenta la secuencia de esta línea cuando muestra la factura" #. module: account #: field:account.bank.statement,account_id:0 @@ -616,12 +633,12 @@ msgstr "El contable confirma el extracto." #: code:addons/account/static/src/xml/account_move_reconciliation.xml:31 #, python-format msgid "Nothing to reconcile" -msgstr "" +msgstr "Nada que reconciliar" #. module: account #: field:account.config.settings,decimal_precision:0 msgid "Decimal precision on journal entries" -msgstr "" +msgstr "Precisión decimal en movimientos contables" #. module: account #: selection:account.config.settings,period:0 @@ -657,6 +674,8 @@ msgid "" "Specified journal does not have any account move entries in draft state for " "this period." msgstr "" +"El diario especificado no tiene movimientos en estado borrador en este " +"período" #. module: account #: view:account.fiscal.position:0 @@ -679,12 +698,12 @@ msgstr "¡La secuencia principal debe ser diferente de la actual!" #: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not configured properly." -msgstr "" +msgstr "La divisa actual no está configurada correctamente" #. module: account #: field:account.journal,profit_account_id:0 msgid "Profit Account" -msgstr "" +msgstr "Cuenta de ganancias" #. module: account #: code:addons/account/account_move_line.py:1144 @@ -708,7 +727,7 @@ msgstr "VEN" #: code:addons/account/account.py:1546 #, python-format msgid "Cannot create move with currency different from .." -msgstr "" +msgstr "No se puede crear un movimiento con divisa distinta de .." #. module: account #: model:email.template,report_name:account.email_template_edi_invoice @@ -743,6 +762,7 @@ msgstr "Periodo diario" msgid "" "You cannot create more than one move per period on a centralized journal." msgstr "" +"No puede crear más de un movimiento por periodo en un diario centralizado." #. module: account #: help:account.tax,account_analytic_paid_id: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/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index ea622788171..2fea6a66631 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.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-10-17 00:11+0000\n" -"Last-Translator: Syllas F. de O. Neto \n" +"PO-Revision-Date: 2012-12-04 13:40+0000\n" +"Last-Translator: Luis Felipe Miléo - http://www.akretion.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-04 05:27+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account @@ -51,7 +51,7 @@ msgstr "Reconciliar a Entrada de Diário" #: view:account.bank.statement:0 #: view:account.move.line:0 msgid "Account Statistics" -msgstr "Estatísticas da Conta" +msgstr "Estatisticas da conta" #. module: account #: view:account.invoice:0 @@ -85,7 +85,7 @@ msgstr "Importar da fatura ou do pagamento" #: code:addons/account/account_move_line.py:1198 #, python-format msgid "Bad Account!" -msgstr "" +msgstr "Conta Inválida" #. module: account #: view:account.move:0 @@ -108,6 +108,8 @@ msgid "" "Error!\n" "You cannot create recursive account templates." msgstr "" +"Erro!\n" +"Não é permitido criar modelos recursivos de contas" #. module: account #. openerp-web @@ -198,6 +200,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Click para adicionar um período fiscal.\n" +"

\n" +" Um período fiscal geralmente é de um mês ou de um trimestre. " +"Correspondendo a data de pagamento dos impostos\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index a1da0632462..77efde5acd5 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.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-11-30 17:32+0000\n" +"PO-Revision-Date: 2012-12-04 16:27+0000\n" "Last-Translator: ccdos \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:29+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account @@ -10443,7 +10443,7 @@ msgstr "发票的状态已完成" #. module: account #: field:account.config.settings,module_account_followup:0 msgid "Manage customer payment follow-ups" -msgstr "" +msgstr "管理客户付款 催款" #. module: account #: model:ir.model,name:account.model_report_account_sales diff --git a/addons/account/partner.py b/addons/account/partner.py index 819aef68892..2b4c4a49cb4 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -220,9 +220,16 @@ class res_partner(osv.osv): 'account.payment.term', type='many2one', relation='account.payment.term', - string ='Payment Term', + string ='Customer Payment Term', view_load=True, - help="This payment term will be used instead of the default one for the current partner"), + help="This payment term will be used instead of the default one for sale orders and customer invoices"), + 'property_supplier_payment_term': fields.property( + 'account.payment.term', + type='many2one', + relation='account.payment.term', + string ='Supplier Payment Term', + view_load=True, + help="This payment term will be used instead of the default one for purchase orders and supplier invoices"), 'ref_companies': fields.one2many('res.company', 'partner_id', 'Companies that refers to partner'), 'last_reconciliation_date': fields.datetime('Latest Reconciliation Date', help='Date on which the partner accounting entries were fully reconciled last time. It differs from the date of the last reconciliation made for this partner, as here we depict the fact that nothing more was to be reconciled at this date. This can be achieved in 2 ways: either the last debit/credit entry was reconciled, either the user pressed the button "Fully Reconciled" in the manual reconciliation process') diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml index d17f8c18eee..8623bd03922 100644 --- a/addons/account/partner_view.xml +++ b/addons/account/partner_view.xml @@ -89,6 +89,7 @@ + diff --git a/addons/account_accountant/i18n/de.po b/addons/account_accountant/i18n/de.po index 9b612d5c6ac..83d63025bd2 100644 --- a/addons/account_accountant/i18n/de.po +++ b/addons/account_accountant/i18n/de.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-25 19:02+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-12-04 07:23+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \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-05 05:20+0000\n" +"X-Generator: Launchpad (build 16335)\n" #. module: account_accountant #: model:ir.actions.client,name:account_accountant.action_client_account_menu msgid "Open Accounting Menu" -msgstr "" +msgstr "Öffne Finanz Menü" #~ msgid "Accountant" #~ msgstr "Finanzbuchhaltung Administrator" 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_analysis/i18n/es_MX.po b/addons/account_analytic_analysis/i18n/es_MX.po index 451f5b9a4f0..0c7bc17d5dd 100644 --- a/addons/account_analytic_analysis/i18n/es_MX.po +++ b/addons/account_analytic_analysis/i18n/es_MX.po @@ -8,13 +8,13 @@ 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-11-27 23:22+0000\n" +"PO-Revision-Date: 2012-12-04 05:45+0000\n" "Last-Translator: OscarAlca \n" "Language-Team: Spanish (Mexico) \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-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account_analytic_analysis @@ -218,6 +218,8 @@ msgid "" "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " "'normal','template'])]}" msgstr "" +"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " +"'normal','template'])]}" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 @@ -253,7 +255,7 @@ 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 @@ -437,6 +439,8 @@ msgid "" "Allows you to set the template field as required when creating an analytic " "account or a contract." msgstr "" +"Le permite configurar el campo plantilla como se requiera cuando se crea una " +"cuenta analítica o contrato." #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_invoiced:0 @@ -608,12 +612,12 @@ msgstr "Fecha del último trabajo realizado en esta cuenta." #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "Configuración de venta" #. 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 @@ -659,6 +663,7 @@ msgstr "Tiempo Total" msgid "" "the field template of the analytic accounts and contracts will be required." msgstr "" +"El campo plantilla de las cuentas analíticas y contratos será requerido" #. 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_asset/i18n/nl.po b/addons/account_asset/i18n/nl.po index 9f09d68e30a..1c5249de89b 100644 --- a/addons/account_asset/i18n/nl.po +++ b/addons/account_asset/i18n/nl.po @@ -8,13 +8,13 @@ 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-01 16:19+0000\n" +"PO-Revision-Date: 2012-12-04 17:19+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account_asset @@ -448,6 +448,12 @@ 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 "" +"Wanneer een activa is aangemaakt is de status 'Concept'.\n" +"Als de activa is bevestigd, wordt de status gezet op 'In bewerking' en " +"kunnen de afschrijvingsregels wporden geboekt in de boekhouding.\n" +"Het is mogelijk een activa handmatig af te sluiten als de afschrijving is " +"voltooid. Als de laatste afschrijvingsregels is geboekt, wordt deze status " +"automatisch ingesteld" #. module: account_asset #: field:account.asset.asset,state:0 diff --git a/addons/account_bank_statement_extensions/i18n/nl.po b/addons/account_bank_statement_extensions/i18n/nl.po index 113052428cd..9d288c778f8 100644 --- a/addons/account_bank_statement_extensions/i18n/nl.po +++ b/addons/account_bank_statement_extensions/i18n/nl.po @@ -8,13 +8,13 @@ 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-11-24 22:05+0000\n" +"PO-Revision-Date: 2012-12-04 17:22+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account_bank_statement_extensions @@ -59,7 +59,7 @@ msgstr "Geselecteerde bankafschriftregels annuleren" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,val_date:0 msgid "Value Date" -msgstr "" +msgstr "Betaaldatum" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 @@ -113,6 +113,8 @@ msgid "" "Delete operation not allowed. Please go to the associated bank " "statement in order to delete and/or modify bank statement line." msgstr "" +"Verwijderen is niet mogelijk. Ga naar het betreffende bankafschrift om een " +"bankafschrift te bewerken of te verwijderen." #. module: account_bank_statement_extensions #: view:confirm.statement.line:0 @@ -220,7 +222,7 @@ msgstr "Handmatig" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Bank Transaction" -msgstr "" +msgstr "Bank transactie" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 diff --git a/addons/account_budget/i18n/de.po b/addons/account_budget/i18n/de.po index 978211d4636..47d67284dd2 100644 --- a/addons/account_budget/i18n/de.po +++ b/addons/account_budget/i18n/de.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-02-08 08:46+0000\n" +"PO-Revision-Date: 2012-12-04 07:23+0000\n" "Last-Translator: Ferdinand @ Camptocamp \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-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account_budget @@ -234,7 +234,7 @@ msgstr "Budgets genehmigen" #. module: account_budget #: view:crossovered.budget:0 msgid "Duration" -msgstr "" +msgstr "Dauer" #. module: account_budget #: field:account.budget.post,code:0 @@ -332,7 +332,7 @@ msgstr "Sollwert" #: view:account.budget.crossvered.summary.report:0 #: view:account.budget.report:0 msgid "or" -msgstr "" +msgstr "oder" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 diff --git a/addons/account_followup/i18n/nb.po b/addons/account_followup/i18n/nb.po index 4d54d42af10..6da2f411163 100644 --- a/addons/account_followup/i18n/nb.po +++ b/addons/account_followup/i18n/nb.po @@ -8,20 +8,20 @@ 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-11-29 13:37+0000\n" +"PO-Revision-Date: 2012-12-04 10:32+0000\n" "Last-Translator: Kaare Pettersen \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account_followup #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,manual_action:0 msgid "Manual Action" -msgstr "" +msgstr "Manuell handling." #. module: account_followup #: help:res.partner,latest_followup_level_id:0 @@ -31,7 +31,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Group by" -msgstr "" +msgstr "Grupper etter." #. module: account_followup #: view:account_followup.stat:0 @@ -47,27 +47,27 @@ msgstr "Oppfølging" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(date)s" -msgstr "" +msgstr "%(Dato)s" #. module: account_followup #: field:res.partner,payment_next_action_date:0 msgid "Next Action Date" -msgstr "" +msgstr "Neste handling dato." #. module: account_followup #: field:account_followup.sending.results,needprinting:0 msgid "Needs Printing" -msgstr "" +msgstr "Trenger utskrift." #. module: account_followup #: view:res.partner:0 msgid "⇾ Mark as Done" -msgstr "" +msgstr "Merk som ferdig." #. module: account_followup #: field:account_followup.followup.line,manual_action_note:0 msgid "Action To Do" -msgstr "" +msgstr "Handling å gjøre." #. module: account_followup #: model:email.template,body_html:account_followup.email_template_account_followup_level0 @@ -149,7 +149,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Follow-ups to do" -msgstr "" +msgstr "Oppfølginger å gjøre." #. module: account_followup #: field:account_followup.followup,company_id:0 @@ -208,12 +208,12 @@ msgstr "E-post kropp." #. module: account_followup #: help:res.partner,payment_responsible_id:0 msgid "Responsible for making sure the action happens." -msgstr "" +msgstr "Ansvarlig for å sørge for at handlingen skjer." #. module: account_followup #: view:res.partner:0 msgid "Overdue amount" -msgstr "" +msgstr "Forfalte beløpet." #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_print @@ -228,7 +228,7 @@ msgstr "Beløp" #. module: account_followup #: view:res.partner:0 msgid "No Responsible" -msgstr "" +msgstr "Ingen ansvarlige." #. module: account_followup #: view:account_followup.stat.by.partner:0 @@ -243,12 +243,12 @@ msgstr "Total debet" #. module: account_followup #: field:res.partner,payment_next_action:0 msgid "Next Action" -msgstr "" +msgstr "Neste handling." #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Partner Name" -msgstr "" +msgstr ": Partner navn." #. module: account_followup #: view:account_followup.followup:0 @@ -283,12 +283,12 @@ msgstr "Dato :" #. module: account_followup #: view:res.partner:0 msgid "I am responsible" -msgstr "" +msgstr "Jeg er ansvarlig." #. module: account_followup #: sql_constraint:account_followup.followup:0 msgid "Only one follow-up per company is allowed" -msgstr "" +msgstr "Bare en oppfølgning per. firma er lov." #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line4 @@ -325,22 +325,22 @@ msgstr "Ikke Prosedyre" #. module: account_followup #: view:res.partner:0 msgid "Without responsible" -msgstr "" +msgstr "Uten ansvar." #. module: account_followup #: view:account_followup.print:0 msgid "Send emails and generate letters" -msgstr "" +msgstr "Send e-poster og lage brever." #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_customer_followup msgid "Manual Follow-Ups" -msgstr "" +msgstr "Manuelle oppfølgninger." #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(partner_name)s" -msgstr "" +msgstr "%(partner_navn)s" #. module: account_followup #: field:account_followup.stat,debit:0 @@ -355,7 +355,7 @@ msgstr "Oppfølging statistikk." #. module: account_followup #: view:res.partner:0 msgid "Send Overdue Email" -msgstr "" +msgstr "Send forfalte e-poster." #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line @@ -371,23 +371,23 @@ msgstr "Gir rekkefølgen av når du viser en liste over oppfølging linjer." #: code:addons/account_followup/wizard/account_followup_print.py:166 #, python-format msgid " will be sent" -msgstr "" +msgstr " Vil bli sendt." #. module: account_followup #: view:account_followup.followup.line:0 msgid ": User's Company Name" -msgstr "" +msgstr ": Brukerens firma navn." #. module: account_followup #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_letter:0 msgid "Send a Letter" -msgstr "" +msgstr "Send et brev." #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form msgid "Payment Follow-ups" -msgstr "" +msgstr "Betaling oppfølgninger." #. module: account_followup #: field:account_followup.followup.line,delay:0 @@ -398,7 +398,7 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:155 #, python-format msgid "Nobody" -msgstr "" +msgstr "Ingen." #. module: account_followup #: field:account.move.line,followup_line_id:0 @@ -420,7 +420,7 @@ msgstr "" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_s msgid "Do Manual Follow-Ups" -msgstr "" +msgstr "Gjøre manuell oppfølging." #. module: account_followup #: report:account_followup.followup.print:0 @@ -451,7 +451,7 @@ msgstr "Send E-post på Partnerens språk" #: code:addons/account_followup/wizard/account_followup_print.py:169 #, python-format msgid " email(s) sent" -msgstr "" +msgstr " E-post(er) sendt." #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_print @@ -501,12 +501,12 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Partners with Credits" -msgstr "" +msgstr "Partnere med kreditter." #. module: account_followup #: help:account_followup.followup.line,send_email:0 msgid "When processing, it will send an email" -msgstr "" +msgstr "Ved behandling, vil den sende en e-post." #. module: account_followup #: view:account_followup.stat.by.partner:0 @@ -528,7 +528,7 @@ msgstr "Oppfølginger" #: code:addons/account_followup/account_followup.py:227 #, python-format msgid "Email not sent because of email address of partner not filled in" -msgstr "" +msgstr "E-posten er ikke send fordi e-postadressen partner ikke er fylt ut." #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup @@ -561,12 +561,12 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:172 #, python-format msgid " manual action(s) assigned:" -msgstr "" +msgstr " Manuell handling(er) tilordnet:" #. module: account_followup #: view:res.partner:0 msgid "Search Partner" -msgstr "" +msgstr "Søk partner." #. module: account_followup #: view:res.partner:0 @@ -581,7 +581,7 @@ msgstr "" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_print_menu msgid "Send Letters and Emails" -msgstr "" +msgstr "Send brever og e-poster." #. module: account_followup #: view:account_followup.followup:0 @@ -597,7 +597,7 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:240 #, python-format msgid "Send Letters and Emails: Actions Summary" -msgstr "" +msgstr "Send brever og e-poster: Handling oppsummering." #. module: account_followup #: view:account_followup.print:0 @@ -612,17 +612,17 @@ msgstr "Blokkert" #. module: account_followup #: sql_constraint:account_followup.followup.line:0 msgid "Days of the follow-up levels must be different" -msgstr "" +msgstr "Dagene for oppfølgnings nivåene må være annerledes." #. module: account_followup #: view:res.partner:0 msgid "Click to mark the action as done." -msgstr "" +msgstr "Klikk for å markere handling som ferdig." #. module: account_followup #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow msgid "Follow-Ups Analysis" -msgstr "" +msgstr "Oppfølgnings analyse." #. module: account_followup #: help:account_followup.print,date:0 @@ -640,7 +640,7 @@ msgstr "Oppfølgings sendedato" #. module: account_followup #: field:res.partner,payment_responsible_id:0 msgid "Follow-up Responsible" -msgstr "" +msgstr "Oppfølgning ansvarlig." #. module: account_followup #: report:account_followup.followup.print:0 @@ -656,12 +656,12 @@ msgstr "Faktura påminnelse" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_menu msgid "Follow-up Levels" -msgstr "" +msgstr "Oppfølgnings nivåer." #. module: account_followup #: view:res.partner:0 msgid "Future Follow-ups" -msgstr "" +msgstr "Fremtidige Oppfølgninger." #. module: account_followup #: view:account_followup.followup:0 @@ -689,13 +689,13 @@ msgstr "Siste Oppfølging" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Download Letters" -msgstr "" +msgstr "Last ned brevene." #. module: account_followup #: field:account_followup.print,company_id:0 #: field:res.partner,unreconciled_aml_ids:0 msgid "unknown" -msgstr "" +msgstr "Ukjent." #. module: account_followup #: code:addons/account_followup/account_followup.py:245 @@ -706,7 +706,7 @@ msgstr "" #. module: account_followup #: model:ir.model,name:account_followup.model_email_template msgid "Email Templates" -msgstr "" +msgstr "E-post maler." #. module: account_followup #: help:account_followup.followup.line,manual_action:0 @@ -719,7 +719,7 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:171 #, python-format msgid " email(s) should have been sent, but " -msgstr "" +msgstr " e-post (e) skal ha blitt sendt, men. " #. module: account_followup #: help:account_followup.print,test_print:0 @@ -740,12 +740,12 @@ msgstr "Totalt:" #. module: account_followup #: field:account_followup.followup.line,email_template_id:0 msgid "Email Template" -msgstr "" +msgstr "E-post mal." #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(user_signature)s" -msgstr "" +msgstr "%(Bruker_signatur)s" #. module: account_followup #: model:ir.model,name:account_followup.model_res_company @@ -761,7 +761,7 @@ msgstr "Oppsummering" #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_email:0 msgid "Send an Email" -msgstr "" +msgstr "Send en e-post." #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line2 @@ -979,17 +979,17 @@ msgstr "Balanse" #. module: account_followup #: help:res.partner,payment_note:0 msgid "Payment Note" -msgstr "" +msgstr "Betalings notat." #. module: account_followup #: view:res.partner:0 msgid "My Follow-ups" -msgstr "" +msgstr "Mine oppfølgninger." #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(company_name)s" -msgstr "" +msgstr "%(Firma_navn)s" #. module: account_followup #: field:account_followup.stat,date_move_last:0 @@ -1011,7 +1011,7 @@ msgstr "Periode" #: code:addons/account_followup/wizard/account_followup_print.py:231 #, python-format msgid "%s partners have no credits and as such the action is cleared" -msgstr "" +msgstr "% s partnere har ingen kreditter og slik at handlingen er fjernet." #. module: account_followup #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report @@ -1024,6 +1024,8 @@ msgid "" ", the latest payment follow-up\n" " was:" msgstr "" +"Den siste betalingen oppfølging\n" +"var." #. module: account_followup #: view:account_followup.print:0 @@ -1033,7 +1035,7 @@ msgstr "Avbryt" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Close" -msgstr "" +msgstr "Lukk." #. module: account_followup #: view:account_followup.stat:0 @@ -1050,33 +1052,33 @@ msgstr "Maks Oppfølgings Nivå" #: code:addons/account_followup/wizard/account_followup_print.py:171 #, python-format msgid " had unknown email address(es)" -msgstr "" +msgstr " hadde ukjente e-postadresse(r)" #. module: account_followup #: view:res.partner:0 msgid "Responsible" -msgstr "" +msgstr "Ansvarlig." #. module: account_followup #: model:ir.ui.menu,name:account_followup.menu_finance_followup #: view:res.partner:0 msgid "Payment Follow-up" -msgstr "" +msgstr "Betaling oppfølgning." #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Current Date" -msgstr "" +msgstr ": Nåværende dato." #. module: account_followup #: field:res.partner,payment_amount_due:0 msgid "Total amount due" -msgstr "" +msgstr "Totalbeløpet." #. module: account_followup #: field:account_followup.followup.line,name:0 msgid "Follow-Up Action" -msgstr "" +msgstr "Oppfølgning handling." #. module: account_followup #: view:account_followup.stat:0 @@ -1100,7 +1102,7 @@ msgstr "" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Summary of actions" -msgstr "" +msgstr "Oppsummering av handlinger." #. module: account_followup #: report:account_followup.followup.print:0 @@ -1110,7 +1112,7 @@ msgstr "Ref" #. module: account_followup #: view:account_followup.followup.line:0 msgid "After" -msgstr "" +msgstr "Etter." #. module: account_followup #: view:account_followup.stat:0 @@ -1132,6 +1134,10 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"Ingen tidsskriftet elementer funnet.\n" +"\n" +" " #. module: account_followup #: view:account.move.line:0 @@ -1190,7 +1196,7 @@ msgstr "Navn" #. module: account_followup #: field:res.partner,latest_followup_level_id:0 msgid "Latest Follow-up Level" -msgstr "" +msgstr "Siste Oppfølging nivå." #. module: account_followup #: field:account_followup.stat,date_move:0 @@ -1207,12 +1213,12 @@ msgstr "Oppfølging statistikk av partner." #: code:addons/account_followup/wizard/account_followup_print.py:172 #, python-format msgid " letter(s) in report" -msgstr "" +msgstr " Brev(er) i rapport." #. module: account_followup #: view:res.partner:0 msgid "Customer Followup" -msgstr "" +msgstr "Kundens oppfølgning." #. module: account_followup #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form @@ -1321,12 +1327,12 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:166 #, python-format msgid "Follow-up letter of " -msgstr "" +msgstr "Oppfølgning brev av. " #. module: account_followup #: view:res.partner:0 msgid "The" -msgstr "" +msgstr "Den." #. module: account_followup #: view:account_followup.print:0 @@ -1346,7 +1352,7 @@ msgstr "Kredit" #. module: account_followup #: view:res.partner:0 msgid "Follow-ups To Do" -msgstr "" +msgstr "Oppfølgninger å gjøre." #. module: account_followup #: report:account_followup.followup.print:0 @@ -1364,7 +1370,7 @@ msgstr "" #. module: account_followup #: help:res.partner,latest_followup_date:0 msgid "Latest date that the follow-up level of the partner was changed" -msgstr "" +msgstr "Siste dato som oppfølging nivå av partner ble endret." #. module: account_followup #: field:account_followup.print,test_print:0 diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po index 7eee8406237..c4a52167a46 100644 --- a/addons/account_followup/i18n/nl.po +++ b/addons/account_followup/i18n/nl.po @@ -7,30 +7,30 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-12-01 16:25+0000\n" +"PO-Revision-Date: 2012-12-04 17:33+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \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-Launchpad-Export-Date: 2012-12-05 05:19+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account_followup #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,manual_action:0 msgid "Manual Action" -msgstr "" +msgstr "Handmatige actie" #. module: account_followup #: help:res.partner,latest_followup_level_id:0 msgid "The maximum follow-up level" -msgstr "" +msgstr "Het maximale herinneringsniveau" #. module: account_followup #: view:res.partner:0 msgid "Group by" -msgstr "" +msgstr "Groeperen op" #. module: account_followup #: view:account_followup.stat:0 @@ -46,27 +46,27 @@ msgstr "Betalingsherinnering" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(date)s" -msgstr "" +msgstr "%(date)s" #. module: account_followup #: field:res.partner,payment_next_action_date:0 msgid "Next Action Date" -msgstr "" +msgstr "Volgende actiedatum" #. module: account_followup #: field:account_followup.sending.results,needprinting:0 msgid "Needs Printing" -msgstr "" +msgstr "Moet worden afgedrukt" #. module: account_followup #: view:res.partner:0 msgid "⇾ Mark as Done" -msgstr "" +msgstr "⇾ Markeer als gereed" #. module: account_followup #: field:account_followup.followup.line,manual_action_note:0 msgid "Action To Do" -msgstr "" +msgstr "Actie Te doen" #. module: account_followup #: model:email.template,body_html:account_followup.email_template_account_followup_level0 @@ -148,7 +148,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Follow-ups to do" -msgstr "" +msgstr "Betalingsherinneringen nog te doen" #. module: account_followup #: field:account_followup.followup,company_id:0 @@ -192,7 +192,7 @@ msgstr "" #. module: account_followup #: view:account_followup.followup.line:0 msgid "days overdue, do the following actions:" -msgstr "" +msgstr "dagen verlopen, doe de navolgende acties:" #. module: account_followup #: view:account_followup.followup.line:0 @@ -207,12 +207,12 @@ msgstr "Email bericht" #. module: account_followup #: help:res.partner,payment_responsible_id:0 msgid "Responsible for making sure the action happens." -msgstr "" +msgstr "Verantwoordelijke die ervoor zorgt dat de actie gebeurt." #. module: account_followup #: view:res.partner:0 msgid "Overdue amount" -msgstr "" +msgstr "Vervallen bedrag" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_print @@ -242,12 +242,12 @@ msgstr "Totaal debet" #. module: account_followup #: field:res.partner,payment_next_action:0 msgid "Next Action" -msgstr "" +msgstr "Volgende actie" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Partner Name" -msgstr "" +msgstr ": Relatie naam" #. module: account_followup #: view:account_followup.followup:0 @@ -282,7 +282,7 @@ msgstr "Datum :" #. module: account_followup #: view:res.partner:0 msgid "I am responsible" -msgstr "" +msgstr "Ik ben verantwoordelijk" #. module: account_followup #: sql_constraint:account_followup.followup:0 @@ -314,7 +314,7 @@ msgstr "" #. module: account_followup #: help:account_followup.followup.line,send_letter:0 msgid "When processing, it will print a letter" -msgstr "" +msgstr "Bij verwerken wordt een brieg gemaakt" #. module: account_followup #: view:account_followup.stat:0 @@ -324,22 +324,22 @@ msgstr "Geen geschil" #. module: account_followup #: view:res.partner:0 msgid "Without responsible" -msgstr "" +msgstr "Zonder verantwoordelijke" #. module: account_followup #: view:account_followup.print:0 msgid "Send emails and generate letters" -msgstr "" +msgstr "Verstuur e-mails en genereer brieven" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_customer_followup msgid "Manual Follow-Ups" -msgstr "" +msgstr "Handmatige herinnneringen" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(partner_name)s" -msgstr "" +msgstr "%(partner_name)s" #. module: account_followup #: field:account_followup.stat,debit:0 @@ -354,7 +354,7 @@ msgstr "Betalingsherinneringen analyses" #. module: account_followup #: view:res.partner:0 msgid "Send Overdue Email" -msgstr "" +msgstr "Stuur betalingsherinnnering e-mail" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line @@ -371,34 +371,34 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:166 #, python-format msgid " will be sent" -msgstr "" +msgstr " wordt verstuurt" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": User's Company Name" -msgstr "" +msgstr ": Bedrijfsnaam van gebruiker" #. module: account_followup #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_letter:0 msgid "Send a Letter" -msgstr "" +msgstr "Stuur een brief" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form msgid "Payment Follow-ups" -msgstr "" +msgstr "Betalingsherinnneringen" #. module: account_followup #: field:account_followup.followup.line,delay:0 msgid "Due Days" -msgstr "" +msgstr "Vervallen dagen" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:155 #, python-format msgid "Nobody" -msgstr "" +msgstr "Niemand" #. module: account_followup #: field:account.move.line,followup_line_id:0 @@ -415,12 +415,12 @@ msgstr "Laatste betalingsherinnering" #: model:ir.actions.act_window,name:account_followup.action_account_manual_reconcile_receivable #: model:ir.ui.menu,name:account_followup.menu_manual_reconcile_followup msgid "Reconcile Invoices & Payments" -msgstr "" +msgstr "Afletteren van facturen en betalingen" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_s msgid "Do Manual Follow-Ups" -msgstr "" +msgstr "Maak handmatige betalingsherinneringen" #. module: account_followup #: report:account_followup.followup.print:0 @@ -435,7 +435,7 @@ msgstr "Stuur e-mail bevestiging" #. module: account_followup #: view:res.partner:0 msgid "Print Overdue Payments" -msgstr "" +msgstr "Vervallen betalingen afdrukken" #. module: account_followup #: field:account_followup.stat.by.partner,date_followup:0 @@ -451,7 +451,7 @@ msgstr "Stuur e-mail in de taal van de relatie" #: code:addons/account_followup/wizard/account_followup_print.py:169 #, python-format msgid " email(s) sent" -msgstr "" +msgstr " e-mail(s) verstuurd" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_print @@ -529,6 +529,8 @@ msgstr "Betalingsherinneringen" #, python-format msgid "Email not sent because of email address of partner not filled in" msgstr "" +"E-mail is niet verstuurd omdat het e-mail adres van de relatie niet is " +"ingevuld." #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup @@ -566,7 +568,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Search Partner" -msgstr "" +msgstr "Zoek relatie" #. module: account_followup #: view:res.partner:0 @@ -581,7 +583,7 @@ msgstr "" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_print_menu msgid "Send Letters and Emails" -msgstr "" +msgstr "Stuur brieven en e-mails" #. module: account_followup #: view:account_followup.followup:0 @@ -591,7 +593,7 @@ msgstr "Zoek betalingsherinnering" #. module: account_followup #: view:res.partner:0 msgid "Account Move line" -msgstr "" +msgstr "Journaalpostregel" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:240 @@ -617,12 +619,12 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Click to mark the action as done." -msgstr "" +msgstr "Klik om de actie als gereed te kenmerken" #. module: account_followup #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow msgid "Follow-Ups Analysis" -msgstr "" +msgstr "Betalingsherinneringanalyse" #. module: account_followup #: help:account_followup.print,date:0 @@ -640,7 +642,7 @@ msgstr "Verzenddatum betalingsherinnering" #. module: account_followup #: field:res.partner,payment_responsible_id:0 msgid "Follow-up Responsible" -msgstr "" +msgstr "Betalingsherinnering verantwoordelijke" #. module: account_followup #: report:account_followup.followup.print:0 @@ -656,12 +658,12 @@ msgstr "Betalingsherinnering" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_menu msgid "Follow-up Levels" -msgstr "" +msgstr "Betalingsherinnering niveau's" #. module: account_followup #: view:res.partner:0 msgid "Future Follow-ups" -msgstr "" +msgstr "Toekomstige betalingsherinneringen" #. module: account_followup #: view:account_followup.followup:0 @@ -689,13 +691,13 @@ msgstr "Laatste betalingsherinnering" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Download Letters" -msgstr "" +msgstr "Download brieven" #. module: account_followup #: field:account_followup.print,company_id:0 #: field:res.partner,unreconciled_aml_ids:0 msgid "unknown" -msgstr "" +msgstr "onbekend" #. module: account_followup #: code:addons/account_followup/account_followup.py:245 @@ -706,7 +708,7 @@ msgstr "" #. module: account_followup #: model:ir.model,name:account_followup.model_email_template msgid "Email Templates" -msgstr "" +msgstr "Email-sjablonen" #. module: account_followup #: help:account_followup.followup.line,manual_action:0 @@ -742,12 +744,12 @@ msgstr "Totaal:" #. module: account_followup #: field:account_followup.followup.line,email_template_id:0 msgid "Email Template" -msgstr "" +msgstr "Email sjabloon" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(user_signature)s" -msgstr "" +msgstr "%(user_signature)s" #. module: account_followup #: model:ir.model,name:account_followup.model_res_company @@ -763,7 +765,7 @@ msgstr "Samenvatting" #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_email:0 msgid "Send an Email" -msgstr "" +msgstr "Verstuur een e-mail" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line2 @@ -981,17 +983,17 @@ msgstr "Saldo" #. module: account_followup #: help:res.partner,payment_note:0 msgid "Payment Note" -msgstr "" +msgstr "Betalingsbewijs" #. module: account_followup #: view:res.partner:0 msgid "My Follow-ups" -msgstr "" +msgstr "Mijn betalingsherinneringen" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(company_name)s" -msgstr "" +msgstr "%(company_name)s" #. module: account_followup #: field:account_followup.stat,date_move_last:0 @@ -1035,7 +1037,7 @@ msgstr "Annuleren" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Close" -msgstr "" +msgstr "Afsluiten" #. module: account_followup #: view:account_followup.stat:0 @@ -1052,12 +1054,12 @@ msgstr "Max. betalingsherinnering niveau" #: code:addons/account_followup/wizard/account_followup_print.py:171 #, python-format msgid " had unknown email address(es)" -msgstr "" +msgstr " had een onbekend e-mail adres" #. module: account_followup #: view:res.partner:0 msgid "Responsible" -msgstr "" +msgstr "Verantwoordelijke" #. module: account_followup #: model:ir.ui.menu,name:account_followup.menu_finance_followup @@ -1068,17 +1070,17 @@ msgstr "" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Current Date" -msgstr "" +msgstr ": Huidige datum" #. module: account_followup #: field:res.partner,payment_amount_due:0 msgid "Total amount due" -msgstr "" +msgstr "Totaal vervallen bedrag" #. module: account_followup #: field:account_followup.followup.line,name:0 msgid "Follow-Up Action" -msgstr "" +msgstr "Betalingsherinnering actie" #. module: account_followup #: view:account_followup.stat:0 @@ -1102,7 +1104,7 @@ msgstr "" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Summary of actions" -msgstr "" +msgstr "Samenvatting van acties" #. module: account_followup #: report:account_followup.followup.print:0 @@ -1112,7 +1114,7 @@ msgstr "Factuur" #. module: account_followup #: view:account_followup.followup.line:0 msgid "After" -msgstr "" +msgstr "Erna" #. module: account_followup #: view:account_followup.stat:0 @@ -1134,6 +1136,10 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Geen journaalposten gevonden.\n" +"

\n" +" " #. module: account_followup #: view:account.move.line:0 @@ -1148,7 +1154,7 @@ msgstr "Betalingsherinneringregels" #. module: account_followup #: field:account_followup.followup.line,manual_action_responsible_id:0 msgid "Assign a Responsible" -msgstr "" +msgstr "Wijs een verantwoordelijke toe" #. module: account_followup #: view:account_followup.print:0 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/account_voucher/i18n/nb.po b/addons/account_voucher/i18n/nb.po index f326d258e47..bffa649ab3a 100644 --- a/addons/account_voucher/i18n/nb.po +++ b/addons/account_voucher/i18n/nb.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-03 16:01+0000\n" -"PO-Revision-Date: 2012-11-29 20:14+0000\n" +"PO-Revision-Date: 2012-12-04 10:00+0000\n" "Last-Translator: Kaare Pettersen \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:41+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: account_voucher @@ -36,7 +36,7 @@ msgstr "Nedskrivning." #. module: account_voucher #: view:account.voucher:0 msgid "Payment Ref" -msgstr "" +msgstr "Betaling referanse." #. module: account_voucher #: view:account.voucher:0 @@ -89,7 +89,7 @@ msgstr "Import" #. module: account_voucher #: view:account.voucher:0 msgid "Voucher Entry" -msgstr "" +msgstr "Kupong inngang." #. module: account_voucher #: selection:sale.receipt.report,month:0 @@ -148,7 +148,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 msgid "Validate" -msgstr "" +msgstr "Valider." #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt @@ -170,7 +170,7 @@ msgstr "Søk kuponger." #. module: account_voucher #: field:account.voucher,writeoff_acc_id:0 msgid "Counterpart Account" -msgstr "" +msgstr "Motparts konto." #. module: account_voucher #: field:account.voucher,account_id:0 @@ -257,6 +257,7 @@ msgstr "Kansellert." msgid "" "You have to configure account base code and account tax code on the '%s' tax!" msgstr "" +"Du må konfigurere kontoens basiskode og kontoens skatteklasse på '% s' skatt!" #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt @@ -342,7 +343,7 @@ msgstr "Importer fakturaer." #: selection:account.voucher,pay_now:0 #: selection:sale.receipt.report,pay_now:0 msgid "Pay Later or Group Funds" -msgstr "" +msgstr "Betal senere eller gruppe fondene." #. module: account_voucher #: view:account.voucher:0 @@ -379,7 +380,7 @@ msgstr "Leverandør" #. module: account_voucher #: view:account.voucher:0 msgid "Supplier Voucher" -msgstr "" +msgstr "Leverandør kupong." #. module: account_voucher #: field:account.voucher,message_follower_ids:0 @@ -395,13 +396,13 @@ msgstr "Debet." #: code:addons/account_voucher/account_voucher.py:1558 #, python-format msgid "Unable to change journal !" -msgstr "" +msgstr "Kan ikke endre journal!" #. module: account_voucher #: view:sale.receipt.report:0 #: field:sale.receipt.report,nbr:0 msgid "# of Voucher Lines" -msgstr "" +msgstr "# av kupong linjer." #. module: account_voucher #: view:sale.receipt.report:0 @@ -423,7 +424,7 @@ msgstr "Kupong oppføringer." #. module: account_voucher #: view:account.voucher:0 msgid "Open Supplier Journal Entries" -msgstr "" +msgstr "Åpen leverandør journal inngang." #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list @@ -450,7 +451,7 @@ msgstr "Salgs kvittering." #. module: account_voucher #: field:account.voucher,is_multi_currency:0 msgid "Multi Currency Voucher" -msgstr "" +msgstr "Fler valuta kupong." #. module: account_voucher #: view:account.voucher:0 @@ -478,7 +479,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,writeoff_amount:0 msgid "Difference Amount" -msgstr "" +msgstr "Forskjellig beløp." #. module: account_voucher #: view:sale.receipt.report:0 @@ -506,7 +507,7 @@ msgstr "Skatt beløp." #. module: account_voucher #: view:sale.receipt.report:0 msgid "Validated Vouchers" -msgstr "" +msgstr "Validert kupong." #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_vendor_receipt @@ -538,13 +539,13 @@ msgstr "Betalt beløp." #. module: account_voucher #: field:account.voucher,payment_option:0 msgid "Payment Difference" -msgstr "" +msgstr "Betaling forskjell." #. module: account_voucher #: view:account.voucher:0 #: field:account.voucher,audit:0 msgid "To Review" -msgstr "" +msgstr "Til gjennomgang." #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:1008 @@ -598,7 +599,7 @@ msgstr "Desember." #. module: account_voucher #: view:sale.receipt.report:0 msgid "Group by month of Invoice Date" -msgstr "" +msgstr "Grupper etter måned fra fakturadato." #. module: account_voucher #: view:sale.receipt.report:0 @@ -616,7 +617,7 @@ msgstr "Valuta." #. module: account_voucher #: view:account.statement.from.invoice.lines:0 msgid "Payable and Receivables" -msgstr "" +msgstr "Betalbar og Fordringer." #. module: account_voucher #: view:account.voucher:0 @@ -1019,7 +1020,7 @@ msgstr "Lagt ut kuponger." #. module: account_voucher #: field:account.voucher,payment_rate:0 msgid "Exchange Rate" -msgstr "" +msgstr "Vekslings vurdering." #. module: account_voucher #: view:account.voucher:0 @@ -1064,7 +1065,7 @@ msgstr "Interne notater." #: view:account.voucher:0 #: field:account.voucher,line_cr_ids:0 msgid "Credits" -msgstr "" +msgstr "Kreditter." #. module: account_voucher #: field:account.voucher.line,amount_original:0 @@ -1142,7 +1143,7 @@ msgstr "April." #. module: account_voucher #: help:account.voucher,tax_id:0 msgid "Only for tax excluded from price" -msgstr "" +msgstr "Bare for skatt ekskludert fra pris" #. module: account_voucher #: field:account.voucher,type:0 @@ -1157,7 +1158,7 @@ msgstr "Meldinger og kommunikasjon historie." #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines msgid "Entries by Statement from Invoices" -msgstr "" +msgstr "Påmeldingene med erklæringen fra fakturaer." #. module: account_voucher #: view:account.voucher:0 @@ -1233,7 +1234,7 @@ msgstr "Partner." #. module: account_voucher #: field:account.voucher.line,amount_unreconciled:0 msgid "Open Balance" -msgstr "" +msgstr "Åpen balanse." #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:997 diff --git a/addons/account_voucher/invoice.py b/addons/account_voucher/invoice.py index 91ba438756e..af8405c1ec9 100644 --- a/addons/account_voucher/invoice.py +++ b/addons/account_voucher/invoice.py @@ -40,7 +40,7 @@ class invoice(osv.osv): 'target': 'new', 'domain': '[]', 'context': { - 'default_partner_id': inv.partner_id.id, + 'default_partner_id': self._find_partner(inv).id, 'default_amount': inv.type in ('out_refund', 'in_refund') and -inv.residual or inv.residual, 'default_number':inv.name, 'close_after_process': True, diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 542acb1e88c..782fbc4f3ee 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -120,7 +120,7 @@ class account_analytic_account(osv.osv): def _get_one_full_name(self, elmt, level=6): if level<=0: return '...' - if elmt.parent_id: + if elmt.parent_id and not elmt.type == 'template': parent_path = self._get_one_full_name(elmt.parent_id, level-1) + "/" else: parent_path = '' 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_openid/i18n/de.po b/addons/auth_openid/i18n/de.po index a1cefc7e855..10330c21691 100644 --- a/addons/auth_openid/i18n/de.po +++ b/addons/auth_openid/i18n/de.po @@ -8,14 +8,13 @@ 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-02-15 22:54+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2012-12-04 07:24+0000\n" +"Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: German \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-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: auth_openid @@ -97,7 +96,7 @@ msgstr "Google Apps" #. module: auth_openid #: model:ir.model,name:auth_openid.model_res_users msgid "Users" -msgstr "" +msgstr "Benutzer" #~ msgid "res.users" #~ msgstr "res.users" diff --git a/addons/auth_openid/i18n/fr.po b/addons/auth_openid/i18n/fr.po index 7ebad3542d1..700cecf965b 100644 --- a/addons/auth_openid/i18n/fr.po +++ b/addons/auth_openid/i18n/fr.po @@ -8,13 +8,13 @@ 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-02-22 10:02+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-12-04 10:02+0000\n" +"Last-Translator: WANTELLET Sylvain \n" "Language-Team: French \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-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: auth_openid @@ -94,7 +94,7 @@ msgstr "Google Apps" #. module: auth_openid #: model:ir.model,name:auth_openid.model_res_users msgid "Users" -msgstr "" +msgstr "Utilisateurs" #~ msgid "OpenID URL:" #~ msgstr "Adresse URL OpenID :" diff --git a/addons/auth_reset_password/__init__.py b/addons/auth_reset_password/__init__.py deleted file mode 100644 index 8341ccd60c7..00000000000 --- a/addons/auth_reset_password/__init__.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA () -# -# 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 controllers -import res_users diff --git a/addons/auth_reset_password/__openerp__.py b/addons/auth_reset_password/__openerp__.py deleted file mode 100644 index 2c5b61bf378..00000000000 --- a/addons/auth_reset_password/__openerp__.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA () -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see -# -############################################################################## - -{ - 'name': 'Reset Password', - 'description': """ -Reset Password -============== - -Allow users to reset their password from the login page. -Allow administrator to click a button to send a "Reset Password" request to a user. -""", - 'author': 'OpenERP SA', - 'version': '1.0', - 'category': 'Authentication', - 'website': 'http://www.openerp.com', - 'installable': True, - 'depends': ['auth_signup', 'email_template'], - 'data': [ - 'auth_reset_password.xml', - 'res_users_view.xml', - ], - 'js': ['static/src/js/reset_password.js'], - 'qweb': ['static/src/xml/reset_password.xml'], -} diff --git a/addons/auth_reset_password/auth_reset_password.xml b/addons/auth_reset_password/auth_reset_password.xml deleted file mode 100644 index 90f08a25899..00000000000 --- a/addons/auth_reset_password/auth_reset_password.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - Reset Password - - ]]> - ${object.email} - Password reset - A password reset was requested for the OpenERP account linked to this email.

- -

You may change your password following this link.

- -

Note: If you did not ask for a password reset, you can safely ignore this email.

]]>
-
- -
-
diff --git a/addons/auth_reset_password/controllers/__init__.py b/addons/auth_reset_password/controllers/__init__.py deleted file mode 100644 index f40f0ee976e..00000000000 --- a/addons/auth_reset_password/controllers/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA () -# -# 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 main - -# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_reset_password/controllers/main.py b/addons/auth_reset_password/controllers/main.py deleted file mode 100644 index 639945cfc09..00000000000 --- a/addons/auth_reset_password/controllers/main.py +++ /dev/null @@ -1,52 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA () -# -# 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 logging - -import werkzeug - -import openerp -from openerp import SUPERUSER_ID -from openerp.modules.registry import RegistryManager - -_logger = logging.getLogger(__name__) - -class Controller(openerp.addons.web.http.Controller): - _cp_path = '/auth_reset_password' - - @openerp.addons.web.http.httprequest - def reset_password(self, req, dbname, login): - """ retrieve user, and perform reset password """ - url = '/' - registry = RegistryManager.get(dbname) - with registry.cursor() as cr: - try: - res_users = registry.get('res.users') - res_users.reset_password(cr, SUPERUSER_ID, login) - cr.commit() - message = 'An email has been sent with credentials to reset your password' - except Exception as e: - # signup error - _logger.exception('error when resetting password') - message = e.message - url = "/#action=login&error_message=%s" % werkzeug.urls.url_quote(message) - return werkzeug.utils.redirect(url) - -# vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_reset_password/i18n/ar.po b/addons/auth_reset_password/i18n/ar.po deleted file mode 100644 index 7d39cee63e4..00000000000 --- a/addons/auth_reset_password/i18n/ar.po +++ /dev/null @@ -1,70 +0,0 @@ -# Arabic 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:03+0000\n" -"PO-Revision-Date: 2012-12-01 10:40+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Arabic \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:55+0000\n" -"X-Generator: Launchpad (build 16335)\n" - -#. module: auth_reset_password -#: model:email.template,body_html:auth_reset_password.reset_password_email -msgid "" -"\n" -"

A password reset was requested for the OpenERP account linked to this " -"email.

\n" -"\n" -"

You may change your password following this link.

\n" -"\n" -"

Note: If you did not ask for a password reset, you can safely ignore this " -"email.

" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Send a special url by email to make the user (re)set their password." -msgstr "" - -#. module: auth_reset_password -#: code:addons/auth_reset_password/res_users.py:59 -#, python-format -msgid "Cannot send email: user has no email address." -msgstr "" - -#. module: auth_reset_password -#: model:ir.model,name:auth_reset_password.model_res_users -msgid "Users" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "{}" -msgstr "" - -#. module: auth_reset_password -#. openerp-web -#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7 -#, python-format -msgid "Reset password" -msgstr "" - -#. module: auth_reset_password -#: model:email.template,subject:auth_reset_password.reset_password_email -msgid "Password reset" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Reset Password" -msgstr "" diff --git a/addons/auth_reset_password/i18n/auth_reset_password.pot b/addons/auth_reset_password/i18n/auth_reset_password.pot deleted file mode 100644 index aa1c2b2eaf0..00000000000 --- a/addons/auth_reset_password/i18n/auth_reset_password.pot +++ /dev/null @@ -1,65 +0,0 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * auth_reset_password -# -msgid "" -msgstr "" -"Project-Id-Version: OpenERP Server 7.0alpha\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-12-03 16:03+0000\n" -"Last-Translator: <>\n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" - -#. module: auth_reset_password -#: model:email.template,body_html:auth_reset_password.reset_password_email -msgid "\n" -"

A password reset was requested for the OpenERP account linked to this email.

\n" -"\n" -"

You may change your password following this link.

\n" -"\n" -"

Note: If you did not ask for a password reset, you can safely ignore this email.

" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Send a special url by email to make the user (re)set their password." -msgstr "" - -#. module: auth_reset_password -#: code:addons/auth_reset_password/res_users.py:59 -#, python-format -msgid "Cannot send email: user has no email address." -msgstr "" - -#. module: auth_reset_password -#: model:ir.model,name:auth_reset_password.model_res_users -msgid "Users" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "{}" -msgstr "" - -#. module: auth_reset_password -#. openerp-web -#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7 -#, python-format -msgid "Reset password" -msgstr "" - -#. module: auth_reset_password -#: model:email.template,subject:auth_reset_password.reset_password_email -msgid "Password reset" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Reset Password" -msgstr "" - diff --git a/addons/auth_reset_password/i18n/it.po b/addons/auth_reset_password/i18n/it.po deleted file mode 100644 index 571e6af83cc..00000000000 --- a/addons/auth_reset_password/i18n/it.po +++ /dev/null @@ -1,70 +0,0 @@ -# Italian 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:03+0000\n" -"PO-Revision-Date: 2012-11-28 19:58+0000\n" -"Last-Translator: Davide Corio - agilebg.com \n" -"Language-Team: Italian \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:55+0000\n" -"X-Generator: Launchpad (build 16335)\n" - -#. module: auth_reset_password -#: model:email.template,body_html:auth_reset_password.reset_password_email -msgid "" -"\n" -"

A password reset was requested for the OpenERP account linked to this " -"email.

\n" -"\n" -"

You may change your password following this link.

\n" -"\n" -"

Note: If you did not ask for a password reset, you can safely ignore this " -"email.

" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Send a special url by email to make the user (re)set their password." -msgstr "" - -#. module: auth_reset_password -#: code:addons/auth_reset_password/res_users.py:59 -#, python-format -msgid "Cannot send email: user has no email address." -msgstr "" - -#. module: auth_reset_password -#: model:ir.model,name:auth_reset_password.model_res_users -msgid "Users" -msgstr "Utenti" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "{}" -msgstr "" - -#. module: auth_reset_password -#. openerp-web -#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7 -#, python-format -msgid "Reset password" -msgstr "Reimposta password" - -#. module: auth_reset_password -#: model:email.template,subject:auth_reset_password.reset_password_email -msgid "Password reset" -msgstr "Ripristino password" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Reset Password" -msgstr "Reimposta Password" diff --git a/addons/auth_reset_password/i18n/nl.po b/addons/auth_reset_password/i18n/nl.po deleted file mode 100644 index 3b88d2fcd64..00000000000 --- a/addons/auth_reset_password/i18n/nl.po +++ /dev/null @@ -1,70 +0,0 @@ -# Dutch translation for openobject-addons -# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-11-29 15:12+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" -"Language-Team: Dutch \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n" -"X-Generator: Launchpad (build 16335)\n" - -#. module: auth_reset_password -#: model:email.template,body_html:auth_reset_password.reset_password_email -msgid "" -"\n" -"

A password reset was requested for the OpenERP account linked to this " -"email.

\n" -"\n" -"

You may change your password following this link.

\n" -"\n" -"

Note: If you did not ask for a password reset, you can safely ignore this " -"email.

" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Send a special url by email to make the user (re)set their password." -msgstr "" - -#. module: auth_reset_password -#: code:addons/auth_reset_password/res_users.py:59 -#, python-format -msgid "Cannot send email: user has no email address." -msgstr "" - -#. module: auth_reset_password -#: model:ir.model,name:auth_reset_password.model_res_users -msgid "Users" -msgstr "Gebruikers" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "{}" -msgstr "" - -#. module: auth_reset_password -#. openerp-web -#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7 -#, python-format -msgid "Reset password" -msgstr "Reset wachtwoord" - -#. module: auth_reset_password -#: model:email.template,subject:auth_reset_password.reset_password_email -msgid "Password reset" -msgstr "Reset wachtwoord" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Reset Password" -msgstr "Stel wachtwoord opnieuw in" diff --git a/addons/auth_reset_password/i18n/ru.po b/addons/auth_reset_password/i18n/ru.po deleted file mode 100644 index e5134f2e89b..00000000000 --- a/addons/auth_reset_password/i18n/ru.po +++ /dev/null @@ -1,70 +0,0 @@ -# Russian 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:03+0000\n" -"PO-Revision-Date: 2012-11-30 19:40+0000\n" -"Last-Translator: FULL NAME \n" -"Language-Team: Russian \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:55+0000\n" -"X-Generator: Launchpad (build 16335)\n" - -#. module: auth_reset_password -#: model:email.template,body_html:auth_reset_password.reset_password_email -msgid "" -"\n" -"

A password reset was requested for the OpenERP account linked to this " -"email.

\n" -"\n" -"

You may change your password following this link.

\n" -"\n" -"

Note: If you did not ask for a password reset, you can safely ignore this " -"email.

" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Send a special url by email to make the user (re)set their password." -msgstr "" - -#. module: auth_reset_password -#: code:addons/auth_reset_password/res_users.py:59 -#, python-format -msgid "Cannot send email: user has no email address." -msgstr "" - -#. module: auth_reset_password -#: model:ir.model,name:auth_reset_password.model_res_users -msgid "Users" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "{}" -msgstr "" - -#. module: auth_reset_password -#. openerp-web -#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7 -#, python-format -msgid "Reset password" -msgstr "" - -#. module: auth_reset_password -#: model:email.template,subject:auth_reset_password.reset_password_email -msgid "Password reset" -msgstr "" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Reset Password" -msgstr "" diff --git a/addons/auth_reset_password/i18n/tr.po b/addons/auth_reset_password/i18n/tr.po deleted file mode 100644 index abd4d74b01f..00000000000 --- a/addons/auth_reset_password/i18n/tr.po +++ /dev/null @@ -1,79 +0,0 @@ -# Turkish 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:03+0000\n" -"PO-Revision-Date: 2012-11-27 22:15+0000\n" -"Last-Translator: Ahmet Altınışık \n" -"Language-Team: Turkish \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:55+0000\n" -"X-Generator: Launchpad (build 16335)\n" - -#. module: auth_reset_password -#: model:email.template,body_html:auth_reset_password.reset_password_email -msgid "" -"\n" -"

A password reset was requested for the OpenERP account linked to this " -"email.

\n" -"\n" -"

You may change your password following this link.

\n" -"\n" -"

Note: If you did not ask for a password reset, you can safely ignore this " -"email.

" -msgstr "" -"\n" -"

Bu epostayla ilişkili OpenERP hesabı için bir parola sıfırlama isteği " -"istendi.

\n" -"\n" -"

Şifrenizi şu adresten değiştirebilirsiniz. this link.

\n" -"\n" -"

Not: Eğer bu parola değiştirme isteğini siz yapmadıysanız bu mesajı " -"görmezden gelebilirsiniz.

" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Send a special url by email to make the user (re)set their password." -msgstr "" - -#. module: auth_reset_password -#: code:addons/auth_reset_password/res_users.py:59 -#, python-format -msgid "Cannot send email: user has no email address." -msgstr "" - -#. module: auth_reset_password -#: model:ir.model,name:auth_reset_password.model_res_users -msgid "Users" -msgstr "Kullanıcılar" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "{}" -msgstr "" - -#. module: auth_reset_password -#. openerp-web -#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7 -#, python-format -msgid "Reset password" -msgstr "Parolayı sıfırla" - -#. module: auth_reset_password -#: model:email.template,subject:auth_reset_password.reset_password_email -msgid "Password reset" -msgstr "Parola sıfırlandı" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Reset Password" -msgstr "Parolayı Sıfırla" diff --git a/addons/auth_reset_password/i18n/zh_CN.po b/addons/auth_reset_password/i18n/zh_CN.po deleted file mode 100644 index f021be3af60..00000000000 --- a/addons/auth_reset_password/i18n/zh_CN.po +++ /dev/null @@ -1,74 +0,0 @@ -# Chinese (Simplified) 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:03+0000\n" -"PO-Revision-Date: 2012-11-28 07:14+0000\n" -"Last-Translator: ccdos \n" -"Language-Team: Chinese (Simplified) \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:55+0000\n" -"X-Generator: Launchpad (build 16335)\n" - -#. module: auth_reset_password -#: model:email.template,body_html:auth_reset_password.reset_password_email -msgid "" -"\n" -"

A password reset was requested for the OpenERP account linked to this " -"email.

\n" -"\n" -"

You may change your password following this link.

\n" -"\n" -"

Note: If you did not ask for a password reset, you can safely ignore this " -"email.

" -msgstr "" -"\n" -"一个关联到这个Email地址的Openerp帐号请求复位密码。\n" -"你可以修改你的密码通过下面这个链接 。\n" -"提醒:如果你没请求复位密码,请忽略这封邮件。" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Send a special url by email to make the user (re)set their password." -msgstr "" - -#. module: auth_reset_password -#: code:addons/auth_reset_password/res_users.py:59 -#, python-format -msgid "Cannot send email: user has no email address." -msgstr "" - -#. module: auth_reset_password -#: model:ir.model,name:auth_reset_password.model_res_users -msgid "Users" -msgstr "用户" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "{}" -msgstr "" - -#. module: auth_reset_password -#. openerp-web -#: code:addons/auth_reset_password/static/src/xml/reset_password.xml:7 -#, python-format -msgid "Reset password" -msgstr "重设密码" - -#. module: auth_reset_password -#: model:email.template,subject:auth_reset_password.reset_password_email -msgid "Password reset" -msgstr "重置密码" - -#. module: auth_reset_password -#: view:res.users:0 -msgid "Reset Password" -msgstr "重置密码" diff --git a/addons/auth_reset_password/res_users.py b/addons/auth_reset_password/res_users.py deleted file mode 100644 index cfac20c76f9..00000000000 --- a/addons/auth_reset_password/res_users.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2012-today OpenERP SA () -# -# 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 openerp.osv import osv, fields -from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT -from openerp.tools.translate import _ - -from datetime import datetime, timedelta - -def now(**kwargs): - dt = datetime.now() + timedelta(**kwargs) - return dt.strftime(DEFAULT_SERVER_DATETIME_FORMAT) - - -class res_users(osv.osv): - _inherit = 'res.users' - - def reset_password(self, cr, uid, login, context=None): - """ retrieve the user corresponding to login (login or email), - and reset their password - """ - user_ids = self.search(cr, uid, [('login', '=', login)], context=context) - if not user_ids: - user_ids = self.search(cr, uid, [('email', '=', login)], context=context) - if len(user_ids) != 1: - raise Exception('Reset password: invalid username or email') - return self.action_reset_password(cr, uid, user_ids, context=context) - - def action_reset_password(self, cr, uid, ids, context=None): - """ create signup token for each user, and send their signup url by email """ - # prepare reset password signup - res_partner = self.pool.get('res.partner') - partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context)] - res_partner.signup_prepare(cr, uid, partner_ids, expiration=now(days=+1), context=context) - - # send email to users with their signup url - template = self.pool.get('ir.model.data').get_object(cr, uid, 'auth_reset_password', 'reset_password_email') - assert template._name == 'email.template' - for user in self.browse(cr, uid, ids, context): - if not user.email: - raise osv.except_osv(_("Cannot send email: user has no email address."), user.name) - self.pool.get('email.template').send_mail(cr, uid, template.id, user.id, context=context) - - return True diff --git a/addons/auth_reset_password/res_users_view.xml b/addons/auth_reset_password/res_users_view.xml deleted file mode 100644 index 628e95b6ff9..00000000000 --- a/addons/auth_reset_password/res_users_view.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - user.form.reset_password - res.users - - - - -
-
-
- - - {} - -
-
- -
-
diff --git a/addons/auth_reset_password/static/src/js/reset_password.js b/addons/auth_reset_password/static/src/js/reset_password.js deleted file mode 100644 index 13fe2a39ce5..00000000000 --- a/addons/auth_reset_password/static/src/js/reset_password.js +++ /dev/null @@ -1,30 +0,0 @@ -openerp.auth_reset_password = function(instance) { - var _t = instance.web._t; - - instance.web.Login.include({ - start: function() { - this.$('a.oe_reset_password').click(this.do_reset_password); - return this._super(); - }, - do_reset_password: function(ev) { - if (ev) { - ev.preventDefault(); - } - var db = this.$("form [name=db]").val(); - var login = this.$("form input[name=login]").val(); - if (!db) { - this.do_warn("Login", "No database selected !"); - return false; - } else if (!login) { - this.do_warn("Login", "Please enter a username or email address.") - return false; - } - var params = { - dbname : db, - login: login, - }; - var url = "/auth_reset_password/reset_password?" + $.param(params); - window.location = url; - } - }); -}; diff --git a/addons/auth_reset_password/static/src/xml/reset_password.xml b/addons/auth_reset_password/static/src/xml/reset_password.xml deleted file mode 100644 index 841f3906622..00000000000 --- a/addons/auth_reset_password/static/src/xml/reset_password.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - -
  • Reset password
  • -
    - - - diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py index 235ac047346..5fe705a4440 100644 --- a/addons/auth_signup/__openerp__.py +++ b/addons/auth_signup/__openerp__.py @@ -22,15 +22,18 @@ { 'name': 'Signup', 'description': """ -Allow users to sign up. -======================= +Allow users to sign up and reset their password +=============================================== """, 'author': 'OpenERP SA', 'version': '1.0', 'category': 'Authentication', 'website': 'http://www.openerp.com', 'installable': True, - 'depends': ['base_setup'], + 'depends': [ + 'base_setup', + 'email_template', + ], 'data': [ 'auth_signup_data.xml', 'res_config.xml', diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml index 39b62148494..32e397b1ba6 100644 --- a/addons/auth_signup/auth_signup_data.xml +++ b/addons/auth_signup/auth_signup_data.xml @@ -18,5 +18,20 @@ + + + Reset Password + + ]]> + ${object.email} + Password reset + A password reset was requested for the OpenERP account linked to this email.

    + +

    You may change your password by following this link.

    + +

    Note: If you do not expect this, you can safely ignore this email.

    ]]>
    +
    + diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index 888d2131f42..d2429e8dfd2 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -19,10 +19,12 @@ # ############################################################################## import logging +import urllib + +import werkzeug import openerp from openerp.modules.registry import RegistryManager - from ..res_users import SignupError _logger = logging.getLogger(__name__) @@ -30,6 +32,18 @@ _logger = logging.getLogger(__name__) class Controller(openerp.addons.web.http.Controller): _cp_path = '/auth_signup' + @openerp.addons.web.http.jsonrequest + def get_config(self, req, dbname): + """ retrieve the module config (which features are enabled) for the login page """ + registry = RegistryManager.get(dbname) + with registry.cursor() as cr: + icp = registry.get('ir.config_parameter') + config = { + 'signup': icp.get_param(cr, openerp.SUPERUSER_ID, 'auth_signup.allow_uninvited') == 'True', + 'reset_password': icp.get_param(cr, openerp.SUPERUSER_ID, 'auth_signup.reset_password') == 'True', + } + return config + @openerp.addons.web.http.jsonrequest def retrieve(self, req, dbname, token): """ retrieve the user info (name, login or email) corresponding to a signup token """ @@ -56,4 +70,21 @@ class Controller(openerp.addons.web.http.Controller): cr.commit() return {} + @openerp.addons.web.http.httprequest + def reset_password(self, req, dbname, login): + """ retrieve user, and perform reset password """ + registry = RegistryManager.get(dbname) + with registry.cursor() as cr: + try: + res_users = registry.get('res.users') + res_users.reset_password(cr, openerp.SUPERUSER_ID, login) + cr.commit() + message = 'An email has been sent with credentials to reset your password' + except Exception as e: + # signup error + _logger.exception('error when resetting password') + message = e.message + params = [('action', 'login'), ('error_message', message)] + return werkzeug.utils.redirect("/#" + urllib.urlencode(params)) + # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auth_signup/i18n/ar.po b/addons/auth_signup/i18n/ar.po index 6f3c45fecf1..90814343ae6 100644 --- a/addons/auth_signup/i18n/ar.po +++ b/addons/auth_signup/i18n/ar.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" "PO-Revision-Date: 2012-12-01 11:08+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Arabic \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-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: auth_signup @@ -29,16 +29,51 @@ msgstr "" msgid "Confirm Password" msgstr "" +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_base_config_settings msgid "base.config.settings" msgstr "" +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "" + #. module: auth_signup #: field:base.config.settings,auth_signup_template_user_id:0 msgid "Template user for new users created through signup" msgstr "" +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 @@ -56,6 +91,26 @@ msgstr "" msgid "Status" msgstr "" +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

    A password reset was requested for the OpenERP account linked to this " +"email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users msgid "Users" @@ -67,13 +122,15 @@ msgid "Signup URL" msgstr "" #. module: auth_signup -#: selection:res.users,state:0 -msgid "Active" +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." msgstr "" #. module: auth_signup -#: help:base.config.settings,auth_signup_uninvited:0 -msgid "If unchecked, only invited users may sign up" +#: selection:res.users,state:0 +msgid "Active" msgstr "" #. module: auth_signup @@ -90,6 +147,18 @@ msgstr "" msgid "Name" msgstr "" +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 @@ -102,6 +171,11 @@ msgstr "" msgid "Signup Expiration" msgstr "" +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 @@ -115,8 +189,48 @@ msgid "Signup Token is Valid" msgstr "" #. module: auth_signup -#: selection:res.users,state:0 -msgid "Resetting Password" +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" msgstr "" #. module: auth_signup diff --git a/addons/auth_signup/i18n/auth_signup.pot b/addons/auth_signup/i18n/auth_signup.pot index 478a4a25e16..bde3b33684e 100644 --- a/addons/auth_signup/i18n/auth_signup.pot +++ b/addons/auth_signup/i18n/auth_signup.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-12-03 16:03+0000\n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" +"PO-Revision-Date: 2012-12-04 14:41+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -27,16 +27,51 @@ msgstr "" msgid "Confirm Password" msgstr "" +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_base_config_settings msgid "base.config.settings" msgstr "" +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "" + #. module: auth_signup #: field:base.config.settings,auth_signup_template_user_id:0 msgid "Template user for new users created through signup" msgstr "" +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 @@ -54,6 +89,23 @@ msgstr "" msgid "Status" msgstr "" +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "\n" +"

    A password reset was requested for the OpenERP account linked to this email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users msgid "Users" @@ -65,13 +117,15 @@ msgid "Signup URL" msgstr "" #. module: auth_signup -#: selection:res.users,state:0 -msgid "Active" +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." msgstr "" #. module: auth_signup -#: help:base.config.settings,auth_signup_uninvited:0 -msgid "If unchecked, only invited users may sign up" +#: selection:res.users,state:0 +msgid "Active" msgstr "" #. module: auth_signup @@ -88,6 +142,18 @@ msgstr "" msgid "Name" msgstr "" +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 @@ -100,6 +166,11 @@ msgstr "" msgid "Signup Expiration" msgstr "" +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 @@ -113,8 +184,48 @@ msgid "Signup Token is Valid" msgstr "" #. module: auth_signup -#: selection:res.users,state:0 -msgid "Resetting Password" +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" msgstr "" #. module: auth_signup diff --git a/addons/auth_signup/i18n/it.po b/addons/auth_signup/i18n/it.po new file mode 100644 index 00000000000..854bdd34185 --- /dev/null +++ b/addons/auth_signup/i18n/it.po @@ -0,0 +1,258 @@ +# Italian 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: \n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" +"PO-Revision-Date: 2012-12-04 20:16+0000\n" +"Last-Translator: Davide Corio - agilebg.com \n" +"Language-Team: Italian \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" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_uninvited:0 +msgid "Allow external users to sign up" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16 +#, python-format +msgid "Confirm Password" +msgstr "" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_base_config_settings +msgid "base.config.settings" +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "Reimposta password" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_template_user_id:0 +msgid "Template user for new users created through signup" +msgstr "" + +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "Ripristino password" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 +#, python-format +msgid "Sign Up" +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "New" +msgstr "" + +#. module: auth_signup +#: field:res.users,state:0 +msgid "Status" +msgstr "" + +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

    A password reset was requested for the OpenERP account linked to this " +"email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_users +msgid "Users" +msgstr "Utenti" + +#. module: auth_signup +#: field:res.partner,signup_url:0 +msgid "Signup URL" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Active" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 +#, python-format +msgid "Username" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8 +#, python-format +msgid "Name" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 +#, python-format +msgid "Username (Email)" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_expiration:0 +msgid "Signup Expiration" +msgstr "" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 +#, python-format +msgid "Log in" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_valid:0 +msgid "Signup Token is Valid" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "Reimposta Password" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24 +#, python-format +msgid "Back to Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22 +#, python-format +msgid "Sign up" +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_partner +msgid "Partner" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_token:0 +msgid "Signup Token" +msgstr "" diff --git a/addons/auth_signup/i18n/nb.po b/addons/auth_signup/i18n/nb.po index 531bbb16418..be66d178c58 100644 --- a/addons/auth_signup/i18n/nb.po +++ b/addons/auth_signup/i18n/nb.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" "PO-Revision-Date: 2012-12-02 20:32+0000\n" "Last-Translator: Kaare Pettersen \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:55+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: auth_signup @@ -29,16 +29,51 @@ msgstr "Tillate eksterne brukere å registrere seg." msgid "Confirm Password" msgstr "Bekreft passord." +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_base_config_settings msgid "base.config.settings" msgstr "Base.Konfigurasjon.Innstillinger." +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "" + #. module: auth_signup #: field:base.config.settings,auth_signup_template_user_id:0 msgid "Template user for new users created through signup" msgstr "" +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 @@ -56,6 +91,26 @@ msgstr "Ny." msgid "Status" msgstr "Status." +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

    A password reset was requested for the OpenERP account linked to this " +"email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users msgid "Users" @@ -66,16 +121,18 @@ msgstr "Brukere" msgid "Signup URL" msgstr "Regitrer deg URL." +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "" + #. module: auth_signup #: selection:res.users,state:0 msgid "Active" msgstr "Aktiv." -#. module: auth_signup -#: help:base.config.settings,auth_signup_uninvited:0 -msgid "If unchecked, only invited users may sign up" -msgstr "" - #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 @@ -90,6 +147,18 @@ msgstr "Brukernavn." msgid "Name" msgstr "Navn." +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "Tilbakestill Passord." + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 @@ -102,6 +171,11 @@ msgstr "Brukernavn (E-post)" msgid "Signup Expiration" msgstr "Registrerings utløpsdato." +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 @@ -115,9 +189,49 @@ msgid "Signup Token is Valid" msgstr "" #. module: auth_signup -#: selection:res.users,state:0 -msgid "Resetting Password" -msgstr "Tilbakestill Passord." +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" +msgstr "" #. module: auth_signup #. openerp-web diff --git a/addons/auth_signup/i18n/nl.po b/addons/auth_signup/i18n/nl.po index b986f545710..96bbebd9134 100644 --- a/addons/auth_signup/i18n/nl.po +++ b/addons/auth_signup/i18n/nl.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-11-29 15:29+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" +"PO-Revision-Date: 2012-12-04 20:16+0000\n" +"Last-Translator: Olivier Dony (OpenERP) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:54+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: auth_signup @@ -29,16 +29,51 @@ msgstr "Toestaan dat externe gebruikers inloggen" msgid "Confirm Password" msgstr "Bevestig wachtwoord" +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_base_config_settings msgid "base.config.settings" msgstr "base.config.settings" +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "Reset wachtwoord" + #. module: auth_signup #: field:base.config.settings,auth_signup_template_user_id:0 msgid "Template user for new users created through signup" msgstr "" +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "Reset wachtwoord" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 @@ -56,6 +91,26 @@ msgstr "Nieuw" msgid "Status" msgstr "Status" +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

    A password reset was requested for the OpenERP account linked to this " +"email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users msgid "Users" @@ -66,16 +121,18 @@ msgstr "Gebruikers" msgid "Signup URL" msgstr "URL voor aanmelden" +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "" + #. module: auth_signup #: selection:res.users,state:0 msgid "Active" msgstr "Actief" -#. module: auth_signup -#: help:base.config.settings,auth_signup_uninvited:0 -msgid "If unchecked, only invited users may sign up" -msgstr "" - #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 @@ -90,6 +147,18 @@ msgstr "Gebruikersnaam" msgid "Name" msgstr "Naam" +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 @@ -102,6 +171,11 @@ msgstr "" msgid "Signup Expiration" msgstr "" +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 @@ -115,8 +189,48 @@ msgid "Signup Token is Valid" msgstr "" #. module: auth_signup -#: selection:res.users,state:0 -msgid "Resetting Password" +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "Stel wachtwoord opnieuw in" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" msgstr "" #. module: auth_signup diff --git a/addons/auth_signup/i18n/pt_BR.po b/addons/auth_signup/i18n/pt_BR.po new file mode 100644 index 00000000000..4fa96cf0535 --- /dev/null +++ b/addons/auth_signup/i18n/pt_BR.po @@ -0,0 +1,270 @@ +# Brazilian Portuguese translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" +"PO-Revision-Date: 2012-12-04 18:30+0000\n" +"Last-Translator: Cristiano Korndörfer \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" +"X-Generator: Launchpad (build 16335)\n" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_uninvited:0 +msgid "Allow external users to sign up" +msgstr "Permitir inscrição de usuários externos" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16 +#, python-format +msgid "Confirm Password" +msgstr "Confirmar Senha" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "Se não marcado, somente usuários convidados poderão inscrever-se" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_base_config_settings +msgid "base.config.settings" +msgstr "Configurações" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" +"Não foi possível enviar e-mail: o usuário não tem um endereço de e-mail" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "Redefinir Senha" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_template_user_id:0 +msgid "Template user for new users created through signup" +msgstr "Modelo de usuário para novos usuários criados através de inscrição" + +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "Redefinir Senha" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "Por favor digite uma senha e sua confirmação." + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "Enviar um e-mail para o usuário para (re)definir sua senha." + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 +#, python-format +msgid "Sign Up" +msgstr "Inscreva-se" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "New" +msgstr "Novo" + +#. module: auth_signup +#: field:res.users,state:0 +msgid "Status" +msgstr "Situação" + +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

    A password reset was requested for the OpenERP account linked to this " +"email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" +"\n" +"

    Uma redefinição de senha foi solicitada para a conta OpenERP associada a " +"este e-mail.

    \n" +"\n" +"

    Você pode mudar sua senha acessando este " +"endereço.

    \n" +"\n" +"

    Nota: Se esta ação não era esperada, você pode seguramente ignorar este e-" +"mail.

    " + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "Por favor informe um nome." + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_users +msgid "Users" +msgstr "Usuários" + +#. module: auth_signup +#: field:res.partner,signup_url:0 +msgid "Signup URL" +msgstr "URL de inscrição" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "Por favor informe um nome de usuário" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Active" +msgstr "Ativo" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 +#, python-format +msgid "Username" +msgstr "Nome do Usuário" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8 +#, python-format +msgid "Name" +msgstr "Nome" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "Por favor informe um nome de usuário ou endereço de e-mail." + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "Redefinindo a Senha" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 +#, python-format +msgid "Username (Email)" +msgstr "Nome de Usuário (E-mail)" + +#. module: auth_signup +#: field:res.partner,signup_expiration:0 +msgid "Signup Expiration" +msgstr "Expiração de Inscrição" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" +"Permite aos usuários disparar a redefinição de senha a partir da página de " +"autenticação." + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 +#, python-format +msgid "Log in" +msgstr "Acessar" + +#. module: auth_signup +#: field:res.partner,signup_valid:0 +msgid "Signup Token is Valid" +msgstr "Token de Inscrição é Válido" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "Autenticação" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "Token de inscrição inválido" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "As senhas não combinam; por favor redigite-as." + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "Nenhuma base de dados selecionada !" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "Redefinir Senha" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" +msgstr "Habilitar redefinição de senha a partir da página de autenticação" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24 +#, python-format +msgid "Back to Login" +msgstr "Voltar para a Página de Autenticação" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22 +#, python-format +msgid "Sign up" +msgstr "Inscreva-se" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_partner +msgid "Partner" +msgstr "Parceiro" + +#. module: auth_signup +#: field:res.partner,signup_token:0 +msgid "Signup Token" +msgstr "Token de Inscrição" diff --git a/addons/auth_signup/i18n/tr.po b/addons/auth_signup/i18n/tr.po new file mode 100644 index 00000000000..b5b0822191e --- /dev/null +++ b/addons/auth_signup/i18n/tr.po @@ -0,0 +1,258 @@ +# Turkish 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: \n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" +"PO-Revision-Date: 2012-12-04 20:16+0000\n" +"Last-Translator: Olivier Dony (OpenERP) \n" +"Language-Team: Turkish \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" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_uninvited:0 +msgid "Allow external users to sign up" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:16 +#, python-format +msgid "Confirm Password" +msgstr "" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_base_config_settings +msgid "base.config.settings" +msgstr "" + +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "Parolayı sıfırla" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_template_user_id:0 +msgid "Template user for new users created through signup" +msgstr "" + +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "Parola sıfırlandı" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 +#, python-format +msgid "Sign Up" +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "New" +msgstr "" + +#. module: auth_signup +#: field:res.users,state:0 +msgid "Status" +msgstr "" + +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

    A password reset was requested for the OpenERP account linked to this " +"email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_users +msgid "Users" +msgstr "Kullanıcılar" + +#. module: auth_signup +#: field:res.partner,signup_url:0 +msgid "Signup URL" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Active" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 +#, python-format +msgid "Username" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:8 +#, python-format +msgid "Name" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 +#, python-format +msgid "Username (Email)" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_expiration:0 +msgid "Signup Expiration" +msgstr "" + +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 +#, python-format +msgid "Log in" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_valid:0 +msgid "Signup Token is Valid" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "Parolayı Sıfırla" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:24 +#, python-format +msgid "Back to Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:22 +#, python-format +msgid "Sign up" +msgstr "" + +#. module: auth_signup +#: model:ir.model,name:auth_signup.model_res_partner +msgid "Partner" +msgstr "" + +#. module: auth_signup +#: field:res.partner,signup_token:0 +msgid "Signup Token" +msgstr "" diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po index 562ea9e53cf..813db8acad6 100644 --- a/addons/auth_signup/i18n/zh_CN.po +++ b/addons/auth_signup/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-11-28 16:52+0000\n" +"POT-Creation-Date: 2012-12-04 14:41+0000\n" +"PO-Revision-Date: 2012-12-04 20:16+0000\n" "Last-Translator: ccdos \n" "Language-Team: Chinese (Simplified) \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:55+0000\n" +"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" "X-Generator: Launchpad (build 16335)\n" #. module: auth_signup @@ -29,16 +29,51 @@ msgstr "允许外部用户登录" msgid "Confirm Password" msgstr "确认密码" +#. module: auth_signup +#: help:base.config.settings,auth_signup_uninvited:0 +msgid "If unchecked, only invited users may sign up." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_base_config_settings msgid "base.config.settings" msgstr "base.config.settings" +#. module: auth_signup +#: code:addons/auth_signup/res_users.py:248 +#, python-format +msgid "Cannot send email: user has no email address." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/xml/auth_signup.xml:25 +#, python-format +msgid "Reset password" +msgstr "重设密码" + #. module: auth_signup #: field:base.config.settings,auth_signup_template_user_id:0 msgid "Template user for new users created through signup" msgstr "用作通过注册创建的新用户的模版" +#. module: auth_signup +#: model:email.template,subject:auth_signup.reset_password_email +msgid "Password reset" +msgstr "重置密码" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#, python-format +msgid "Please enter a password and confirm it." +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Send an email to the user to (re)set their password." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:23 @@ -56,6 +91,26 @@ msgstr "新建" msgid "Status" msgstr "状态" +#. module: auth_signup +#: model:email.template,body_html:auth_signup.reset_password_email +msgid "" +"\n" +"

    A password reset was requested for the OpenERP account linked to this " +"email.

    \n" +"\n" +"

    You may change your password by following this link.

    \n" +"\n" +"

    Note: If you do not expect this, you can safely ignore this email.

    " +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#, python-format +msgid "Please enter a name." +msgstr "" + #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users msgid "Users" @@ -66,16 +121,18 @@ msgstr "用户" msgid "Signup URL" msgstr "注册 URL" +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#, python-format +msgid "Please enter a username." +msgstr "" + #. module: auth_signup #: selection:res.users,state:0 msgid "Active" msgstr "启用" -#. module: auth_signup -#: help:base.config.settings,auth_signup_uninvited:0 -msgid "If unchecked, only invited users may sign up" -msgstr "如果不选中,只有被邀请用户方可注册。" - #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12 @@ -90,6 +147,18 @@ msgstr "用户名" msgid "Name" msgstr "姓名" +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Please enter a username or email address." +msgstr "" + +#. module: auth_signup +#: selection:res.users,state:0 +msgid "Resetting Password" +msgstr "复位密码" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13 @@ -102,6 +171,11 @@ msgstr "用户名(Email)" msgid "Signup Expiration" msgstr "注册过期" +#. module: auth_signup +#: help:base.config.settings,auth_signup_reset_password:0 +msgid "This allows users to trigger a password reset from the Login page." +msgstr "" + #. module: auth_signup #. openerp-web #: code:addons/auth_signup/static/src/xml/auth_signup.xml:21 @@ -115,9 +189,49 @@ msgid "Signup Token is Valid" msgstr "注册令牌( Token )是有效的" #. module: auth_signup -#: selection:res.users,state:0 -msgid "Resetting Password" -msgstr "复位密码" +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:114 +#: code:addons/auth_signup/static/src/js/auth_signup.js:117 +#: code:addons/auth_signup/static/src/js/auth_signup.js:120 +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#: code:addons/auth_signup/static/src/js/auth_signup.js:160 +#, python-format +msgid "Login" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:94 +#, python-format +msgid "Invalid signup token" +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:123 +#, python-format +msgid "Passwords do not match; please retype them." +msgstr "" + +#. module: auth_signup +#. openerp-web +#: code:addons/auth_signup/static/src/js/auth_signup.js:111 +#: code:addons/auth_signup/static/src/js/auth_signup.js:157 +#, python-format +msgid "No database selected !" +msgstr "" + +#. module: auth_signup +#: view:res.users:0 +msgid "Reset Password" +msgstr "重置密码" + +#. module: auth_signup +#: field:base.config.settings,auth_signup_reset_password:0 +msgid "Enable password reset from Login page" +msgstr "" #. module: auth_signup #. openerp-web diff --git a/addons/auth_signup/res_config.py b/addons/auth_signup/res_config.py index 21fce19745c..9cdb41568ff 100644 --- a/addons/auth_signup/res_config.py +++ b/addons/auth_signup/res_config.py @@ -26,14 +26,19 @@ class base_config_settings(osv.TransientModel): _inherit = 'base.config.settings' _columns = { - 'auth_signup_uninvited': fields.boolean('Allow external users to sign up', help="If unchecked, only invited users may sign up"), - 'auth_signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup'), + 'auth_signup_reset_password': fields.boolean('Enable password reset from Login page', + help="This allows users to trigger a password reset from the Login page."), + 'auth_signup_uninvited': fields.boolean('Allow external users to sign up', + help="If unchecked, only invited users may sign up."), + 'auth_signup_template_user_id': fields.many2one('res.users', + string='Template user for new users created through signup'), } def get_default_auth_signup_template_user_id(self, cr, uid, fields, context=None): icp = self.pool.get('ir.config_parameter') # we use safe_eval on the result, since the value of the parameter is a nonempty string return { + 'auth_signup_reset_password': safe_eval(icp.get_param(cr, uid, 'auth_signup.reset_password', 'False')), 'auth_signup_uninvited': safe_eval(icp.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')), 'auth_signup_template_user_id': safe_eval(icp.get_param(cr, uid, 'auth_signup.template_user_id', 'False')), } @@ -42,5 +47,6 @@ class base_config_settings(osv.TransientModel): config = self.browse(cr, uid, ids[0], context=context) icp = self.pool.get('ir.config_parameter') # we store the repr of the values, since the value of the parameter is a required string + icp.set_param(cr, uid, 'auth_signup.reset_password', repr(config.auth_signup_reset_password)) icp.set_param(cr, uid, 'auth_signup.allow_uninvited', repr(config.auth_signup_uninvited)) icp.set_param(cr, uid, 'auth_signup.template_user_id', repr(config.auth_signup_template_user_id.id)) diff --git a/addons/auth_signup/res_config.xml b/addons/auth_signup/res_config.xml index 9d3eb4eaa5a..86c56a065a7 100644 --- a/addons/auth_signup/res_config.xml +++ b/addons/auth_signup/res_config.xml @@ -8,6 +8,10 @@ +
    + +