diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 019af2cdef5..7fffc4f07d4 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -141,7 +141,7 @@ for a particular financial year and for preparation of vouchers there is a modul 'project/analytic_account_demo.xml', 'demo/account_minimal.xml', 'demo/account_invoice_demo.xml', -# 'account_unit_test.xml', + 'account_unit_test.xml', ], 'test': [ 'test/account_customer_invoice.yml', diff --git a/addons/account/account.py b/addons/account/account.py index 98e51d0cf4f..9ae6edcba38 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -75,8 +75,8 @@ class account_payment_term(osv.osv): amount = value result = [] obj_precision = self.pool.get('decimal.precision') + prec = obj_precision.precision_get(cr, uid, 'Account') for line in pt.line_ids: - prec = obj_precision.precision_get(cr, uid, 'Account') if line.value == 'fixed': amt = round(line.value_amount, prec) elif line.value == 'procent': @@ -92,19 +92,20 @@ class account_payment_term(osv.osv): next_date += relativedelta(day=line.days2, months=1) result.append( (next_date.strftime('%Y-%m-%d'), amt) ) amount -= amt - return result -account_payment_term() + amount = reduce(lambda x,y: x+y[1], result, 0.0) + dist = round(value-amount, prec) + if dist: + result.append( (time.strftime('%Y-%m-%d'), dist) ) + return result class account_payment_term_line(osv.osv): _name = "account.payment.term.line" _description = "Payment Term Line" _columns = { - 'name': fields.char('Line Name', size=32, required=True), - 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"), 'value': fields.selection([('procent', 'Percent'), ('balance', 'Balance'), - ('fixed', 'Fixed Amount')], 'Valuation', + ('fixed', 'Fixed Amount')], 'Computation', required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""), 'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."), @@ -115,10 +116,10 @@ class account_payment_term_line(osv.osv): } _defaults = { 'value': 'balance', - 'sequence': 5, + 'days': 30, 'days2': 0, } - _order = "sequence" + _order = "value desc,days" def _check_percent(self, cr, uid, ids, context=None): obj = self.browse(cr, uid, ids[0], context=context) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index ec8dd677527..cdd340ef551 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -80,8 +80,11 @@ class account_invoice(osv.osv): def _reconciled(self, cr, uid, ids, name, args, context=None): res = {} - for id in ids: - res[id] = self.test_paid(cr, uid, [id]) + wf_service = netsvc.LocalService("workflow") + for inv in self.browse(cr, uid, ids, context=context): + res[inv.id] = self.test_paid(cr, uid, [inv.id]) + if not res[inv.id] and inv.state == 'paid': + wf_service.trg_validate(uid, 'account.invoice', inv.id, 'open_test', cr) return res def _get_reference_type(self, cr, uid, context=None): @@ -1159,7 +1162,7 @@ class account_invoice(osv.osv): return map(lambda x: (0,0,x), lines) def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None): - invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id']) + invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id', 'user_id', 'fiscal_position']) obj_invoice_line = self.pool.get('account.invoice.line') obj_invoice_tax = self.pool.get('account.invoice.tax') obj_journal = self.pool.get('account.journal') @@ -1208,7 +1211,8 @@ class account_invoice(osv.osv): }) # take the id part of the tuple returned for many2one fields for field in ('partner_id', 'company_id', - 'account_id', 'currency_id', 'payment_term', 'journal_id'): + 'account_id', 'currency_id', 'payment_term', 'journal_id', + 'user_id', 'fiscal_position'): invoice[field] = invoice[field] and invoice[field][0] # create the new invoice new_ids.append(self.create(cr, uid, invoice)) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 2c6e651b14b..25c898f6c0d 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -443,9 +443,9 @@ class account_move_line(osv.osv): 'statement_id': fields.many2one('account.bank.statement', 'Statement', help="The bank statement used for bank reconciliation", select=1), 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2), 'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2), - 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile'), + 'reconcile': fields.function(_get_reconcile, type='char', string='Reconcile Ref'), 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')), - 'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."), + 'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount in Currency', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."), 'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."), 'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."), 'journal_id': fields.related('move_id', 'journal_id', string='Journal', type='many2one', relation='account.journal', required=True, select=True, @@ -456,7 +456,7 @@ class account_move_line(osv.osv): store = { 'account.move': (_get_move_lines, ['period_id'], 20) }), - 'blocked': fields.boolean('Litigation', help="You can check this box to mark this journal item as a litigation with the associated partner"), + 'blocked': fields.boolean('No Follow-up', help="You can check this box to mark this journal item as a litigation with the associated partner"), 'partner_id': fields.many2one('res.partner', 'Partner', select=1, ondelete='restrict'), 'date_maturity': fields.date('Due date', select=True ,help="This field is used for payable and receivable journal entries. You can put the limit date for the payment of this line."), 'date': fields.related('move_id','date', string='Effective date', type='date', required=True, select=True, @@ -856,7 +856,12 @@ class account_move_line(osv.osv): if r[0][1] != None: raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.')) - if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \ + if context.get('fy_closing'): + # We don't want to generate any write-off when being called from the + # wizard used to close a fiscal year (and it doesn't give us any + # writeoff_acc_id). + pass + elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \ (account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))): if not writeoff_acc_id: raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.')) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6d3519cc461..401f569c74e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1549,10 +1549,8 @@ account.payment.term.line - - - + @@ -1563,37 +1561,20 @@ account.payment.term.line
- - - - - - + + - - -
@@ -1616,7 +1597,7 @@ - + diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml index 97bea14c1f2..f8a0fcdfcaa 100644 --- a/addons/account/data/account_data.xml +++ b/addons/account/data/account_data.xml @@ -10,17 +10,33 @@ - - 30 Days End of Month - 30 Days End of Month + + Immediate Payment + Immediate Payment - - 30 Days End of Month + + + Immediate Payment balance - - - + + + + + + + 15 Days + 15 Days + + + + 15 Days + balance + + + + + Payment Term 6 @@ -30,6 +46,7 @@ 30 Net Days 30 Net Days + 30 Net Days balance @@ -37,28 +54,7 @@ - - - 30% Advance End 30 Days - 30% Advance End 30 Days - - - 30% Advance - procent - - - - - - - - Remaining Balance - balance - - - - - + diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml index 8b0f026c9f0..6918ad44702 100644 --- a/addons/account/demo/account_demo.xml +++ b/addons/account/demo/account_demo.xml @@ -127,6 +127,41 @@ + + + + + 30 Days End of Month + 30 Days End of Month + + + 30 Days End of Month + balance + + + + + + + 30% Advance End 30 Days + 30% Advance End 30 Days + + + 30% Advance + procent + + + + + + + + Remaining Balance + balance + + + + diff --git a/addons/account/edi/invoice_action_data.xml b/addons/account/edi/invoice_action_data.xml index 0501c86635b..c4b0c8103f1 100644 --- a/addons/account/edi/invoice_action_data.xml +++ b/addons/account/edi/invoice_action_data.xml @@ -29,8 +29,9 @@ Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} + ${object.partner_id.lang} +

Hello${object.partner_id.name and ' ' or ''}${object.partner_id.name or ''},

@@ -73,7 +74,7 @@

-

+

${object.company_id.name}

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 4e3759713c4..dc3291fc9da 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-12-05 22:09+0000\n" +"PO-Revision-Date: 2012-12-06 10:40+0000\n" "Last-Translator: Thorsten Vocks (OpenBig.org) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-06 04:40+0000\n" +"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account @@ -9891,7 +9891,7 @@ msgstr "Gültig ab" #. module: account #: field:account.cashbox.line,pieces:0 msgid "Unit of Currency" -msgstr "" +msgstr "Währungseinheit" #. module: account #: code:addons/account/account.py:3137 @@ -10019,6 +10019,16 @@ msgid "" "related journal entries may or may not be reconciled. \n" "* The 'Cancelled' status is used when user cancel invoice." msgstr "" +" * Der \"Entwurf\"-Status wird verwendet, wenn ein Benutzer eine Rechnung " +"erstellt, aber noch nicht gebucht hat.\n" +"* Der \"Pro-forma\" Status wird nach dessen Auswahl angezeigt, es wird aber " +"noch keine Rechnungsnummer vergeben. \n" +"* Die Rechnung ist im \"Offen\" Status, wenn Sie gebucht wurde, dadurch eine " +"Rechnungsnummer bekommen hat, aber noch nicht vom Kunden bezahlt wurde. \n" +"* Der\"Bezahlt\"-Status wird automatisch vergeben, wenn die offene Rechnung " +"vom Kunden bezahlt wurde.\n" +"* Eine Anzeige im \"Abgebrochen\"-Status erfolgt immer dann, wenn die " +"Rechnung storniert wurde." #. module: account #: field:account.period,date_stop:0 @@ -10038,7 +10048,7 @@ msgstr "Finanz Reports" #. module: account #: model:account.account.type,name:account.account_type_liability_view1 msgid "Liability View" -msgstr "" +msgstr "Passiva Ansicht" #. module: account #: report:account.account.balance:0 @@ -10086,7 +10096,7 @@ msgstr "Firmenreferenzen Partner" #. module: account #: view:account.invoice:0 msgid "Ask Refund" -msgstr "" +msgstr "Gutschrift anfragen" #. module: account #: view:account.move.line:0 @@ -10127,12 +10137,12 @@ msgstr "Forderungskonten" #. module: account #: field:account.config.settings,purchase_refund_sequence_prefix:0 msgid "Supplier credit note sequence" -msgstr "" +msgstr "Nummernfolge Lieferantengutschrift" #. module: account #: field:account.config.settings,purchase_sequence_next:0 msgid "Next supplier invoice number" -msgstr "" +msgstr "Nächste Eingangsrechnung" #. module: account #: help:account.config.settings,module_account_payment:0 @@ -10144,6 +10154,12 @@ msgid "" "payments.\n" " This installs the module account_payment." msgstr "" +"Sie können Zahlungsaufträge erstellen und verwalten , um\n" +"                     * diese als Grundlage für externe Erweiterungen zur " +"Automatisierung von Zahlungen zu nutzen. \n" +"                     * dadurch den Rechnungsausgleich von Lieferanten und " +"andere Kreditoren durchzuführen.\n" +"                 Es erfolgt eine Installation des Moduls account_payment." #. module: account #: xsl:account.transfer:0 @@ -10162,6 +10178,7 @@ msgstr "Bankauszüge" #, python-format msgid "To reconcile the entries company should be the same for all entries." msgstr "" +"Das Unternehmen sollte für alle auszugleichenden Buchungen identisch sein." #. module: account #: field:account.account,balance:0 @@ -10241,7 +10258,7 @@ msgstr "Filter nach" #: field:account.cashbox.line,number_closing:0 #: field:account.cashbox.line,number_opening:0 msgid "Number of Units" -msgstr "" +msgstr "Stückzahl" #. module: account #: model:process.node,note:account.process_node_manually0 @@ -10266,12 +10283,12 @@ msgstr "Buchung" #: code:addons/account/wizard/account_period_close.py:51 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "Diese Aktion ist fehlerhaft!" #. module: account #: view:account.bank.statement:0 msgid "Date / Period" -msgstr "" +msgstr "Datum / Periode" #. module: account #: report:account.central.journal:0 @@ -10464,7 +10481,7 @@ msgstr "Fälligkeitsdatum" #: code:addons/account/account.py:1459 #, python-format msgid " Centralisation" -msgstr "" +msgstr " Zusammenfassung" #. module: account #: help:account.journal,type:0 @@ -10548,7 +10565,7 @@ msgstr "Rechnungsentwürfe" #: view:cash.box.in:0 #: model:ir.actions.act_window,name:account.action_cash_box_in msgid "Put Money In" -msgstr "" +msgstr "Zahle Geld ein" #. module: account #: selection:account.account.type,close_method:0 @@ -10609,7 +10626,7 @@ msgstr "Abrechnen von Analyt. Buchungen" #. module: account #: view:account.installer:0 msgid "Configure your Fiscal Year" -msgstr "" +msgstr "Konfiguration Geschäftsjahr" #. module: account #: field:account.period,name:0 @@ -10623,6 +10640,8 @@ msgid "" "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' " "or 'Done' state." msgstr "" +"Die ausgewählten Rechnungen können im Status \"abgebrochen\" oder " +"\"bezahlt\" nicht mehr storniert werden." #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 @@ -10657,6 +10676,10 @@ msgid "" "some non legal fields or you must unconfirm the journal entry first.\n" "%s." msgstr "" +"Sie können keine Änderung bereits erfolgter Buchungen vornehmen. Lediglich " +"unkritische Informationen können ohne weiteres geändert werden, ansonsten " +"ist zunächst die zugrunde liegende Buchung zu stornieren.\n" +"%s." #. module: account #: help:account.config.settings,module_account_budget:0 @@ -10667,6 +10690,15 @@ msgid "" "analytic account.\n" " This installs the module account_budget." msgstr "" +"Definieren Sie Ihre Kostenstellen und budgetieren Sie die dort relevanten " +"Erfolgskonten.\n" +"                 Sobald Sie die Vorlagen für Ihre anstehenden " +"Budgetplanungen erstellt haben ,\n" +"                 können Ihre verantwortlichen Projektmanager die geplante " +"Beträge für Ihre Kostenstellen\n" +" differenziert nach Erfolgs- und Kostenkonten aufteilen.\n" +"                 Zu diesem Zweck installieren Sie hier das Modul " +"account_budget." #. module: account #: help:res.partner,property_account_payable:0 @@ -10721,12 +10753,12 @@ msgstr "Haben" #. module: account #: view:account.invoice:0 msgid "Draft Invoice " -msgstr "" +msgstr "Entwurf Rechnung " #. module: account #: selection:account.invoice.refund,filter_refund:0 msgid "Cancel: create credit note and reconcile" -msgstr "" +msgstr "Abbrechen: Erstelle Gutschrift und Ausgleich" #. module: account #: model:ir.ui.menu,name:account.menu_account_general_journal @@ -10827,7 +10859,7 @@ msgstr "Gewinn & Verlust Übertrag" #: code:addons/account/account_invoice.py:368 #, python-format msgid "There is no Sale/Purchase Journal(s) defined." -msgstr "" +msgstr "Es wurde noch kein Journal für Verkauf / Einkauf angelegt." #. module: account #: view:account.move.line.reconcile.select:0 @@ -10905,7 +10937,7 @@ msgstr "Kontotyp" #. module: account #: field:account.subscription.generate,date:0 msgid "Generate Entries Before" -msgstr "" +msgstr "Buchungspositionen vorab erstellen" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_running @@ -11005,6 +11037,8 @@ msgstr "Status" #: help:product.template,property_account_income:0 msgid "This account will be used to value outgoing stock using sale price." msgstr "" +"Dieses Konto wird für abgehende Bestände mit dem Verkaufspreis bewertet und " +"gebucht." #. module: account #: field:account.invoice,check_total:0 @@ -11027,12 +11061,12 @@ msgstr "Bruttobetrag" #: code:addons/account/wizard/account_invoice_refund.py:109 #, python-format msgid "Cannot %s draft/proforma/cancel invoice." -msgstr "" +msgstr "Entwurf / Proforma / Abgebrochen Rechnungen können nicht %s werden." #. module: account #: field:account.tax,account_analytic_paid_id:0 msgid "Refund Tax Analytic Account" -msgstr "" +msgstr "Kostenstelle für Steuer der Gutschrift" #. module: account #: view:account.move.bank.reconcile:0 @@ -11099,7 +11133,7 @@ msgstr "Fälligkeitsdatum" #: field:cash.box.in,name:0 #: field:cash.box.out,name:0 msgid "Reason" -msgstr "" +msgstr "Begründung" #. module: account #: selection:account.partner.ledger,filter:0 @@ -11157,7 +11191,7 @@ msgstr "Konten ohne Buchung? " #: code:addons/account/account_move_line.py:1046 #, python-format msgid "Unable to change tax!" -msgstr "" +msgstr "Eine Änderung der Steuer ist nicht möglich" #. module: account #: constraint:account.bank.statement:0 @@ -11189,6 +11223,9 @@ msgid "" "customer. The tool search can also be used to personalise your Invoices " "reports and so, match this analysis to your needs." msgstr "" +"Durch diesen Bericht erhalten Sie einen Überblick über die Abrechnungen " +"Ihrer Kunden. Das Suche + Filter Tool kann zur weiteren auf Ihre Bedürfnisse " +"angepassten Analyse angepasst werden." #. module: account #: view:account.partner.reconcile.process:0 @@ -11209,7 +11246,7 @@ msgstr "Status der Rechnung ist 'Erledigt'" #. module: account #: field:account.config.settings,module_account_followup:0 msgid "Manage customer payment follow-ups" -msgstr "" +msgstr "Verwalten Sie Zahlungserinnerungen" #. module: account #: model:ir.model,name:account.model_report_account_sales @@ -11285,7 +11322,7 @@ msgstr "Debitoren" #: code:addons/account/account_move_line.py:776 #, python-format msgid "Already reconciled." -msgstr "" +msgstr "Bereits ausgeglichen." #. module: account #: selection:account.model.line,date_maturity:0 @@ -11361,6 +11398,7 @@ msgstr "Gruppiere je Monat des Rechnungsdatums" #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)." msgstr "" +"Es wurde kein Ertragskonto für dieses Produkt definiert: \"%s\" (Kürzel: %d)." #. module: account #: model:ir.actions.act_window,name:account.action_aged_receivable_graph @@ -11423,6 +11461,8 @@ msgid "" "The selected unit of measure is not compatible with the unit of measure of " "the product." msgstr "" +"Die ausgewählte Mengeneinheit ist nicht mit derjenigen für das Produkt " +"kompatibel." #. module: account #: view:account.fiscal.position:0 @@ -11446,6 +11486,17 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"                 Klicken Sie um neue Steuern zu definieren.\n" +"               \n" +"                 Je nach Land, ist eine Steuer in der Regel ein Wert in " +"Ihrer \n" +"                 Umsatzsteuererklärung. OpenERP ermöglicht die Definition\n" +"                 von Steuerstrukturen, damit sämtliche Steuerberechnungen \n" +" und Buchungen dann in einer oder mehrerer Positionen für \n" +" die Voranmeldung bzw. Steuererklärung auftauchen.\n" +"               \n" +" " #. module: account #: selection:account.entries.report,month:0 @@ -11472,6 +11523,22 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"                 Wählen Sie Periode und Journal für Ihre Buchungen.\n" +"               \n" +"                 Diese Ansicht kann von Wirtschaftsprüfern und " +"Steuerberatern genutzt werden, \n" +" um schnellstmöglich Buchungen in OpenERP von außen " +"einzugeben. Wenn Sie eine \n" +" Lieferantenrechnung erfassen, beginnen Sie normalerweise " +"mit der Eingabe des \n" +" Aufwandskontos für eine Rechnung. OpenERP wird Ihnen aus " +"dem Kontext des\n" +" Produkts dann automatisch eine Steuer vorschlagen sowie das " +"Gegenkonto für die \n" +" \"Kreditoren\".\n" +"               \n" +" " #. module: account #: help:account.invoice.line,account_id:0 @@ -11481,7 +11548,7 @@ msgstr "Aufwand- und Erlöskonto des Produktes" #. module: account #: view:account.config.settings:0 msgid "Install more chart templates" -msgstr "" +msgstr "Installieren Sie weitere Kontenpläne" #. module: account #: report:account.general.journal:0 @@ -11529,6 +11596,8 @@ msgid "" "You cannot remove/deactivate an account which is set on a customer or " "supplier." msgstr "" +"Sie können keine Konten deaktivieren, die bereits einem Kunden oder " +"Lieferanten zugewiesen wurden." #. module: account #: model:ir.model,name:account.model_validate_account_move_lines @@ -11540,6 +11609,8 @@ msgstr "Verbuche Buchungszeilen" msgid "" "The fiscal position will determine taxes and accounts used for the partner." msgstr "" +"Die Steuerzuordnung steuert die zu benutzenden Steuern und Konten für den " +"Partner." #. module: account #: model:process.node,note:account.process_node_supplierpaidinvoice0 @@ -11573,6 +11644,7 @@ msgstr "Manuelle Berechnung Steuer" #, python-format msgid "The payment term of supplier does not have a payment term line." msgstr "" +"Die Zahlungsbedingung für die Lieferantenrechnung hat keine Zahlungsposition." #. module: account #: field:account.account,parent_right:0 @@ -11585,7 +11657,7 @@ msgstr "Oberkonto Rechts" #: code:addons/account/static/src/js/account_move_reconciliation.js:80 #, python-format msgid "Never" -msgstr "" +msgstr "Niemals" #. module: account #: model:ir.model,name:account.model_account_addtmpl_wizard @@ -11606,7 +11678,7 @@ msgstr "Partner" #. module: account #: field:account.account,note:0 msgid "Internal Notes" -msgstr "" +msgstr "Interne Hinweise" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear @@ -11639,7 +11711,7 @@ msgstr "Buchungsvorlage" #: code:addons/account/account_cash_statement.py:292 #, python-format msgid "Loss" -msgstr "" +msgstr "Verlust" #. module: account #: selection:account.entries.report,month:0 @@ -11665,7 +11737,7 @@ msgstr "" #: view:account.bank.statement:0 #: help:account.cashbox.line,number_closing:0 msgid "Closing Unit Numbers" -msgstr "" +msgstr "Abschluss Bankauszug" #. module: account #: field:account.bank.accounts.wizard,bank_account_id:0 @@ -11731,7 +11803,7 @@ msgstr "" #. module: account #: selection:account.config.settings,tax_calculation_rounding_method:0 msgid "Round per line" -msgstr "" +msgstr "Runden per Zeile" #. module: account #: help:account.move.line,amount_residual_currency:0 diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index 27801a0da69..ab240056600 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.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 20:35+0000\n" +"PO-Revision-Date: 2012-12-07 15:21+0000\n" "Last-Translator: Frederic Clementi - Camptocamp.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:21+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account #: code:addons/account/wizard/account_fiscalyear_close.py:41 @@ -184,7 +184,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:30 #, python-format msgid "Reconcile" -msgstr "Lettrer" +msgstr "Let." #. module: account #: field:account.bank.statement,name:0 @@ -988,12 +988,12 @@ msgstr "" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 msgid "J.C./Move name" -msgstr "J.C. / Nom du mouvement" +msgstr "J.C. / description de l'écriture" #. module: account #: view:account.account:0 msgid "Account Code and Name" -msgstr "" +msgstr "Code et Nom du Compte" #. module: account #: model:mail.message.subtype,name:account.mt_invoice_new @@ -2993,7 +2993,7 @@ msgstr "Relevés" #. module: account #: report:account.analytic.account.journal:0 msgid "Move Name" -msgstr "Nom de la transaction" +msgstr "Description de l'écriture" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff @@ -3008,7 +3008,7 @@ msgstr "Ligne d'écriture lettrée (écriture d'écart)" #: field:account.move.line,account_tax_id:0 #: view:account.tax:0 msgid "Tax" -msgstr "Impôts et taxes" +msgstr "Taxes" #. module: account #: view:account.analytic.account:0 @@ -4350,7 +4350,7 @@ msgstr "" #: field:account.move.reconcile,name:0 #: field:account.subscription,name:0 msgid "Name" -msgstr "Nom" +msgstr "Decription" #. module: account #: code:addons/account/installer.py:94 @@ -4918,7 +4918,7 @@ msgstr "Nom du compte" #. module: account #: help:account.fiscalyear.close,report_name:0 msgid "Give name of the new entries" -msgstr "Indique le nom à donner aux nouvelles écritures" +msgstr "Indique la description à donner aux nouvelles écritures" #. module: account #: model:ir.model,name:account.model_account_invoice_report @@ -4982,12 +4982,12 @@ msgstr "Le nom de la période doit être unique par société!" #. module: account #: help:wizard.multi.charts.accounts,currency_id:0 msgid "Currency as per company's country." -msgstr "" +msgstr "Devise selon le pays de la société" #. module: account #: view:account.tax:0 msgid "Tax Computation" -msgstr "" +msgstr "Calcul des taxes" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -6246,7 +6246,7 @@ msgstr "Comptes fils" #: code:addons/account/account_move_line.py:1107 #, python-format msgid "Move name (id): %s (%s)" -msgstr "Nom du mouvement (id): %s (%s)" +msgstr "Description de l'écriture (id): %s (%s)" #. module: account #: view:account.move.line.reconcile:0 @@ -6258,7 +6258,7 @@ msgstr "Ajustement" #. module: account #: field:res.partner,debit:0 msgid "Total Payable" -msgstr "Total à payer" +msgstr "Total dû" #. module: account #: model:account.account.type,name:account.data_account_type_income @@ -7850,7 +7850,7 @@ msgstr "" #. module: account #: field:account.fiscalyear.close,report_name:0 msgid "Name of new entries" -msgstr "Nom des nouvelles écritures" +msgstr "Description des nouvelles écritures" #. module: account #: view:account.use.model:0 @@ -7865,7 +7865,7 @@ msgstr "" #. module: account #: help:account.config.settings,currency_id:0 msgid "Main currency of the company." -msgstr "" +msgstr "Devise de a société" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reports @@ -8843,7 +8843,7 @@ msgstr "" #: field:account.move.line,reconcile_partial_id:0 #: view:account.move.line.reconcile:0 msgid "Partial Reconcile" -msgstr "Rapprochement partiel" +msgstr "Let.P" #. module: account #: model:ir.model,name:account.model_account_analytic_inverted_balance diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 1e822b5817e..af3d00e9615 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-12-06 00:09+0000\n" +"PO-Revision-Date: 2012-12-07 22:37+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-06 04:40+0000\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account @@ -305,6 +305,9 @@ msgid "" "sales, purchase, expense, contra, etc.\n" " This installs the module account_voucher." msgstr "" +"Include tutte le funzioni basilari per le registrazioni dei pagamenti per " +"banca, cassa, vendite, acquisti, costi, contra, ecc.\n" +" Installa il modulo account_voucher." #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry @@ -481,6 +484,14 @@ msgid "" "this box, you will be able to do invoicing & payments,\n" " but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +"Permette di gestire le immobilizzazioni possedute da un'azienda o da una " +"persona.\n" +" Tiene traccia del deprezzamento di queste immobilizzazioni, e " +"crea movimenti contabili per queste righe di ammortamento.\n" +" Installa il modulo account_asset. Se non viene selezionata " +"questa casella, sarà possibile effettuare fatture e pagamenti,\n" +" ma non contabilizzarli (Registrazioni nel Sezionale, Piano " +"dei Conti, ...)" #. module: account #. openerp-web @@ -509,6 +520,17 @@ msgid "" "should choose 'Round per line' because you certainly want the sum of your " "tax-included line subtotals to be equal to the total amount with taxes." msgstr "" +"Se è selezionato 'Arrotondamento per Riga' : per ogni imposta, l'ammontare " +"dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine " +"d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati " +"saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è " +"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale " +"dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di " +"vendita/fattura, poi questi ammontari saranno sommati e infine questo somma " +"totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta " +"compresa, sarebbe meglio selezionare 'Arrotondamento per riga' perchè " +"l'ammontare totale dei sub-totali delle righe compreso l'imposta sarà uguale " +"al totale imposte comprese." #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts @@ -1895,7 +1917,7 @@ msgstr "" "dell'imposta sarà prima calcolato e arrotondato per ogni riga di Ordine " "d'aquisto/Ordine di vendita/fattura e poi questi ammontari arrotondati " "saranno sommati, formando quindi l'ammontare totale per quella tassa. Se è " -"selezionato 'Arrotondamento Globale': per ogni imposta, il totale " +"selezionato 'Arrotondamento sul Totale': per ogni imposta, il totale " "dell'imposta sarà calcolato per ogni riga di Ordine d'aquisto/Ordine di " "vendita/fattura, poi questi ammontari saranno sommati e infine questo somma " "totale sarà arrotondata. Se le vendite vengono effettuate con l'imposta " @@ -2039,6 +2061,108 @@ msgid "" "

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

Buongiorno${object.partner_id.name and ' ' or " +"''}${object.partner_id.name or ''},

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

E' disponibile una nuova fattura:

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

\\n\n" +"   RIFERIMENTO
\\n\n" +"   Numero fattura: ${object.number}
\\" +"n\n" +"   Totale fattura: ${object.amount_total} " +"${object.currency_id.name}
\\n\n" +"   Data fattura: ${object.date_invoice}
\\n\n" +" % if object.origin:\\n\n" +"   Rif. ordine: ${object.origin}
\\n\n" +" % endif\\n\n" +" % if object.user_id:\\n\n" +"   Vs. contatto: ${object.user_id.name}\\n\n" +" % endif\\n\n" +"

\\n\n" +" \\n\n" +" % if object.company_id.paypal_account and object.type in ('out_invoice', " +"'in_refund'):\\n\n" +" <% \\n\n" +" comp_name = quote(object.company_id.name)\\n\n" +" inv_number = quote(object.number)\\n\n" +" paypal_account = quote(object.company_id.paypal_account)\\n\n" +" inv_amount = quote(str(object.residual))\\n\n" +" cur_name = quote(object.currency_id.name)\\n\n" +" paypal_url = \\\"https://www.paypal.com/cgi-" +"bin/webscr?cmd=_xclick&business=%s&item_name=%s%%20Invoice%%20%s&" +"\\\" \\\\\\n\n" +" \\" +"\"invoice=%s&amount=%s&currency_code=%s&button_subtype=services&a" +"mp;no_note=1&bn=OpenERP_Invoice_PayNow_%s\\\" % \\\\\\n\n" +" " +"(paypal_account,comp_name,inv_number,inv_number,inv_amount,cur_name,cur_name)" +"\\n\n" +" %>\\n\n" +"
\\n\n" +"

E' possibile anche pagare direttamente con Paypal:

\\n\n" +" \\n\n" +" \\n\n" +" \\n\n" +" % endif\\n\n" +" \\n\n" +"
\\n\n" +"

Per qualsiasi informazione, non esitate a contattarci.

\\n\n" +"

Grazie per aver scelto ${object.company_id.name or 'us'}!

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

\\n\n" +" ${object.company_id.name}

\\n\n" +"
\\n\n" +"
\\n\n" +" \\n\n" +" % if object.company_id.street:\\n\n" +" ${object.company_id.street}
\\n\n" +" % endif\\n\n" +" % if object.company_id.street2:\\n\n" +" ${object.company_id.street2}
\\n\n" +" % endif\\n\n" +" % if object.company_id.city or object.company_id.zip:\\n\n" +" ${object.company_id.zip} ${object.company_id.city}
\\n\n" +" % endif\\n\n" +" % if object.company_id.country_id:\\n\n" +" ${object.company_id.state_id and ('%s, ' % " +"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name " +"or ''}
\\n\n" +" % endif\\n\n" +" \\n\n" +" % if object.company_id.phone:\\n\n" +"
\\n\n" +" Tel.:  ${object.company_id.phone}\\n\n" +"
\\n\n" +" % endif\\n\n" +" % if object.company_id.website:\\n\n" +"
\\n\n" +" Web : ${object.company_id.website}\\n\n" +"
\\n\n" +" %endif\\n\n" +"

\\n\n" +"
\\n\n" +"
\\n\n" +" " #. module: account #: field:account.tax.code,sum:0 @@ -2407,7 +2531,7 @@ msgstr "Chiusura Anno Fiscale" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14 #, python-format msgid "Journal :" -msgstr "" +msgstr "Sezionale :" #. module: account #: sql_constraint:account.fiscal.position.tax:0 @@ -3032,7 +3156,7 @@ msgstr "Movimento contabile di riconciliazione (storno)" #: field:account.move.line,account_tax_id:0 #: view:account.tax:0 msgid "Tax" -msgstr "Tassa" +msgstr "Imposta" #. module: account #: view:account.analytic.account:0 @@ -3272,12 +3396,14 @@ msgid "" "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-" "Forma' state." msgstr "" +"La fattura(/e) selezionata non possono essere confermate perché non sono in " +"stato 'Bozza' o 'Proforma'." #. module: account #: code:addons/account/account.py:1056 #, python-format msgid "You should choose the periods that belong to the same company." -msgstr "" +msgstr "I periodi dovrebbero appartenere alla stessa azienda." #. module: account #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all @@ -3290,7 +3416,7 @@ msgstr "Vendite per conto" #: code:addons/account/account.py:1406 #, python-format msgid "You cannot delete a posted journal entry \"%s\"." -msgstr "" +msgstr "Non è possibile cancellare una registrazione contabilizzata \"%s\"." #. module: account #: view:account.invoice:0 @@ -3317,6 +3443,8 @@ msgid "" "This journal already contains items, therefore you cannot modify its company " "field." msgstr "" +"Questo sezionale contiene già registrazioni, perciò non è possibile " +"modificare i campi aziendali." #. module: account #: code:addons/account/account.py:408 @@ -3325,6 +3453,8 @@ msgid "" "You need an Opening journal with centralisation checked to set the initial " "balance." msgstr "" +"E' necessario un Sezionale di apertura configurato con la centralizzazione " +"per configurare il saldo iniziale." #. module: account #: model:ir.actions.act_window,name:account.action_tax_code_list @@ -3362,7 +3492,7 @@ msgstr "Agosto" #. module: account #: field:accounting.report,debit_credit:0 msgid "Display Debit/Credit Columns" -msgstr "" +msgstr "Visualizza colonne Debito/Credito" #. module: account #: selection:account.entries.report,month:0 @@ -4057,6 +4187,10 @@ msgid "" "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." msgstr "" +"Non è possibile modificare una registrazione contabilizzata in questo " +"sezionale.\n" +"Prima è necessario configurare il sezionale per permettere l'eliminazione " +"delle registrazioni." #. module: account #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal @@ -4081,6 +4215,8 @@ msgid "" "There is no fiscal year defined for this date.\n" "Please create one from the configuration of the accounting menu." msgstr "" +"Non c'è alcun anno fiscale definito per questa data.\n" +"Crearne uno dalla configurazione del menu contabilità." #. module: account #: view:account.addtmpl.wizard:0 @@ -4392,12 +4528,12 @@ msgstr "Nessuna azienda non configurata !" #. module: account #: field:res.company,expects_chart_of_accounts:0 msgid "Expects a Chart of Accounts" -msgstr "" +msgstr "Necessario un Piano dei Conti" #. module: account #: model:mail.message.subtype,name:account.mt_invoice_paid msgid "paid" -msgstr "" +msgstr "pagato" #. module: account #: field:account.move.line,date:0 @@ -4408,7 +4544,7 @@ msgstr "Data effettiva" #: code:addons/account/wizard/account_fiscalyear_close.py:100 #, python-format msgid "The journal must have default credit and debit account." -msgstr "" +msgstr "Il sezionale deve avere un conto di credito e di debito di default." #. module: account #: model:ir.actions.act_window,name:account.action_bank_tree @@ -4420,11 +4556,13 @@ msgstr "Configurazione conti bancari" #: selection:account.invoice.refund,filter_refund:0 msgid "Modify: create credit note, reconcile and create a new draft invoice" msgstr "" +"Modificare: crea una nota di credito, riconcilia e crea una nuova bozza di " +"fattura" #. module: account #: xsl:account.transfer:0 msgid "Partner ID" -msgstr "" +msgstr "Partner ID" #. module: account #: help:account.bank.statement,message_ids:0 @@ -5415,7 +5553,7 @@ msgstr "Scritture da rivedere" #. module: account #: selection:res.company,tax_calculation_rounding_method:0 msgid "Round Globally" -msgstr "Arrotonda Globalmente" +msgstr "Arrotondamento sul Totale" #. module: account #: field:account.bank.statement,message_comment_ids:0 @@ -5510,7 +5648,7 @@ msgstr "" #. module: account #: model:res.groups,name:account.group_account_manager msgid "Financial Manager" -msgstr "" +msgstr "Manager Finanziario" #. module: account #: field:account.journal,group_invoice_lines:0 @@ -5544,6 +5682,9 @@ msgid "" "If you do not check this box, you will be able to do invoicing & payments, " "but not accounting (Journal Items, Chart of Accounts, ...)" msgstr "" +"Se questa casella non è selezionata, sarà possibile creare fatture e " +"pagamenti, ma non contabilizzarli (Registrazioni nel sezionale, Piani dei " +"Conti, ...)" #. module: account #: view:account.period:0 @@ -5577,6 +5718,8 @@ msgid "" "There is no period defined for this date: %s.\n" "Please create one." msgstr "" +"Non c'è alcun periodo definito per questa data: %s.\n" +"Crearne uno." #. module: account #: help:account.tax,price_include:0 @@ -5705,7 +5848,7 @@ msgstr "Anno" #. module: account #: help:account.invoice,sent:0 msgid "It indicates that the invoice has been sent." -msgstr "" +msgstr "Indica che la fattura è stata spedita." #. module: account #: view:account.payment.term.line:0 @@ -5725,11 +5868,14 @@ msgid "" "Put a sequence in the journal definition for automatic numbering or create a " "sequence manually for this piece." msgstr "" +"Non è possibile creare una sequenza automatica per questo codice.\n" +"Inserire una sequenza nella configurazione del sezionale per la numerazione " +"automatica o creare una sequenza manualmente per questo codice." #. module: account #: view:account.invoice:0 msgid "Pro Forma Invoice " -msgstr "" +msgstr "Fattura Proforma " #. module: account #: selection:account.subscription,period_type:0 @@ -5795,6 +5941,8 @@ msgstr "Codice calcolo (se tipo=codice)" msgid "" "Cannot find a chart of accounts for this company, you should create one." msgstr "" +"Non è possibile trovare un piano dei conti per questa azienda, è necessario " +"crearne uno." #. module: account #: selection:account.analytic.journal,type:0 @@ -5854,6 +6002,8 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Gestisce il sommario (numero di messaggi, ...) di Chatter. Questo sommario è " +"direttamente in html così da poter essere inserito nelle viste kanban." #. module: account #: field:account.tax,child_depend:0 @@ -5917,13 +6067,15 @@ msgstr "account.installer" #. module: account #: view:account.invoice:0 msgid "Recompute taxes and total" -msgstr "" +msgstr "Ricalcola imposte e totale" #. module: account #: code:addons/account/account.py:1097 #, python-format msgid "You cannot modify/delete a journal with entries for this period." msgstr "" +"Non è possibile modificare/eliminare un sezionale che ha registrazioni in " +"questo periodo." #. module: account #: field:account.tax.template,include_base_amount:0 @@ -5933,7 +6085,7 @@ msgstr "Incluso nell'imponibile" #. module: account #: field:account.invoice,supplier_invoice_number:0 msgid "Supplier Invoice Number" -msgstr "" +msgstr "Numero Fattura Fornitore" #. module: account #: help:account.payment.term.line,days:0 @@ -5955,6 +6107,8 @@ msgstr "Calcolo ammontare" #, python-format msgid "You can not add/modify entries in a closed period %s of journal %s." msgstr "" +"Non è possibile aggiungere/modificare registrazioni in un periodo chiuso %s " +"del sezionale %s." #. module: account #: view:account.journal:0 @@ -5979,7 +6133,7 @@ msgstr "Inizio Periodo" #. module: account #: model:account.account.type,name:account.account_type_asset_view1 msgid "Asset View" -msgstr "" +msgstr "Vista Immobilizzazioni" #. module: account #: model:ir.model,name:account.model_account_common_account_report @@ -6055,12 +6209,12 @@ msgstr "Registrazioni di sezionale di fine anno" #. module: account #: view:account.invoice:0 msgid "Draft Refund " -msgstr "" +msgstr "Bozza Rimborso " #. module: account #: view:cash.box.in:0 msgid "Fill in this form if you put money in the cash register:" -msgstr "" +msgstr "Compilare questo form se viene immesso contante nel registro cassa:" #. module: account #: field:account.payment.term.line,value_amount:0 @@ -6143,7 +6297,7 @@ msgstr "Importo valuta" #. module: account #: selection:res.company,tax_calculation_rounding_method:0 msgid "Round per Line" -msgstr "" +msgstr "Arrotondamento per Riga" #. module: account #: report:account.analytic.account.balance:0 @@ -6200,7 +6354,7 @@ msgstr "" #: code:addons/account/wizard/account_report_aged_partner_balance.py:56 #, python-format msgid "You must set a period length greater than 0." -msgstr "" +msgstr "E' necessario impostare una durata del periodo maggiore di 0." #. module: account #: view:account.fiscal.position.template:0 @@ -6211,7 +6365,7 @@ msgstr "Modelli di \"posizioni fiscali\"" #. module: account #: view:account.invoice:0 msgid "Draft Refund" -msgstr "" +msgstr "Bozza Rimborso" #. module: account #: view:account.analytic.chart:0 @@ -6249,6 +6403,8 @@ msgstr "Riconcilia Con Storno" #: constraint:account.move.line:0 msgid "You cannot create journal items on an account of type view." msgstr "" +"Non è possibile creare registrazioni nel sezionale con un conto di tipo " +"vista." #. module: account #: selection:account.payment.term.line,value:0 @@ -6262,6 +6418,8 @@ msgstr "Importo fissato" #, python-format msgid "You cannot change the tax, you should remove and recreate lines." msgstr "" +"Non è possibile cambiare l'imposta, è necessario rimuoverla e ricreare le " +"righe." #. module: account #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile @@ -6386,7 +6544,7 @@ msgstr "Corrispondenza imposte" #. module: account #: view:account.config.settings:0 msgid "Select Company" -msgstr "" +msgstr "Selezionare Azienda" #. module: account #: model:ir.actions.act_window,name:account.action_account_state_open @@ -6460,7 +6618,7 @@ msgstr "# di Linee" #. module: account #: view:account.invoice:0 msgid "(update)" -msgstr "" +msgstr "(aggiornare)" #. module: account #: field:account.aged.trial.balance,filter:0 @@ -6587,7 +6745,7 @@ msgstr "Azienda collegata a questo sezionale." #. module: account #: help:account.config.settings,group_multi_currency:0 msgid "Allows you multi currency environment" -msgstr "" +msgstr "Permette una gestione multivaluta" #. module: account #: view:account.subscription:0 @@ -6670,7 +6828,7 @@ msgstr "Voce conto analitico" #. module: account #: model:ir.ui.menu,name:account.menu_action_model_form msgid "Models" -msgstr "" +msgstr "Modelli" #. module: account #: code:addons/account/account_invoice.py:1090 @@ -6679,6 +6837,8 @@ msgid "" "You cannot cancel an invoice which is partially paid. You need to " "unreconcile related payment entries first." msgstr "" +"Non è possibile eliminare una fattura che è parzialmente pagata. E' " +"necessario prima annullare la riconciliazione dei relativi pagamenti." #. module: account #: field:product.template,taxes_id:0 @@ -6763,7 +6923,7 @@ msgstr "Mostra semplicemente i sottoconti" #. module: account #: view:account.config.settings:0 msgid "Bank & Cash" -msgstr "" +msgstr "Banca e Cassa" #. module: account #: help:account.fiscalyear.close.state,fy_id:0 @@ -6849,13 +7009,15 @@ msgstr "Crediti" #. module: account #: constraint:account.move.line:0 msgid "You cannot create journal items on closed account." -msgstr "" +msgstr "Non è possibile creare registrazioni contabili su conti chiusi." #. module: account #: code:addons/account/account_invoice.py:594 #, python-format msgid "Invoice line account's company and invoice's compnay does not match." msgstr "" +"Il conto dell'azienda delle righe della fattura non coincide con l'azienda " +"emittente la fattura." #. module: account #: view:account.invoice:0 @@ -6876,7 +7038,7 @@ msgstr "La valuta del conto non e' eguale a quella dell'azienda." #: code:addons/account/installer.py:48 #, python-format msgid "Custom" -msgstr "" +msgstr "Personalizzazioni" #. module: account #: view:account.analytic.account:0 @@ -6887,7 +7049,7 @@ msgstr "Correnti" #: code:addons/account/account_invoice.py:1305 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)." -msgstr "" +msgstr "La fattura '%s' è parzialmente pagata: %s%s di %s%s (%s%s residuo)." #. module: account #: field:account.journal,cashbox_line_ids:0 @@ -6903,7 +7065,7 @@ msgstr "Capitale" #. module: account #: field:account.journal,internal_account_id:0 msgid "Internal Transfers Account" -msgstr "" +msgstr "Conto Trasferimenti Interni" #. module: account #: code:addons/account/wizard/pos_box.py:33 @@ -6920,7 +7082,7 @@ msgstr "Percentuale" #. module: account #: selection:account.config.settings,tax_calculation_rounding_method:0 msgid "Round globally" -msgstr "" +msgstr "Arrotondamento sul Totale" #. module: account #: selection:account.report.general.ledger,sortby:0 @@ -6952,7 +7114,7 @@ msgstr "Numero fattura" #. module: account #: field:account.bank.statement,difference:0 msgid "Difference" -msgstr "" +msgstr "Differenza" #. module: account #: help:account.tax,include_base_amount:0 @@ -7021,12 +7183,12 @@ msgstr "" #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 #, python-format msgid "User Error!" -msgstr "" +msgstr "Errore Utente!" #. module: account #: view:account.open.closed.fiscalyear:0 msgid "Discard" -msgstr "" +msgstr "Annulla" #. module: account #: selection:account.account,type:0 @@ -7044,7 +7206,7 @@ msgstr "Voci Giornale Analitico" #. module: account #: field:account.config.settings,has_default_company:0 msgid "Has default company" -msgstr "" +msgstr "Ha un'azienda di default" #. module: account #: view:account.fiscalyear.close:0 @@ -7193,6 +7355,8 @@ msgid "" "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for " "2%." msgstr "" +"Le percentuali delle Righe delle Condizioni di Pagamento devono essere " +"comprese tra 0 e 1, esempio: 0.02 per 2%." #. module: account #: report:account.invoice:0 @@ -7213,7 +7377,7 @@ msgstr "Conto Categoria Costi" #. module: account #: sql_constraint:account.tax:0 msgid "Tax Name must be unique per company!" -msgstr "" +msgstr "Il nome dell'imposta deve essere unico per azienda!" #. module: account #: view:account.bank.statement:0 @@ -7253,12 +7417,14 @@ msgid "" "You cannot provide a secondary currency if it is the same than the company " "one." msgstr "" +"Non è possibile indicare una valuta secondaria se è la stessa di quella " +"principale." #. module: account #: code:addons/account/account_invoice.py:1321 #, python-format msgid "Customer invoice" -msgstr "" +msgstr "Fattura cliente" #. module: account #: selection:account.account.type,report_type:0 @@ -7343,13 +7509,13 @@ msgstr "Conto Economico" #. module: account #: field:account.bank.statement,total_entry_encoding:0 msgid "Total Transactions" -msgstr "" +msgstr "Transazioni Totali" #. module: account #: code:addons/account/account.py:635 #, python-format msgid "You cannot remove an account that contains journal items." -msgstr "" +msgstr "Non è possibile eliminare un conto con registrazioni contabili." #. module: account #: code:addons/account/account_move_line.py:1095 @@ -7393,7 +7559,7 @@ msgstr "Manuale" #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 #, python-format msgid "You must set a start date." -msgstr "" +msgstr "E' necessario impostare una data iniziale." #. module: account #: view:account.automatic.reconcile:0 @@ -7442,7 +7608,7 @@ msgstr "Registrazioni Sezionale" #: code:addons/account/wizard/account_invoice_refund.py:147 #, python-format msgid "No period found on the invoice." -msgstr "" +msgstr "Nessun periodo trovato nella fattura." #. module: account #: help:account.partner.ledger,page_split:0 @@ -7488,6 +7654,8 @@ msgstr "Tutte le registrazioni" #: constraint:account.move.reconcile:0 msgid "You can only reconcile journal items with the same partner." msgstr "" +"E' possibile solo riconciliare registrazioni contabili con lo stesso " +"partnere." #. module: account #: view:account.journal.select:0 @@ -7601,7 +7769,7 @@ msgstr "" #. module: account #: field:account.config.settings,module_account_voucher:0 msgid "Manage customer payments" -msgstr "" +msgstr "Gestione pagamenti clienti" #. module: account #: help:report.invoice.created,origin:0 @@ -7620,6 +7788,8 @@ msgid "" "Error!\n" "The start date of a fiscal year must precede its end date." msgstr "" +"Errore!\n" +"La data iniziale di un anno fiscale deve precedere quella finale." #. module: account #: view:account.tax.template:0 @@ -7635,7 +7805,7 @@ msgstr "Fatture Clienti" #. module: account #: view:account.tax:0 msgid "Misc" -msgstr "" +msgstr "Varie" #. module: account #: view:account.analytic.line:0 @@ -7700,6 +7870,7 @@ msgstr "Documento di origine" #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)." msgstr "" +"Non c'è un conto di costo definito per questo prodotto: \"%s\" (id:%d)." #. module: account #: constraint:account.account:0 @@ -7717,7 +7888,7 @@ msgstr "Report contabile" #. module: account #: field:account.analytic.line,currency_id:0 msgid "Account Currency" -msgstr "" +msgstr "Conto Valuta" #. module: account #: report:account.invoice:0 @@ -7731,6 +7902,8 @@ msgid "" "You can not delete an invoice which is not cancelled. You should refund it " "instead." msgstr "" +"Non è possibile eliminare una fattura che non è annullata. E' necessario " +"creare invece una nota di credito." #. module: account #: help:account.tax,amount:0 @@ -7782,7 +7955,7 @@ msgstr "Movimenti aperti su conto di spesa" #. module: account #: view:account.invoice:0 msgid "Customer Reference" -msgstr "" +msgstr "Riferimento cliente" #. module: account #: field:account.account.template,parent_id:0 @@ -7839,7 +8012,7 @@ msgstr "Raggruppare per anno data fattura" #. module: account #: field:account.config.settings,purchase_tax_rate:0 msgid "Purchase tax (%)" -msgstr "" +msgstr "Imposta sugli acquisti (%)" #. module: account #: help:res.partner,credit:0 @@ -7905,7 +8078,7 @@ msgstr "Movimenti Aperti Conto di Ricavo" #. module: account #: field:account.config.settings,group_proforma_invoices:0 msgid "Allow pro-forma invoices" -msgstr "" +msgstr "Consentire fatture proforma" #. module: account #: view:account.bank.statement:0 @@ -7936,12 +8109,12 @@ msgstr "Crea registrazioni" #. module: account #: model:ir.model,name:account.model_cash_box_out msgid "cash.box.out" -msgstr "" +msgstr "cash.box.out" #. module: account #: help:account.config.settings,currency_id:0 msgid "Main currency of the company." -msgstr "" +msgstr "Valuta principale di questa azienda." #. module: account #: model:ir.ui.menu,name:account.menu_finance_reports @@ -7969,7 +8142,7 @@ msgstr "Sezionale Contabile" #. module: account #: field:account.config.settings,tax_calculation_rounding_method:0 msgid "Tax calculation rounding method" -msgstr "" +msgstr "Metodo di arrotondamento delle imposte" #. module: account #: model:process.node,name:account.process_node_paidinvoice0 @@ -8021,6 +8194,8 @@ msgid "" "There is no default credit account defined \n" "on journal \"%s\"." msgstr "" +"Non c'è un conto di credito di default definito \n" +"nel sezionale \"%s\"." #. module: account #: view:account.invoice.line:0 @@ -8184,6 +8359,8 @@ msgid "" "This date will be used as the invoice date for credit note and period will " "be chosen accordingly!" msgstr "" +"Questa data sarà usata come data fattura per la nota di credito e il periodo " +"sarà scelto di conseguenza!" #. module: account #: view:product.template:0 @@ -8197,6 +8374,8 @@ msgid "" "You have to set a code for the bank account defined on the selected chart of " "accounts." msgstr "" +"E' necessario selezionare un codice per il conto bancario definito sul piano " +"dei conti selezionato." #. module: account #: model:ir.ui.menu,name:account.menu_manual_reconcile @@ -8278,7 +8457,7 @@ msgstr "Codice" #. module: account #: field:account.config.settings,sale_refund_sequence_prefix:0 msgid "Credit note sequence" -msgstr "" +msgstr "Sequenza note di credito" #. module: account #: model:ir.actions.act_window,name:account.action_validate_account_move @@ -8292,7 +8471,7 @@ msgstr "Conferma le scritture contabili" #. module: account #: field:account.journal,centralisation:0 msgid "Centralised Counterpart" -msgstr "" +msgstr "Contropartita Centralizzata" #. module: account #: selection:account.bank.statement.line,type:0 @@ -8348,7 +8527,7 @@ msgstr "Sequenza" #. module: account #: field:account.config.settings,paypal_account:0 msgid "Paypal account" -msgstr "" +msgstr "Conto Paypal" #. module: account #: selection:account.print.journal,sort_selection:0 @@ -8367,11 +8546,13 @@ msgid "" "Error!\n" "You cannot create recursive accounts." msgstr "" +"Errore!\n" +"Non è possibile creare conti ricorsivi." #. module: account #: model:ir.model,name:account.model_cash_box_in msgid "cash.box.in" -msgstr "" +msgstr "cash.box.in" #. module: account #: help:account.invoice,move_id:0 @@ -8381,7 +8562,7 @@ msgstr "Collegamento alle voci del sezionale generate automaticamente." #. module: account #: model:ir.model,name:account.model_account_config_settings msgid "account.config.settings" -msgstr "" +msgstr "account.config.settings" #. module: account #: selection:account.config.settings,period:0 @@ -8404,7 +8585,7 @@ msgstr "Saldo Calcolato" #: code:addons/account/static/src/js/account_move_reconciliation.js:89 #, python-format msgid "You must choose at least one record." -msgstr "" +msgstr "E' necessario selezionare almeno un record." #. module: account #: field:account.account,parent_id:0 @@ -8479,7 +8660,7 @@ msgstr "Mastro del partner" #: code:addons/account/account_invoice.py:1340 #, python-format msgid "%s cancelled." -msgstr "" +msgstr "%s annullato." #. module: account #: code:addons/account/account.py:652 @@ -8493,12 +8674,12 @@ msgstr "Attenzione !" #: help:account.bank.statement,message_unread:0 #: help:account.invoice,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Se selezionato, nuovi messaggi richiedono la tua attenzione" #. module: account #: field:res.company,tax_calculation_rounding_method:0 msgid "Tax Calculation Rounding Method" -msgstr "" +msgstr "Metodo di Arrotondamento calcolo Imposte" #. module: account #: field:account.entries.report,move_line_state:0 @@ -8620,6 +8801,7 @@ msgstr "Bilancio Analitico Invertito -" msgid "" "Is this reconciliation produced by the opening of a new fiscal year ?." msgstr "" +"La riconciliazione è prodotto dall'apertura di un nuovo anno fiscale ?." #. module: account #: view:account.analytic.line:0 @@ -8693,7 +8875,7 @@ msgstr "Registro Costi" #. module: account #: view:account.config.settings:0 msgid "No Fiscal Year Defined for This Company" -msgstr "" +msgstr "Nessun Anno Fiscale Definito per Questa Azienda" #. module: account #: view:account.invoice:0 @@ -8724,7 +8906,7 @@ msgstr "Sezionale Note di Credito Fornitori" #: code:addons/account/account.py:1292 #, python-format msgid "Please define a sequence on the journal." -msgstr "" +msgstr "E' necessario definire una sequenza per il sezionale." #. module: account #: help:account.tax.template,amount:0 @@ -8753,6 +8935,9 @@ msgid "" "recalls.\n" " This installs the module account_followup." msgstr "" +"Consente di automatizzare le lettere per le fatture non pagate, non richiami " +"multi-livello.\n" +" Installa il modulo account_followup." #. module: account #: field:account.automatic.reconcile,period_id:0 @@ -8797,12 +8982,12 @@ msgstr "Totale imponibile" #: code:addons/account/wizard/account_report_common.py:153 #, python-format msgid "Select a starting and an ending period." -msgstr "" +msgstr "Selezionare un periodo iniziale e uno finale." #. module: account #: field:account.config.settings,sale_sequence_next:0 msgid "Next invoice number" -msgstr "" +msgstr "Numero di fattura successivo" #. module: account #: model:ir.ui.menu,name:account.menu_finance_generic_reporting @@ -8951,7 +9136,7 @@ msgstr "Import automatico dei movimenti bancari" #: code:addons/account/account_invoice.py:370 #, python-format msgid "Unknown Error!" -msgstr "" +msgstr "Errore Sconosciuto!" #. module: account #: model:ir.model,name:account.model_account_move_bank_reconcile @@ -8961,7 +9146,7 @@ msgstr "Riconciliazione movimenti bancari" #. module: account #: view:account.config.settings:0 msgid "Apply" -msgstr "" +msgstr "Conferma" #. module: account #: field:account.financial.report,account_type_ids:0 @@ -8977,6 +9162,8 @@ msgid "" "You cannot use this general account in this journal, check the tab 'Entry " "Controls' on the related journal." msgstr "" +"Non è possibile usare questo conto generale in questo sezionale, controllare " +"la sezione 'Voci di controllo' nel relativo sezionale." #. module: account #: view:account.payment.term.line:0 @@ -9189,6 +9376,8 @@ msgstr "Il codice del conto deve essere unico per ogni azienda!" #: help:product.template,property_account_expense:0 msgid "This account will be used to value outgoing stock using cost price." msgstr "" +"Questo conto sarà utilizzato per valutare le merci in uscita utilizzando il " +"prezzo di costo." #. module: account #: view:account.invoice:0 @@ -9226,7 +9415,7 @@ msgstr "Conti consentiti (vuoto per non effettuare nessun controllo)" #. module: account #: field:account.config.settings,sale_tax_rate:0 msgid "Sales tax (%)" -msgstr "" +msgstr "Imposta sulle vendite (%)" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2 @@ -9292,6 +9481,8 @@ msgid "" "This allows you to check writing and printing.\n" " This installs the module account_check_writing." msgstr "" +"Permette di verificare la scrittura e la stampa.\n" +" Installa il modulo account_check_writing." #. module: account #: model:res.groups,name:account.group_account_invoice @@ -9369,6 +9560,9 @@ msgid "" "created. If you leave that field empty, it will use the same journal as the " "current invoice." msgstr "" +"E' possibile selezionare qui il sezionale da utilizzare per le note di " +"credito che saranno create. Se questa casella viene lasciata vuota, verrà " +"utilizzato lo stesso sezionale della fattura corrente." #. module: account #: help:account.bank.statement.line,sequence:0 @@ -9401,7 +9595,7 @@ msgstr "Modello errato !" #: view:account.tax.code.template:0 #: view:account.tax.template:0 msgid "Tax Template" -msgstr "" +msgstr "Modello Imposta" #. module: account #: field:account.invoice.refund,period:0 @@ -9421,6 +9615,10 @@ msgid "" "some non legal fields or you must unreconcile first.\n" "%s." msgstr "" +"Non è possibile fare questa modifica su una registrazione riconciliata. E' " +"possibile cambiare solo alcuni campi non fiscali, altrimenti è necessario " +"prima annullare la riconciliazione.\n" +"%s." #. module: account #: help:account.financial.report,sign:0 @@ -9467,7 +9665,7 @@ msgstr "Le Bozze di fatture sono marcate, convalidate e stampate." #: field:account.bank.statement,message_is_follower:0 #: field:account.invoice,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "E' un Follower" #. module: account #: view:account.move:0 @@ -10480,7 +10678,7 @@ msgstr "Utile (Perdita) da visualizzare" #: code:addons/account/account_invoice.py:368 #, python-format msgid "There is no Sale/Purchase Journal(s) defined." -msgstr "" +msgstr "Non c'è un Sezionale(/i) di Vendita/Acquisto definito." #. module: account #: view:account.move.line.reconcile.select:0 @@ -11396,7 +11594,7 @@ msgstr "" #. module: account #: selection:account.config.settings,tax_calculation_rounding_method:0 msgid "Round per line" -msgstr "Arrotonda per riga" +msgstr "Arrotondamento per Riga" #. module: account #: help:account.move.line,amount_residual_currency:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 77efde5acd5..7a4d62d5876 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-12-04 16:27+0000\n" +"PO-Revision-Date: 2012-12-06 14:09+0000\n" "Last-Translator: ccdos \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-05 05:20+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -1137,7 +1137,7 @@ msgstr "科目名称" #. module: account #: field:account.journal,with_last_closing_balance:0 msgid "Opening With Last Closing Balance" -msgstr "用末期的期终余额打开" +msgstr "用上个期末余额作期初" #. module: account #: help:account.tax.code,notprintable:0 @@ -1959,7 +1959,7 @@ msgstr "Pending Accounts" #. module: account #: view:account.open.closed.fiscalyear:0 msgid "Cancel Fiscal Year Opening Entries" -msgstr "" +msgstr "取消财务年度未结案分录" #. module: account #: report:account.journal.period.print.sale.purchase:0 diff --git a/addons/account/partner.py b/addons/account/partner.py index b5e0a9538ef..2b4c4a49cb4 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -134,18 +134,23 @@ class res_partner(osv.osv): return [] having_values = tuple(map(itemgetter(2), args)) where = ' AND '.join( - map(lambda x: '(SUM(debit-credit) %(operator)s %%s)' % { + map(lambda x: '(SUM(bal2) %(operator)s %%s)' % { 'operator':x[1]},args)) query = self.pool.get('account.move.line')._query_get(cr, uid, context=context) - cr.execute(('SELECT partner_id FROM account_move_line l '\ - 'WHERE account_id IN '\ - '(SELECT id FROM account_account '\ - 'WHERE type=%s AND active) '\ - 'AND reconcile_id IS NULL '\ - 'AND '+query+' '\ - 'AND partner_id IS NOT NULL '\ - 'GROUP BY partner_id HAVING '+where), - (type,) + having_values) + cr.execute(('SELECT pid AS partner_id, SUM(bal2) FROM ' \ + '(SELECT CASE WHEN bal IS NOT NULL THEN bal ' \ + 'ELSE 0.0 END AS bal2, p.id as pid FROM ' \ + '(SELECT (debit-credit) AS bal, partner_id ' \ + 'FROM account_move_line l ' \ + 'WHERE account_id IN ' \ + '(SELECT id FROM account_account '\ + 'WHERE type=%s AND active) ' \ + 'AND reconcile_id IS NULL ' \ + 'AND '+query+') AS l ' \ + 'RIGHT JOIN res_partner p ' \ + 'ON p.id = partner_id ) AS pl ' \ + 'GROUP BY pid HAVING ' + where), + (type,) + having_values) res = cr.fetchall() if not res: return [('id','=','0')] diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index a70fdf38f3c..44d53839700 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -4,6 +4,7 @@ product.normal.form.inherit product.product + 5 diff --git a/addons/account/report/account_financial_report.py b/addons/account/report/account_financial_report.py index 5380383f537..6e0c8b95e1a 100644 --- a/addons/account/report/account_financial_report.py +++ b/addons/account/report/account_financial_report.py @@ -56,7 +56,7 @@ class report_account_common(report_sxw.rml_parse, common_report_header): for report in self.pool.get('account.financial.report').browse(self.cr, self.uid, ids2, context=data['form']['used_context']): vals = { 'name': report.name, - 'balance': report.balance, + 'balance': report.balance * report.sign, 'type': 'report', 'level': bool(report.style_overwrite) and report.style_overwrite or report.level, 'account_type': report.type =='sum' and 'view' or False, #used to underline the financial report balances diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py index 56e324bc361..076e598ac54 100644 --- a/addons/account/report/account_report.py +++ b/addons/account/report/account_report.py @@ -48,6 +48,7 @@ class report_account_receivable(osv.osv): _order = 'name desc' def init(self, cr): + tools.drop_view_if_exists(cr, 'report_account_receivable') cr.execute(""" create or replace view report_account_receivable as ( select @@ -183,6 +184,7 @@ class report_invoice_created(osv.osv): _order = 'create_date' def init(self, cr): + tools.drop_view_if_exists(cr, 'report_invoice_created') cr.execute("""create or replace view report_invoice_created as ( select inv.id as id, inv.name as name, inv.type as type, diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 38a22baa9f1..52c754b5394 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -36,7 +36,7 @@ class account_invoice_refund(osv.osv_memory): 'period': fields.many2one('account.period', 'Force period'), 'journal_id': fields.many2one('account.journal', 'Refund Journal', help='You can select here the journal to use for the credit note that will be created. If you leave that field empty, it will use the same journal as the current invoice.'), 'description': fields.char('Reason', size=128, required=True), - 'filter_refund': fields.selection([('refund', 'Create a draft credit note'), ('cancel', 'Cancel: create credit note and reconcile'),('modify', 'Modify: create credit note, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Credit note base on this type. You can not Modify and Cancel if the invoice is already reconciled'), + 'filter_refund': fields.selection([('refund', 'Create a draft refund'), ('cancel', 'Cancel: create refund and reconcile'),('modify', 'Modify: create refund, reconcile and create a new draft invoice')], "Refund Method", required=True, help='Refund base on this type. You can not Modify and Cancel if the invoice is already reconciled'), } def _get_journal(self, cr, uid, context=None): diff --git a/addons/account/wizard/account_invoice_refund_view.xml b/addons/account/wizard/account_invoice_refund_view.xml index 3945a6f57e6..49c1550ad01 100644 --- a/addons/account/wizard/account_invoice_refund_view.xml +++ b/addons/account/wizard/account_invoice_refund_view.xml @@ -40,7 +40,7 @@
-
diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index 4438484aaaf..2c1448b5e6f 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -24,6 +24,7 @@ from lxml import etree from osv import fields, osv from tools.translate import _ +from openerp.osv.orm import setup_modifiers class account_common_report(osv.osv_memory): _name = "account.common.report" @@ -67,16 +68,16 @@ class account_common_report(osv.osv_memory): (_check_company_id, 'The fiscalyear, periods or chart of account chosen have to belong to the same company.', ['chart_account_id','fiscalyear_id','period_from','period_to']), ] - def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): if context is None:context = {} res = super(account_common_report, self).fields_view_get(cr, uid, view_id=view_id, view_type=view_type, context=context, toolbar=toolbar, submenu=False) - if context.get('active_model', False) == 'account.account' and view_id: + if context.get('active_model', False) == 'account.account': doc = etree.XML(res['arch']) nodes = doc.xpath("//field[@name='chart_account_id']") for node in nodes: node.set('readonly', '1') node.set('help', 'If you print the report from Account list/form view it will not consider Charts of account') + setup_modifiers(node, res['fields']['chart_account_id']) res['arch'] = etree.tostring(doc) return res @@ -121,8 +122,8 @@ class account_common_report(osv.osv_memory): now = time.strftime('%Y-%m-%d') company_id = False ids = context.get('active_ids', []) - if ids: - company_id = self.browse(cr, uid, ids[0], context=context).company_id.id + if ids and context.get('active_model') == 'account.account': + company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, [('date_start', '<', now), ('date_stop', '>', now), ('company_id', '=', company_id)], limit=1) return fiscalyears and fiscalyears[0] or False diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index 53ebf225de1..5ff15c09076 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -45,7 +45,7 @@ Adds menu to show relevant information to each manager.You can also view the rep 'css': [ 'static/src/css/analytic.css' ], - 'demo': [], + 'demo': ['analytic_account_demo.xml'], 'installable': True, 'auto_install': False, } diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 9eb8fe90895..368dd7f3b65 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -8,7 +8,7 @@ form tree,form [('invoice_id','=',False)] - {'search_default_to_invoice': 1} + {'search_default_to_invoice': 1, 'search_default_sales': 1}

@@ -34,7 +34,7 @@ - + diff --git a/addons/account_analytic_analysis/analytic_account_demo.xml b/addons/account_analytic_analysis/analytic_account_demo.xml new file mode 100644 index 00000000000..f721fc1459d --- /dev/null +++ b/addons/account_analytic_analysis/analytic_account_demo.xml @@ -0,0 +1,48 @@ + + + + + + True + 1200 + True + + + 100000 + + + + + + + + + + 100 + + + + + True + 500 + True + + 50000 + + + + + + + + + True + True + 100 + + + + + + + diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po index 5f1fd8a54e8..0b0894681b8 100644 --- a/addons/account_analytic_analysis/i18n/de.po +++ b/addons/account_analytic_analysis/i18n/de.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-02-08 08:41+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-06 21:29+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:34+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -24,17 +25,17 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Group By..." -msgstr "Gruppiere nach..." +msgstr "Gruppierung ..." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "To Invoice" -msgstr "" +msgstr "Abrechenbar" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Remaining" -msgstr "" +msgstr "Verbleibend" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -58,7 +59,7 @@ msgstr "vorheriger Arbeitstag" #. module: account_analytic_analysis #: field:account.analytic.account,ca_to_invoice:0 msgid "Uninvoiced Amount" -msgstr "Nicht berechnete Beträge" +msgstr "Abrechenbarer Betrag" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -69,56 +70,58 @@ msgid "" "to\n" " define the customer invoice price rate." msgstr "" +"Die abzurechnenden Arbeitsstunden werden gemäß der Preisliste des Vertrags " +"für das beim Mitarbeiter hinterlegte Produkt berechnet." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "⇒ Invoice" -msgstr "" +msgstr "=> Rechnung" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 msgid "Invoiced Amount" -msgstr "Rechnungsbetrag" +msgstr "Abgerechnet" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_invoiced_date:0 msgid "Date of Last Invoiced Cost" -msgstr "Datum letzte Berechnung" +msgstr "Datum der letzten Abrechnung" #. module: account_analytic_analysis #: help:account.analytic.account,fix_price_to_invoice:0 msgid "Sum of quotations for this contract." -msgstr "" +msgstr "Summe abzurechnende Beträge" #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 msgid "Total customer invoiced amount for this account." -msgstr "Gesamtbetrag Kundenrechnungen für dieses Konto" +msgstr "Bereits abgerechnete Beträge" #. module: account_analytic_analysis #: help:account.analytic.account,timesheet_ca_invoiced:0 msgid "Sum of timesheet lines invoiced for this contract." -msgstr "" +msgstr "Summe abgerechneter Arbeitszeiten" #. module: account_analytic_analysis #: help:account.analytic.account,revenue_per_hour:0 msgid "Computed using the formula: Invoiced Amount / Total Time" -msgstr "Berechnet als: Verrechneter Betrag / Gesamt Zeit" +msgstr "Berechnungsformel: Abgerechnete Beträge / Abgerechnete Stunden" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts not assigned" -msgstr "" +msgstr "Nicht unterzeichnete Verträge" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Partner" -msgstr "" +msgstr "Kunde" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts that are not assigned to an account manager." -msgstr "Verträge, die keinem Account Manager zugeordnet sind." +msgstr "Verträge ohne verantwortlichen Mitarbeiter" #. module: account_analytic_analysis #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue @@ -138,11 +141,25 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie um neuen Vertrag anzulegen.\n" +"

\n" +" Sie finden hier die zu verlängernden Verträge, bei denen " +"entweder das terminierte Vertragsende\n" +" bereits überschritten wurde oder die geleistete Arbeitszeit " +"nicht mehr durch die vertraglich vereinbarte abrechenbare Arbeitszeit " +"abgedeckt wird.\n" +"

\n" +" OpenERP versetzt automatisch die zu erneuernden Verträge in " +"den Status Wiedervorlage. Nach der Erneuerung einer Vereinbarung sollte der " +"Verkäufer den alten Vertrag entweder abschließen oder erneuern. \n" +"

\n" +" " #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "End Date" -msgstr "Enddatum" +msgstr "Ende Datum" #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_non_invoiced:0 @@ -156,12 +173,12 @@ msgstr "" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours_to_invoice:0 msgid "Computed using the formula: Maximum Time - Total Invoiced Time" -msgstr "" +msgstr "Berechnungsformel: Maximale Zeit - Abgerechnete Zeit" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Expected" -msgstr "" +msgstr "Geplant" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -174,7 +191,7 @@ msgstr "Analytisches Konto" #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 msgid "Computed using the formula: Theoretical Revenue - Total Costs" -msgstr "" +msgstr "Berechnungsformel: Geplanter Umsatz - Gesamte Kosten" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 @@ -204,7 +221,7 @@ msgstr "Marge (%)" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours:0 msgid "Computed using the formula: Maximum Time - Total Worked Time" -msgstr "" +msgstr "Berechnungsformel: Maximale Zeit - Geleistete Zeit" #. module: account_analytic_analysis #: help:account.analytic.account,hours_quantity:0 @@ -224,17 +241,17 @@ msgstr "" #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action msgid "Template of Contract" -msgstr "" +msgstr "Vertragsvorlage" #. module: account_analytic_analysis #: model:res.groups,name:account_analytic_analysis.group_template_required msgid "Mandatory use of templates in contracts" -msgstr "" +msgstr "Vertragsvorlage ist verbindlich" #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 msgid "Total Worked Time" -msgstr "" +msgstr "Gesamte Arbeitszeit" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin:0 @@ -244,18 +261,17 @@ msgstr "Realisierte Marge" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month msgid "Hours summary by month" -msgstr "Stundenanzahl pro Monat" +msgstr "Stunden pro Monat" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin_rate:0 msgid "Computes using the formula: (Real Margin / Total Costs) * 100." -msgstr "" -"Berechnung nutzt diese Formel: (absolute Gewinnspanne / Gesamtkosten) * 100" +msgstr "Berechnungsformel: (Marge / Gesamte Kosten) * 100" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "or view" -msgstr "" +msgstr "oder Ansicht" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -272,7 +288,7 @@ msgstr "Monat" #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all msgid "Time & Materials to Invoice" -msgstr "" +msgstr "Abrechenbare Zeiten & Sachaufwendungen" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all @@ -283,12 +299,12 @@ msgstr "Verträge" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Start Date" -msgstr "" +msgstr "Start Datum" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Invoiced" -msgstr "" +msgstr "Abgerechnet" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -296,8 +312,8 @@ msgid "" "The contracts to be renewed because the deadline is passed or the working " "hours are higher than the allocated hours" msgstr "" -"Der Vertrag muss erneuert werden, das die Frist abgelaufen ist oder die " -"geplanten Stunden überschritten sind" +"Zu erneuernde Verträge, aufgrund Laufzeitende oder Überschreitung der " +"vereinbarten Stunden" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -307,7 +323,7 @@ msgstr "Verträge, die zu erneuern sind" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Timesheets" -msgstr "" +msgstr "Stundenzettel" #. module: account_analytic_analysis #: code:addons/account_analytic_analysis/account_analytic_analysis.py:461 @@ -328,7 +344,7 @@ msgstr "Überfällige Mengen" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 @@ -349,13 +365,12 @@ msgstr "Ein Vertrag ist ein Analyse Konto mit Partner" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order msgid "Sales Orders" -msgstr "" +msgstr "Aufträge" #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 msgid "If invoice from the costs, this is the date of the latest invoiced." -msgstr "" -"Wenn Kosten verrechnet werden, dann ist dies das Datum der letzten Rechnung." +msgstr "Letztmaliges Datum der Kostenabrechnung" #. module: account_analytic_analysis #: help:account.analytic.account,ca_theorical:0 @@ -364,9 +379,8 @@ msgid "" "if all these costs have been invoiced at the normal sale price provided by " "the pricelist." msgstr "" -"Ausgehend von den entstandenen Projektkosten. Welcher Erlös wäre erzielt " -"worden, wenn diese Kosten auf der Basis der normalen Preisliste des Verkaufs " -"abgerechnet worden wären." +"Theoretischer Erlös, wenn alle Kosten auf Basis der \"Allgemeinen " +"Preisliste\" abgerechnet worden wären." #. module: account_analytic_analysis #: field:account.analytic.account,user_ids:0 @@ -387,6 +401,16 @@ msgid "" "

\n" " " msgstr "" +"

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

\n" +" Vorlagen sind vordefinierte Verträge für Projekte, aus " +"denen zur schnellen\n" +"und einfachen Erstellung neuer Vereinbarungen, die zugrundeliegenden " +"Einstellungen und Konditionen\n" +"übernommen werden.\n" +"

\n" +" " #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user @@ -404,6 +428,8 @@ msgid "" "Allows you to set the template field as required when creating an analytic " "account or a contract." msgstr "" +"Bei Erstellung eines Vertrags oder Projekt ist die Verwendung einer Vorlage " +"verpflichtend." #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_invoiced:0 @@ -434,16 +460,28 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie zur Erstellung eines Vertrags.\n" +"

\n" +" Setzen Sie Verträge ein, um hierüber Aufgaben, Vorfälle, " +"Stundenzettel oder Abrechnungen \n" +" geleisteter Arbeitszeiten, Personalspesen und/oder " +"Verkaufsaufträge zu verfolgen. OpenERP\n" +" überwacht dabei automatisch, ob Verträge erneuert werden " +"müssen und benachrichtigt den\n" +" zugewiesenen Verkäufer.\n" +"

\n" +" " #. module: account_analytic_analysis #: field:account.analytic.account,toinvoice_total:0 msgid "Total to Invoice" -msgstr "" +msgstr "Gesamt Abrechnungsbetrag" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Sale Orders" -msgstr "" +msgstr "Verkaufsaufträge" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -453,18 +491,18 @@ msgstr "Offen" #. module: account_analytic_analysis #: field:account.analytic.account,invoiced_total:0 msgid "Total Invoiced" -msgstr "" +msgstr "Abgerechneter Betrag" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_ca:0 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount." msgstr "" -"Berechnet auf Basis der Formel: Max. Einkaufspreis - Abgerechneter Betrag" +"Berechnungsformel: Geplanter Abrechnungsbetrag - Abgerechneter Betrag" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Responsible" -msgstr "" +msgstr "Projektleiter" #. module: account_analytic_analysis #: field:account.analytic.account,last_invoice_date:0 @@ -484,16 +522,25 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Sie finden hier die aufgezeichneten Stundenzettel und " +"eingekauften Sachmittel, \n" +" die für diesen Vertrag abgerechnet werden können. Für neue " +"abzurechnende\n" +" Arbeitszeiten sollten Sie das Menü für die Stundenzettel " +"benutzen.\n" +"

\n" +" " #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_non_invoiced:0 msgid "Uninvoiced Time" -msgstr "nicht verrechnete Zeit" +msgstr "Nicht abgerechnete Zeit" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Invoicing" -msgstr "Eingangsrechnung" +msgstr "Abrechnung" #. module: account_analytic_analysis #: field:account.analytic.account,total_cost:0 @@ -507,6 +554,10 @@ msgid "" "remaining subtotals which, in turn, are computed as the maximum between " "'(Estimation - Invoiced)' and 'To Invoice' amounts" msgstr "" +"Insgesamt verbleibender Abrechnungsbetrag für diesen Vertrag. Der Betrag " +"errechnet sich aus der Summe der Einzelpositionen, sowie im Umkehrschluss " +"aus dem Maximalbetrag der Differenz 'Geplant - Abgerechnet' und " +"'Abzurechnen'." #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue @@ -517,7 +568,7 @@ msgstr "Zu erneuernde Verträge" #. module: account_analytic_analysis #: help:account.analytic.account,toinvoice_total:0 msgid " Sum of everything that could be invoiced for this contract." -msgstr "" +msgstr " Summe abzurechnender Beträge für diesen Vertrag" #. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 @@ -527,22 +578,22 @@ msgstr "Theoretische Marge" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_total:0 msgid "Total Remaining" -msgstr "" +msgstr "Summe verbleibende Abrechnung" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 msgid "Computed using the formula: Invoiced Amount - Total Costs." -msgstr "Berechnet durch die Formel: Rechnungsbetrag - Gesamt Kosten." +msgstr "Berechnungsformel: Rechnungsbetrag - Gesamt Kosten." #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_est:0 msgid "Estimation of Hours to Invoice" -msgstr "" +msgstr "Geplante abzurechnende Stunden" #. module: account_analytic_analysis #: field:account.analytic.account,fix_price_invoices:0 msgid "Fixed Price" -msgstr "" +msgstr "Festpreis" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_date:0 @@ -557,12 +608,12 @@ msgstr "" #. module: account_analytic_analysis #: field:sale.config.settings,group_template_required:0 msgid "Mandatory use of templates." -msgstr "" +msgstr "Zwingende Nutzung von Vorlagen" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts Having a Partner" -msgstr "" +msgstr "Verträge mit Kunden" #. module: account_analytic_analysis #: help:account.analytic.account,total_cost:0 @@ -577,7 +628,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,est_total:0 msgid "Total Estimation" -msgstr "" +msgstr "Erwartete Gesamtabrechnung" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_ca:0 @@ -605,16 +656,18 @@ msgstr "Gesamtzeit" msgid "" "the field template of the analytic accounts and contracts will be required." msgstr "" +"ein Auswahl für die Projekt Vorlage und Vertragseinstellungen sind " +"erforderlich" #. module: account_analytic_analysis #: field:account.analytic.account,invoice_on_timesheets:0 msgid "On Timesheets" -msgstr "" +msgstr "auf Stundenzettel" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Total" -msgstr "" +msgstr "Gesamt" #~ msgid "" #~ "Number of hours that can be invoiced plus those that already have been " diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po index fa4c27ef43f..c97598df0fe 100644 --- a/addons/account_analytic_default/i18n/de.po +++ b/addons/account_analytic_default/i18n/de.po @@ -7,31 +7,32 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-01-13 19:25+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-06 22:26+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:37+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user msgid "Analytic Rules" -msgstr "Analytische Kontierungsrichtlinie" +msgstr "Kostenstellen Kontierungsregeln" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Group By..." -msgstr "Gruppierung..." +msgstr "Gruppierung ..." #. module: account_analytic_default #: help:account.analytic.default,date_stop:0 msgid "Default end date for this Analytic Account." -msgstr "" +msgstr "Vorgabe für Ende Datum der Kostenstelle" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_stock_picking @@ -50,6 +51,9 @@ msgid "" "default (e.g. create new customer invoice or Sale order if we select this " "partner, it will automatically take this as an analytic account)" msgstr "" +"Wählen Sie einen Partner aus, der bereits eine spezifizierte Kostenstelle " +"hat (z.B. durch neu definierte Ausgangsrechnung oder einen Verkaufsauftrag " +"bei einer Auswahl des unterzuordnenden Partners)" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -60,7 +64,7 @@ msgstr "Produkt" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_analytic_default msgid "Analytic Distribution" -msgstr "Analytische Verrechnung" +msgstr "Kostenstellen Distribution" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -86,18 +90,21 @@ msgid "" "default (e.g. create new customer invoice or Sale order if we select this " "product, it will automatically take this as an analytic account)" msgstr "" +"Wählen Sie ein Produkt mit hinterlegter Standard Kostenstelle (z.B. bei der " +"Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der Auswahl " +"des Produkts eine automatische Erkennung der Kostenstelle gestartet)." #. module: account_analytic_default #: field:account.analytic.default,date_stop:0 msgid "End Date" -msgstr "Endedatum" +msgstr "Ende Datum" #. module: account_analytic_default #: view:account.analytic.default:0 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list msgid "Analytic Defaults" -msgstr "Analytische Buchungsvorlage" +msgstr "Kostenstellen Buchungsvorlage" #. module: account_analytic_default #: field:account.analytic.default,sequence:0 @@ -111,12 +118,16 @@ msgid "" "default (e.g. create new customer invoice or Sale order if we select this " "company, it will automatically take this as an analytic account)" msgstr "" +"Wählen Sie ein Unternehmen mit hinterlegter Standard Kostenstelle (z.B. bei " +"der Erstellung einer Ausgangsrechnung oder eines Angebots wird bei der " +"Auswahl des Unternehmens eine automatische Erkennung der Kostenstelle " +"gestartet)." #. module: account_analytic_default #: help:account.analytic.default,user_id:0 msgid "" "Select a user which will use analytic account specified in analytic default." -msgstr "" +msgstr "Wählen Sie einen Benutzer mit der hinterlegten Standard Kostenstelle" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_invoice_line @@ -127,17 +138,17 @@ msgstr "Rechnungszeile" #: view:account.analytic.default:0 #: field:account.analytic.default,analytic_id:0 msgid "Analytic Account" -msgstr "Analytische Konten" +msgstr "Kostenstelle" #. module: account_analytic_default #: help:account.analytic.default,date_start:0 msgid "Default start date for this Analytic Account." -msgstr "" +msgstr "Standard Start Datum für Kostenstelle" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Accounts" -msgstr "Konten" +msgstr "Kostenstellen" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -154,9 +165,7 @@ msgstr "Start Datum" #: help:account.analytic.default,sequence:0 msgid "" "Gives the sequence order when displaying a list of analytic distribution" -msgstr "" -"Zeigt eine Liste analytischer Konten, in der Reihenfolge wie von Ihnen " -"festgelegt." +msgstr "Zeigt eine Liste mit Kostenstellen" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_sale_order_line diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po index 44a0658b311..5defd9b28f1 100644 --- a/addons/account_analytic_plans/i18n/de.po +++ b/addons/account_analytic_plans/i18n/de.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-10-12 23:19+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-06 22:38+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:34+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account4_ids:0 @@ -48,7 +49,7 @@ msgstr "Anteil (%)" #: code:addons/account_analytic_plans/account_analytic_plans.py:234 #, python-format msgid "The total should be between %s and %s." -msgstr "" +msgstr "Die Summe sollte zwischen %s und %s sein." #. module: account_analytic_plans #: view:account.analytic.plan:0 @@ -131,7 +132,7 @@ msgstr "Zeige keine leeren Zeilen" #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 #, python-format msgid "There are no analytic lines related to account %s." -msgstr "" +msgstr "Es gibt keine Kostenstellen Buchungen für das Konto %s." #. module: account_analytic_plans #: field:account.analytic.plan.instance,account3_ids:0 @@ -142,7 +143,7 @@ msgstr "Konto3 ID" #: view:account.crossovered.analytic:0 #: view:analytic.plan.create.model:0 msgid "or" -msgstr "" +msgstr "oder" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_line @@ -281,7 +282,7 @@ msgstr "Bankauszug Buchungen" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "Error!" -msgstr "" +msgstr "Fehler !" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -297,7 +298,7 @@ msgstr "Druck Kreuzanalyse" #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:61 #, python-format msgid "User Error!" -msgstr "" +msgstr "Benutzerfehler !" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account6_ids:0 @@ -316,6 +317,7 @@ msgstr "Analytisches Journal" #, python-format msgid "Please put a name and a code before saving the model." msgstr "" +"Bitte tragen Sie eine Bezeichnung und ein Kürzel vor dem Speichern ein." #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -347,7 +349,7 @@ msgstr "Journal" #: code:addons/account_analytic_plans/account_analytic_plans.py:486 #, python-format msgid "You have to define an analytic journal on the '%s' journal." -msgstr "" +msgstr "Sie müssen eine Kostenstelle für das Journal '%s' eintragen" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:342 @@ -375,7 +377,7 @@ msgstr "Rechnungszeile" #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:41 #, python-format msgid "There is no analytic plan defined." -msgstr "" +msgstr "Es existieren Kostenstellen und ein Plan" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_bank_statement @@ -402,7 +404,7 @@ msgstr "Analytische Verrechnung" #: code:addons/account_analytic_plans/account_analytic_plans.py:221 #, python-format msgid "A model with this name and code already exists." -msgstr "" +msgstr "Ein Modul mit ähnlichem Name und Kürzel existiert bereits." #. module: account_analytic_plans #: help:account.analytic.plan.line,root_analytic_id:0 diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index a44226e76c8..3190801764b 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -41,8 +41,8 @@ class account_asset_category(osv.osv): 'company_id': fields.many2one('res.company', 'Company', required=True), 'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, help="Choose the method to use to compute the amount of depreciation lines.\n"\ " * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \ - " * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"), - 'method_number': fields.integer('Number of Depreciations'), + " * Degressive: Calculated on basis of: Residual Value * Degressive Factor"), + 'method_number': fields.integer('Number of Depreciations', help="The number of depreciations needed to depreciate your asset"), 'method_period': fields.integer('Period Length', help="State here the time between 2 depreciations, in months", required=True), 'method_progress_factor': fields.float('Degressive Factor'), 'method_time': fields.selection([('number','Number of Depreciations'),('end','Ending Date')], 'Time Method', required=True, @@ -222,6 +222,15 @@ class account_asset_asset(osv.osv): else: val['currency_id'] = company.currency_id.id return {'value': val} + + def onchange_purchase_salvage_value(self, cr, uid, ids, purchase_value, salvage_value, context=None): + val = {} + for asset in self.browse(cr, uid, ids, context=context): + if purchase_value: + val['value_residual'] = purchase_value - salvage_value + if salvage_value: + val['value_residual'] = purchase_value - salvage_value + return {'value': val} _columns = { 'account_move_line_ids': fields.one2many('account.move.line', 'asset_id', 'Entries', readonly=True, states={'draft':[('readonly',False)]}), @@ -243,9 +252,9 @@ class account_asset_asset(osv.osv): 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True, states={'draft':[('readonly',False)]}), 'method': fields.selection([('linear','Linear'),('degressive','Degressive')], 'Computation Method', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="Choose the method to use to compute the amount of depreciation lines.\n"\ " * Linear: Calculated on basis of: Gross Value / Number of Depreciations\n" \ - " * Degressive: Calculated on basis of: Remaining Value * Degressive Factor"), - 'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="Calculates Depreciation within specified interval"), - 'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="State here the time during 2 depreciations, in months"), + " * Degressive: Calculated on basis of: Residual Value * Degressive Factor"), + 'method_number': fields.integer('Number of Depreciations', readonly=True, states={'draft':[('readonly',False)]}, help="The number of depreciations needed to depreciate your asset"), + 'method_period': fields.integer('Number of Months in a Period', required=True, readonly=True, states={'draft':[('readonly',False)]}, help="The amount of time between two depreciations, in months"), 'method_end': fields.date('Ending Date', readonly=True, states={'draft':[('readonly',False)]}), 'method_progress_factor': fields.float('Degressive Factor', readonly=True, states={'draft':[('readonly',False)]}), 'value_residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual Value'), @@ -359,8 +368,8 @@ class account_asset_depreciation_line(osv.osv): 'sequence': fields.integer('Sequence', required=True), 'asset_id': fields.many2one('account.asset.asset', 'Asset', required=True), 'parent_state': fields.related('asset_id', 'state', type='char', string='State of Asset'), - 'amount': fields.float('Depreciation Amount', digits_compute=dp.get_precision('Account'), required=True), - 'remaining_value': fields.float('Amount to Depreciate', digits_compute=dp.get_precision('Account'),required=True), + 'amount': fields.float('Current Depreciation', digits_compute=dp.get_precision('Account'), required=True), + 'remaining_value': fields.float('Next Period Depreciation', digits_compute=dp.get_precision('Account'),required=True), 'depreciated_value': fields.float('Amount Already Depreciated', required=True), 'depreciation_date': fields.date('Depreciation Date', select=1), 'move_id': fields.many2one('account.move', 'Depreciation Entry'), @@ -460,7 +469,7 @@ class account_asset_history(osv.osv): help="The method to use to compute the dates and number of depreciation lines.\n"\ "Number of Depreciations: Fix the number of depreciation lines and the time between 2 depreciations.\n" \ "Ending Date: Choose the time between 2 depreciations and the date the depreciations won't go beyond."), - 'method_number': fields.integer('Number of Depreciations'), + 'method_number': fields.integer('Number of Depreciations', help="The number of depreciations needed to depreciate your asset"), 'method_period': fields.integer('Period Length', help="Time in month between two depreciations"), 'method_end': fields.date('Ending date'), 'note': fields.text('Note'), diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index 520ee733e73..c4cb17bded3 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -108,8 +108,8 @@ - - + + diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po index 0fa2625a99e..daf6bdb23fd 100755 --- a/addons/account_asset/i18n/de.po +++ b/addons/account_asset/i18n/de.po @@ -8,14 +8,15 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-05-10 17:36+0000\n" -"Last-Translator: Ferdinand-camptocamp \n" +"PO-Revision-Date: 2012-12-06 23:48+0000\n" +"Last-Translator: Thorsten Vocks (OpenBig.org) \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:53+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -156,7 +157,7 @@ msgstr "Abschreibungs Datum" #. module: account_asset #: constraint:account.asset.asset:0 msgid "Error ! You cannot create recursive assets." -msgstr "" +msgstr "Fehler ! Sie können keine rekursiven Anlagengegenstände definieren." #. module: account_asset #: field:asset.asset.report,posted_value:0 @@ -201,7 +202,7 @@ msgstr "# der Abschreibungsbuchungen" #. module: account_asset #: field:account.asset.asset,method_period:0 msgid "Number of Months in a Period" -msgstr "" +msgstr "Anzahl Monate in Perioden" #. module: account_asset #: view:asset.asset.report:0 @@ -389,7 +390,7 @@ msgstr "Zeit Methode" #: view:asset.depreciation.confirmation.wizard:0 #: view:asset.modify:0 msgid "or" -msgstr "" +msgstr "oder" #. module: account_asset #: field:account.asset.asset,note:0 @@ -446,12 +447,17 @@ msgid "" "You can manually close an asset when the depreciation is over. If the last " "line of depreciation is posted, the asset automatically goes in that status." msgstr "" +"Wenn eine Anlage angelegt wird, ist der Status \"Entwurf\". Nach Bestätigung " +"der Anlage wird dies aktiv und Abschreibungen können verbucht werden. Sie " +"können die Anlage automatisch schließen, wenn die Abschreibungen vorbei " +"sind. Nach Verbuchung der letzen Abschreibung wird die Anlage automatisch " +"geschlossen." #. module: account_asset #: field:account.asset.asset,state:0 #: field:asset.asset.report,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: account_asset #: field:account.asset.asset,partner_id:0 @@ -498,7 +504,7 @@ msgstr "Berechnen" #. module: account_asset #: view:account.asset.history:0 msgid "Asset History" -msgstr "" +msgstr "Historie Anlagegegüter" #. module: account_asset #: field:asset.asset.report,name:0 @@ -619,7 +625,7 @@ msgstr "Abzuschreibender Betrag" #. module: account_asset #: field:account.asset.asset,name:0 msgid "Asset Name" -msgstr "" +msgstr "Anlagegut Bezeichnung" #. module: account_asset #: field:account.asset.category,open_asset:0 @@ -670,11 +676,16 @@ msgid "" "

\n" " " msgstr "" +"Über diesen Report erhalten Sie einen Überblick über alle Abschreibungen. " +"Die Suche kann auch zur \n" +"individuellen und persönlichen Auswertung über das Anlagevermögen benutzt " +"werden.\n" +" " #. module: account_asset #: field:account.asset.asset,purchase_value:0 msgid "Gross Value" -msgstr "" +msgstr "Brutto Erlös" #. module: account_asset #: field:account.asset.category,name:0 diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po index a3c6589613e..3cae4c25678 100644 --- a/addons/account_asset/i18n/zh_CN.po +++ b/addons/account_asset/i18n/zh_CN.po @@ -8,14 +8,14 @@ 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-05-10 17:45+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2012-12-07 15:37+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:54+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -153,7 +153,7 @@ msgstr "折旧日期" #. module: account_asset #: constraint:account.asset.asset:0 msgid "Error ! You cannot create recursive assets." -msgstr "" +msgstr "错误！你不能创建循环的固定资产." #. module: account_asset #: field:asset.asset.report,posted_value:0 @@ -198,7 +198,7 @@ msgstr "折旧行编号" #. module: account_asset #: field:account.asset.asset,method_period:0 msgid "Number of Months in a Period" -msgstr "" +msgstr "在一个周期内的月数" #. module: account_asset #: view:asset.asset.report:0 @@ -441,7 +441,7 @@ msgstr "" #: field:account.asset.asset,state:0 #: field:asset.asset.report,state:0 msgid "Status" -msgstr "" +msgstr "状态" #. module: account_asset #: field:account.asset.asset,partner_id:0 @@ -488,7 +488,7 @@ msgstr "计算" #. module: account_asset #: view:account.asset.history:0 msgid "Asset History" -msgstr "" +msgstr "资产历史" #. module: account_asset #: field:asset.asset.report,name:0 @@ -607,7 +607,7 @@ msgstr "要折旧的金额" #. module: account_asset #: field:account.asset.asset,name:0 msgid "Asset Name" -msgstr "" +msgstr "资产名称" #. module: account_asset #: field:account.asset.category,open_asset:0 @@ -662,7 +662,7 @@ msgstr "" #. module: account_asset #: field:account.asset.asset,purchase_value:0 msgid "Gross Value" -msgstr "" +msgstr "总值" #. module: account_asset #: field:account.asset.category,name:0 @@ -708,7 +708,7 @@ msgstr "新建固定资产会计凭证" #. module: account_asset #: field:account.asset.depreciation.line,sequence:0 msgid "Sequence" -msgstr "" +msgstr "编号" #. module: account_asset #: help:account.asset.category,method_period:0 diff --git a/addons/account_asset/wizard/account_asset_change_duration_view.xml b/addons/account_asset/wizard/account_asset_change_duration_view.xml index 1c7f3458441..bb848e6db5d 100644 --- a/addons/account_asset/wizard/account_asset_change_duration_view.xml +++ b/addons/account_asset/wizard/account_asset_change_duration_view.xml @@ -8,12 +8,17 @@
- + - - + + + diff --git a/addons/account_bank_statement_extensions/i18n/de.po b/addons/account_bank_statement_extensions/i18n/de.po index 53fda3a1501..a8f9e63205b 100644 --- a/addons/account_bank_statement_extensions/i18n/de.po +++ b/addons/account_bank_statement_extensions/i18n/de.po @@ -8,14 +8,15 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-02-09 15:02+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-06 23:53+0000\n" +"Last-Translator: Thorsten Vocks (OpenBig.org) \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-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 @@ -59,7 +60,7 @@ msgstr "Storniere ausgewählte Buchungszeilen" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,val_date:0 msgid "Value Date" -msgstr "" +msgstr "Datum Wertstellung" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 @@ -104,7 +105,7 @@ msgstr "Batch Zahlungs Info" #. module: account_bank_statement_extensions #: field:account.bank.statement.line,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: account_bank_statement_extensions #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129 @@ -113,11 +114,13 @@ msgid "" "Delete operation not allowed. Please go to the associated bank " "statement in order to delete and/or modify bank statement line." msgstr "" +"Lösche Operation ist nicht erlaubt. Bitte wechseln Sie zum angebundenen " +"Bankauszug Beleg, um dort die Zahlungsvorschläge zu beurteilen." #. module: account_bank_statement_extensions #: view:confirm.statement.line:0 msgid "or" -msgstr "" +msgstr "oder" #. module: account_bank_statement_extensions #: view:confirm.statement.line:0 @@ -219,7 +222,7 @@ msgstr "Manuell" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 msgid "Bank Transaction" -msgstr "" +msgstr "Bank Auszug" #. module: account_bank_statement_extensions #: view:account.bank.statement.line:0 @@ -326,7 +329,7 @@ msgstr "Buchungszeilen" #: code:addons/account_bank_statement_extensions/account_bank_statement.py:129 #, python-format msgid "Warning!" -msgstr "" +msgstr "Warnung !" #. module: account_bank_statement_extensions #: view:account.bank.statement.line.global:0 diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po index fd4ab89ce0f..72995709663 100644 --- a/addons/account_budget/i18n/nl.po +++ b/addons/account_budget/i18n/nl.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-11-25 20:59+0000\n" +"PO-Revision-Date: 2012-12-06 11:57+0000\n" "Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:42+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_budget #: view:account.budget.analytic:0 @@ -367,6 +367,27 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Een budget is een prognose van uw bedrijfs inkomsten en " +"uitgaven,\n" +" welke wordt verwacht in een bepaalde periode in de toekomst. " +"Een budget\n" +" wordt gedefinieerd op grootboekrekeningen en/of " +"kostenplaatsen (welke \n" +" projecten, afdelingen, productcategorieën, etc. " +"vertegenwoordigen)\n" +"

\n" +" Door deze geldstromen bij te houden is het waarschijnlijk, " +"dat u niet\n" +" te veel uitgeeft en u een grotere kans heeft u financieel " +"doelen te\n" +" realiseren. Definieer een budget door de verwachte opbrengst " +"in\n" +" te geven per kostenplaats en volg de voortgang, gebaseerd op " +"werkelijke\n" +" gerealiseerde gegevens, gedurende die periode.\n" +"

\n" +" " #. module: account_budget #: report:account.budget:0 diff --git a/addons/account_check_writing/account_voucher_view.xml b/addons/account_check_writing/account_voucher_view.xml index 520c78009d5..de7ecd327a9 100644 --- a/addons/account_check_writing/account_voucher_view.xml +++ b/addons/account_check_writing/account_voucher_view.xml @@ -9,7 +9,7 @@ account.voucher - + diff --git a/addons/account_check_writing/i18n/de.po b/addons/account_check_writing/i18n/de.po index 3a5606680bb..6e288e877b9 100644 --- a/addons/account_check_writing/i18n/de.po +++ b/addons/account_check_writing/i18n/de.po @@ -8,15 +8,15 @@ 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-05-10 18:06+0000\n" +"PO-Revision-Date: 2012-12-07 09:04+0000\n" "Last-Translator: Thorsten Vocks (OpenBig.org) \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-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_check_writing #: selection:res.company,check_layout:0 @@ -107,6 +107,19 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"                 Klicken Sie, um einen neuen Scheck erstellen.\n" +"               \n" +"                 Mit dem Scheck Formular können Sie Zahlungen an Lieferanten " +"per Scheck \n" +" anweisen, durchführen und verfolgen. Wenn Sie einen " +"Lieferanten auswählen, \n" +" sowie Zahlungsmethode und Betrag , macht OpenERP Ihnen den " +"Vorschlag, \n" +" diese Zahlung mit einer offenen Rechnung Ihres Lieferanten " +"auszugleichen.\n" +"               \n" +" " #. module: account_check_writing #: field:account.voucher,allow_check:0 @@ -128,7 +141,7 @@ msgstr "Benutze Vordruck" #. module: account_check_writing #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom msgid "Print Check (Bottom)" -msgstr "" +msgstr "Scheck drucken (Unterteil)" #. module: account_check_writing #: report:account.print.check.bottom:0 @@ -140,7 +153,7 @@ msgstr "Fälligkeit" #. module: account_check_writing #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle msgid "Print Check (Middle)" -msgstr "" +msgstr "Scheck drucken (Mittelteil)" #. module: account_check_writing #: model:ir.model,name:account_check_writing.model_res_company @@ -156,7 +169,7 @@ msgstr "Saldenausgleich" #. module: account_check_writing #: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top msgid "Print Check (Top)" -msgstr "" +msgstr "Scheck drucken (Oberteil)" #. module: account_check_writing #: report:account.print.check.bottom:0 diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index 3a09707c4b3..17a09d51e6e 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -24,7 +24,6 @@ from lxml import etree from tools.translate import _ - class followup(osv.osv): _name = 'account_followup.followup' _description = 'Account Follow-up' @@ -74,7 +73,7 @@ class followup_line(osv.osv): Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days. -Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department at (+32).10.68.94.39. +Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department. Best Regards, """, @@ -118,12 +117,61 @@ class account_move_line(osv.osv): class email_template(osv.osv): _inherit = 'email.template' - # Adds current_date to the context. That way it can be used to put - # the account move lines in bold that are overdue in the email - def render_template(self, cr, uid, template, model, res_id, context=None): - context['current_date'] = fields.date.context_today(cr, uid, context) - return super(email_template, self).render_template(cr, uid, template, model, res_id, context=context) + def _get_followup_table_html(self, cr, uid, res_id, context=None): + ''' + Build the html tables to be included in emails send to partners, when reminding them their + overdue invoices. + :param res_id: ID of the partner for whom we are building the tables + :rtype: string + ''' + from report import account_followup_print + + partner = self.pool.get('res.partner').browse(cr, uid, res_id, context=context) + followup_table = '' + if partner.unreconciled_aml_ids: + company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id + current_date = fields.date.context_today(cr, uid, context) + rml_parse = account_followup_print.report_rappel(cr, uid, "followup_rml_parser") + final_res = rml_parse._lines_get_with_partner(partner, company.id) + + for currency_dict in final_res: + currency = currency_dict.get('line', [{'currency_id': company.currency_id}])[0]['currency_id'] + followup_table += ''' + + + + + + + + + ''' % (currency.symbol) + total = 0 + for aml in currency_dict['line']: + block = aml['blocked'] and 'X' or ' ' + total += aml['balance'] + strbegin = "" + date = aml['date_maturity'] or aml['date'] + if date <= current_date and aml['balance'] > 0: + strbegin = "" + followup_table +="" + strbegin + str(aml['date']) + strend + strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin + str(aml['balance']) + strend + strbegin + block + strend + "" + total = rml_parse.formatLang(total, dp='Account', currency_obj=currency) + followup_table += ''' +
Invoice dateReferenceDue dateAmount (%s)Lit.
" + strend = "" + strend = "
+

Amount due: %s
''' % (total) + return followup_table + + + def render_template(self, cr, uid, template, model, res_id, context=None): + if model == 'res.partner' and context.get('followup'): + context['followup_table'] = self._get_followup_table_html(cr, uid, res_id, context=context) + # Adds current_date to the context. That way it can be used to put + # the account move lines in bold that are overdue in the email + context['current_date'] = fields.date.context_today(cr, uid, context) + return super(email_template, self).render_template(cr, uid, template, model, res_id, context=context) class res_partner(osv.osv): @@ -209,32 +257,36 @@ class res_partner(osv.osv): } def do_partner_mail(self, cr, uid, partner_ids, context=None): + if context is None: + context = {} + ctx = context.copy() + ctx['followup'] = True #partner_ids are res.partner ids # If not defined by latest follow-up level, it will be the default template if it can find it mtp = self.pool.get('email.template') unknown_mails = 0 - for partner in self.browse(cr, uid, partner_ids, context=context): + for partner in self.browse(cr, uid, partner_ids, context=ctx): if partner.email and partner.email.strip(): level = partner.latest_followup_level_id_without_lit if level and level.send_email and level.email_template_id and level.email_template_id.id: - mtp.send_mail(cr, uid, level.email_template_id.id, partner.id, context=context) + mtp.send_mail(cr, uid, level.email_template_id.id, partner.id, context=ctx) else: mail_template_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account_followup', 'email_template_account_followup_default') - mtp.send_mail(cr, uid, mail_template_id[1], partner.id, context=context) + mtp.send_mail(cr, uid, mail_template_id[1], partner.id, context=ctx) else: unknown_mails = unknown_mails + 1 action_text = _("Email not sent because of email address of partner not filled in") if partner.payment_next_action_date: - payment_action_date = min(fields.date.context_today(cr, uid, context), partner.payment_next_action_date) + payment_action_date = min(fields.date.context_today(cr, uid, ctx), partner.payment_next_action_date) else: - payment_action_date = fields.date.context_today(cr, uid, context) + payment_action_date = fields.date.context_today(cr, uid, ctx) if partner.payment_next_action: - payment_next_action = partner.payment_next_action + " + " + action_text + payment_next_action = partner.payment_next_action + " \n " + action_text else: payment_next_action = action_text self.write(cr, uid, [partner.id], {'payment_next_action_date': payment_action_date, - 'payment_next_action': payment_next_action}, context=context) + 'payment_next_action': payment_next_action}, context=ctx) return unknown_mails def action_done(self, cr, uid, ids, context=None): @@ -256,21 +308,122 @@ class res_partner(osv.osv): } + def _get_amounts_and_date(self, cr, uid, ids, name, arg, context=None): + ''' + Function that computes values for the followup functional fields. Note that 'payment_amount_due' + is similar to 'credit' field on res.partner except it filters on user's company. + ''' + res = {} + company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id + current_date = fields.date.context_today(cr, uid, context) + for partner in self.browse(cr, uid, ids, context=context): + worst_due_date = False + amount_due = amount_overdue = 0.0 + for aml in partner.unreconciled_aml_ids: + if (aml.company_id == company): + date_maturity = aml.date_maturity or aml.date + if not worst_due_date or date_maturity < worst_due_date: + worst_due_date = date_maturity + amount_due += aml.result + if (date_maturity <= current_date): + amount_overdue += aml.result + res[partner.id] = {'payment_amount_due': amount_due, + 'payment_amount_overdue': amount_overdue, + 'payment_earliest_due_date': worst_due_date} + return res + + def _get_followup_overdue_query(self, cr, uid, args, overdue_only=False, context=None): + ''' + This function is used to build the query and arguments to use when making a search on functional fields + * payment_amount_due + * payment_amount_overdue + Basically, the query is exactly the same except that for overdue there is an extra clause in the WHERE. + + :param args: arguments given to the search in the usual domain notation (list of tuples) + :param overdue_only: option to add the extra argument to filter on overdue accounting entries or not + :returns: a tuple with + * the query to execute as first element + * the arguments for the execution of this query + :rtype: (string, []) + ''' + company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id + having_where_clause = ' AND '.join(map(lambda x: '(SUM(bal2) %s %%s)' % (x[1]), args)) + having_values = [x[2] for x in args] + query = self.pool.get('account.move.line')._query_get(cr, uid, context=context) + overdue_only_str = overdue_only and 'AND date_maturity <= NOW()' or '' + return ('''SELECT pid AS partner_id, SUM(bal2) FROM + (SELECT CASE WHEN bal IS NOT NULL THEN bal + ELSE 0.0 END AS bal2, p.id as pid FROM + (SELECT (debit-credit) AS bal, partner_id + FROM account_move_line l + WHERE account_id IN + (SELECT id FROM account_account + WHERE type=\'receivable\' AND active) + ''' + overdue_only_str + ''' + AND reconcile_id IS NULL + AND company_id = %s + AND ''' + query + ''') AS l + RIGHT JOIN res_partner p + ON p.id = partner_id ) AS pl + GROUP BY pid HAVING ''' + having_where_clause, [company_id] + having_values) + + def _payment_overdue_search(self, cr, uid, obj, name, args, context=None): + if not args: + return [] + query, query_args = self._get_followup_overdue_query(cr, uid, args, overdue_only=True, context=context) + cr.execute(query, query_args) + res = cr.fetchall() + if not res: + return [('id','=','0')] + return [('id','in', [x[0] for x in res])] + + def _payment_earliest_date_search(self, cr, uid, obj, name, args, context=None): + if not args: + return [] + company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id + having_where_clause = ' AND '.join(map(lambda x: '(MIN(l.date_maturity) %s %%s)' % (x[1]), args)) + having_values = [x[2] for x in args] + query = self.pool.get('account.move.line')._query_get(cr, uid, context=context) + cr.execute('SELECT partner_id FROM account_move_line l '\ + 'WHERE account_id IN '\ + '(SELECT id FROM account_account '\ + 'WHERE type=\'receivable\' AND active) '\ + 'AND l.company_id = %s ' + 'AND reconcile_id IS NULL '\ + 'AND '+query+' '\ + 'AND partner_id IS NOT NULL '\ + 'GROUP BY partner_id HAVING '+ having_where_clause, + [company_id] + having_values) + res = cr.fetchall() + if not res: + return [('id','=','0')] + return [('id','in', [x[0] for x in res])] + + def _payment_due_search(self, cr, uid, obj, name, args, context=None): + if not args: + return [] + query, query_args = self._get_followup_overdue_query(cr, uid, args, overdue_only=False, context=context) + cr.execute(query, query_args) + res = cr.fetchall() + if not res: + return [('id','=','0')] + return [('id','in', [x[0] for x in res])] + _inherit = "res.partner" _columns = { 'payment_responsible_id':fields.many2one('res.users', ondelete='set null', string='Follow-up Responsible', - help="Responsible for making sure the action happens."), + help="Optionally you can assign a user to this field, which will make him responsible for the action."), 'payment_note':fields.text('Customer Payment Promise', help="Payment Note"), - 'payment_next_action':fields.text('Next Action', - help="This is the next action to be taken by the user. It will automatically be set when the action fields are empty and the partner gets a follow-up level that requires a manual action. "), + 'payment_next_action':fields.text('Next Action', + help="This is the next action to be taken. It will automatically be set when the partner gets a follow-up level that requires a manual action. "), 'payment_next_action_date':fields.date('Next Action Date', - help="This is when further follow-up is needed. The date will have been set to the current date if the action fields are empty and the partner gets a follow-up level that requires a manual action. "), + help="This is when the manual follow-up is needed. " \ + "The date will be set to the current date when the partner gets a follow-up level that requires a manual action. Can be practical to set manually e.g. to see if he keeps his promises."), 'unreconciled_aml_ids':fields.one2many('account.move.line', 'partner_id', domain=['&', ('reconcile_id', '=', False), '&', ('account_id.active','=', True), '&', ('account_id.type', '=', 'receivable'), ('state', '!=', 'draft')]), 'latest_followup_date':fields.function(_get_latest, method=True, type='date', string="Latest Follow-up Date", help="Latest date that the follow-up level of the partner was changed", - store=False, - multi="latest"), + store=False, multi="latest"), 'latest_followup_level_id':fields.function(_get_latest, method=True, type='many2one', relation='account_followup.followup.line', string="Latest Follow-up Level", help="The maximum follow-up level", @@ -281,7 +434,19 @@ class res_partner(osv.osv): help="The maximum follow-up level without taking into account the account move lines with litigation", store=False, multi="latest"), - 'payment_amount_due':fields.related('credit', type='float', string="Total amount due", readonly=True), + 'payment_amount_due':fields.function(_get_amounts_and_date, + type='float', string="Amount Due", + store = False, multi="followup", + fnct_search=_payment_due_search), + 'payment_amount_overdue':fields.function(_get_amounts_and_date, + type='float', string="Amount Overdue", + store = False, multi="followup", + fnct_search = _payment_overdue_search), + 'payment_earliest_due_date':fields.function(_get_amounts_and_date, + type='date', + string = "Worst Due Date", + multi="followup", + fnct_search=_payment_earliest_date_search), } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml index df703773303..0471eb52fbe 100644 --- a/addons/account_followup/account_followup_customers.xml +++ b/addons/account_followup/account_followup_customers.xml @@ -16,7 +16,9 @@ - + + + @@ -28,10 +30,9 @@ - + - - + @@ -43,29 +44,7 @@ - - Search - res.partner - - - - - - - - - - - - - - - - - - - + Manual Follow-Ups @@ -73,7 +52,7 @@ res.partner form tree,form - {} + [('payment_amount_due', '>', 0.0)] {'Followupfirst':True, 'search_default_todo': True} @@ -88,9 +67,9 @@

The , the latest payment follow-up @@ -105,22 +84,22 @@ help="Click to mark the action as done." class="oe_link" attrs="{'invisible':[('payment_next_action_date','=', False)]}" groups="base.group_partner_manager"/> - +

- - - diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po index 6293620420f..db45401dbc0 100644 --- a/addons/account_followup/i18n/de.po +++ b/addons/account_followup/i18n/de.po @@ -7,31 +7,31 @@ 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-15 22:50+0000\n" +"PO-Revision-Date: 2012-12-07 21:18+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:19+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_followup #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,manual_action:0 msgid "Manual Action" -msgstr "" +msgstr "Manuelle Folgeaktion" #. module: account_followup #: help:res.partner,latest_followup_level_id:0 msgid "The maximum follow-up level" -msgstr "" +msgstr "Maximale Mahnstufe" #. module: account_followup #: view:res.partner:0 msgid "Group by" -msgstr "" +msgstr "Gruppierung ..." #. module: account_followup #: view:account_followup.stat:0 @@ -47,27 +47,27 @@ msgstr "Mahnung" #. 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 "Nächste Zahlungserinnerung" #. module: account_followup #: field:account_followup.sending.results,needprinting:0 msgid "Needs Printing" -msgstr "" +msgstr "Ausdruck ist erforderlich" #. module: account_followup #: view:res.partner:0 msgid "⇾ Mark as Done" -msgstr "" +msgstr "-> Als erledigt markieren" #. module: account_followup #: field:account_followup.followup.line,manual_action_note:0 msgid "Action To Do" -msgstr "" +msgstr "Folgeaktion" #. module: account_followup #: model:email.template,body_html:account_followup.email_template_account_followup_level0 @@ -145,11 +145,85 @@ msgid "" "\n" " " msgstr "" +"\n" +"
\n" +"\n" +"

Guten Tag ${object.name},

\n" +"

\n" +" unter der Annahme, dass unsere Konten korrekt gebucht sind, sind " +"offensichtlich folgende Beträge nicht bezahlt.\n" +" Bitte nehmen Sie innerhalb der nächsten 8 Tage einen Kontoausgleich " +"vor.\n" +"\n" +" Sollte sich unsere Mahnung mit Ihrer Zahlung überschneiden, betrachten " +"Sie diesen Vorgang als erledigt.\n" +" Bitte zögern Sie bei Rückfragen nicht, unsere Finanzabteilung per EMail " +"oder Telefon zu kontaktieren.\n" +"\n" +"
\n" +"Viele Grüsse\n" +"\n" +"
\n" +"${user.name}\n" +"\n" +"
\n" +"
\n" +"<%\n" +" from openerp.addons.account_followup.report import " +"account_followup_print\n" +" rml_parse = account_followup_print.report_rappel(object._cr, user.id, " +"\"followup_rml_parser\")\n" +" final_res = rml_parse._lines_get_with_partner(object, " +"user.company_id.id)\n" +" followup_table = ''\n" +" for currency_dict in final_res:\n" +" currency_symbol = currency_dict.get('line', [{'currency_id': " +"user.company_id.currency_id}])[0]['currency_id'].symbol\n" +" followup_table += '''\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" ''' % (currency_symbol)\n" +" total = 0\n" +" for aml in currency_dict['line']:\n" +" block = aml['blocked'] and 'X' or ' '\n" +" total += aml['balance']\n" +" strbegin = \" \"\n" +" date = aml['date_maturity'] or aml['date']\n" +" if date <= ctx['current_date'] and aml['balance'] > 0:\n" +" strbegin = \"\"\n" +" followup_table +=\"\" + strbegin + str(aml['date']) + strend " +"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin " +"+ str(aml['balance']) + strend + strbegin + block + strend + \"\"\n" +" total = rml_parse.formatLang(total, dp='Account', " +"currency_obj=object.company_id.currency_id)\n" +" followup_table += '''\n" +"
RechnungsdatumReferenzFällig amBetrag (%s)EUR
\"\n" +" strend = \"\"\n" +" strend = \"
\n" +"

fälliger Gesamtbetrag: %s
''' % " +"(total)\n" +"\n" +"%>\n" +"\n" +"${followup_table}\n" +"\n" +"
\n" +"\n" +"
\n" +" " #. module: account_followup #: view:res.partner:0 msgid "Follow-ups to do" -msgstr "" +msgstr "Anstehende Mahnungen" #. module: account_followup #: field:account_followup.followup,company_id:0 @@ -189,36 +263,52 @@ msgid "" "Best Regards,\n" " " msgstr "" +"\n" +"Sehr geehrte(r) %(partner_name)s,\n" +"\n" +"trotz verschiedener Zahlungserinnerungen, wurde Ihr Konto bislang nicht " +"ausgegelichen.\n" +"\n" +"Sollte in den nächsten 8 Tagen keine Zahlung eingehen, ergreifen wir ohne " +"weitere Vorwarnung die erforderlichen Maßnahmen des gesetzlichen " +"Mahnverfahrens. Voraussichtlich wird dieser Schritt nicht erforderlich sein, " +"sie sehen alle fälligen Rechnungen in der unteren Liste.\n" +"\n" +"Bei weiteren Fragestellungen zu der Rechnung, zögern Sie bitte nicht unsere " +"Finanzbuchhaltung anzusprechen. \n" +"\n" +"Best Regards,\n" +" " #. module: account_followup #: view:account_followup.followup.line:0 msgid "days overdue, do the following actions:" -msgstr "" +msgstr "bei fällig, tun Sie folgendes:" #. module: account_followup #: view:account_followup.followup.line:0 msgid "Follow-up Steps" -msgstr "" +msgstr "Mahnstufen" #. module: account_followup #: field:account_followup.print,email_body:0 msgid "Email Body" -msgstr "" +msgstr "Text der E-Mail" #. module: account_followup #: help:res.partner,payment_responsible_id:0 msgid "Responsible for making sure the action happens." -msgstr "" +msgstr "Verantwortlicher Mitarbeiter für die Durchführung" #. module: account_followup #: view:res.partner:0 msgid "Overdue amount" -msgstr "" +msgstr "Überfälliger Betrag" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_print msgid "Send Follow-Ups" -msgstr "" +msgstr "Sende Mahnungen" #. module: account_followup #: report:account_followup.followup.print:0 @@ -228,7 +318,7 @@ msgstr "Betrag" #. module: account_followup #: view:res.partner:0 msgid "No Responsible" -msgstr "" +msgstr "Kein Verantwortlicher" #. module: account_followup #: view:account_followup.stat.by.partner:0 @@ -243,12 +333,12 @@ msgstr "Gesamt Soll" #. module: account_followup #: field:res.partner,payment_next_action:0 msgid "Next Action" -msgstr "" +msgstr "Nächste Aktion" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Partner Name" -msgstr "" +msgstr ": Partner Name" #. module: account_followup #: view:account_followup.followup:0 @@ -283,12 +373,12 @@ msgstr "Datum:" #. module: account_followup #: view:res.partner:0 msgid "I am responsible" -msgstr "" +msgstr "Ich bin verantwortlich" #. module: account_followup #: sql_constraint:account_followup.followup:0 msgid "Only one follow-up per company is allowed" -msgstr "" +msgstr "Es ist nur ein Mahnverfahren je Unternehmen zulässig" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line4 @@ -311,11 +401,33 @@ msgid "" "Best Regards,\n" " " msgstr "" +"\n" +"Sehr geehrte(r) %(partner_name)s,\n" +"\n" +"trotz mehrerer Mahnungen, ist Ihr Konto leider immer noch nicht " +"ausgeglichen.\n" +"\n" +"Sofern keine vollständige Bezahlung innerhalb der nächsten 8 Tage " +"vorgenommen wird, \n" +"werden wir unsererseits die erforderlichen rechtlichen Schritte für das " +"gesetzliche\n" +"Mahnverfahren ohne weitere Ankündigung in die Wege leiten.\n" +"\n" +"Wir sind zuversichtlich, dass diese Aktion nicht erforderlich sein wird. " +"Sämtliche Details der \n" +"fälligen Rechnungen sind in diesem Schreiben aufgelistet.\n" +"\n" +"Bei Fragen zu dieser Angelegenheit, zögern Sie bitte nicht, unsere " +"Buchhaltung unter #\n" +"(+49) 4471 840 9000 zu kontaktieren.\n" +"\n" +"Freundliche Grüsse\n" +" " #. module: account_followup #: help:account_followup.followup.line,send_letter:0 msgid "When processing, it will print a letter" -msgstr "" +msgstr "Bei Verarbeitung wird ein Anschreiben gedruckt" #. module: account_followup #: view:account_followup.stat:0 @@ -325,22 +437,22 @@ msgstr "Kein Verzug" #. module: account_followup #: view:res.partner:0 msgid "Without responsible" -msgstr "" +msgstr "Ohne Verantwortlichen" #. module: account_followup #: view:account_followup.print:0 msgid "Send emails and generate letters" -msgstr "" +msgstr "Sende Emails und erstelle Anschreiben" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_customer_followup msgid "Manual Follow-Ups" -msgstr "" +msgstr "Manuelle Mahnung" #. 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 @@ -350,17 +462,17 @@ msgstr "Forderung" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_stat msgid "Follow-up Statistics" -msgstr "" +msgstr "Statistik Mahnungen" #. module: account_followup #: view:res.partner:0 msgid "Send Overdue Email" -msgstr "" +msgstr "Sende fällige Rechnungen" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line msgid "Follow-up Criteria" -msgstr "" +msgstr "Mahnkriterien" #. module: account_followup #: help:account_followup.followup.line,sequence:0 @@ -373,34 +485,34 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:166 #, python-format msgid " will be sent" -msgstr "" +msgstr " wird gesendet" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": User's Company Name" -msgstr "" +msgstr ": Benutzer Unternehmen" #. module: account_followup #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_letter:0 msgid "Send a Letter" -msgstr "" +msgstr "Sende Anschreiben" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_definition_form msgid "Payment Follow-ups" -msgstr "" +msgstr "Mahnwesen" #. module: account_followup #: field:account_followup.followup.line,delay:0 msgid "Due Days" -msgstr "" +msgstr "Zahlungsverzug" #. 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 @@ -417,12 +529,12 @@ msgstr "Letzte Erinnerung" #: 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 "Ausgleich Rechnungen & Zahlungen" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_s msgid "Do Manual Follow-Ups" -msgstr "" +msgstr "Erstelle händische Mahnung" #. module: account_followup #: report:account_followup.followup.print:0 @@ -432,17 +544,17 @@ msgstr "Limit" #. module: account_followup #: field:account_followup.print,email_conf:0 msgid "Send Email Confirmation" -msgstr "" +msgstr "Sende Email Bestätigung" #. module: account_followup #: view:res.partner:0 msgid "Print Overdue Payments" -msgstr "" +msgstr "Drucke fällige Zahlungen" #. module: account_followup #: field:account_followup.stat.by.partner,date_followup:0 msgid "Latest follow-up" -msgstr "" +msgstr "Letzte Mahnung" #. module: account_followup #: field:account_followup.print,partner_lang:0 @@ -453,13 +565,13 @@ msgstr "Sende EMail in Sprache d. Partners" #: code:addons/account_followup/wizard/account_followup_print.py:169 #, python-format msgid " email(s) sent" -msgstr "" +msgstr " gesendete Email(s)" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_print #: model:ir.model,name:account_followup.model_account_followup_print_all msgid "Print Follow-up & Send Mail to Customers" -msgstr "" +msgstr "Drucke Erinnerungen & Sende Emails" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line1 @@ -499,17 +611,17 @@ msgstr "gedruckte Mitteilung" #. module: account_followup #: field:res.partner,latest_followup_level_id_without_lit:0 msgid "Latest Follow-up Level without litigation" -msgstr "" +msgstr "Letzte Mahnstufe vor Mahnverfahren" #. module: account_followup #: view:res.partner:0 msgid "Partners with Credits" -msgstr "" +msgstr "Kunden mit Guthaben" #. module: account_followup #: help:account_followup.followup.line,send_email:0 msgid "When processing, it will send an email" -msgstr "" +msgstr "Bei Durchführung wird Email gesendet" #. module: account_followup #: view:account_followup.stat.by.partner:0 @@ -519,7 +631,7 @@ msgstr "Zu erinnernde Partner" #. module: account_followup #: view:res.partner:0 msgid "Print overdue payments report independent of follow-up line" -msgstr "" +msgstr "Drucke fällige Zahlungen ohne Mahnstufe" #. module: account_followup #: field:account_followup.followup.line,followup_id:0 @@ -531,12 +643,12 @@ msgstr "Mahnungen" #: 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 "Email wurde aufgrund fehlender Mailadresse nicht gesendet" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup msgid "Account Follow-up" -msgstr "" +msgstr "Mahnwesen" #. module: account_followup #: help:res.partner,payment_next_action_date:0 @@ -545,11 +657,15 @@ msgid "" "the current date if the action fields are empty and the partner gets a " "follow-up level that requires a manual action. " msgstr "" +"Folgendermassen können Sie eine weitere Mahnung schreiben. Tragen Sie das " +"aktuelle Datum ein und lassen Sie alle weiteren Felder unausgefüllt damit " +"der Partner hierdurch eine Mahnstufe erhält, die eine manuelle Aktion " +"erfordert. " #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_sending_results msgid "Results from the sending of the different letters and emails" -msgstr "" +msgstr "Ergebnis der Versendung von Anschreiben und EMails" #. module: account_followup #: constraint:account_followup.followup.line:0 @@ -564,12 +680,12 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:172 #, python-format msgid " manual action(s) assigned:" -msgstr "" +msgstr " manuell zugewiesene Aktion:" #. module: account_followup #: view:res.partner:0 msgid "Search Partner" -msgstr "" +msgstr "Suche Partner" #. module: account_followup #: view:res.partner:0 @@ -580,32 +696,38 @@ msgid "" " order to not include it in the next payment\n" " follow-ups." msgstr "" +"Unten sehen Sie die Vorgangshistorie für diesen \n" +" Kunden. Einer Rechnung kann zugewiesen werden, " +"daß Sie per\n" +" gesetzlichem Mahnverfahren weiter verfolgt " +"wird, um weitere\n" +" Versendungen von Mahnungen zu vermeiden." #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_print_menu msgid "Send Letters and Emails" -msgstr "" +msgstr "Sende Mahnschreiben und Emails" #. module: account_followup #: view:account_followup.followup:0 msgid "Search Follow-up" -msgstr "" +msgstr "Suche Mahnungen" #. module: account_followup #: view:res.partner:0 msgid "Account Move line" -msgstr "" +msgstr "Buchungszeile" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:240 #, python-format msgid "Send Letters and Emails: Actions Summary" -msgstr "" +msgstr "Versende Mahnschreiben und Emails: Zusammenfassung" #. module: account_followup #: view:account_followup.print:0 msgid "or" -msgstr "" +msgstr "oder" #. module: account_followup #: field:account_followup.stat,blocked:0 @@ -615,17 +737,17 @@ msgstr "Abgewiesen" #. module: account_followup #: sql_constraint:account_followup.followup.line:0 msgid "Days of the follow-up levels must be different" -msgstr "" +msgstr "Tage der Mahnstufen müssen verschieden sein" #. module: account_followup #: view:res.partner:0 msgid "Click to mark the action as done." -msgstr "" +msgstr "Klicken Sie um Aktion abzuschließen" #. module: account_followup #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow msgid "Follow-Ups Analysis" -msgstr "" +msgstr "Statistik Mahnungen" #. module: account_followup #: help:account_followup.print,date:0 @@ -643,7 +765,7 @@ msgstr "Datum für Versand der Mahnung(en)" #. module: account_followup #: field:res.partner,payment_responsible_id:0 msgid "Follow-up Responsible" -msgstr "" +msgstr "Verantwortlich für Mahnung" #. module: account_followup #: report:account_followup.followup.print:0 @@ -659,12 +781,12 @@ msgstr "Erinnerung an zu zahlende Rechnungen" #. module: account_followup #: model:ir.ui.menu,name:account_followup.account_followup_menu msgid "Follow-up Levels" -msgstr "" +msgstr "Mahnstufen" #. module: account_followup #: view:res.partner:0 msgid "Future Follow-ups" -msgstr "" +msgstr "Zukünftige Mahnungen" #. module: account_followup #: view:account_followup.followup:0 @@ -678,11 +800,19 @@ msgid "" "certain\n" " amount of days." msgstr "" +"Um Kunden an die Zahlung Ihrer offenen Rechnungen zu erinnern, können Sie\n" +" je nach Fristüberschreitung unterschiedliche " +"Mahnaktionen auslösen .\n" +" Diese werden zusammengefasst in verschiedenen " +"Mahnstufen,\n" +" die in Abhängigkeit Ihres maximalen Verzugs bei " +"Überschreitung\n" +" ausgelöst werden." #. module: account_followup #: view:account_followup.stat:0 msgid "Follow-up Entries with period in current year" -msgstr "" +msgstr "Mahnungen mit Rechnung aus diesem Jahr" #. module: account_followup #: field:account.move.line,followup_date:0 @@ -692,13 +822,13 @@ msgstr "Letzte Mahnung" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Download Letters" -msgstr "" +msgstr "Herunterladen Abschreiben" #. module: account_followup #: field:account_followup.print,company_id:0 #: field:res.partner,unreconciled_aml_ids:0 msgid "unknown" -msgstr "" +msgstr "unbekannt" #. module: account_followup #: code:addons/account_followup/account_followup.py:245 @@ -709,7 +839,7 @@ msgstr "" #. module: account_followup #: model:ir.model,name:account_followup.model_email_template msgid "Email Templates" -msgstr "" +msgstr "EMail Vorlagen" #. module: account_followup #: help:account_followup.followup.line,manual_action:0 @@ -717,18 +847,20 @@ msgid "" "When processing, it will set the manual action to be taken for that " "customer. " msgstr "" +"Bei Durchführung wird das manuelle Verfahren für diesen Kunden vorgeschlagen " #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:171 #, python-format msgid " email(s) should have been sent, but " -msgstr "" +msgstr " EMail(s) sollten ausgetauscht werden, aber " #. module: account_followup #: help:account_followup.print,test_print:0 msgid "" "Check if you want to print follow-ups without changing follow-ups level." msgstr "" +"Möchten Sie Ausdrucke von Mahnungen ohne Wechsel der Stufe generieren." #. module: account_followup #: model:ir.model,name:account_followup.model_account_move_line @@ -743,12 +875,12 @@ msgstr "Summe:" #. module: account_followup #: field:account_followup.followup.line,email_template_id:0 msgid "Email Template" -msgstr "" +msgstr "EMail Vorlage" #. 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 @@ -764,7 +896,7 @@ msgstr "Zusammenfassung" #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,send_email:0 msgid "Send an Email" -msgstr "" +msgstr "Sende eine Email" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line2 @@ -790,6 +922,25 @@ msgid "" "Best Regards,\n" " " msgstr "" +"\n" +"Sehr geehrte(r) %partner_name,\n" +"\n" +"wir haben mit Enttäuschung feststellen müssen, dass trotz erfolgter Mahnung, " +"Ihr Konto weiterhin überfällig ist.\n" +"\n" +"Es ist in Ihrem eigenen Interesse sehr wichtig, dass die sofortige Zahlung " +"erfolgt, sonst müssen wir in Betracht ziehen, \n" +"dass wir nicht mehr in der Lage sein werden, Ihr Unternehmen mit Waren / " +"Dienstleistungen zu beliefern. Bitte ergreifen Sie \n" +"geeignete Maßnahmen, um die Durchführung dieser Zahlung in den nächsten 8 " +"Tagen vorzunehmen.\n" +"\n" +"Wenn es ein Problem mit der Zahlung der Rechnung gibt, die uns aktuell nicht " +"bewusst ist, zögern Sie bitte nicht, unsere Buchhaltung unter (+49) 4471 " +"8409000 zu kontaktieren. damit wir die Angelegenheit schnell lösen können.\n" +"\n" +"Details fälliger Zahlungen werden dann weiter unten gedruckt.\n" +" " #. module: account_followup #: report:account_followup.followup.print:0 @@ -881,12 +1032,14 @@ msgid "" "The maximum follow-up level without taking into account the account move " "lines with litigation" msgstr "" +"Die höchstmögliche Mahnstufe, ohne dass die Rechnung dem gesetzlichen " +"Mahnverfahren übergeben wird." #. module: account_followup #: view:account_followup.stat:0 #: field:res.partner,latest_followup_date:0 msgid "Latest Follow-up Date" -msgstr "" +msgstr "Letzte Mahnung" #. module: account_followup #: model:email.template,body_html:account_followup.email_template_account_followup_level1 @@ -970,6 +1123,88 @@ msgid "" "\n" " " msgstr "" +"\n" +"
\n" +" \n" +"

Sehr geehrte(r) ${object.name},

\n" +"

\n" +" \t Wir sind enttäuscht, dass trotz Mahnung, Ihr Konto immer noch " +"überfällige Rechnungen ausweist.\n" +"\n" +"Es ist wichtig, dass die sofortige Zahlung erfolgt, sonst müssen wir in " +"Betracht ziehen, Ihr Kundenkonto zu sperren, \n" +"wodurch wir dann leider gezwungen sind, Ihr Unternehmen vorerst nicht mehr " +"mit Waren / Dienstleistungen zu \n" +"beliefern. Bitte ergreifen Sie geeignete Maßnahmen, um eine Zahlung in den " +"nächsten 8 Tagen durchzuführen.\n" +"\n" +"Wenn es ein Problem mit der Zahlung der Rechnung(en) gibt, die uns nicht " +"bekannt ist, zögern Sie nicht, \n" +"unsere Buchhaltung unter (+49) 4471 8409000 zu kontaktieren, damit wir die " +"Angelegenheit lösen können.\n" +"\n" +"Details zu den fälligen Zahlungen finden Sie unten.\n" +"

\n" +"
\n" +"Mit freundlichen Grüßen\n" +" \n" +"
\n" +"${user.name}\n" +" \n" +"
\n" +"
\n" +"\n" +" \n" +"<%\n" +" from openerp.addons.account_followup.report import " +"account_followup_print\n" +" rml_parse = account_followup_print.report_rappel(object._cr, user.id, " +"\"followup_rml_parser\")\n" +" final_res = rml_parse._lines_get_with_partner(object, " +"user.company_id.id)\n" +" followup_table = ''\n" +" for currency_dict in final_res:\n" +" currency_symbol = currency_dict.get('line', [{'currency_id': " +"user.company_id.currency_id}])[0]['currency_id'].symbol\n" +" followup_table += '''\n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" ''' % (currency_symbol)\n" +" total = 0\n" +" for aml in currency_dict['line']:\n" +" block = aml['blocked'] and 'X' or ' '\n" +" total += aml['balance']\n" +" strbegin = \" \"\n" +" date = aml['date_maturity'] or aml['date']\n" +" if date <= ctx['current_date'] and aml['balance'] > 0:\n" +" strbegin = \"\"\n" +" followup_table +=\"\" + strbegin + str(aml['date']) + strend " +"+ strbegin + aml['ref'] + strend + strbegin + str(date) + strend + strbegin " +"+ str(aml['balance']) + strend + strbegin + block + strend + \"\"\n" +" total = rml_parse.formatLang(total, dp='Account', " +"currency_obj=object.company_id.currency_id)\n" +" followup_table += '''\n" +"
RechnungsdatumRechnungsnummerfällig amBetrag(%s)EUR
\"\n" +" strend = \"\"\n" +" strend = \"
\n" +"
Fälliger Betrag: %s
''' % (total)\n" +"\n" +"%>\n" +"\n" +"${followup_table}\n" +"\n" +"
\n" +"\n" +"
\n" +" " #. module: account_followup #: field:account.move.line,result:0 @@ -982,17 +1217,17 @@ msgstr "Saldo" #. module: account_followup #: help:res.partner,payment_note:0 msgid "Payment Note" -msgstr "" +msgstr "Zahlungsmitteilung" #. module: account_followup #: view:res.partner:0 msgid "My Follow-ups" -msgstr "" +msgstr "Meine Mahnungen" #. 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 @@ -1014,12 +1249,12 @@ 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 Partner haben kein Guthaben, insofern wurde die Aktion gelöscht" #. module: account_followup #: model:ir.actions.report.xml,name:account_followup.account_followup_followup_report msgid "Follow-up Report" -msgstr "" +msgstr "Statistik Mahnungen" #. module: account_followup #: view:res.partner:0 @@ -1027,6 +1262,8 @@ msgid "" ", the latest payment follow-up\n" " was:" msgstr "" +", die letzte Mahnung\n" +" war:" #. module: account_followup #: view:account_followup.print:0 @@ -1036,7 +1273,7 @@ msgstr "Abbrechen" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Close" -msgstr "" +msgstr "Schließen" #. module: account_followup #: view:account_followup.stat:0 @@ -1053,33 +1290,33 @@ msgstr "Höchste Mahnstufe" #: code:addons/account_followup/wizard/account_followup_print.py:171 #, python-format msgid " had unknown email address(es)" -msgstr "" +msgstr " es ergab()en sich unbekannte Emailanschrift(en)" #. module: account_followup #: view:res.partner:0 msgid "Responsible" -msgstr "" +msgstr "Verantwortlicher" #. module: account_followup #: model:ir.ui.menu,name:account_followup.menu_finance_followup #: view:res.partner:0 msgid "Payment Follow-up" -msgstr "" +msgstr "Mahnwesen" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Current Date" -msgstr "" +msgstr ": Heutiges Datum" #. module: account_followup #: field:res.partner,payment_amount_due:0 msgid "Total amount due" -msgstr "" +msgstr "Fälliger Gesamtbetrag" #. module: account_followup #: field:account_followup.followup.line,name:0 msgid "Follow-Up Action" -msgstr "" +msgstr "Mahnung" #. module: account_followup #: view:account_followup.stat:0 @@ -1098,12 +1335,12 @@ msgstr "Beschreibung" #: model:email.template,subject:account_followup.email_template_account_followup_level1 #: model:email.template,subject:account_followup.email_template_account_followup_level2 msgid "${user.company_id.name} Payment Follow-up" -msgstr "" +msgstr "${user.company_id.name} Mahnwesen" #. module: account_followup #: view:account_followup.sending.results:0 msgid "Summary of actions" -msgstr "" +msgstr "Zusammenfassung Mahnungen" #. module: account_followup #: report:account_followup.followup.print:0 @@ -1113,7 +1350,7 @@ msgstr "Ref." #. module: account_followup #: view:account_followup.followup.line:0 msgid "After" -msgstr "" +msgstr "Danach" #. module: account_followup #: view:account_followup.stat:0 @@ -1126,6 +1363,8 @@ msgid "" "If not specified by the latest follow-up level, it will send from the " "default follow-up of overdue invoices template" msgstr "" +"Falls nicht automatisch durch die Mahnstufe vorgegeben, wird die Standard " +"Mahnvorlage für Anschreiben und EMail angewendet." #. module: account_followup #: model:ir.actions.act_window,help:account_followup.action_account_manual_reconcile_receivable @@ -1135,6 +1374,11 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Es wurden keine Buchungsbelege in diesem Journal " +"gefunden.\n" +"

\n" +" " #. module: account_followup #: view:account.move.line:0 @@ -1144,12 +1388,12 @@ msgstr "Partnereinträge" #. module: account_followup #: view:account_followup.stat:0 msgid "Follow-up lines" -msgstr "" +msgstr "Mahnpositionen" #. module: account_followup #: field:account_followup.followup.line,manual_action_responsible_id:0 msgid "Assign a Responsible" -msgstr "" +msgstr "Zuweisen eines Verantwortlichen" #. module: account_followup #: view:account_followup.print:0 @@ -1157,6 +1401,9 @@ msgid "" "This action will send follow-up emails, print the letters and\n" " set the manual actions per customers." msgstr "" +"Hierdurch werden Mahnungen als EMails versendet, Anschreiben ausgedruckt und " +"die manuell zu\n" +"bearbeiteten Mahnungen der Kunden ausgelöst." #. module: account_followup #: help:account_followup.print,partner_lang:0 @@ -1179,6 +1426,14 @@ msgid "" "installed\n" " using to top right icon." msgstr "" +"Schreiben Sie hier eine allgemeingültige Einführung,\n" +" in Abhängigkeit von der Mahnstufe. Sie können " +"dabei\n" +" die folgenden Schlüsselwörter verwenden. " +"Vergessen Sie\n" +" allerdings dann nicht alle Sprachen, die Sie " +"verwenden, mit Hilfe\n" +" des oberen rechten Knopfs zu installierenn." #. module: account_followup #: view:account_followup.stat:0 @@ -1194,7 +1449,7 @@ msgstr "Name" #. module: account_followup #: field:res.partner,latest_followup_level_id:0 msgid "Latest Follow-up Level" -msgstr "" +msgstr "Letzte Mahnstufe" #. module: account_followup #: field:account_followup.stat,date_move:0 @@ -1205,18 +1460,18 @@ msgstr "Erste Zahlung:" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_stat_by_partner msgid "Follow-up Statistics by Partner" -msgstr "" +msgstr "Statistik Mahnwesen nach Partner" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:172 #, python-format msgid " letter(s) in report" -msgstr "" +msgstr " Geschäftsformulare Ansicht" #. module: account_followup #: view:res.partner:0 msgid "Customer Followup" -msgstr "" +msgstr "Kunden Historie" #. module: account_followup #: model:ir.actions.act_window,help:account_followup.action_account_followup_definition_form @@ -1232,6 +1487,17 @@ msgid "" "

\n" " " msgstr "" +"p class = \"oe_view_nocontent_create\">\n" +"                 Klicken Sie, um zu definieren Follow-up Ebenen und die " +"damit verbundenen Aktionen.\n" +"               \n" +"                 Für jeden Schritt fest, welche Aktionen ergriffen werden " +"und verzögern in Tagen. es ist\n" +"                 möglich, Print-und E-Mail-Vorlagen verwenden, um bestimmte " +"Nachrichten zu senden\n" +"                 der Kunde.\n" +"               \n" +" " #. module: account_followup #: model:email.template,body_html:account_followup.email_template_account_followup_level2 @@ -1320,6 +1586,11 @@ msgid "" "set when the action fields are empty and the partner gets a follow-up level " "that requires a manual action. " msgstr "" +"Dies ist die nächste Aktion, die durch den Anwender getroffen werden muss. " +"Die Aktion wird jetzt automatisch so eingestellt, \r\n" +"dass erst wenn die Aktion Felder leer sind und der Partner eine automatische " +"Mahnstufe erhält, ein manueller Eingriff \r\n" +"erforderlich sein wird. " #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:166 @@ -1330,7 +1601,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "The" -msgstr "" +msgstr "Der" #. module: account_followup #: view:account_followup.print:0 @@ -1388,12 +1659,12 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Accounting" -msgstr "" +msgstr "Finanzbuchhaltung" #. module: account_followup #: field:res.partner,payment_note:0 msgid "Customer Payment Promise" -msgstr "" +msgstr "Kundenzahlung Versprechen" #~ msgid "All payable entries" #~ msgstr "Alle offenen Posten" diff --git a/addons/account_followup/i18n/pt.po b/addons/account_followup/i18n/pt.po index a41462e57b6..234b3bf1191 100644 --- a/addons/account_followup/i18n/pt.po +++ b/addons/account_followup/i18n/pt.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2010-12-16 00:03+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2012-12-07 10:43+0000\n" +"Last-Translator: Andrei Talpa (multibase.pt) \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:19+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:58+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_followup #: view:account_followup.followup.line:0 #: field:account_followup.followup.line,manual_action:0 msgid "Manual Action" -msgstr "" +msgstr "Ação manual" #. module: account_followup #: help:res.partner,latest_followup_level_id:0 @@ -30,7 +30,7 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "Group by" -msgstr "" +msgstr "Agrupar por" #. module: account_followup #: view:account_followup.stat:0 @@ -398,7 +398,7 @@ msgstr "" #: code:addons/account_followup/wizard/account_followup_print.py:155 #, python-format msgid "Nobody" -msgstr "" +msgstr "Ninguém" #. module: account_followup #: field:account.move.line,followup_line_id:0 diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 90dd5969d53..f101aeaa369 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -25,6 +25,8 @@ import pooler from report import report_sxw class report_rappel(report_sxw.rml_parse): + _name = "account_followup.report.rappel" + def __init__(self, cr, uid, name, context=None): super(report_rappel, self).__init__(cr, uid, name, context=context) self.localcontext.update({ @@ -79,7 +81,6 @@ class report_rappel(report_sxw.rml_parse): final_res.append({'line': line_cur[cur]['line']}) return final_res - def _get_text(self, stat_line, followup_id, context=None): if context is None: context = {} @@ -108,7 +109,6 @@ class report_rappel(report_sxw.rml_parse): 'company_name': stat_line.company_id.name, 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '', } - return text report_sxw.report_sxw('report.account_followup.followup.print', diff --git a/addons/account_followup/tests/test_account_followup.py b/addons/account_followup/tests/test_account_followup.py index c46977bd6b5..4495ffa6469 100644 --- a/addons/account_followup/tests/test_account_followup.py +++ b/addons/account_followup/tests/test_account_followup.py @@ -108,7 +108,7 @@ class TestAccountFollowup(TransactionCase): def test_03_filter_on_credit(self): """ Check the partners can be filtered on having credits """ cr, uid = self.cr, self.uid - ids = self.partner.search(cr, uid, [('credit', '>=', 0.0)]) + ids = self.partner.search(cr, uid, [('payment_amount_due', '>=', 0.0)]) self.assertIn(self.partner_id, ids) def test_04_action_done(self): @@ -153,7 +153,6 @@ class TestAccountFollowup(TransactionCase): }, context={"followup_id": self.followup_id}) self.wizard.do_process(cr, uid, [self.wizard_id], context={"followup_id": self.followup_id}) partner_ref = self.partner.browse(cr, uid, self.partner_id) - print partner_ref.credit, partner_ref.payment_next_action_date, partner_ref.payment_responsible_id - self.assertEqual(0, self.partner.browse(cr, uid, self.partner_id).credit, "Credit != 0") + self.assertEqual(0, self.partner.browse(cr, uid, self.partner_id).payment_amount_due, "Amount Due != 0") self.assertFalse(self.partner.browse(cr, uid, self.partner_id).payment_next_action_date, "Next action date not cleared") - \ No newline at end of file + diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index db93b3c63a8..3f8bba1830f 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -152,7 +152,7 @@ class account_followup_print(osv.osv_memory): if partner.max_followup_id.manual_action: partner_obj.do_partner_manual_action(cr, uid, [partner.partner_id.id], context=context) nbmanuals = nbmanuals + 1 - key = partner.partner_id.payment_responsible_id.name or _("Nobody") + key = partner.partner_id.payment_responsible_id.name or _("Anybody") if not key in manuals.keys(): manuals[key]= 1 else: @@ -198,15 +198,12 @@ class account_followup_print(osv.osv_memory): ids = self.pool.get('res.partner').search(cr, uid, ['&', ('id', 'not in', partner_list_ids), '|', ('payment_responsible_id', '!=', False), ('payment_next_action_date', '!=', False)], context=context) - partners = self.pool.get('res.partner').browse(cr, uid, ids, context=context) - newids = [] - for part in partners: - credit = 0 - for aml in part.unreconciled_aml_ids: - credit +=aml.result - if credit <= 0: - newids.append(part.id) - self.pool.get('res.partner').action_done(cr, uid, newids, context=context) + + partners_to_clear = [] + for part in self.pool.get('res.partner').browse(cr, uid, ids, context=context): + if not part.unreconciled_aml_ids: + partners_to_clear.append(part.id) + self.pool.get('res.partner').action_done(cr, uid, partners_to_clear, context=context) return len(ids) def do_process(self, cr, uid, ids, context=None): diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index 29f36522d05..62943330d63 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -13,7 +13,7 @@

This action will send follow-up emails, print the letters and - set the manual actions per customers. + set the manual actions per customer, according to the follow-up levels defined.

- - - - - - - - Create a Partner - ir.actions.act_window - crm.lead2partner - form - - new - - - - diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py index edfefb5e5bc..38f88b1c083 100644 --- a/addons/crm/wizard/crm_merge_opportunities.py +++ b/addons/crm/wizard/crm_merge_opportunities.py @@ -21,33 +21,51 @@ from osv import osv, fields from tools.translate import _ class crm_merge_opportunity(osv.osv_memory): - """Merge two Opportunities""" + """ + Merge opportunities together. + If we're talking about opportunities, it's just because it makes more sense + to merge opps than leads, because the leads are more ephemeral objects. + But since opportunities are leads, it's also possible to merge leads + together (resulting in a new lead), or leads and opps together (resulting + in a new opp). + """ _name = 'crm.merge.opportunity' - _description = 'Merge two Opportunities' - - def action_merge(self, cr, uid, ids, context=None): - if context is None: - context = {} - lead = self.pool.get('crm.lead') - record = self.browse(cr, uid, ids[0], context=context) - opportunities = record.opportunity_ids - #TOFIX: why need to check lead_ids here - lead_ids = [opportunities[0].id] - self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context) - context['lead_ids'] = lead_ids - merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context) - return lead.redirect_opportunity_view(cr, uid, merge_id, context=context) - + _description = 'Merge opportunities' _columns = { 'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'), } + def action_merge(self, cr, uid, ids, context=None): + if context is None: + context = {} + + lead_obj = self.pool.get('crm.lead') + wizard = self.browse(cr, uid, ids[0], context=context) + opportunity2merge_ids = wizard.opportunity_ids + + #TODO: why is this passed through the context ? + context['lead_ids'] = [opportunity2merge_ids[0].id] + + merge_id = lead_obj.merge_opportunity(cr, uid, [x.id for x in opportunity2merge_ids], context=context) + + # The newly created lead might be a lead or an opp: redirect toward the right view + merge_result = lead_obj.browse(cr, uid, merge_id, context=context) + + if merge_result.type == 'opportunity': + return lead_obj.redirect_opportunity_view(cr, uid, merge_id, context=context) + else: + return lead_obj.redirect_lead_view(cr, uid, merge_id, context=context) + def default_get(self, cr, uid, fields, context=None): """ - This function gets default values + Use active_ids from the context to fetch the leads/opps to merge. + In order to get merged, these leads/opps can't be in 'Done' or + 'Cancel' state. """ - record_ids = context and context.get('active_ids', False) or False + if context is None: + context = {} + record_ids = context.get('active_ids', False) res = super(crm_merge_opportunity, self).default_get(cr, uid, fields, context=context) if record_ids: @@ -61,6 +79,4 @@ class crm_merge_opportunity(osv.osv_memory): return res -crm_merge_opportunity() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_partner_binding.py b/addons/crm/wizard/crm_partner_binding.py new file mode 100644 index 00000000000..bc686db40f4 --- /dev/null +++ b/addons/crm/wizard/crm_partner_binding.py @@ -0,0 +1,115 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from osv import osv, fields +from tools.translate import _ + +class crm_partner_binding(osv.osv_memory): + """ + Handle the partner binding or generation in any CRM wizard that requires + such feature, like the lead2opportunity wizard, or the + phonecall2opportunity wizard. Try to find a matching partner from the + CRM model's information (name, email, phone number, etc) or create a new + one on the fly. + Use it like a mixin with the wizard of your choice. + """ + _name = 'crm.partner.binding' + _description = 'Handle partner binding or generation in CRM wizards.' + _columns = { + 'action': fields.selection([ + ('exist', 'Link to an existing customer'), + ('create', 'Create a new customer'), + ('nothing', 'Do not link to a customer') + ], 'Related Customer', required=True), + 'partner_id': fields.many2one('res.partner', 'Customer'), + } + + def _find_matching_partner(self, cr, uid, context=None): + """ + Try to find a matching partner regarding the active model data, like + the customer's name, email, phone number, etc. + + :return int partner_id if any, False otherwise + """ + if context is None: + context = {} + partner_id = False + partner_obj = self.pool.get('res.partner') + + # The active model has to be a lead or a phonecall + if (context.get('active_model') == 'crm.lead') and context.get('active_id'): + active_model = self.pool.get('crm.lead').browse(cr, uid, context.get('active_id'), context=context) + elif (context.get('active_model') == 'crm.phonecall') and context.get('active_id'): + active_model = self.pool.get('crm.phonecall').browse(cr, uid, context.get('active_id'), context=context) + + # Find the best matching partner for the active model + if (active_model): + partner_obj = self.pool.get('res.partner') + + # A partner is set already + if active_model.partner_id: + partner_id = active_model.partner_id.id + # Search through the existing partners based on the lead's email + elif active_model.email_from: + partner_ids = partner_obj.search(cr, uid, [('email', '=', active_model.email_from)], context=context) + if partner_ids: + partner_id = partner_ids[0] + # Search through the existing partners based on the lead's partner or contact name + elif active_model.partner_name: + partner_ids = partner_obj.search(cr, uid, [('name', 'ilike', '%'+active_model.partner_name+'%')], context=context) + if partner_ids: + partner_id = partner_ids[0] + elif active_model.contact_name: + partner_ids = partner_obj.search(cr, uid, [ + ('name', 'ilike', '%'+active_model.contact_name+'%')], context=context) + if partner_ids: + partner_id = partner_ids[0] + + return partner_id + + def default_get(self, cr, uid, fields, context=None): + res = super(crm_partner_binding, self).default_get(cr, uid, fields, context=context) + partner_id = self._find_matching_partner(cr, uid, context=context) + + if 'action' in fields: + res['action'] = partner_id and 'exist' or 'create' + if 'partner_id' in fields: + res['partner_id'] = partner_id + + return res + + def _create_partner(self, cr, uid, ids, context=None): + """ + Create partner based on action. + :return dict: dictionary organized as followed: {lead_id: partner_assigned_id} + """ + #TODO this method in only called by crm_lead2opportunity_partner + #wizard and would probably diserve to be refactored or at least + #moved to a better place + if context is None: + context = {} + lead = self.pool.get('crm.lead') + lead_ids = context.get('active_ids', []) + data = self.browse(cr, uid, ids, context=context)[0] + partner_id = data.partner_id and data.partner_id.id or False + return lead.handle_partner_assignation(cr, uid, lead_ids, data.action, partner_id, context=context) + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_partner_to_opportunity.py b/addons/crm/wizard/crm_partner_to_opportunity.py deleted file mode 100644 index aa8f4a2a036..00000000000 --- a/addons/crm/wizard/crm_partner_to_opportunity.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import osv, fields -from tools.translate import _ - -class crm_partner2opportunity(osv.osv_memory): - """Converts Partner To Opportunity""" - - _name = 'crm.partner2opportunity' - _description = 'Partner To Opportunity' - - _columns = { - 'name' : fields.char('Opportunity Name', size=64, required=True), - 'planned_revenue': fields.float('Expected Revenue', digits=(16,2)), - 'probability': fields.float('Success Probability', digits=(16,2)), - 'partner_id': fields.many2one('res.partner', 'Customer'), - } - - def action_cancel(self, cr, uid, ids, context=None): - """ - Closes Partner 2 Opportunity - """ - return {'type':'ir.actions.act_window_close'} - - def default_get(self, cr, uid, fields, context=None): - """ - This function gets default values - """ - partner_obj = self.pool.get('res.partner') - data = context and context.get('active_ids', []) or [] - res = super(crm_partner2opportunity, self).default_get(cr, uid, fields, context=context) - - for partner in partner_obj.browse(cr, uid, data, []): - if 'name' in fields: - res.update({'name': partner.name}) - if 'partner_id' in fields: - res.update({'partner_id': data and data[0] or False}) - return res - - def make_opportunity(self, cr, uid, ids, context=None): - partner_ids = context and context.get('active_ids', []) or [] - partner_id = partner_ids[0] if partner_ids else None - partner = self.pool.get('res.partner') - lead = self.pool.get('crm.lead') - data = self.browse(cr, uid, ids, context=context)[0] - opportunity_ids = partner.make_opportunity(cr, uid, partner_ids, - data.name, - data.planned_revenue, - data.probability, - partner_id, - context=context, - ) - opportunity_id = opportunity_ids[partner_ids[0]] - return lead.redirect_opportunity_view(cr, uid, opportunity_id, context=context) - -crm_partner2opportunity() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml deleted file mode 100644 index 7f0b5957071..00000000000 --- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - crm.crm.partner2opportunity - crm.partner2opportunity - -
- - - - - - -
-
-
- - - - - diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity.py b/addons/crm/wizard/crm_phonecall_to_opportunity.py index 7305cbd8b5f..e69de29bb2d 100644 --- a/addons/crm/wizard/crm_phonecall_to_opportunity.py +++ b/addons/crm/wizard/crm_phonecall_to_opportunity.py @@ -1,65 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import osv, fields -from tools.translate import _ - -class crm_phonecall2opportunity(osv.osv_memory): - """ Converts Phonecall to Opportunity""" - - _name = 'crm.phonecall2opportunity' - _inherit = 'crm.partner2opportunity' - _description = 'Phonecall To Opportunity' - - def make_opportunity(self, cr, uid, ids, context=None): - """ - This converts Phonecall to Opportunity and opens Phonecall view - """ - if not len(ids): - return False - call_ids = context and context.get('active_ids', False) or False - this = self.browse(cr, uid, ids[0], context=context) - if not call_ids: - return {} - opportunity = self.pool.get('crm.lead') - phonecall = self.pool.get('crm.phonecall') - opportunity_ids = phonecall.convert_opportunity(cr, uid, call_ids, this.name, this.partner_id and this.partner_id.id or False, \ - this.planned_revenue, this.probability, context=context) - return opportunity.redirect_opportunity_view(cr, uid, opportunity_ids[call_ids[0]], context=context) - - def default_get(self, cr, uid, fields, context=None): - """ - This function gets default values - """ - record_id = context and context.get('active_id', False) or False - res = {} - - if record_id: - phonecall = self.pool.get('crm.phonecall').browse(cr, uid, record_id, context=context) - if 'name' in fields: - res.update({'name': phonecall.name}) - if 'partner_id' in fields: - res.update({'partner_id': phonecall.partner_id and phonecall.partner_id.id or False}) - return res - -crm_phonecall2opportunity() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml b/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml deleted file mode 100644 index 4b2ec725759..00000000000 --- a/addons/crm/wizard/crm_phonecall_to_opportunity_view.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - crm.phonecall2opportunity.form - crm.phonecall2opportunity - -
- - - - -
-
-
- - - - - - - Convert to opportunity - crm.phonecall2opportunity - form - form - - new - - - - diff --git a/addons/crm/wizard/crm_phonecall_to_partner.py b/addons/crm/wizard/crm_phonecall_to_partner.py deleted file mode 100644 index 715b7396c66..00000000000 --- a/addons/crm/wizard/crm_phonecall_to_partner.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import osv, fields -from tools.translate import _ - -class crm_phonecall2partner(osv.osv_memory): - """ Converts phonecall to partner """ - - _name = 'crm.phonecall2partner' - _inherit = 'crm.lead2partner' - _description = 'Phonecall to Partner' - - def _select_partner(self, cr, uid, context=None): - """ - This function Searches for Partner from selected phonecall. - """ - if context is None: - context = {} - - phonecall_obj = self.pool.get('crm.phonecall') - partner_obj = self.pool.get('res.partner') - rec_ids = context and context.get('active_ids', []) - value = {} - partner_id = False - for phonecall in phonecall_obj.browse(cr, uid, rec_ids, context=context): - partner_ids = partner_obj.search(cr, uid, [('name', '=', phonecall.name or phonecall.name)]) - if not partner_ids and (phonecall.partner_phone or phonecall.partner_mobile): - partner_ids = partner_obj.search(cr, uid, ['|', ('phone', '=', phonecall.partner_phone), ('mobile','=',phonecall.partner_mobile)]) - - partner_id = partner_ids and partner_ids[0] or False - return partner_id - - - def _create_partner(self, cr, uid, ids, context=None): - """ - This function Creates partner based on action. - """ - if context is None: - context = {} - phonecall = self.pool.get('crm.phonecall') - data = self.browse(cr, uid, ids, context=context)[0] - call_ids = context and context.get('active_ids') or [] - partner_id = data.partner_id and data.partner_id.id or False - return phonecall.convert_partner(cr, uid, call_ids, data.action, partner_id, context=context) - -crm_phonecall2partner() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_phonecall_to_partner_view.xml b/addons/crm/wizard/crm_phonecall_to_partner_view.xml deleted file mode 100644 index 7231876b0c1..00000000000 --- a/addons/crm/wizard/crm_phonecall_to_partner_view.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - crm.phonecall2partner.view.create - crm.phonecall2partner - -
-
- - - - - - crm.phonecall2partner.view - crm.phonecall2partner - -
- - - - -
-
-
- - - - - - - Create a Partner - ir.actions.act_window - crm.phonecall2partner - form - - new - - - diff --git a/addons/crm_claim/i18n/pt_BR.po b/addons/crm_claim/i18n/pt_BR.po index f3d7fdc7395..30cd4e9f304 100644 --- a/addons/crm_claim/i18n/pt_BR.po +++ b/addons/crm_claim/i18n/pt_BR.po @@ -8,14 +8,15 @@ 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-02-16 01:30+0000\n" -"Last-Translator: Gustavo T \n" +"PO-Revision-Date: 2012-12-07 22:40+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"\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-04 05:49+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_claim #: help:crm.claim.stage,fold:0 @@ -23,6 +24,8 @@ msgid "" "This stage is not visible, for example in status bar or kanban view, when " "there are no records in that stage to display." msgstr "" +"Este estágio não é visível, por exemplo na barra de status ou visão kanban, " +"quando não há registros definidos no mesmo para visualizar." #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -46,11 +49,13 @@ msgid "" "Allows you to configure your incoming mail server, and create claims from " "incoming emails." msgstr "" +"Permite configurar o servidor de e-mails recebidos, e criar solicitações a " +"partir de e-mails recebidos." #. module: crm_claim #: model:ir.model,name:crm_claim.model_crm_claim_stage msgid "Claim stages" -msgstr "" +msgstr "Estágios de Solicitações" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -65,7 +70,7 @@ msgstr "Adiar o fechamento" #. module: crm_claim #: field:crm.claim,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Mensagens não lidas" #. module: crm_claim #: field:crm.claim,resolution:0 @@ -91,6 +96,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Clique para criar uma categoria de solicitação.\n" +"

\n" +" Crie categorias de solicitações para melhor gerenciar e " +"classificar as solicitações,\n" +" Alguns exemplos de solicitações podem ser: ação preventiva, " +"ação corretiva.\n" +"

\n" +" " #. module: crm_claim #: view:crm.claim.report:0 @@ -100,7 +114,7 @@ msgstr "Nº da Solicitação" #. module: crm_claim #: field:crm.claim.stage,name:0 msgid "Stage Name" -msgstr "" +msgstr "Nome do Estágio" #. module: crm_claim #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim @@ -114,7 +128,7 @@ msgstr "" #. module: crm_claim #: view:crm.claim.report:0 msgid "Salesperson" -msgstr "" +msgstr "Vendedor" #. module: crm_claim #: selection:crm.claim,priority:0 @@ -158,7 +172,7 @@ msgstr "Preventiva" #. module: crm_claim #: help:crm.claim,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Se marcado novas mensagens solicitarão sua atenção." #. module: crm_claim #: field:crm.claim.report,date_closed:0 @@ -168,7 +182,7 @@ msgstr "Data de Fechamento" #. module: crm_claim #: view:res.partner:0 msgid "False" -msgstr "" +msgstr "Falso" #. module: crm_claim #: field:crm.claim,ref:0 @@ -191,6 +205,9 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Contém o resumo da conversação (número de mensagens, ...). Este resumo é " +"gerado diretamente em formato HTML para que possa ser inserido nas visões " +"kanban." #. module: crm_claim #: view:crm.claim:0 @@ -249,12 +266,12 @@ msgstr "Prioridade" #. module: crm_claim #: field:crm.claim.stage,fold:0 msgid "Hide in Views when Empty" -msgstr "" +msgstr "Ocultar nas visões quando estiver vazio" #. module: crm_claim #: field:crm.claim,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Seguidores" #. module: crm_claim #: view:crm.claim:0 @@ -268,7 +285,7 @@ msgstr "Nova" #. module: crm_claim #: field:crm.claim.stage,section_ids:0 msgid "Sections" -msgstr "" +msgstr "Seções" #. module: crm_claim #: field:crm.claim,email_from:0 @@ -304,7 +321,7 @@ msgstr "Assunto da Solicitação" #. module: crm_claim #: model:crm.claim.stage,name:crm_claim.stage_claim3 msgid "Rejected" -msgstr "" +msgstr "Rejeitada" #. module: crm_claim #: field:crm.claim,date_action_next:0 @@ -315,7 +332,7 @@ msgstr "Data da próxima ação" #: code:addons/crm_claim/crm_claim.py:243 #, python-format msgid "Claim has been created." -msgstr "" +msgstr "A solicitação foi criada." #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -349,13 +366,13 @@ msgstr "Datas" #. module: crm_claim #: help:crm.claim,email_from:0 msgid "Destination email for email gateway." -msgstr "" +msgstr "Email de destino para o servidor de email." #. module: crm_claim #: code:addons/crm_claim/crm_claim.py:199 #, python-format msgid "No Subject" -msgstr "" +msgstr "Sem Assunto" #. module: crm_claim #: help:crm.claim.stage,state:0 @@ -365,11 +382,15 @@ msgid "" "is related to the status 'Close', when your document reaches this stage, it " "will be automatically have the 'closed' status." msgstr "" +"O estado relacionado para o estágio. A situação do documento muda " +"automaticamente em relação à fase selecionada. Por exemplo, se uma etapa " +"está relacionada ao \"Fechamento\", quando o documento chega a esta fase, " +"ficará automaticamente com a situação de 'fechado'." #. module: crm_claim #: view:crm.claim:0 msgid "Settle" -msgstr "" +msgstr "Resolução" #. module: crm_claim #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view @@ -395,7 +416,7 @@ msgstr "Relatório de Solicitações no CRM" #. module: crm_claim #: view:sale.config.settings:0 msgid "Configure" -msgstr "" +msgstr "Configurar" #. module: crm_claim #: model:crm.case.resource.type,name:crm_claim.type_claim1 @@ -441,6 +462,8 @@ msgid "" "If you check this field, this stage will be proposed by default on each " "sales team. It will not assign this stage to existing teams." msgstr "" +"Se você marcar este campo, esta etapa será proposta por padrão em cada " +"equipe de vendas. Não irá atribuir esta fase às equipes já existentes." #. module: crm_claim #: field:crm.claim,categ_id:0 @@ -497,7 +520,7 @@ msgstr "Fechada" #. module: crm_claim #: view:crm.claim:0 msgid "Reject" -msgstr "" +msgstr "Rejeitar" #. module: crm_claim #: view:res.partner:0 @@ -507,7 +530,7 @@ msgstr "Solicitações de Parceiros" #. module: crm_claim #: view:crm.claim.stage:0 msgid "Claim Stage" -msgstr "" +msgstr "Estágio da Solicitação" #. module: crm_claim #: view:crm.claim:0 @@ -525,7 +548,7 @@ msgstr "Pendente" #: field:crm.claim.report,state:0 #: field:crm.claim.stage,state:0 msgid "Status" -msgstr "" +msgstr "Situação" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -541,7 +564,7 @@ msgstr "Normal" #. module: crm_claim #: help:crm.claim.stage,sequence:0 msgid "Used to order stages. Lower is better." -msgstr "" +msgstr "Usado para ordenar estágios. Mais baixo é melhor." #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -561,7 +584,7 @@ msgstr "Telefone" #. module: crm_claim #: field:crm.claim,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "É um Seguidor" #. module: crm_claim #: field:crm.claim.report,user_id:0 @@ -583,6 +606,17 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Clique para configurar um novo estágio na resolução de " +"solicitações. \n" +"

\n" +" Você pode criar estágios para categorizar a situação de " +"cada\n" +" solicitação inserida no sistema. Os estágios definem todos " +"os passos\n" +" necessários para resolver a solicitação.\n" +"

\n" +" " #. module: crm_claim #: help:crm.claim,state:0 @@ -593,6 +627,10 @@ msgid "" "the case needs to be reviewed then the status is set " "to 'Pending'." msgstr "" +"A situação é definida como 'Provisória' quando o caso é criado. Se o caso " +"está em progresso, a situação muda para 'Aberto'. Quando o caso termina, a " +"situação é definida como 'Concluído'. Se o caso precisa ser revisado, a " +"situação é definida como 'Pendente'." #. module: crm_claim #: field:crm.claim,active:0 @@ -613,7 +651,7 @@ msgstr "Filtros Extendidos..." #: field:crm.claim,message_comment_ids:0 #: help:crm.claim,message_comment_ids:0 msgid "Comments and emails" -msgstr "" +msgstr "Comentários e e-mails" #. module: crm_claim #: view:crm.claim:0 @@ -626,6 +664,8 @@ msgid "" "Responsible sales team. Define Responsible user and Email account for mail " "gateway." msgstr "" +"Responsável da Equipe de Vendas. Definir o usuário e email para o servidor " +"de emails." #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -646,7 +686,7 @@ msgstr "Data da Solicitação" #. module: crm_claim #: field:crm.claim,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Resumo" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action @@ -656,7 +696,7 @@ msgstr "Categorias de Solicitações" #. module: crm_claim #: field:crm.claim.stage,case_default:0 msgid "Common to All Teams" -msgstr "" +msgstr "Comum a Todas as Equipes" #. module: crm_claim #: view:crm.claim:0 @@ -695,7 +735,7 @@ msgstr "Solicitação" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Company" -msgstr "" +msgstr "Minha Empresa" #. module: crm_claim #: view:crm.claim.report:0 @@ -751,7 +791,7 @@ msgstr "Solicitações em aberto" #: code:addons/crm_claim/crm_claim.py:247 #, python-format msgid "Claim has been refused." -msgstr "" +msgstr "A solicitação foi recusada." #. module: crm_claim #: field:crm.claim,cause:0 @@ -792,7 +832,7 @@ msgstr "Ações de Resolução" #. module: crm_claim #: field:crm.claim.stage,case_refused:0 msgid "Refused stage" -msgstr "" +msgstr "Estágio Recusado" #. module: crm_claim #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0 @@ -818,7 +858,7 @@ msgstr "Nº de Emails" #: code:addons/crm_claim/crm_claim.py:253 #, python-format msgid "Stage changed to %s." -msgstr "" +msgstr "Estágio alterado para %s." #. module: crm_claim #: view:crm.claim.report:0 @@ -833,7 +873,7 @@ msgstr "Fevereiro" #. module: crm_claim #: model:ir.model,name:crm_claim.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: crm_claim #: view:crm.claim.report:0 @@ -859,22 +899,22 @@ msgstr "Meu(s) Caso(s)" #. module: crm_claim #: model:crm.claim.stage,name:crm_claim.stage_claim2 msgid "Settled" -msgstr "" +msgstr "Resolvido" #. module: crm_claim #: help:crm.claim,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Histórico de mensagens e comunicação" #. module: crm_claim #: field:sale.config.settings,fetchmail_claim:0 msgid "Create claims from incoming mails" -msgstr "" +msgstr "Criar solicitações a partir de emails" #. module: crm_claim #: field:crm.claim.stage,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Seqüência" #. module: crm_claim #: view:crm.claim:0 @@ -909,11 +949,13 @@ msgid "" "Link between stages and sales teams. When set, this limitate the current " "stage to the selected sales teams." msgstr "" +"Conexão entre estágios e equipes de vendas. Quando definido, ele limita o " +"estágio atual às equipes de vendas selecionadas." #. module: crm_claim #: help:crm.claim.stage,case_refused:0 msgid "Refused stages are specific stages for done." -msgstr "" +msgstr "Estágios de Recusados são específicos para concluídos." #~ msgid "Partner Contact" #~ msgstr "Contato do Parceiro" diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po index 309261244c0..579e1536875 100644 --- a/addons/crm_helpdesk/i18n/pt_BR.po +++ b/addons/crm_helpdesk/i18n/pt_BR.po @@ -8,14 +8,15 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-02-16 01:24+0000\n" -"Last-Translator: Gustavo T \n" +"PO-Revision-Date: 2012-12-07 23:04+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"\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-11-25 06:28+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -31,7 +32,7 @@ msgstr "# de Casos" #: code:addons/crm_helpdesk/crm_helpdesk.py:152 #, python-format msgid "Case has been created." -msgstr "" +msgstr "O caso foi criado." #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -42,7 +43,7 @@ msgstr "Agrupar Por..." #. module: crm_helpdesk #: help:crm.helpdesk,email_from:0 msgid "Destination email for email gateway" -msgstr "" +msgstr "Email de destino para o servidor." #. module: crm_helpdesk #: selection:crm.helpdesk.report,month:0 @@ -52,7 +53,7 @@ msgstr "Março" #. module: crm_helpdesk #: field:crm.helpdesk,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Mensagens não lidas" #. module: crm_helpdesk #: field:crm.helpdesk,company_id:0 @@ -69,7 +70,7 @@ msgstr "Emails dos Observadores" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Salesperson" -msgstr "" +msgstr "Vendedor" #. module: crm_helpdesk #: selection:crm.helpdesk,priority:0 @@ -112,7 +113,7 @@ msgstr "Cancelado" #. module: crm_helpdesk #: help:crm.helpdesk,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Se marcado novas mensagens solicitarão sua atenção." #. module: crm_helpdesk #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk @@ -142,6 +143,9 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Contém o resumo da conversação (número de mensagens, ...). Este resumo é " +"gerado diretamente em formato HTML para que possa ser inserido nas visões " +"kanban." #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -182,7 +186,7 @@ msgstr "Prioridade" #. module: crm_helpdesk #: field:crm.helpdesk,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Seguidores" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -284,6 +288,8 @@ msgid "" "Helpdesk requests that are assigned to me or to one of the sale teams I " "manage" msgstr "" +"Pedidos de helpdesk que são atribuídas a mim ou para uma das equipes de " +"venda que eu administro" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -406,7 +412,7 @@ msgstr "Pendente" #: view:crm.helpdesk.report:0 #: field:crm.helpdesk.report,state:0 msgid "Status" -msgstr "" +msgstr "Situação" #. module: crm_helpdesk #: selection:crm.helpdesk.report,month:0 @@ -451,6 +457,21 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Clique para criar um novo caso. \n" +"

\n" +" Helpdesk e Suporte permite que você acompanhe suas " +"intervenções.\n" +"

\n" +" Use o Sistema de Casos do OpenERP para gerenciar suas " +"atividades\n" +" de suporte. Casos podem ser conectados através de um email: " +"novos\n" +" emails podem criar casos, cada um deles registra o histórico " +"de\n" +" comunicação com o cliente.\n" +"

\n" +" " #. module: crm_helpdesk #: field:crm.helpdesk,planned_revenue:0 @@ -460,7 +481,7 @@ msgstr "Receita Planejada" #. module: crm_helpdesk #: field:crm.helpdesk,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "É um Seguidor" #. module: crm_helpdesk #: field:crm.helpdesk.report,user_id:0 @@ -491,7 +512,7 @@ msgstr "Pedidos de Chamados" #: field:crm.helpdesk,message_comment_ids:0 #: help:crm.helpdesk,message_comment_ids:0 msgid "Comments and emails" -msgstr "" +msgstr "Comentários e e-mails" #. module: crm_helpdesk #: help:crm.helpdesk,section_id:0 @@ -499,6 +520,8 @@ msgid "" "Responsible sales team. Define Responsible user and Email account for mail " "gateway." msgstr "" +"Responsável da Equipe de Vendas. Definir o usuário e email para o servidor " +"de emails." #. module: crm_helpdesk #: selection:crm.helpdesk.report,month:0 @@ -513,7 +536,7 @@ msgstr "Janeiro" #. module: crm_helpdesk #: field:crm.helpdesk,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Resumo" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -529,7 +552,7 @@ msgstr "Diversos" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "My Company" -msgstr "" +msgstr "Minha Empresa" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -674,11 +697,15 @@ msgid "" " \n" "If the case needs to be reviewed then the status is set to 'Pending'." msgstr "" +"A situação é definida como 'Provisório', quando o caso é criado.\n" +"Se o caso está em andamento, a situação é definida como 'Aberto'.\n" +"Quando o caso finaliza, a situação muda para 'Concluído'.\n" +"Se o caso necessitar de revisão então a situação será 'Pendente\"." #. module: crm_helpdesk #: help:crm.helpdesk,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Histórico de mensagens e comunicação" #. module: crm_helpdesk #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action @@ -720,7 +747,7 @@ msgstr "Última Ação" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Assigned to Me or My Sales Team(s)" -msgstr "" +msgstr "Associado a Mim ou a Minha Equipe de Vendas" #. module: crm_helpdesk #: field:crm.helpdesk,duration:0 diff --git a/addons/crm_partner_assign/i18n/nb.po b/addons/crm_partner_assign/i18n/nb.po new file mode 100644 index 00000000000..56497c83f58 --- /dev/null +++ b/addons/crm_partner_assign/i18n/nb.po @@ -0,0 +1,931 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 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-06 10:55+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-07 04:36+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,delay_close:0 +msgid "Delay to Close" +msgstr "Forsinkelse til lukking." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,author_id:0 +msgid "Author" +msgstr "Forfatter." + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,planned_revenue:0 +msgid "Planned Revenue" +msgstr "Planlagt omsetning." + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,type:0 +msgid "" +"Message type: email for email message, notification for system message, " +"comment for other messages such as user replies" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,nbr:0 +msgid "# of Cases" +msgstr "# av Saker." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: view:crm.partner.report.assign:0 +msgid "Group By..." +msgstr "Grupper etter ..." + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,body:0 +msgid "Automatically sanitized HTML contents" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead:0 +msgid "Forward" +msgstr "Fremover." + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Geo Localize" +msgstr "Geo lokalisert." + +#. module: crm_partner_assign +#: view:crm.lead.forward.to.partner:0 +msgid "Body" +msgstr "Kropp." + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,email_from:0 +msgid "" +"Email address of the sender. This field is set when no matching partner is " +"found for incoming emails." +msgstr "" + +#. module: crm_partner_assign +#: view:crm.partner.report.assign:0 +msgid "Date Partnership" +msgstr "Dato Partnerskap." + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,type:0 +msgid "Lead" +msgstr "Fører." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Delay to close" +msgstr "Forsinket til lukking." + +#. module: crm_partner_assign +#: selection:crm.lead.forward.to.partner,history_mode:0 +msgid "Whole Story" +msgstr "Hele historien." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,company_id:0 +msgid "Company" +msgstr "Firma." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,notification_ids:0 +msgid "Notifications" +msgstr "Varsling." + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,date_assign:0 +msgid "Partner Date" +msgstr "Partner dato." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: view:crm.partner.report.assign:0 +#: view:res.partner:0 +msgid "Salesperson" +msgstr "Salgsman." + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,priority:0 +msgid "Highest" +msgstr "Høyest." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,day:0 +msgid "Day" +msgstr "Dag." + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,message_id:0 +msgid "Message unique identifier" +msgstr "Unik melding identifikator." + +#. module: crm_partner_assign +#: field:res.partner,date_review_next:0 +msgid "Next Partner Review" +msgstr "Neste partner anmeldelse." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,favorite_user_ids:0 +msgid "Favorite" +msgstr "Favoritt." + +#. module: crm_partner_assign +#: selection:crm.lead.forward.to.partner,history_mode:0 +msgid "Latest email" +msgstr "Siste e-posten." + +#. module: crm_partner_assign +#: field:crm.lead,partner_latitude:0 +#: field:res.partner,partner_latitude:0 +msgid "Geo Latitude" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,state:0 +msgid "Cancelled" +msgstr "Kansellert." + +#. module: crm_partner_assign +#: view:crm.lead:0 +msgid "Geo Assignation" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner +msgid "Email composition wizard" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.partner.report.assign,turnover:0 +msgid "Turnover" +msgstr "Omsetning." + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,date_closed:0 +msgid "Close Date" +msgstr "Lukkingsdato." + +#. module: crm_partner_assign +#: help:res.partner,partner_weight:0 +msgid "" +"Gives the probability to assign a lead to this partner. (0 means no " +"assignation.)" +msgstr "" + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Partner Activation" +msgstr "Partner Aktivisering." + +#. module: crm_partner_assign +#: selection:crm.lead.forward.to.partner,type:0 +msgid "System notification" +msgstr "System varsling." + +#. module: crm_partner_assign +#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77 +#, python-format +msgid "Lead forward" +msgstr "Fører framover." + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,probability:0 +msgid "Avg Probability" +msgstr "" + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Previous" +msgstr "Forrige." + +#. module: crm_partner_assign +#: code:addons/crm_partner_assign/partner_geo_assign.py:36 +#, python-format +msgid "Network error" +msgstr "Nettverks feil." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,email_from:0 +msgid "From" +msgstr "Fra." + +#. module: crm_partner_assign +#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action +#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action +#: view:res.partner.grade:0 +msgid "Partner Grade" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: view:crm.partner.report.assign:0 +msgid "Section" +msgstr "Seksjon." + +#. module: crm_partner_assign +#: view:crm.lead.forward.to.partner:0 +msgid "Send" +msgstr "Send." + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Next" +msgstr "Neste." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,priority:0 +msgid "Priority" +msgstr "Prioritet." + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,author_id:0 +msgid "" +"Author of the message. If not set, email_from may hold an email address that " +"did not match any partner." +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,favorite_user_ids:0 +msgid "Users that set this message in their favorites" +msgstr "Brukere som setter denne meldingen i sine favoritter." + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,delay_expected:0 +msgid "Overpassed Deadline" +msgstr "Passert frist." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,type:0 +#: field:crm.lead.report.assign,type:0 +msgid "Type" +msgstr "Type." + +#. module: crm_partner_assign +#: selection:crm.lead.forward.to.partner,type:0 +msgid "Email" +msgstr "E-post." + +#. module: crm_partner_assign +#: help:crm.lead,partner_assigned_id:0 +msgid "Partner this case has been forwarded/assigned to." +msgstr "Partner, denne saken har blitt videresendt / tildelt." + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,priority:0 +msgid "Lowest" +msgstr "Laveste." + +#. module: crm_partner_assign +#: view:crm.partner.report.assign:0 +msgid "Date Invoice" +msgstr "Faktura dato." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,template_id:0 +msgid "Template" +msgstr "Mal." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Assign Date" +msgstr "Tildel dato." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Leads Analysis" +msgstr "Fører analyse." + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,creation_date:0 +msgid "Creation Date" +msgstr "Opprettelses dato." + +#. module: crm_partner_assign +#: model:ir.model,name:crm_partner_assign.model_res_partner_activation +msgid "res.partner.activation" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,parent_id:0 +msgid "Parent Message" +msgstr "Partner melding." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,res_id:0 +msgid "Related Document ID" +msgstr "Relatert dokument ID." + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,state:0 +msgid "Pending" +msgstr "Venter." + +#. module: crm_partner_assign +#: view:crm.lead:0 +msgid "Partner Assignation" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.report.assign,type:0 +msgid "Type is used to separate Leads and Opportunities" +msgstr "Typen brukes til å skille fører og muligheter." + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "July" +msgstr "Juli." + +#. module: crm_partner_assign +#: view:crm.partner.report.assign:0 +msgid "Date Review" +msgstr "Anmeldelse dato." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,stage_id:0 +msgid "Stage" +msgstr "Fase." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,state:0 +msgid "Status" +msgstr "Status." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,to_read:0 +msgid "To read" +msgstr "Å lese." + +#. module: crm_partner_assign +#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77 +#, python-format +msgid "Fwd" +msgstr "" + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Geo Localization" +msgstr "Geo lokalisering." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: view:crm.partner.report.assign:0 +msgid "Opportunities Assignment Analysis" +msgstr "Tilordnet muligheter analyse." + +#. module: crm_partner_assign +#: view:crm.lead.forward.to.partner:0 +#: view:res.partner:0 +msgid "Cancel" +msgstr "Avbryt." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,history_mode:0 +msgid "Send history" +msgstr "Send historie." + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Close" +msgstr "Lukk." + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "March" +msgstr "Mars." + +#. module: crm_partner_assign +#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign +#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree +msgid "Opp. Assignment Analysis" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.report.assign,delay_close:0 +msgid "Number of Days to close the case" +msgstr "Antall dager til sak lukkes." + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,notified_partner_ids:0 +msgid "" +"Partners that have a notification pushing this message in their mailboxes" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.forward.to.partner,type:0 +msgid "Comment" +msgstr "Kommentar." + +#. module: crm_partner_assign +#: field:res.partner,partner_weight:0 +msgid "Weight" +msgstr "Vekt." + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "April" +msgstr "April." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,grade_id:0 +#: view:crm.partner.report.assign:0 +#: field:crm.partner.report.assign,grade_id:0 +msgid "Grade" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "December" +msgstr "Desember." + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,vote_user_ids:0 +msgid "Users that voted for this message" +msgstr "Brukere som stemte på denne beskjeden." + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,month:0 +msgid "Month" +msgstr "Måned." + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,opening_date:0 +msgid "Opening Date" +msgstr "Åpningsdato." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,child_ids:0 +msgid "Child Messages" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.partner.report.assign,date_review:0 +#: field:res.partner,date_review:0 +msgid "Latest Partner Review" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,subject:0 +msgid "Subject" +msgstr "Emne." + +#. module: crm_partner_assign +#: view:crm.lead.forward.to.partner:0 +msgid "or" +msgstr "Eller." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,body:0 +msgid "Contents" +msgstr "Innhold." + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,vote_user_ids:0 +msgid "Votes" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "#Opportunities" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.partner.report.assign,date_partnership:0 +#: field:res.partner,date_partnership:0 +msgid "Partnership Date" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead:0 +msgid "Team" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,state:0 +msgid "Draft" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,priority:0 +msgid "Low" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: selection:crm.lead.report.assign,state:0 +msgid "Closed" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward +msgid "Mass forward to partner" +msgstr "" + +#. module: crm_partner_assign +#: view:res.partner:0 +#: field:res.partner,opportunity_assigned_ids:0 +msgid "Assigned Opportunities" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead,date_assign:0 +msgid "Assignation Date" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,probability_max:0 +msgid "Max Probability" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "August" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,record_name:0 +msgid "Name get of the related document." +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,priority:0 +msgid "Normal" +msgstr "" + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Escalate" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "June" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.report.assign,delay_open:0 +msgid "Number of Days to open the case" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,delay_open:0 +msgid "Delay to Open" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,user_id:0 +#: field:crm.partner.report.assign,user_id:0 +msgid "User" +msgstr "" + +#. module: crm_partner_assign +#: field:res.partner.grade,active:0 +msgid "Active" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "November" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Extended Filters..." +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead,partner_longitude:0 +#: field:res.partner,partner_longitude:0 +msgid "Geo Longitude" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.partner.report.assign,opp:0 +msgid "# of Opportunity" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Lead Assign" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "October" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead:0 +msgid "Assignation" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "January" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.forward.to.partner:0 +msgid "Send Mail" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,date:0 +msgid "Date" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Planned Revenues" +msgstr "" + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Partner Review" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.partner.report.assign,period_id:0 +msgid "Invoice Period" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.model,name:crm_partner_assign.model_res_partner_grade +msgid "res.partner.grade" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,message_id:0 +msgid "Message-Id" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.forward.to.partner:0 +#: field:crm.lead.forward.to.partner,attachment_ids:0 +msgid "Attachments" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,record_name:0 +msgid "Message Record Name" +msgstr "" + +#. module: crm_partner_assign +#: field:res.partner.activation,sequence:0 +#: field:res.partner.grade,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: crm_partner_assign +#: code:addons/crm_partner_assign/partner_geo_assign.py:37 +#, python-format +msgid "" +"Cannot contact geolocation servers. Please make sure that your internet " +"connection is up and running (%s)." +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "September" +msgstr "" + +#. module: crm_partner_assign +#: field:res.partner.grade,name:0 +msgid "Grade Name" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead,date_assign:0 +msgid "Last date this case was forwarded/assigned to a partner" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,state:0 +#: view:res.partner:0 +msgid "Open" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,subtype_id:0 +msgid "Subtype" +msgstr "" + +#. module: crm_partner_assign +#: field:res.partner,date_localization:0 +msgid "Geo Localization Date" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Current" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.model,name:crm_partner_assign.model_crm_lead +msgid "Lead/Opportunity" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,notified_partner_ids:0 +msgid "Notified partners" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.forward.to.partner:0 +#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act +msgid "Forward to Partner" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,section_id:0 +#: field:crm.partner.report.assign,section_id:0 +msgid "Sales Team" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "May" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,probable_revenue:0 +msgid "Probable Revenue" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.partner.report.assign:0 +#: field:crm.partner.report.assign,activation:0 +#: view:res.partner:0 +#: field:res.partner,activation:0 +#: view:res.partner.activation:0 +msgid "Activation" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead:0 +#: field:crm.lead,partner_assigned_id:0 +msgid "Assigned Partner" +msgstr "" + +#. module: crm_partner_assign +#: field:res.partner,grade_id:0 +msgid "Partner Level" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,type:0 +msgid "Opportunity" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,partner_id:0 +msgid "Customer" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,month:0 +msgid "February" +msgstr "" + +#. module: crm_partner_assign +#: field:res.partner.activation,name:0 +msgid "Name" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_activation_act +#: model:ir.ui.menu,name:crm_partner_assign.res_partner_activation_config_mi +msgid "Partner Activations" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,country_id:0 +#: view:crm.partner.report.assign:0 +#: field:crm.partner.report.assign,country_id:0 +msgid "Country" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,year:0 +msgid "Year" +msgstr "" + +#. module: crm_partner_assign +#: view:res.partner:0 +msgid "Convert to Opportunity" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead:0 +msgid "Geo Assign" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +msgid "Delay to open" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_partner_assign +#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_partner_assign_tree +msgid "Partnership Analysis" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,notification_ids:0 +msgid "" +"Technical field holding the message notifications. Use notified_partner_ids " +"to access notified partners." +msgstr "" + +#. module: crm_partner_assign +#: view:crm.partner.report.assign:0 +msgid "Partner assigned Analysis" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign +msgid "CRM Lead Report" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,composition_mode:0 +msgid "Composition mode" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,model:0 +msgid "Related Document Model" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.forward.to.partner,history_mode:0 +msgid "Case Information" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,to_read:0 +msgid "Functional field to search for messages the current user has to read" +msgstr "" + +#. module: crm_partner_assign +#: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign +msgid "CRM Partner Report" +msgstr "" + +#. module: crm_partner_assign +#: selection:crm.lead.report.assign,priority:0 +msgid "High" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,partner_ids:0 +msgid "Additional contacts" +msgstr "" + +#. module: crm_partner_assign +#: help:crm.lead.forward.to.partner,parent_id:0 +msgid "Initial thread message." +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.report.assign,create_date:0 +msgid "Create Date" +msgstr "" + +#. module: crm_partner_assign +#: field:crm.lead.forward.to.partner,filter_id:0 +msgid "Filters" +msgstr "" + +#. module: crm_partner_assign +#: view:crm.lead.report.assign:0 +#: field:crm.lead.report.assign,partner_assigned_id:0 +#: view:crm.partner.report.assign:0 +#: field:crm.partner.report.assign,partner_id:0 +#: model:ir.model,name:crm_partner_assign.model_res_partner +msgid "Partner" +msgstr "" diff --git a/addons/crm_profiling/i18n/pt_BR.po b/addons/crm_profiling/i18n/pt_BR.po index 8936b3846c8..ae565f1fbdc 100644 --- a/addons/crm_profiling/i18n/pt_BR.po +++ b/addons/crm_profiling/i18n/pt_BR.po @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-05-10 17:19+0000\n" -"Last-Translator: Adriano Prado \n" +"PO-Revision-Date: 2012-12-07 22:42+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -151,7 +152,7 @@ msgstr "Use as Regras de Criação de Perfil" #. module: crm_profiling #: constraint:crm.segmentation:0 msgid "Error ! You cannot create recursive profiles." -msgstr "" +msgstr "Erro! Você não pode criar perfis recursivos." #. module: crm_profiling #: field:crm.segmentation,answer_yes:0 @@ -200,7 +201,7 @@ msgstr "Salvar Dados" #. module: crm_profiling #: view:open.questionnaire:0 msgid "or" -msgstr "" +msgstr "ou" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" diff --git a/addons/crm_todo/i18n/pt_BR.po b/addons/crm_todo/i18n/pt_BR.po index 03e62a86157..eb001f1426c 100644 --- a/addons/crm_todo/i18n/pt_BR.po +++ b/addons/crm_todo/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-02-16 14:02+0000\n" -"Last-Translator: Rafael Sales - http://www.tompast.com.br \n" +"PO-Revision-Date: 2012-12-06 13:12+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-04 05:54+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_todo #: model:ir.model,name:crm_todo.model_project_task @@ -30,7 +30,7 @@ msgstr "Período de Tempo" #. module: crm_todo #: view:crm.lead:0 msgid "Lead" -msgstr "" +msgstr "Prospecto" #. module: crm_todo #: view:crm.lead:0 @@ -67,12 +67,12 @@ msgstr "Cancelar" #. module: crm_todo #: model:ir.model,name:crm_todo.model_crm_lead msgid "Lead/Opportunity" -msgstr "" +msgstr "Prospecto/Oportunidade" #. module: crm_todo #: field:project.task,lead_id:0 msgid "Lead / Opportunity" -msgstr "Prospecção / Oportunidade" +msgstr "Prospecto / Oportunidade" #. module: crm_todo #: view:crm.lead:0 diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py index 24da03bf1d8..3d6139195be 100644 --- a/addons/delivery/sale.py +++ b/addons/delivery/sale.py @@ -28,7 +28,6 @@ class sale_order(osv.osv): _inherit = 'sale.order' _columns = { 'carrier_id':fields.many2one("delivery.carrier", "Delivery Method", help="Complete this field if you plan to invoice the shipping based on picking."), - 'id': fields.integer('ID', readonly=True,invisible=True), } def onchange_partner_id(self, cr, uid, ids, part, context=None): diff --git a/addons/document_ftp/res_config_view.xml b/addons/document_ftp/res_config_view.xml index f0184ed8e63..b571a4bb004 100644 --- a/addons/document_ftp/res_config_view.xml +++ b/addons/document_ftp/res_config_view.xml @@ -6,9 +6,9 @@ knowledge.config.settings - + - + diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index a9a60570735..efdbf1be3b2 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -57,43 +57,6 @@ - - - Event: Mark unread - True - ir.actions.server - - code - self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context) - - - action_event_event_unread - - - action - - event.event - client_action_multi - - - - Event: Mark read - True - ir.actions.server - - code - self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context) - - - action_event_event_read - - - action - - event.event - client_action_multi - - Events event.event @@ -375,42 +338,6 @@ - - - Event registration : Mark unread - True - ir.actions.server - - code - self.message_mark_as_unread(cr, uid, context.get('active_ids'), context=context) - - - action_event_registration_unread - - - action - - event.registration - client_action_multi - - - - Event registration : Mark read - True - ir.actions.server - - code - self.message_mark_as_read(cr, uid, context.get('active_ids'), context=context) - - - action_event_registration_read - - - action - - event.registration - client_action_multi - event.registration.tree diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml index 7cc300521ce..ef8af01ec3b 100644 --- a/addons/event_moodle/wizard_moodle.xml +++ b/addons/event_moodle/wizard_moodle.xml @@ -6,12 +6,6 @@ event.moodle.config.wiz
-
-
@@ -25,6 +19,12 @@ +
+
diff --git a/addons/event_project/i18n/pt_BR.po b/addons/event_project/i18n/pt_BR.po index 31e7bd93e6b..2e0168cb054 100644 --- a/addons/event_project/i18n/pt_BR.po +++ b/addons/event_project/i18n/pt_BR.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:36+0000\n" -"PO-Revision-Date: 2012-05-10 18:12+0000\n" -"Last-Translator: Adriano Prado \n" +"PO-Revision-Date: 2012-12-07 19:29+0000\n" +"Last-Translator: Cristiano Korndörfer \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-10-30 05:20+0000\n" -"X-Generator: Launchpad (build 16206)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: event_project #: model:ir.model,name:event_project.model_event_project @@ -24,7 +24,7 @@ msgstr "Evento de Projeto" #. module: event_project #: field:event.project,date:0 msgid "Date End" -msgstr "Data de término" +msgstr "Data de Término" #. module: event_project #: view:event.project:0 diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index f4d7fcaa013..4f77b945f69 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -26,7 +26,7 @@ class product(osv.osv): _inherit = 'product.product' _columns = { 'event_ok': fields.boolean('Event Subscription', help='Determine if a product needs to create automatically an event registration at the confirmation of a sale order line.'), - 'event_type_id': fields.many2one('event.type', 'Type of Event', help='Filter the list of event on this category only, in the sale order lines'), + 'event_type_id': fields.many2one('event.type', 'Type of Event', help='Select event types so when we use this product in Sale order line, it will filter events of this type only.'), } def onchange_event_ok(self, cr, uid, ids, event_ok, context=None): diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index ab7568d704e..cc00365c980 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -10,9 +10,9 @@ @@ -21,12 +21,18 @@ sale.order - - + + + + + + + + diff --git a/addons/event_sale/i18n/pt_BR.po b/addons/event_sale/i18n/pt_BR.po new file mode 100644 index 00000000000..fd2ea6ffcfd --- /dev/null +++ b/addons/event_sale/i18n/pt_BR.po @@ -0,0 +1,94 @@ +# 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-03 16:03+0000\n" +"PO-Revision-Date: 2012-12-07 19:28+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-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: event_sale +#: model:ir.model,name:event_sale.model_product_product +msgid "Product" +msgstr "Produto" + +#. module: event_sale +#: help:product.product,event_ok:0 +msgid "" +"Determine if a product needs to create automatically an event registration " +"at the confirmation of a sale order line." +msgstr "" +"Determina se um produto precisa criar automaticamente um registro de evento " +"na confirmação de uma linha de ordem de venda." + +#. module: event_sale +#: help:sale.order.line,event_id:0 +msgid "" +"Choose an event and it will automatically create a registration for this " +"event." +msgstr "" +"Escolha um evento e será criado automaticamente um registro para ele." + +#. module: event_sale +#: field:product.product,event_type_id:0 +msgid "Type of Event" +msgstr "Tipo de Evento" + +#. module: event_sale +#: model:event.event,name:event_sale.event_technical_training +msgid "Technical training in Grand-Rosiere" +msgstr "Treinamento técnico em Grand-Rosiere" + +#. module: event_sale +#: help:product.product,event_type_id:0 +msgid "" +"Filter the list of event on this category only, in the sale order lines" +msgstr "" +"Filtrar a lista de eventos somente desta categoria nas linhas de ordens de " +"vendas" + +#. module: event_sale +#: field:sale.order.line,event_ok:0 +msgid "event_ok" +msgstr "event_ok" + +#. module: event_sale +#: code:addons/event_sale/event_sale.py:88 +#, python-format +msgid "The registration %s has been created from the Sale Order %s." +msgstr "O registro %s foi criado pela Ordem de Venda %s." + +#. module: event_sale +#: field:product.product,event_ok:0 +msgid "Event Subscription" +msgstr "Assinatura de Evento" + +#. module: event_sale +#: field:sale.order.line,event_type_id:0 +msgid "Event Type" +msgstr "Tipo de Evento" + +#. module: event_sale +#: model:product.template,name:event_sale.event_product_product_template +msgid "Technical Training" +msgstr "Treinamento Técnico" + +#. module: event_sale +#: field:sale.order.line,event_id:0 +msgid "Event" +msgstr "Evento" + +#. module: event_sale +#: model:ir.model,name:event_sale.model_sale_order_line +msgid "Sales Order Line" +msgstr "Linha da Ordem de Vendas" diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py index 68f05dfeee2..e5cd70948cd 100644 --- a/addons/fetchmail/fetchmail.py +++ b/addons/fetchmail/fetchmail.py @@ -195,12 +195,12 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS strip_attachments=(not server.attach), context=context) if res_id and server.action_id: - action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", False)}) + action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", server.object_id.model)}) imap_server.store(num, '+FLAGS', '\\Seen') cr.commit() count += 1 _logger.info("fetched/processed %s email(s) on %s server %s", count, server.type, server.name) - except Exception, e: + except Exception: _logger.exception("Failed to fetch mail from %s server %s.", server.type, server.name) finally: if imap_server: @@ -220,11 +220,11 @@ openerp_mailgate.py -u %(uid)d -p PASSWORD -o %(model)s -d %(dbname)s --host=HOS strip_attachments=(not server.attach), context=context) if res_id and server.action_id: - action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", False)}) + action_pool.run(cr, uid, [server.action_id.id], {'active_id': res_id, 'active_ids':[res_id], 'active_model': context.get("thread_model", server.object_id.model)}) pop_server.dele(num) cr.commit() _logger.info("fetched/processed %s email(s) on %s server %s", numMsgs, server.type, server.name) - except Exception, e: + except Exception: _logger.exception("Failed to fetch mail from %s server %s.", server.type, server.name) finally: if pop_server: diff --git a/addons/fleet/__openerp__.py b/addons/fleet/__openerp__.py index f1e0d1a8580..58ee5bc2d16 100644 --- a/addons/fleet/__openerp__.py +++ b/addons/fleet/__openerp__.py @@ -49,12 +49,13 @@ Main Features ], 'data' : [ 'fleet_view.xml', + 'fleet_cars.xml', 'fleet_data.xml', 'fleet_board_view.xml', ], 'update_xml' : ['security/fleet_security.xml','security/ir.model.access.csv'], - 'demo': ['fleet_cars.xml','fleet_demo.xml'], + 'demo': ['fleet_demo.xml'], 'installable' : True, 'application' : True, diff --git a/addons/fleet/fleet_data.xml b/addons/fleet/fleet_data.xml index 9b8ebb19e19..54be46c90fe 100644 --- a/addons/fleet/fleet_data.xml +++ b/addons/fleet/fleet_data.xml @@ -436,5 +436,230 @@ Break + + + Corsa + + + + + Astra + + + + + Agila + + + + + Combo Tour + + + + + Meriva + + + + + AstraGTC + + + + + Zafira + + + + + Zafira Tourer + + + + + Insignia + + + + + Mokka + + + + + Antara + + + + + Ampera + + + + + A1 + + + + + A3 + + + + + A4 + + + + + A5 + + + + + A6 + + + + + A7 + + + + + A8 + + + + + Q3 + + + + + Q5 + + + + + Q7 + + + + + TT + + + + + Serie 1 + + + + + Serie 3 + + + + + Serie 5 + + + + + Serie 6 + + + + + Serie 7 + + + + + Serie X + + + + + Serie Z4 + + + + + Serie M + + + + + Serie Hybrid + + + + + Class A + + + + + Class B + + + + + Class C + + + + + Class CL + + + + + Class CLS + + + + + Class E + + + + + Class M + + + + + Class GL + + + + + Class GLK + + + + + Class R + + + + + Class S + + + + + Class SLK + + + + + SLS + + diff --git a/addons/fleet/fleet_demo.xml b/addons/fleet/fleet_demo.xml index d70943f4beb..03e8bcd38f1 100644 --- a/addons/fleet/fleet_demo.xml +++ b/addons/fleet/fleet_demo.xml @@ -1,231 +1,6 @@ - - Corsa - - - - - Astra - - - - - Agila - - - - - Combo Tour - - - - - Meriva - - - - - AstraGTC - - - - - Zafira - - - - - Zafira Tourer - - - - - Insignia - - - - - Mokka - - - - - Antara - - - - - Ampera - - - - - A1 - - - - - A3 - - - - - A4 - - - - - A5 - - - - - A6 - - - - - A7 - - - - - A8 - - - - - Q3 - - - - - Q5 - - - - - Q7 - - - - - TT - - - - - Serie 1 - - - - - Serie 3 - - - - - Serie 5 - - - - - Serie 6 - - - - - Serie 7 - - - - - Serie X - - - - - Serie Z4 - - - - - Serie M - - - - - Serie Hybrid - - - - - Class A - - - - - Class B - - - - - Class C - - - - - Class CL - - - - - Class CLS - - - - - Class E - - - - - Class M - - - - - Class GL - - - - - Class GLK - - - - - Class R - - - - - Class S - - - - - Class SLK - - - - - SLS - - - In shop 1 diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml index 1810cc5a938..4d4c74fd297 100644 --- a/addons/fleet/fleet_view.xml +++ b/addons/fleet/fleet_view.xml @@ -8,14 +8,16 @@
- - +
+
diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po index deb6b1cac2f..660ab4702c1 100644 --- a/addons/fleet/i18n/zh_CN.po +++ b/addons/fleet/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-11-30 11:52+0000\n" +"PO-Revision-Date: 2012-12-06 13:05+0000\n" "Last-Translator: ccdos \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-01 05:09+0000\n" -"X-Generator: Launchpad (build 16319)\n" +"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: fleet #: selection:fleet.vehicle,fuel_type:0 @@ -553,7 +553,7 @@ msgstr "合同状态" #. module: fleet #: field:fleet.vehicle,contract_renewal_total:0 msgid "Total of contracts due or overdue minus one" -msgstr "" +msgstr "到期或逾期合同汇总" #. module: fleet #: field:fleet.vehicle.cost,cost_subtype:0 @@ -1804,6 +1804,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 单击创建一个服务入口。\n" +"

\n" +" OpenERP 帮你跟踪所有汽车上完成的服务的。\n" +" 服务有多种类型：偶然维修，定期维护保养，等等。\n" +"

\n" +" " #. module: fleet #: field:fleet.vehicle,co2:0 diff --git a/addons/google_base_account/i18n/pt_BR.po b/addons/google_base_account/i18n/pt_BR.po index aa9303c93cf..617274741d6 100644 --- a/addons/google_base_account/i18n/pt_BR.po +++ b/addons/google_base_account/i18n/pt_BR.po @@ -8,14 +8,15 @@ 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-07-28 22:59+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-12-07 22:43+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"\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-04 05:54+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: google_base_account #: field:res.users,gmail_user:0 @@ -36,12 +37,12 @@ msgstr "Erro de importação dos contatos Google!" #. module: google_base_account #: model:ir.model,name:google_base_account.model_res_users msgid "Users" -msgstr "" +msgstr "Usuários" #. module: google_base_account #: view:google.login:0 msgid "or" -msgstr "" +msgstr "ou" #. module: google_base_account #: view:google.login:0 @@ -57,7 +58,7 @@ msgstr "Senha do Google" #: code:addons/google_base_account/wizard/google_login.py:77 #, python-format msgid "Error!" -msgstr "" +msgstr "Erro!" #. module: google_base_account #: view:res.users:0 @@ -67,13 +68,13 @@ msgstr "Conta do Google" #. module: google_base_account #: view:res.users:0 msgid "Synchronization" -msgstr "" +msgstr "Sincronização" #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:77 #, python-format msgid "Authentication failed. Check the user and password." -msgstr "" +msgstr "Falha na Autenticação. Verifique o Nome de Usuário e Senha." #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:29 @@ -93,7 +94,7 @@ msgstr "Contatos do Google" #. module: google_base_account #: view:google.login:0 msgid "Cancel" -msgstr "" +msgstr "Cancelar" #. module: google_base_account #: field:google.login,user:0 diff --git a/addons/google_docs/i18n/pt_BR.po b/addons/google_docs/i18n/pt_BR.po index d280f28bcba..f3cb6eda1b8 100644 --- a/addons/google_docs/i18n/pt_BR.po +++ b/addons/google_docs/i18n/pt_BR.po @@ -8,14 +8,15 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-12-04 13:17+0000\n" -"Last-Translator: Cristiano Korndörfer \n" +"PO-Revision-Date: 2012-12-07 22:47+0000\n" +"Last-Translator: Fábio Martinelli - http://zupy.com.br " +"\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" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: google_docs #: code:addons/google_docs/google_docs.py:136 @@ -198,6 +199,22 @@ msgid "" "`drawings:123456789`\n" "...\n" msgstr "" +"\n" +"Este é o ID do modelo de documento no Google. Você pode encontra-lo graças a " +"essa URL: \n" +"*para um documento de texto com uma url como " +"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, o ID é " +"`document:123456789`\n" +"*para uma planilha com url como " +"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, " +"o ID é `spreadsheet:123456789`\n" +"*para uma apresentação (slide show) com url como " +"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id" +".p`, o ID é `presentation:123456789`\n" +"*para um documento de desenho com url como " +"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, o ID é " +"`drawings:123456789`\n" +"...\n" #. module: google_docs #: model:ir.model,name:google_docs.model_ir_attachment diff --git a/addons/hr/hr.py b/addons/hr/hr.py index ca165b7e8eb..21c2e0fc6da 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -116,7 +116,6 @@ class hr_job(osv.osv): help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."), } _defaults = { - 'expected_employees': 1, 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'hr.job', context=c), 'state': 'open', } diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index 7d27fe456b8..dc65fa80e8b 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -25,8 +25,8 @@

-