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..22f2b3bda9c 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) @@ -1082,7 +1083,7 @@ class account_journal_period(osv.osv): 'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"), 'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"), 'icon': fields.function(_icon_get, string='Icon', type='char', size=32), - 'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the journal period without removing it."), 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'Status', required=True, readonly=True, help='When journal period is created. The status is \'Draft\'. If a report is printed it comes to \'Printed\' status. When all transactions are done, it comes in \'Done\' status.'), 'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'), diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index c363bab4426..be8eb9641ee 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): @@ -1157,7 +1160,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') @@ -1206,7 +1209,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 0072a949d89..96b021650ce 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 7cc4f4978f7..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 ''},

@@ -49,7 +50,7 @@ % endif

- % if object.company_id.paypal_account and object.type in ('out_invoice', 'in_refund'): + % if object.company_id.paypal_account and object.type in ('out_invoice'): <% comp_name = quote(object.company_id.name) inv_number = quote(object.number) @@ -73,7 +74,7 @@

-

+

${object.company_id.name}

diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index dc3291fc9da..a5a3ef57009 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-06 10:40+0000\n" +"PO-Revision-Date: 2012-12-08 10:58+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-07 04:35+0000\n" +"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account @@ -1930,7 +1930,7 @@ msgstr "Geschäftsjahr Sequenz" #. module: account #: field:account.config.settings,group_analytic_accounting:0 msgid "Analytic accounting" -msgstr "" +msgstr "Buchen von Kostenstellen" #. module: account #: report:account.overdue:0 @@ -4041,6 +4041,11 @@ msgid "" "You can create one in the menu: \n" "Configuration/Journals/Journals." msgstr "" +"Es kann kein Buchungsjournal, mit dem %s Typ für dieses Unternehmens " +"gefunden werden.\n" +"\n" +"Sie können ein neues Buchungsjournal in folgendem Menü erstellen:\n" +"Finanzen / Konfiguration / Einstellungen / Buchungsjournale" #. module: account #: model:ir.actions.act_window,name:account.action_account_unreconcile @@ -7496,6 +7501,8 @@ msgid "" "You cannot provide a secondary currency if it is the same than the company " "one." msgstr "" +"Sie können keine weitere Währung verwalten, wenn diese identisch mit Ihrer " +"Hauswährung ist." #. module: account #: code:addons/account/account_invoice.py:1321 @@ -10438,6 +10445,8 @@ msgid "" "Credit note base on this type. You can not Modify and Cancel if the invoice " "is already reconciled" msgstr "" +"Gutschrift für diesen Typ. Es können keine Änderungen oder Stornierungen " +"vorgenommen werden, wenn die Rechnungen bereits ausgeglichen wurde." #. module: account #: report:account.account.balance:0 @@ -10774,7 +10783,7 @@ msgstr "Wiederkehrende Buchungen Journal" #: code:addons/account/account.py:1058 #, python-format msgid "Start period should precede then end period." -msgstr "" +msgstr "Start Periode die auf die Ende Periode folgen soll." #. module: account #: field:account.invoice,number: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 6bc1a0ac2bc..4324e492364 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 21:42+0000\n" +"PO-Revision-Date: 2012-12-09 23:36+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-07 04:35+0000\n" +"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account @@ -1229,6 +1229,20 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Clicca per aggiungere un conto.\n" +"

\n" +" Quando si fanno operazioni multi-valuta, è possibile perdere " +"o\n" +" guadagnare degli importi a causa della variazione del tasso " +"di cambio.\n" +" Questo menu dà una previsione del Guadagno o Perdita " +"realizzato se\n" +" queste operazioni fossero concluse oggi. Solo per conti che " +"hanno\n" +" una valuta secondaria.\n" +"

\n" +" " #. module: account #: field:account.bank.accounts.wizard,acc_name:0 @@ -3156,7 +3170,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 @@ -3527,7 +3541,7 @@ msgstr "Solo Un Piano dei Conti Disponibile" #: field:product.category,property_account_expense_categ:0 #: field:product.template,property_account_expense:0 msgid "Expense Account" -msgstr "Bilancio spese" +msgstr "Conto di Costo" #. module: account #: field:account.bank.statement,message_summary:0 @@ -7460,7 +7474,7 @@ msgid "" "This account will be used instead of the default one as the receivable " "account for the current partner" msgstr "" -"Qiesto conto verra' usato al posto del default come conto per incassi dal " +"Questo conto verrà usato invece del default come conto incassi per il " "partner corrente" #. module: account @@ -8012,7 +8026,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 @@ -8359,6 +8373,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 @@ -8372,6 +8388,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 @@ -8797,6 +8815,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 @@ -8901,7 +8920,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 @@ -8930,6 +8949,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 @@ -8974,12 +8996,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 @@ -9128,7 +9150,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 @@ -9138,7 +9160,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 @@ -9154,6 +9176,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 @@ -9366,6 +9390,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 @@ -9403,7 +9429,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 @@ -9469,6 +9495,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 @@ -9546,6 +9574,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 @@ -9578,7 +9609,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 @@ -9598,6 +9629,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 @@ -9644,7 +9679,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 @@ -9924,7 +9959,7 @@ msgstr "Aziende collegate al Partner" #. module: account #: view:account.invoice:0 msgid "Ask Refund" -msgstr "" +msgstr "Richiesta Rimborso" #. module: account #: view:account.move.line:0 @@ -9966,12 +10001,12 @@ msgstr "Conti di Credito" #. module: account #: field:account.config.settings,purchase_refund_sequence_prefix:0 msgid "Supplier credit note sequence" -msgstr "" +msgstr "Sequenza nota di credito fornitore" #. module: account #: field:account.config.settings,purchase_sequence_next:0 msgid "Next supplier invoice number" -msgstr "" +msgstr "Numero fattura fornitore successivo" #. module: account #: help:account.config.settings,module_account_payment:0 @@ -10001,6 +10036,8 @@ msgstr "Estratti Conto Bancari" #, python-format msgid "To reconcile the entries company should be the same for all entries." msgstr "" +"Per riconciliare le registrazioni l'azienda dovrebbe essere la stessa per " +"tutte le registrazioni." #. module: account #: field:account.account,balance:0 @@ -10078,7 +10115,7 @@ msgstr "Filtra per" #: field:account.cashbox.line,number_closing:0 #: field:account.cashbox.line,number_opening:0 msgid "Number of Units" -msgstr "" +msgstr "Numero di Unità" #. module: account #: model:process.node,note:account.process_node_manually0 @@ -10103,12 +10140,12 @@ msgstr "Movimento contabile" #: code:addons/account/wizard/account_period_close.py:51 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "Azione non valida!" #. module: account #: view:account.bank.statement:0 msgid "Date / Period" -msgstr "" +msgstr "Data / Periodo" #. module: account #: report:account.central.journal:0 @@ -10127,11 +10164,14 @@ msgid "" "The period is invalid. Either some periods are overlapping or the period's " "dates are not matching the scope of the fiscal year." msgstr "" +"Errore!\n" +"Il periodo non è valido. Alcuni periodi sono sovrapposti o le date del " +"periodo non sono all'interno dell'anno fiscale." #. module: account #: report:account.overdue:0 msgid "There is nothing due with this customer." -msgstr "" +msgstr "Non c'è alcun credito scaduto verso questo cliente." #. module: account #: help:account.tax,account_paid_id:0 @@ -10151,7 +10191,7 @@ msgstr "Crea un conto con il template selezionato sotto il mastro esistente." #. module: account #: report:account.invoice:0 msgid "Source" -msgstr "" +msgstr "Origine" #. module: account #: selection:account.model.line,date_maturity:0 @@ -10174,11 +10214,13 @@ msgid "" "This field contains the information related to the numbering of the journal " "entries of this journal." msgstr "" +"Questo campo contiene le informazioni relative alla numerazione delle " +"registrazioni di questo sezionale." #. module: account #: field:account.invoice,sent:0 msgid "Sent" -msgstr "" +msgstr "Spedito" #. module: account #: view:account.unreconcile.reconcile:0 @@ -10194,7 +10236,7 @@ msgstr "Report Comune" #: field:account.config.settings,default_sale_tax:0 #: field:account.config.settings,sale_tax:0 msgid "Default sale tax" -msgstr "" +msgstr "Imposta sulle vendite di default" #. module: account #: report:account.overdue:0 @@ -10205,7 +10247,7 @@ msgstr "Saldo:" #: code:addons/account/account.py:1542 #, python-format msgid "Cannot create moves for different companies." -msgstr "" +msgstr "Non è possibile creare movimenti per diverse aziende." #. module: account #: view:account.invoice.report:0 @@ -10281,7 +10323,7 @@ msgstr "Periodo finale" #. module: account #: model:account.account.type,name:account.account_type_expense_view1 msgid "Expense View" -msgstr "" +msgstr "Vista Costi" #. module: account #: field:account.move.line,date_maturity:0 @@ -10292,7 +10334,7 @@ msgstr "Data scadenza" #: code:addons/account/account.py:1459 #, python-format msgid " Centralisation" -msgstr "" +msgstr " Centralizzazione" #. module: account #: help:account.journal,type:0 @@ -10860,7 +10902,7 @@ msgstr "Totale" #: code:addons/account/wizard/account_invoice_refund.py:109 #, python-format msgid "Cannot %s draft/proforma/cancel invoice." -msgstr "" +msgstr "Non è possibile %s una fattura bozza/proforma/annullata." #. module: account #: field:account.tax,account_analytic_paid_id:0 @@ -10989,7 +11031,7 @@ msgstr "Conti vuoti ? " #: code:addons/account/account_move_line.py:1046 #, python-format msgid "Unable to change tax!" -msgstr "" +msgstr "Impossibile cambiare l'imposta!" #. module: account #: constraint:account.bank.statement:0 diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index 74fca69af53..95069e431dc 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/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-12-01 16:00+0000\n" -"Last-Translator: Thomas Pot (Open2bizz) \n" +"PO-Revision-Date: 2012-12-09 19:02+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:21+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n" +"X-Generator: Launchpad (build 16341)\n" #, python-format #~ msgid "Integrity Error !" @@ -30,13 +30,13 @@ msgstr "Betaling (administratief)" msgid "" "An account fiscal position could be defined only once time on same accounts." msgstr "" -"Een fiscale positie kan maar één keer worden gedefinieerd voro dezelfde " +"Een fiscale positie kan maar één keer worden gedefinieerd voor dezelfde " "rekening." #. module: account #: view:account.unreconcile:0 msgid "Unreconciliate Transactions" -msgstr "Afletteren transactief ongedaan maken" +msgstr "Afletteren transacties ongedaan maken" #. module: account #: help:account.tax.code,sequence:0 @@ -502,7 +502,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "Periode:" #. module: account #: field:account.account.template,chart_template_id:0 @@ -974,6 +974,8 @@ msgid "" "Print Report with the currency column if the currency differs from the " "company currency." msgstr "" +"Print de rapportage met de valuta kolom als de valuta afwijkt van de " +"bedrijfsvaluta" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 @@ -1077,6 +1079,8 @@ msgid "" "You cannot validate this journal entry because account \"%s\" does not " "belong to chart of accounts \"%s\"." msgstr "" +"U kunt deze journaalpost niet valideren omdat rekening \"%s\" niet tot het " +"rekeningschema \"%s\" behoort." #. module: account #: view:validate.account.move:0 @@ -1094,7 +1098,7 @@ msgstr "Totaalbedrag" #. module: account #: help:account.invoice,supplier_invoice_number:0 msgid "The reference of this invoice as provided by the supplier." -msgstr "" +msgstr "De referentie van deze factuur zoals opgegeven door de leverancier" #. module: account #: selection:account.account,type:0 @@ -1270,6 +1274,8 @@ msgstr "Crediteer " #: help:account.config.settings,company_footer:0 msgid "Bank accounts as printed in the footer of each printed document" msgstr "" +"Rekeninginformatie die afgedrukt wordt in de voettekst van ieder afgedrukt " +"document" #. module: account #: view:account.tax:0 @@ -1496,7 +1502,7 @@ msgstr "Niveau" #: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice." -msgstr "" +msgstr "U kunt alleen de valuta wijzigen van een voorlopige factuur" #. module: account #: report:account.invoice:0 @@ -1617,7 +1623,7 @@ msgstr "Debiteuren" #: code:addons/account/account.py:767 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (kopie)" #. module: account #: selection:account.balance.report,display_account:0 @@ -2125,7 +2131,7 @@ msgstr "Klant ref:" #: help:account.tax.template,ref_tax_code_id:0 #: help:account.tax.template,tax_code_id:0 msgid "Use this code for the tax declaration." -msgstr "" +msgstr "Gebruik deze code voor de belastingaangifte" #. module: account #: help:account.period,special:0 @@ -2292,6 +2298,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klik om een bankafschrift te registreren.\n" +"

\n" +" Een bankafschrift is een samenvatting van alle financiele " +"transacties\n" +" van een bankrekening gedurende een bepaalde periode.\n" +" U ontvangt deze periodieke van uw bank.\n" +"

\n" +" Met OpenERP kunt u de bankafschriften direct afletteren\n" +" met de gerelateerde in- en verkoopfacturen.\n" +"

\n" +" " #. module: account #: field:account.config.settings,currency_id:0 @@ -2381,7 +2399,7 @@ msgstr "Afsluiten boekjaar" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14 #, python-format msgid "Journal :" -msgstr "" +msgstr "Dagboek:" #. module: account #: sql_constraint:account.fiscal.position.tax:0 @@ -7290,7 +7308,7 @@ msgstr "Behoud het balans +/- teken" #: model:ir.actions.report.xml,name:account.account_vat_declaration #: model:ir.ui.menu,name:account.menu_account_vat_declaration msgid "Taxes Report" -msgstr "Belastingen rapport" +msgstr "BTW aangifte" #. module: account #: selection:account.journal.period,state:0 @@ -10658,7 +10676,7 @@ msgstr "Vervaldatum" #: field:cash.box.in,name:0 #: field:cash.box.out,name:0 msgid "Reason" -msgstr "" +msgstr "Reden" #. module: account #: selection:account.partner.ledger,filter:0 @@ -10839,7 +10857,7 @@ msgstr "Debiteuren" #: code:addons/account/account_move_line.py:776 #, python-format msgid "Already reconciled." -msgstr "" +msgstr "Al afgeletterd" #. module: account #: selection:account.model.line,date_maturity:0 @@ -11138,7 +11156,7 @@ msgstr "Rechts bovenliggende" #: code:addons/account/static/src/js/account_move_reconciliation.js:80 #, python-format msgid "Never" -msgstr "" +msgstr "Nooit" #. module: account #: model:ir.model,name:account.model_account_addtmpl_wizard @@ -11159,7 +11177,7 @@ msgstr "Relaties" #. module: account #: field:account.account,note:0 msgid "Internal Notes" -msgstr "" +msgstr "Interne notities" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear @@ -11192,7 +11210,7 @@ msgstr "Administratiemodel" #: code:addons/account/account_cash_statement.py:292 #, python-format msgid "Loss" -msgstr "" +msgstr "Verlies" #. module: account #: selection:account.entries.report,month:0 diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po index d5f9538df77..8791f550fc9 100644 --- a/addons/account/i18n/sl.po +++ b/addons/account/i18n/sl.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-01 18:30+0000\n" +"PO-Revision-Date: 2012-12-10 00:34+0000\n" "Last-Translator: Dusan Laznik \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:25+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -386,7 +386,7 @@ msgstr "" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesperson" -msgstr "" +msgstr "Prodajalec" #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -452,7 +452,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "Obdobje:" #. module: account #: field:account.account.template,chart_template_id:0 @@ -1108,7 +1108,7 @@ msgstr "Oznaka" #. module: account #: view:account.config.settings:0 msgid "Features" -msgstr "" +msgstr "Možnosti" #. module: account #: code:addons/account/account.py:2293 @@ -1189,7 +1189,7 @@ msgstr "" #. module: account #: view:account.invoice:0 msgid "Refund " -msgstr "" +msgstr "Dobropis " #. module: account #: help:account.config.settings,company_footer:0 @@ -1329,7 +1329,7 @@ msgstr "Izhodna tečajna lista" #. module: account #: field:account.config.settings,chart_template_id:0 msgid "Template" -msgstr "" +msgstr "Predloga" #. module: account #: selection:account.analytic.journal,type:0 @@ -1542,7 +1542,7 @@ msgstr "Konto terjatev" #: code:addons/account/account.py:767 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (kopija)" #. module: account #: selection:account.balance.report,display_account:0 @@ -1611,7 +1611,7 @@ msgstr "Preskoči stanje \"Osnutek\" za ročno vnašanje" #: code:addons/account/wizard/account_report_common.py:159 #, python-format msgid "Not implemented." -msgstr "" +msgstr "Ni vgrajeno." #. module: account #: view:account.invoice.refund:0 @@ -1698,7 +1698,7 @@ msgstr "Neobdavčeno" #. module: account #: view:account.journal:0 msgid "Advanced Settings" -msgstr "" +msgstr "Napredne nastavitve" #. module: account #: view:account.bank.statement:0 diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 7a4d62d5876..65c83ae19f2 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-12-06 14:09+0000\n" -"Last-Translator: ccdos \n" +"PO-Revision-Date: 2012-12-09 04:42+0000\n" +"Last-Translator: sum1201 \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-07 04:35+0000\n" +"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account @@ -104,6 +104,8 @@ msgid "" "Error!\n" "You cannot create recursive account templates." msgstr "" +"错误！\n" +"您不能创建重复的帐户模板。" #. module: account #. openerp-web @@ -192,6 +194,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +"点击添加一个会计期间.\n" +"

\n" +"会计期间通常是一个月或一个季度。它通常对应纳税申报的期间。\n" +"

\n" +" " #. module: account #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard @@ -440,7 +448,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8 #, python-format msgid "Period :" -msgstr "" +msgstr "时间：" #. module: account #: field:account.account.template,chart_template_id:0 @@ -603,7 +611,7 @@ msgstr "没有什么被核销" #. module: account #: field:account.config.settings,decimal_precision:0 msgid "Decimal precision on journal entries" -msgstr "" +msgstr "日记帐分录小数精度" #. module: account #: selection:account.config.settings,period:0 @@ -722,7 +730,7 @@ msgstr "账簿的会计期间" #: constraint:account.move:0 msgid "" "You cannot create more than one move per period on a centralized journal." -msgstr "" +msgstr "在每个会计期间，你不可以创建1个以上的总分类凭证" #. module: account #: help:account.tax,account_analytic_paid_id:0 @@ -1401,7 +1409,7 @@ msgstr "级别" #: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice." -msgstr "" +msgstr "您只能修改发票草稿的货币。" #. module: account #: report:account.invoice:0 @@ -2288,7 +2296,7 @@ msgstr "关闭财政年度" #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14 #, python-format msgid "Journal :" -msgstr "" +msgstr "流水帐" #. module: account #: sql_constraint:account.fiscal.position.tax:0 @@ -2995,7 +3003,7 @@ msgstr "单号" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Purchase Tax" -msgstr "" +msgstr "购置税" #. module: account #: help:account.move.line,tax_code_id:0 @@ -3089,7 +3097,7 @@ msgstr "沟通类型" #. module: account #: constraint:account.move.line:0 msgid "Account and Period must belong to the same company." -msgstr "" +msgstr "帐户和帐期必须属于同一家公司。" #. module: account #: field:account.invoice.line,discount:0 @@ -3117,7 +3125,7 @@ msgstr "补差额金额" #: field:account.bank.statement,message_unread:0 #: field:account.invoice,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "未读消息" #. module: account #: code:addons/account/wizard/account_invoice_state.py:44 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_accountant/i18n/hr.po b/addons/account_accountant/i18n/hr.po index da83a8c12c9..8886a91875a 100644 --- a/addons/account_accountant/i18n/hr.po +++ b/addons/account_accountant/i18n/hr.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:51+0000\n" -"PO-Revision-Date: 2011-01-17 00:02+0000\n" +"PO-Revision-Date: 2012-12-09 19:38+0000\n" "Last-Translator: Goran Kliska \n" "Language-Team: Croatian \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-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_accountant #: model:ir.actions.client,name:account_accountant.action_client_account_menu msgid "Open Accounting Menu" -msgstr "" +msgstr "Otvori izbornik računovodstvo" #~ msgid "" #~ "\n" 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/it.po b/addons/account_analytic_analysis/i18n/it.po index 2dcf15f669b..641209e35ce 100644 --- a/addons/account_analytic_analysis/i18n/it.po +++ b/addons/account_analytic_analysis/i18n/it.po @@ -7,19 +7,19 @@ 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-08-16 09:05+0000\n" -"Last-Translator: gagarin \n" +"PO-Revision-Date: 2012-12-09 13:20+0000\n" +"Last-Translator: Davide Corio - agilebg.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:34+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:38+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "No order to invoice, create" -msgstr "" +msgstr "Nessun ordine da fatturare, crealo" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -29,12 +29,12 @@ msgstr "Raggruppa per..." #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "To Invoice" -msgstr "" +msgstr "Da fatturare" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Remaining" -msgstr "" +msgstr "Rimanenti" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -73,7 +73,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "⇒ Invoice" -msgstr "" +msgstr "⇒ Fattura" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 @@ -88,7 +88,7 @@ msgstr "Data dell'ultimo costo fatturato" #. module: account_analytic_analysis #: help:account.analytic.account,fix_price_to_invoice:0 msgid "Sum of quotations for this contract." -msgstr "" +msgstr "Somma dei preventivi di questo contratto." #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 @@ -98,7 +98,7 @@ msgstr "Importo totale fatture cliente per questo conto" #. module: account_analytic_analysis #: help:account.analytic.account,timesheet_ca_invoiced:0 msgid "Sum of timesheet lines invoiced for this contract." -msgstr "" +msgstr "Somma delle linee timesheet fatturate di questo contratto." #. module: account_analytic_analysis #: help:account.analytic.account,revenue_per_hour:0 @@ -108,12 +108,12 @@ msgstr "Calcolato usando la formula: Fatturato / Tempo Totale" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts not assigned" -msgstr "" +msgstr "Contratti non assegnati" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Partner" -msgstr "" +msgstr "Partner" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -156,12 +156,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 "Calcolato usando la formula: Tempo Massimo - Totale Tempo Fatturato" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Expected" -msgstr "" +msgstr "Atteso" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -174,7 +174,7 @@ msgstr "Contabilità Analitica" #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 msgid "Computed using the formula: Theoretical Revenue - Total Costs" -msgstr "" +msgstr "Calcolato usando la formula: Ricavo Teorico - Totale Costi" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 @@ -195,6 +195,8 @@ msgid "" "{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " "'normal','template'])]}" msgstr "" +"{'required': [('type','=','contract')], 'invisible': [('type','in',['view', " +"'normal','template'])]}" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 @@ -204,7 +206,7 @@ msgstr "Tasso di margine reale (%)" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours:0 msgid "Computed using the formula: Maximum Time - Total Worked Time" -msgstr "" +msgstr "Calcolato usando la formula: Tempo Massimo - Totale Tempo Lavorato" #. module: account_analytic_analysis #: help:account.analytic.account,hours_quantity:0 @@ -218,23 +220,23 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Nothing to invoice, create" -msgstr "" +msgstr "Niente da fatturare, crealo" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.template_of_contract_action #: model:ir.ui.menu,name:account_analytic_analysis.menu_template_of_contract_action msgid "Template of Contract" -msgstr "" +msgstr "Modello Contratto" #. module: account_analytic_analysis #: model:res.groups,name:account_analytic_analysis.group_template_required msgid "Mandatory use of templates in contracts" -msgstr "" +msgstr "Utilizzo dei template obbligatorio nei contratti" #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 msgid "Total Worked Time" -msgstr "" +msgstr "Totale Tempo Lavorato" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin:0 @@ -255,7 +257,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "or view" -msgstr "" +msgstr "o vista" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -272,7 +274,7 @@ msgstr "Mese" #: 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 "Tempo & Materiali da Fatturare" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all @@ -283,12 +285,12 @@ msgstr "Contratti" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Start Date" -msgstr "" +msgstr "Data Inizio" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Invoiced" -msgstr "" +msgstr "Fatturato" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -307,13 +309,13 @@ msgstr "Contratti in sospeso da rinnovare con il cliente" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Timesheets" -msgstr "" +msgstr "Timesheets" #. module: account_analytic_analysis #: code:addons/account_analytic_analysis/account_analytic_analysis.py:461 #, python-format msgid "Sale Order Lines of %s" -msgstr "" +msgstr "Linee Ordine di Vendita di %s" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -328,7 +330,7 @@ msgstr "Quantità Scadute" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Status" -msgstr "" +msgstr "Stato" #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 @@ -350,7 +352,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order msgid "Sales Orders" -msgstr "" +msgstr "Ordini di Vendita" #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 @@ -404,6 +406,8 @@ msgid "" "Allows you to set the template field as required when creating an analytic " "account or a contract." msgstr "" +"Consente di impostare il campo modello come obbligatorio durante la " +"creazione di un conto analitico o di un contratto." #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_invoiced:0 @@ -436,12 +440,12 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,toinvoice_total:0 msgid "Total to Invoice" -msgstr "" +msgstr "Totale da Fatturare" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Sale Orders" -msgstr "" +msgstr "Ordini di Vendita" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -451,7 +455,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,invoiced_total:0 msgid "Total Invoiced" -msgstr "" +msgstr "Totale Fatturato" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_ca:0 @@ -462,7 +466,7 @@ msgstr "" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Responsible" -msgstr "" +msgstr "Responsabile" #. module: account_analytic_analysis #: field:account.analytic.account,last_invoice_date:0 @@ -516,6 +520,7 @@ msgstr "Contratti da Rinnovare" #: help:account.analytic.account,toinvoice_total:0 msgid " Sum of everything that could be invoiced for this contract." msgstr "" +" Somma di tutto quello che può essere fatturato per questo contratto." #. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 @@ -525,7 +530,7 @@ msgstr "Margine teorico" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_total:0 msgid "Total Remaining" -msgstr "" +msgstr "Totale Rimanente" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 @@ -535,12 +540,12 @@ msgstr "Calcolato utilizzando la formula: importo fatturato - totale costi" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_est:0 msgid "Estimation of Hours to Invoice" -msgstr "" +msgstr "Stima delle Ore da Fatturare" #. module: account_analytic_analysis #: field:account.analytic.account,fix_price_invoices:0 msgid "Fixed Price" -msgstr "" +msgstr "Prezzo Fisso" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_date:0 @@ -550,17 +555,17 @@ msgstr "Data dell'ultimo lavoro fatto su questo conto." #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_sale_config_settings msgid "sale.config.settings" -msgstr "" +msgstr "sale.config.settings" #. module: account_analytic_analysis #: field:sale.config.settings,group_template_required:0 msgid "Mandatory use of templates." -msgstr "" +msgstr "Uso dei modelli obbligatorio" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts Having a Partner" -msgstr "" +msgstr "Contratti con Partner" #. module: account_analytic_analysis #: help:account.analytic.account,total_cost:0 @@ -574,7 +579,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,est_total:0 msgid "Total Estimation" -msgstr "" +msgstr "Stima Totale" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_ca:0 @@ -601,16 +606,17 @@ msgstr "Durata totale" msgid "" "the field template of the analytic accounts and contracts will be required." msgstr "" +"il campo modello dei conti analitici e dei contratti sarà obbligatorio." #. module: account_analytic_analysis #: field:account.analytic.account,invoice_on_timesheets:0 msgid "On Timesheets" -msgstr "" +msgstr "Su Timesheets" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Total" -msgstr "" +msgstr "Totale" #~ msgid "Computed using the formula: Theorial Revenue - Total Costs" #~ msgstr "Calcolato utilizzando la formula: Reddito teorico - costi totali" diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po index 20f5dd70abc..5defd9b28f1 100644 --- a/addons/account_analytic_plans/i18n/de.po +++ b/addons/account_analytic_plans/i18n/de.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-07 04:35+0000\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account_analytic_plans 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 d299ad86c07..daf6bdb23fd 100755 --- a/addons/account_asset/i18n/de.po +++ b/addons/account_asset/i18n/de.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account_asset diff --git a/addons/account_asset/i18n/it.po b/addons/account_asset/i18n/it.po index a117c70b422..2bd5f5ddc7b 100644 --- a/addons/account_asset/i18n/it.po +++ b/addons/account_asset/i18n/it.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-11-30 00:08+0000\n" +"PO-Revision-Date: 2012-12-09 22:00+0000\n" "Last-Translator: Sergio Corato \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:53+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_asset #: view:account.asset.asset:0 @@ -87,7 +87,7 @@ msgstr "Azienda" #. module: account_asset #: view:asset.modify:0 msgid "Modify" -msgstr "" +msgstr "Modifica" #. module: account_asset #: selection:account.asset.asset,state:0 @@ -112,7 +112,7 @@ msgstr "Analisi Immobilizzazioni" #. module: account_asset #: field:asset.modify,name:0 msgid "Reason" -msgstr "" +msgstr "Causale" #. module: account_asset #: field:account.asset.asset,method_progress_factor:0 @@ -189,7 +189,7 @@ msgstr "Note" #. module: account_asset #: field:account.asset.depreciation.line,move_id:0 msgid "Depreciation Entry" -msgstr "" +msgstr "Riga Ammortamento" #. module: account_asset #: view:asset.asset.report:0 @@ -223,7 +223,7 @@ msgstr "Riferimento" #. module: account_asset #: view:account.asset.asset:0 msgid "Account Asset" -msgstr "" +msgstr "Conto Immobilizzazione" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard @@ -336,7 +336,7 @@ msgstr "Immobilizzazioni in stato \"chiuso\"" #. module: account_asset #: field:account.asset.asset,parent_id:0 msgid "Parent Asset" -msgstr "" +msgstr "Immobilizzazione Padre" #. module: account_asset #: view:account.asset.history:0 @@ -362,7 +362,7 @@ msgstr "" #. module: account_asset #: model:ir.model,name:account_asset.model_account_move_line msgid "Journal Items" -msgstr "" +msgstr "Voci Sezionale" #. module: account_asset #: field:asset.asset.report,unposted_value: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 f6bc79de2b7..a8f9e63205b 100644 --- a/addons/account_bank_statement_extensions/i18n/de.po +++ b/addons/account_bank_statement_extensions/i18n/de.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-07 04:36+0000\n" +"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: account_bank_statement_extensions diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po index f47b3acd216..4f7bf102dad 100644 --- a/addons/account_budget/i18n/it.po +++ b/addons/account_budget/i18n/it.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2011-01-26 17:36+0000\n" -"Last-Translator: Nicola Riolini - Micronaet \n" +"PO-Revision-Date: 2012-12-09 20: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-04 05:42+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_budget #: view:account.budget.analytic:0 @@ -120,7 +120,7 @@ msgstr "Stato" #: code:addons/account_budget/account_budget.py:119 #, python-format msgid "The Budget '%s' has no accounts!" -msgstr "" +msgstr "Il Budget '%s' non ha un conto!" #. module: account_budget #: report:account.budget:0 @@ -198,7 +198,7 @@ msgstr "Data fine" #: model:ir.model,name:account_budget.model_account_budget_analytic #: model:ir.model,name:account_budget.model_account_budget_report msgid "Account Budget report for analytic account" -msgstr "" +msgstr "Report Budget Conto per conto analitico" #. module: account_budget #: view:account.analytic.account:0 @@ -234,7 +234,7 @@ msgstr "" #. module: account_budget #: view:crossovered.budget:0 msgid "Duration" -msgstr "" +msgstr "Durata" #. module: account_budget #: field:account.budget.post,code:0 @@ -332,7 +332,7 @@ msgstr "Importo Teorico" #: view:account.budget.crossvered.summary.report:0 #: view:account.budget.report:0 msgid "or" -msgstr "" +msgstr "o" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 @@ -418,7 +418,7 @@ msgstr "Maschera Analisi" #. module: account_budget #: view:crossovered.budget:0 msgid "Draft Budgets" -msgstr "" +msgstr "Budget in Bozza" #~ msgid "%" #~ msgstr "%" 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/__openerp__.py b/addons/account_followup/__openerp__.py index fc2f17e6a97..dbb4ea6583e 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -25,7 +25,7 @@ 'category': 'Accounting & Finance', 'description': """ Module to automate letters for unpaid invoices, with multi-level recalls. -========================================================================== +========================================================================= You can define your multiple levels of recall through the menu: --------------------------------------------------------------- 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"/> - +

]]> - - - - @@ -319,7 +170,7 @@ Dear %(partner_name)s, 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, @@ -342,15 +193,13 @@ We are disappointed to see that despite sending a reminder, that your account is It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services). Please, take appropriate measures in order to carry out this payment in the next 8 days. -If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly. +If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department, so that we can resolve the matter quickly. Details of due payments is printed below. Best Regards, - - Call the customer on the phone 3 @@ -369,7 +218,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o I trust that this action will prove unnecessary and details of due payments is printed below. -In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39. +In case of any queries concerning this matter, do not hesitate to contact our accounting department. Best Regards, diff --git a/addons/account_followup/account_followup_demo.xml b/addons/account_followup/account_followup_demo.xml index 4f22c18857d..0c470f5980e 100644 --- a/addons/account_followup/account_followup_demo.xml +++ b/addons/account_followup/account_followup_demo.xml @@ -17,7 +17,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o I trust that this action will prove unnecessary and details of due payments is printed below. -In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39. +In case of any queries concerning this matter, do not hesitate to contact our accounting department. Best Regards, @@ -39,7 +39,7 @@ Unless full payment is made in next 8 days, then legal action for the recovery o I trust that this action will prove unnecessary and details of due payments is printed below. -In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39. +In case of any queries concerning this matter, do not hesitate to contact our accounting department. Best Regards, diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 1df87feac76..5560ca822dc 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -69,7 +69,6 @@ account_followup.followup.form account_followup.followup -

@@ -77,9 +76,11 @@ To remind customers of paying their invoices, you can define different actions depending on how severely overdue the customer is. These actions are bundled - into folow-up levels that are triggered when the due - date of the most overdue invoice has passed a certain - amount of days. + into follow-up levels that are triggered when the due + date of an invoice has passed a certain + number of days. If there are other overdue invoices for the + same customer, the actions of the most + overdue invoice will be executed.

@@ -91,7 +92,7 @@ account_followup.followup - + @@ -180,18 +181,5 @@ - - - diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po index 6293620420f..59f09101eb9 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-08 09:41+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-09 04:39+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,24 +822,24 @@ 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 #, python-format msgid "Printed overdue payments report" -msgstr "" +msgstr "Druck überfällige Zahlungen" #. 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 @@ -874,6 +1025,82 @@ msgid "" "\n" " " msgstr "" +"\n" +"
\n" +" \n" +"

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

\n" +"

\n" +"  Vorbehaltlich eines Fehler unsererseits, sind offensichtlich die " +"folgenden Beträge noch nicht bezahlt. \n" +"Bitte ergreifen Sie geeignete Maßnahmen Ihrerseits, um die entsprechenden " +"Zahlungen innerhalb der nächsten \n" +"8 Tage anzuweisen. Sollte sich diese EMail mit Ihrer Bezahlung zeitlich " +"überschneiden, ignorieren Sie bitte diese Nachricht. \n" +"Zögern Sie bei Rückfragen bitte auch nicht, unsere Buchhaltung unter (+49) " +"4471 8409000 zu kontaktieren.\n" +"

\n" +"
\n" +"Freundliche Grüsse\n" +"
\n" +"
\n" +"
\n" +"${user.name}\n" +" \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 #: help:res.partner,latest_followup_level_id_without_lit:0 @@ -881,12 +1108,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 +1199,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 +1293,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 +1325,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 +1338,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 +1349,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 +1366,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 +1411,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 +1426,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 +1439,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 +1450,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 +1464,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 +1477,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 +1502,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 +1525,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 +1536,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 +1563,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 @@ -1312,6 +1654,83 @@ msgid "" "\n" " " msgstr "" +"\n" +"
\n" +" \n" +"

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

\n" +"

\n" +"    Trotz mehrerer Mahnungen, ist Ihr Konto immer noch nicht ausgeglichen.\n" +"Sofern keine vollständige Bezahlung in den nächsten 8 Tagen vorgenommen " +"wird, werden wir \n" +"weitere rechtliche Schritte ohne weitere Ankündigung in die Wege leiten. " +"Wir sind zuversichtlich, \n" +"dass diese Aktion unnötig ist. Sollten Ihrerseits zu diesem Zeitpunkt " +"weitere Detailfragen zu diesem \n" +"Thema auftreten, zögern Sie bitte nicht, unsere Buchhaltung unter (+49) " +"4471 8409000 \n" +"zu kontaktieren.\n" +"

\n" +"
\n" +"Freundliche Grüsse\n" +" \n" +"
\n" +"${user.name}\n" +" \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 #: help:res.partner,payment_next_action:0 @@ -1320,6 +1739,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,12 +1754,12 @@ msgstr "" #. module: account_followup #: view:res.partner:0 msgid "The" -msgstr "" +msgstr "Der" #. module: account_followup #: view:account_followup.print:0 msgid "Send follow-ups" -msgstr "" +msgstr "Sende Mahnungen" #. module: account_followup #: view:account.move.line:0 @@ -1350,7 +1774,7 @@ msgstr "Punkte" #. module: account_followup #: view:res.partner:0 msgid "Follow-ups To Do" -msgstr "" +msgstr "To-Do Liste Mahnungen" #. module: account_followup #: report:account_followup.followup.print:0 @@ -1368,7 +1792,7 @@ msgstr "" #. module: account_followup #: help:res.partner,latest_followup_date:0 msgid "Latest date that the follow-up level of the partner was changed" -msgstr "" +msgstr "Letztes Änderung der Mahnstufe" #. module: account_followup #: field:account_followup.print,test_print:0 @@ -1378,22 +1802,22 @@ msgstr "Testdruck" #. module: account_followup #: view:res.partner:0 msgid "Search view" -msgstr "" +msgstr "Suche Ansicht" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": User Name" -msgstr "" +msgstr ": Benutzer Name" #. 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/nl.po b/addons/account_followup/i18n/nl.po index c4a52167a46..c7cdc088578 100644 --- a/addons/account_followup/i18n/nl.po +++ b/addons/account_followup/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-12-04 17:33+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" +"PO-Revision-Date: 2012-12-09 18:16+0000\n" +"Last-Translator: Harjan Talen \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-05 05:19+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: account_followup #: view:account_followup.followup.line:0 @@ -287,7 +287,7 @@ msgstr "Ik ben verantwoordelijk" #. module: account_followup #: sql_constraint:account_followup.followup:0 msgid "Only one follow-up per company is allowed" -msgstr "" +msgstr "Per bedrijf is één betalingsherinnering mogelijk" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line4 @@ -310,6 +310,21 @@ msgid "" "Best Regards,\n" " " msgstr "" +"\n" +"Geachte %(partner_name)s,\n" +"\n" +"Ondanks herhaaldelijk verzoek is onze vordering nog niet voldaan.\n" +"\n" +"Wanneer de volledige betaling niet binnen 8 dagen wordt voldaan zijn wij " +"genoodzaakt verdere stappen te ondernemen zonder vermelding vooraf.\n" +"\n" +"Wij gaan er vanuit dat dit echter niet noodzakelijk zal zijn. Onderstaand " +"een overzicht van de openstaande posten.\n" +"\n" +"Wanneer u vragen op opmerkingen hierover heeft dan horen wij dat graag.\n" +"\n" +"Met vriendelijke groet,\n" +" " #. module: account_followup #: help:account_followup.followup.line,send_letter:0 @@ -496,17 +511,17 @@ msgstr "Afgedrukt bericht" #. module: account_followup #: field:res.partner,latest_followup_level_id_without_lit:0 msgid "Latest Follow-up Level without litigation" -msgstr "" +msgstr "Laatste herinnering voor het incasso-traject." #. module: account_followup #: view:res.partner:0 msgid "Partners with Credits" -msgstr "" +msgstr "Relaties met openstaande facturen" #. module: account_followup #: help:account_followup.followup.line,send_email:0 msgid "When processing, it will send an email" -msgstr "" +msgstr "Bij verwerking wordt een e-mail verzonden" #. module: account_followup #: view:account_followup.stat.by.partner:0 @@ -517,6 +532,7 @@ msgstr "Relatie voor betalingsherinnering" #: view:res.partner:0 msgid "Print overdue payments report independent of follow-up line" msgstr "" +"Druk overzicht openstaande posten af ongeacht status betalingsherinneringen." #. module: account_followup #: field:account_followup.followup.line,followup_id:0 @@ -614,7 +630,7 @@ msgstr "Geblokkeerd" #. module: account_followup #: sql_constraint:account_followup.followup.line:0 msgid "Days of the follow-up levels must be different" -msgstr "" +msgstr "De dagen van de herinnerings-niveau's moeten van elkaar verschillen" #. module: account_followup #: view:res.partner:0 @@ -703,7 +719,7 @@ msgstr "onbekend" #: code:addons/account_followup/account_followup.py:245 #, python-format msgid "Printed overdue payments report" -msgstr "" +msgstr "Druk het rapport achterstallige betalingen af" #. module: account_followup #: model:ir.model,name:account_followup.model_email_template 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/i18n/zh_CN.po b/addons/account_followup/i18n/zh_CN.po index bde6e33ac6f..e2184129bf8 100644 --- a/addons/account_followup/i18n/zh_CN.po +++ b/addons/account_followup/i18n/zh_CN.po @@ -7,61 +7,61 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:02+0000\n" -"PO-Revision-Date: 2012-11-30 12:07+0000\n" -"Last-Translator: ccdos \n" +"PO-Revision-Date: 2012-12-09 04:57+0000\n" +"Last-Translator: sum1201 \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:20+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:37+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 "手动操作" #. module: account_followup #: help:res.partner,latest_followup_level_id:0 msgid "The maximum follow-up level" -msgstr "" +msgstr "最大跟踪级别" #. module: account_followup #: view:res.partner:0 msgid "Group by" -msgstr "" +msgstr "分组" #. module: account_followup #: view:account_followup.stat:0 #: view:res.partner:0 msgid "Group By..." -msgstr "分组..." +msgstr "基于...分组" #. module: account_followup #: field:account_followup.print,followup_id:0 msgid "Follow-Up" -msgstr "催款" +msgstr "后续跟进" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(date)s" -msgstr "" +msgstr "%(日期）" #. module: account_followup #: field:res.partner,payment_next_action_date:0 msgid "Next Action Date" -msgstr "" +msgstr "下次活动日期" #. module: account_followup #: field:account_followup.sending.results,needprinting:0 msgid "Needs Printing" -msgstr "" +msgstr "需要印刷" #. module: account_followup #: view:res.partner:0 msgid "⇾ Mark as Done" -msgstr "" +msgstr "标记为完成" #. module: account_followup #: field:account_followup.followup.line,manual_action_note:0 @@ -192,7 +192,7 @@ msgstr "" #. module: account_followup #: view:account_followup.followup.line:0 msgid "days overdue, do the following actions:" -msgstr "" +msgstr "天过期，做下列动作：" #. module: account_followup #: view:account_followup.followup.line:0 @@ -207,12 +207,12 @@ msgstr "电子邮件正文" #. module: account_followup #: help:res.partner,payment_responsible_id:0 msgid "Responsible for making sure the action happens." -msgstr "" +msgstr "负责确保动作发生。" #. module: account_followup #: view:res.partner:0 msgid "Overdue amount" -msgstr "" +msgstr "逾期金额" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_account_followup_print @@ -242,12 +242,12 @@ msgstr "借方合计" #. module: account_followup #: field:res.partner,payment_next_action:0 msgid "Next Action" -msgstr "" +msgstr "下个行动日期" #. module: account_followup #: view:account_followup.followup.line:0 msgid ": Partner Name" -msgstr "" +msgstr "：伙伴名称" #. module: account_followup #: view:account_followup.followup:0 @@ -334,7 +334,7 @@ msgstr "" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.action_customer_followup msgid "Manual Follow-Ups" -msgstr "" +msgstr "手动跟进" #. module: account_followup #: view:account_followup.followup.line:0 @@ -354,7 +354,7 @@ msgstr "催款统计" #. module: account_followup #: view:res.partner:0 msgid "Send Overdue Email" -msgstr "" +msgstr "过期邮件发送" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line @@ -370,7 +370,7 @@ msgstr "输入序列用于显示催款列表" #: code:addons/account_followup/wizard/account_followup_print.py:166 #, python-format msgid " will be sent" -msgstr "" +msgstr " 将被发送" #. module: account_followup #: view:account_followup.followup.line: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/__openerp__.py b/addons/crm_claim/__openerp__.py index dfc549412d4..78dfba2ed53 100644 --- a/addons/crm_claim/__openerp__.py +++ b/addons/crm_claim/__openerp__.py @@ -27,7 +27,7 @@ 'description': """ Manage Customer Claims. -================================================================================ +======================= This application allows you to track your customers/suppliers claims and grievances. It is fully integrated with the email gateway so that you can create diff --git a/addons/crm_claim/i18n/de.po b/addons/crm_claim/i18n/de.po index 06ccb801fa2..0911b43464b 100644 --- a/addons/crm_claim/i18n/de.po +++ b/addons/crm_claim/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:03+0000\n" -"PO-Revision-Date: 2012-01-13 22:05+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-09 10:52+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:49+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_claim #: help:crm.claim.stage,fold:0 @@ -22,6 +23,9 @@ 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 "" +"Die Stufe wird in bestimmten Ansichten verborgen, z.B. in der " +"Fortschrittsanzeige oder den Kanban Karten, wenn es keine Datensätze in " +"dieser Stufe gibt." #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -45,11 +49,13 @@ msgid "" "Allows you to configure your incoming mail server, and create claims from " "incoming emails." msgstr "" +"Ermöglicht die Konfiguration des Posteingang Server, um automatisch " +"Reklamations Vorfälle aus eingehenden EMails zu generieren." #. module: crm_claim #: model:ir.model,name:crm_claim.model_crm_claim_stage msgid "Claim stages" -msgstr "" +msgstr "Reklamationen Stufen" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -64,7 +70,7 @@ msgstr "Dauer für Beendigung" #. module: crm_claim #: field:crm.claim,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Ungelesene Mitteilungen" #. module: crm_claim #: field:crm.claim,resolution:0 @@ -90,6 +96,19 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Click to create a claim category.\n" +"

\n" +"                 Klicken Sie, um neue Kategorien für Ihre Reklamationen zu " +"erstellen.\n" +"               \n" +" Durch Kategorien haben Sie die Möglichkeit Ihre " +"Reklamationen zu koordinieren.\n" +" Beispiele für Reklamationen können folgende sein : " +"Austausch, Reparatur, \n" +"                 Kulanzvorfall u.s.w.\n" +"

\n" +" " #. module: crm_claim #: view:crm.claim.report:0 @@ -99,7 +118,7 @@ msgstr "# Reklamation" #. module: crm_claim #: field:crm.claim.stage,name:0 msgid "Stage Name" -msgstr "" +msgstr "Bezeichnung Stufe" #. module: crm_claim #: model:ir.actions.act_window,help:crm_claim.action_report_crm_claim @@ -114,7 +133,7 @@ msgstr "" #. module: crm_claim #: view:crm.claim.report:0 msgid "Salesperson" -msgstr "" +msgstr "Verkäufer" #. module: crm_claim #: selection:crm.claim,priority:0 @@ -168,7 +187,7 @@ msgstr "Datum Beendigung" #. module: crm_claim #: view:res.partner:0 msgid "False" -msgstr "" +msgstr "trifft nicht zu" #. module: crm_claim #: field:crm.claim,ref:0 @@ -191,6 +210,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 "" +"Beinhaltet die Chatter Zusammenfassung (Anzahl der Nachrichten, ...). Diese " +"Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt " +"zu werden." #. module: crm_claim #: view:crm.claim:0 @@ -249,12 +271,12 @@ msgstr "Priorität" #. module: crm_claim #: field:crm.claim.stage,fold:0 msgid "Hide in Views when Empty" -msgstr "" +msgstr "Ohne Eintrag in Ansichten verbergen" #. module: crm_claim #: field:crm.claim,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Followers" #. module: crm_claim #: view:crm.claim:0 @@ -268,7 +290,7 @@ msgstr "Neu" #. module: crm_claim #: field:crm.claim.stage,section_ids:0 msgid "Sections" -msgstr "" +msgstr "Sektionen" #. module: crm_claim #: field:crm.claim,email_from:0 @@ -304,7 +326,7 @@ msgstr "Reklamationsursache" #. module: crm_claim #: model:crm.claim.stage,name:crm_claim.stage_claim3 msgid "Rejected" -msgstr "" +msgstr "Abgelehnt" #. module: crm_claim #: field:crm.claim,date_action_next:0 @@ -315,7 +337,7 @@ msgstr "Datum nächste Aktion" #: code:addons/crm_claim/crm_claim.py:243 #, python-format msgid "Claim has been created." -msgstr "" +msgstr "Reklamation wurde erstellt." #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -349,13 +371,13 @@ msgstr "Daten" #. module: crm_claim #: help:crm.claim,email_from:0 msgid "Destination email for email gateway." -msgstr "" +msgstr "EMail Empfänger für Mailgateway" #. module: crm_claim #: code:addons/crm_claim/crm_claim.py:199 #, python-format msgid "No Subject" -msgstr "" +msgstr "Kein Betreff" #. module: crm_claim #: help:crm.claim.stage,state:0 @@ -365,6 +387,11 @@ msgid "" "is related to the status 'Close', when your document reaches this stage, it " "will be automatically have the 'closed' status." msgstr "" +"Der verbundene Status für diese Stufe. Der Status des Vorgangs ändert sich " +"automatisch mit, wenn die ausgewählte Stufe geändert wird. Wenn z.B. eine " +"Stufe mit dem Status 'Abgeschlossen' verbunden ist, wird der Vorgang " +"automatisch auch 'abgeschlossen', wenn eine entsprechend verbundene Stufe " +"für den Vorgang angegeben wird." #. module: crm_claim #: view:crm.claim:0 @@ -395,7 +422,7 @@ msgstr "CRM Bericht Reklamationen" #. module: crm_claim #: view:sale.config.settings:0 msgid "Configure" -msgstr "" +msgstr "Einstellungen" #. module: crm_claim #: model:crm.case.resource.type,name:crm_claim.type_claim1 @@ -441,6 +468,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 "" +"Durch Aktivierung wird diese Stufe automatisch dem Verkaufsteam zugeordnet. " +"Dieses wird nicht unmittelbar für die bereits bestehenden Teams übernommen." #. module: crm_claim #: field:crm.claim,categ_id:0 @@ -497,7 +526,7 @@ msgstr "Beendet" #. module: crm_claim #: view:crm.claim:0 msgid "Reject" -msgstr "" +msgstr "Ablehnen" #. module: crm_claim #: view:res.partner:0 @@ -507,7 +536,7 @@ msgstr "Antrag des Partners" #. module: crm_claim #: view:crm.claim.stage:0 msgid "Claim Stage" -msgstr "" +msgstr "Reklamation Stufe" #. module: crm_claim #: view:crm.claim:0 @@ -525,7 +554,7 @@ msgstr "Unerledigt" #: field:crm.claim.report,state:0 #: field:crm.claim.stage,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -541,7 +570,7 @@ msgstr "Normal" #. module: crm_claim #: help:crm.claim.stage,sequence:0 msgid "Used to order stages. Lower is better." -msgstr "" +msgstr "Wird zum ordnen der Stufen in aufsteigender Reihenfolge genutzt." #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -583,6 +612,19 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie zur Erstellung einer neuen Stufe für die " +"Bearbeitung von Reklamationen. \n" +"

\n" +" Sie definieren hier Stufen, die dabei helfen den Fortschritt " +"der Bearbeitung Ihrer\n" +" Reklamationen zu erfassen und zu verfolgen. Die hier " +"anzulegenden Stufen umfassen\n" +" dabei den gesamten Arbeitszyklus, der zu Erledigung von " +"Reklamationen erforderlich\n" +" ist\n" +"

\n" +" " #. module: crm_claim #: help:crm.claim,state:0 @@ -613,7 +655,7 @@ msgstr "Erweiterter Filter..." #: field:crm.claim,message_comment_ids:0 #: help:crm.claim,message_comment_ids:0 msgid "Comments and emails" -msgstr "" +msgstr "Kommentare und EMails" #. module: crm_claim #: view:crm.claim:0 @@ -626,6 +668,8 @@ msgid "" "Responsible sales team. Define Responsible user and Email account for mail " "gateway." msgstr "" +"Verantwortliches Team. Definieren Sie den Teamleiter und das EMail Konto, " +"dessen Posteingang überwacht wird." #. module: crm_claim #: selection:crm.claim.report,month:0 @@ -646,7 +690,7 @@ msgstr "Reklamation Datum" #. module: crm_claim #: field:crm.claim,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Zusammenfassung" #. module: crm_claim #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action @@ -656,7 +700,7 @@ msgstr "Reklamation Kategorien" #. module: crm_claim #: field:crm.claim.stage,case_default:0 msgid "Common to All Teams" -msgstr "" +msgstr "Gemeinsam für alle Teams" #. module: crm_claim #: view:crm.claim:0 @@ -695,7 +739,7 @@ msgstr "Reklamation" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Company" -msgstr "" +msgstr "Mein Unternehmen" #. module: crm_claim #: view:crm.claim.report:0 @@ -751,7 +795,7 @@ msgstr "Nicht zugeordnete Anträge" #: code:addons/crm_claim/crm_claim.py:247 #, python-format msgid "Claim has been refused." -msgstr "" +msgstr "Reklamation wurde verworfen." #. module: crm_claim #: field:crm.claim,cause:0 @@ -792,7 +836,7 @@ msgstr "Vorgehen Problembehebung" #. module: crm_claim #: field:crm.claim.stage,case_refused:0 msgid "Refused stage" -msgstr "" +msgstr "Stufe für Abgelehnt" #. module: crm_claim #: model:ir.actions.act_window,help:crm_claim.crm_case_categ_claim0 @@ -819,7 +863,7 @@ msgstr "# EMails" #: code:addons/crm_claim/crm_claim.py:253 #, python-format msgid "Stage changed to %s." -msgstr "" +msgstr "Stufe wurde geändert auf %s." #. module: crm_claim #: view:crm.claim.report:0 @@ -865,17 +909,17 @@ msgstr "" #. module: crm_claim #: help:crm.claim,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Nachrichten und Kommunikation" #. module: crm_claim #: field:sale.config.settings,fetchmail_claim:0 msgid "Create claims from incoming mails" -msgstr "" +msgstr "Erstelle automatische Reklamationen aus dem EMail Posteingang" #. module: crm_claim #: field:crm.claim.stage,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Reihenfolge" #. module: crm_claim #: view:crm.claim:0 @@ -910,11 +954,13 @@ msgid "" "Link between stages and sales teams. When set, this limitate the current " "stage to the selected sales teams." msgstr "" +"Verbindung vertrieblicher Stufen zu Teams. Hierdurch können Sie die " +"Auswahlmöglichkeiten für Stufen in Abhängigkeit vom Team einschränken." #. module: crm_claim #: help:crm.claim.stage,case_refused:0 msgid "Refused stages are specific stages for done." -msgstr "" +msgstr "Die Abgelehnt Stufe ist spezifisch für Erledigt." #~ msgid "" #~ "Sales team to which Case belongs to.Define Responsible user and Email " 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/de.po b/addons/crm_helpdesk/i18n/de.po index a9487814eab..74a62475e03 100644 --- a/addons/crm_helpdesk/i18n/de.po +++ b/addons/crm_helpdesk/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-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-01-13 23:20+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-09 11:24+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-11-25 06:28+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -30,7 +31,7 @@ msgstr "# Fälle" #: code:addons/crm_helpdesk/crm_helpdesk.py:152 #, python-format msgid "Case has been created." -msgstr "" +msgstr "Anfrage wurde erstellt." #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -41,7 +42,7 @@ msgstr "Gruppierung..." #. module: crm_helpdesk #: help:crm.helpdesk,email_from:0 msgid "Destination email for email gateway" -msgstr "" +msgstr "EMail Empfänger für Mailgateway" #. module: crm_helpdesk #: selection:crm.helpdesk.report,month:0 @@ -51,7 +52,7 @@ msgstr "März" #. module: crm_helpdesk #: field:crm.helpdesk,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Ungelesene Mitteilungen" #. module: crm_helpdesk #: field:crm.helpdesk,company_id:0 @@ -68,7 +69,7 @@ msgstr "Empfänger EMails" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "Salesperson" -msgstr "" +msgstr "Verkäufer" #. module: crm_helpdesk #: selection:crm.helpdesk,priority:0 @@ -141,6 +142,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 "" +"Beinhaltet die Chatter Zusammenfassung (Anzahl der Nachrichten, ...). Diese " +"Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt " +"zu werden." #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -282,7 +286,7 @@ msgstr "Kein Betreff" msgid "" "Helpdesk requests that are assigned to me or to one of the sale teams I " "manage" -msgstr "" +msgstr "Mir persönlich oder dem von mir geleiteten Team zugewiesene Anfragen" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 @@ -405,7 +409,7 @@ msgstr "Unerledigt" #: view:crm.helpdesk.report:0 #: field:crm.helpdesk.report,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: crm_helpdesk #: selection:crm.helpdesk.report,month:0 @@ -450,6 +454,24 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie zur Erstellung einer neuen Anfrage an Ihren " +"Kundendienst.\n" +"

\n" +" Im Kundendienst können Sie alle Beratung und Support " +"Vorfälle verfolgen.\n" +"

\n" +" Benutzen Sie die OpenERP Kundendienst Vorfälle für das " +"Management Ihrer\n" +" Kundenberatung und den Support. Durch Verbindung mit dem " +"EMail Gateway \n" +" können Vorfälle automatisch erzeugt werden. Praktisch ist " +"dabei auch die \n" +" Möglichkeit die gesamte Historie einzusehen und weiter zu " +"verfolgen oder \n" +" auch auszuwerten.\n" +"

\n" +" " #. module: crm_helpdesk #: field:crm.helpdesk,planned_revenue:0 @@ -490,7 +512,7 @@ msgstr "Kundendienst Anfragen" #: field:crm.helpdesk,message_comment_ids:0 #: help:crm.helpdesk,message_comment_ids:0 msgid "Comments and emails" -msgstr "" +msgstr "Kommentare und EMails" #. module: crm_helpdesk #: help:crm.helpdesk,section_id:0 @@ -512,7 +534,7 @@ msgstr "Januar" #. module: crm_helpdesk #: field:crm.helpdesk,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Zusammenfassung" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -528,7 +550,7 @@ msgstr "Diverse" #. module: crm_helpdesk #: view:crm.helpdesk.report:0 msgid "My Company" -msgstr "" +msgstr "Mein Unternehmen" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -675,11 +697,19 @@ msgid "" " \n" "If the case needs to be reviewed then the status is set to 'Pending'." msgstr "" +"Durch Erstellung und Speichern einer Anfrage ist der Status zunächst " +"'Entwurf'. \n" +"Durch die Bearbeitung ändert sich der Status dann automatisch in 'Offen'. " +" \n" +"Wenn die Anfrage beantwortet wird, ändert sich der Status in 'Erledigt'. " +" \n" +"Sollte zunächst eine spätere Bearbeitung erforderlich sein, wird der Status " +"geändert zu 'Wiedervorlage'." #. module: crm_helpdesk #: help:crm.helpdesk,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Nachrichten und Kommunikation" #. module: crm_helpdesk #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action @@ -722,7 +752,7 @@ msgstr "Letzte Aktion" #. module: crm_helpdesk #: view:crm.helpdesk:0 msgid "Assigned to Me or My Sales Team(s)" -msgstr "" +msgstr "Mir oder meinem Team zugewiesen" #. module: crm_helpdesk #: field:crm.helpdesk,duration:0 diff --git a/addons/crm_helpdesk/i18n/pt_BR.po b/addons/crm_helpdesk/i18n/pt_BR.po index 309261244c0..5dc31b16599 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-09 04:39+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/de.po b/addons/crm_partner_assign/i18n/de.po index ebaffb6153c..eb7abbc8764 100644 --- a/addons/crm_partner_assign/i18n/de.po +++ b/addons/crm_partner_assign/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:03+0000\n" -"PO-Revision-Date: 2012-01-14 11:42+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-09 16:24+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:52+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_close:0 @@ -25,7 +26,7 @@ msgstr "Zeit f. Beendigung" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,author_id:0 msgid "Author" -msgstr "" +msgstr "Urheber" #. module: crm_partner_assign #: field:crm.lead.report.assign,planned_revenue:0 @@ -38,6 +39,8 @@ msgid "" "Message type: email for email message, notification for system message, " "comment for other messages such as user replies" msgstr "" +"Nachrichtentyp: EMail für Emailnachricht, Mitteilung für Systemnachricht, " +"Kommentar für andere Mitteilungen wie Diskussionsbeiträge von Benutzern." #. module: crm_partner_assign #: field:crm.lead.report.assign,nbr:0 @@ -53,7 +56,7 @@ msgstr "Gruppierung..." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,body:0 msgid "Automatically sanitized HTML contents" -msgstr "" +msgstr "Automatisch bereinigter HTML Inhalt" #. module: crm_partner_assign #: view:crm.lead:0 @@ -76,11 +79,13 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found for incoming emails." msgstr "" +"EMail Adresse des Senders. Dieses Feld wird eingetragen, wenn aufgrund der " +"eingehenden EMail keine automatische Zuordnung eines Partners möglich ist." #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "Date Partnership" -msgstr "" +msgstr "Beginn Partnerschaft" #. module: crm_partner_assign #: selection:crm.lead.report.assign,type:0 @@ -106,7 +111,7 @@ msgstr "Unternehmen" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,notification_ids:0 msgid "Notifications" -msgstr "" +msgstr "Benachrichtigungen" #. module: crm_partner_assign #: field:crm.lead.report.assign,date_assign:0 @@ -118,7 +123,7 @@ msgstr "Partner Daten" #: view:crm.partner.report.assign:0 #: view:res.partner:0 msgid "Salesperson" -msgstr "" +msgstr "Verkäufer" #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -139,12 +144,12 @@ msgstr "Eindeutige Identifikation der Nachricht" #. module: crm_partner_assign #: field:res.partner,date_review_next:0 msgid "Next Partner Review" -msgstr "" +msgstr "Nächste Partnerbewertung" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,favorite_user_ids:0 msgid "Favorite" -msgstr "" +msgstr "Bevorzugter Verkäufer" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history_mode:0 @@ -170,12 +175,12 @@ msgstr "Geogr. Zuweisung" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner msgid "Email composition wizard" -msgstr "" +msgstr "Emailerstellung Assistent" #. module: crm_partner_assign #: field:crm.partner.report.assign,turnover:0 msgid "Turnover" -msgstr "" +msgstr "Umsatz" #. module: crm_partner_assign #: field:crm.lead.report.assign,date_closed:0 @@ -192,18 +197,18 @@ msgstr "Ermöglicht automatische Zuweisung von Leads zu Partnern" #. module: crm_partner_assign #: view:res.partner:0 msgid "Partner Activation" -msgstr "" +msgstr "Aktivierung Partner" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,type:0 msgid "System notification" -msgstr "" +msgstr "System Benachrichtigung" #. module: crm_partner_assign #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77 #, python-format msgid "Lead forward" -msgstr "" +msgstr "Interessenten Übermittlung" #. module: crm_partner_assign #: field:crm.lead.report.assign,probability:0 @@ -261,11 +266,14 @@ msgid "" "Author of the message. If not set, email_from may hold an email address that " "did not match any partner." msgstr "" +"Verfasser der Mitteilung. Falls hier kein Eintrag enthalten ist, kann die " +"EMail Empfang Adresse auch eine Email Adresse enthalten, die nicht zu einem " +"Partner gehört." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,favorite_user_ids:0 msgid "Users that set this message in their favorites" -msgstr "" +msgstr "Benutzer, die diese Nachricht in Ihren Favoriten verfolgen" #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_expected:0 @@ -281,7 +289,7 @@ msgstr "Typ" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,type:0 msgid "Email" -msgstr "" +msgstr "EMail" #. module: crm_partner_assign #: help:crm.lead,partner_assigned_id:0 @@ -296,7 +304,7 @@ msgstr "Sehr gering" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "Date Invoice" -msgstr "" +msgstr "Datum Rechnung" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,template_id:0 @@ -356,7 +364,7 @@ msgstr "Juli" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "Date Review" -msgstr "" +msgstr "Bewertungsdatum" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -368,12 +376,12 @@ msgstr "Stufe" #: view:crm.lead.report.assign:0 #: field:crm.lead.report.assign,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,to_read:0 msgid "To read" -msgstr "" +msgstr "ungelesen" #. module: crm_partner_assign #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77 @@ -429,11 +437,13 @@ msgstr "Anzahl Tage f. Beendigung" msgid "" "Partners that have a notification pushing this message in their mailboxes" msgstr "" +"Partner, die benachrichtigt wurden, dass diese EMail in Ihrem Posteingang " +"ist." #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,type:0 msgid "Comment" -msgstr "" +msgstr "Kommentar" #. module: crm_partner_assign #: field:res.partner,partner_weight:0 @@ -461,7 +471,7 @@ msgstr "Dezember" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,vote_user_ids:0 msgid "Users that voted for this message" -msgstr "" +msgstr "Benutzer die für diese Mitteilung gestimmt haben" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -483,7 +493,7 @@ msgstr "" #: field:crm.partner.report.assign,date_review:0 #: field:res.partner,date_review:0 msgid "Latest Partner Review" -msgstr "" +msgstr "Letzte Partner Bewertung" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,subject:0 @@ -493,17 +503,17 @@ msgstr "Betreff" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "or" -msgstr "" +msgstr "oder" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,body:0 msgid "Contents" -msgstr "" +msgstr "Inhalte" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,vote_user_ids:0 msgid "Votes" -msgstr "" +msgstr "Bewertungen" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -514,7 +524,7 @@ msgstr "# Verkaufschancen" #: field:crm.partner.report.assign,date_partnership:0 #: field:res.partner,date_partnership:0 msgid "Partnership Date" -msgstr "" +msgstr "Beginn Partnerschaft" #. module: crm_partner_assign #: view:crm.lead:0 @@ -566,7 +576,7 @@ msgstr "August" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,record_name:0 msgid "Name get of the related document." -msgstr "" +msgstr "Bezeichnung kommt vom verbundenen Vorgang." #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 @@ -663,12 +673,12 @@ msgstr "Geplanter Umsatz" #. module: crm_partner_assign #: view:res.partner:0 msgid "Partner Review" -msgstr "" +msgstr "Partner Bewertung" #. module: crm_partner_assign #: field:crm.partner.report.assign,period_id:0 msgid "Invoice Period" -msgstr "" +msgstr "Abrechnungsperiode" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_res_partner_grade @@ -689,7 +699,7 @@ msgstr "Anhänge" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,record_name:0 msgid "Message Record Name" -msgstr "" +msgstr "Mitteilung Bezeichnung" #. module: crm_partner_assign #: field:res.partner.activation,sequence:0 @@ -704,6 +714,8 @@ msgid "" "Cannot contact geolocation servers. Please make sure that your internet " "connection is up and running (%s)." msgstr "" +"Die Verbindung zum Geolokalisierung Server war nicht erfolgreich. Bitte " +"stellen Sie sicher, daß Sie eine Internet Verbindung haben (%s)." #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -729,7 +741,7 @@ msgstr "Offen" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,subtype_id:0 msgid "Subtype" -msgstr "" +msgstr "Untertyp" #. module: crm_partner_assign #: field:res.partner,date_localization:0 @@ -744,12 +756,12 @@ msgstr "Aktuell" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead msgid "Lead/Opportunity" -msgstr "" +msgstr "Interessent / Chance" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,notified_partner_ids:0 msgid "Notified partners" -msgstr "" +msgstr "Benachrichtigter Partner" #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 @@ -780,7 +792,7 @@ msgstr "Geplanter Umsatz" #: field:res.partner,activation:0 #: view:res.partner.activation:0 msgid "Activation" -msgstr "" +msgstr "Aktivierung" #. module: crm_partner_assign #: view:crm.lead:0 @@ -791,7 +803,7 @@ msgstr "Zugewiesener Partner" #. module: crm_partner_assign #: field:res.partner,grade_id:0 msgid "Partner Level" -msgstr "" +msgstr "Partner Level" #. module: crm_partner_assign #: selection:crm.lead.report.assign,type:0 @@ -817,7 +829,7 @@ msgstr "Bezeichnung" #: 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 "" +msgstr "Partnerschaft Aktivierung" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -860,6 +872,8 @@ msgid "" "Technical field holding the message notifications. Use notified_partner_ids " "to access notified partners." msgstr "" +"Technisches Feld mit der Benachrichtigung. Zum Zugriff auf zu " +"benachrichtigenden Partner verwenden Sie notified_partner_ids." #. module: crm_partner_assign #: view:crm.partner.report.assign:0 @@ -874,12 +888,12 @@ msgstr "Auswertung Leads" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,composition_mode:0 msgid "Composition mode" -msgstr "" +msgstr "Erstellungsmodus" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,model:0 msgid "Related Document Model" -msgstr "" +msgstr "verbundenes Datenmodell" #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history_mode:0 @@ -890,6 +904,7 @@ msgstr "Fall Information" #: help:crm.lead.forward.to.partner,to_read:0 msgid "Functional field to search for messages the current user has to read" msgstr "" +"Feld mit Funktion zur Suche der ungelesenen Mitteilungen des Benutzers" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign @@ -904,12 +919,12 @@ msgstr "Hoch" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,partner_ids:0 msgid "Additional contacts" -msgstr "" +msgstr "Weitere Kontakte" #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,parent_id:0 msgid "Initial thread message." -msgstr "" +msgstr "Anfangsmitteilung" #. module: crm_partner_assign #: field:crm.lead.report.assign,create_date:0 diff --git a/addons/crm_partner_assign/i18n/nb.po b/addons/crm_partner_assign/i18n/nb.po index 56497c83f58..08bf8e4aa56 100644 --- a/addons/crm_partner_assign/i18n/nb.po +++ b/addons/crm_partner_assign/i18n/nb.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-12-06 10:55+0000\n" +"PO-Revision-Date: 2012-12-08 19:38+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-Launchpad-Export-Date: 2012-12-09 04:39+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: crm_partner_assign @@ -76,6 +76,8 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found for incoming emails." msgstr "" +"E-postadressen til avsenderen. Dette feltet er satt når ingen samsvarende " +"partner er funnet for innkommende e-post." #. module: crm_partner_assign #: view:crm.partner.report.assign:0 @@ -170,7 +172,7 @@ msgstr "" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner msgid "Email composition wizard" -msgstr "" +msgstr "Epost komposisjon veiviseren." #. module: crm_partner_assign #: field:crm.partner.report.assign,turnover:0 @@ -231,7 +233,7 @@ msgstr "Fra." #: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action #: view:res.partner.grade:0 msgid "Partner Grade" -msgstr "" +msgstr "Partner grad." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -261,6 +263,8 @@ msgid "" "Author of the message. If not set, email_from may hold an email address that " "did not match any partner." msgstr "" +"Forfatter av meldingen. Hvis det ikke er angitt, kan email_fra Mai holde en " +"e-postadresse som ikke samsvarer med noen partner." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,favorite_user_ids:0 @@ -321,7 +325,7 @@ msgstr "Opprettelses dato." #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_res_partner_activation msgid "res.partner.activation" -msgstr "" +msgstr "Res.partner.aktivering." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,parent_id:0 @@ -379,7 +383,7 @@ msgstr "Å lese." #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:77 #, python-format msgid "Fwd" -msgstr "" +msgstr "Fwd." #. module: crm_partner_assign #: view:res.partner:0 @@ -429,6 +433,7 @@ msgstr "Antall dager til sak lukkes." msgid "" "Partners that have a notification pushing this message in their mailboxes" msgstr "" +"Partnere som har et varsel om skyve denne meldingen i sine postkasser." #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,type:0 @@ -451,7 +456,7 @@ msgstr "April." #: view:crm.partner.report.assign:0 #: field:crm.partner.report.assign,grade_id:0 msgid "Grade" -msgstr "" +msgstr "Nivå." #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 @@ -477,13 +482,13 @@ msgstr "Åpningsdato." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,child_ids:0 msgid "Child Messages" -msgstr "" +msgstr "Barne meldinger." #. module: crm_partner_assign #: field:crm.partner.report.assign,date_review:0 #: field:res.partner,date_review:0 msgid "Latest Partner Review" -msgstr "" +msgstr "Siste partner anmeldelse." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,subject:0 @@ -503,50 +508,50 @@ msgstr "Innhold." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,vote_user_ids:0 msgid "Votes" -msgstr "" +msgstr "Stemmer." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "#Opportunities" -msgstr "" +msgstr "#Muligheter." #. module: crm_partner_assign #: field:crm.partner.report.assign,date_partnership:0 #: field:res.partner,date_partnership:0 msgid "Partnership Date" -msgstr "" +msgstr "Partnerskap dato." #. module: crm_partner_assign #: view:crm.lead:0 msgid "Team" -msgstr "" +msgstr "Lag." #. module: crm_partner_assign #: selection:crm.lead.report.assign,state:0 msgid "Draft" -msgstr "" +msgstr "Kladd." #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 msgid "Low" -msgstr "" +msgstr "Lav." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 #: selection:crm.lead.report.assign,state:0 msgid "Closed" -msgstr "" +msgstr "Lukket." #. module: crm_partner_assign #: model:ir.actions.act_window,name:crm_partner_assign.action_crm_send_mass_forward msgid "Mass forward to partner" -msgstr "" +msgstr "Massen frem til partner." #. module: crm_partner_assign #: view:res.partner:0 #: field:res.partner,opportunity_assigned_ids:0 msgid "Assigned Opportunities" -msgstr "" +msgstr "Tilordnede muligheter." #. module: crm_partner_assign #: field:crm.lead,date_assign:0 @@ -556,22 +561,22 @@ msgstr "" #. module: crm_partner_assign #: field:crm.lead.report.assign,probability_max:0 msgid "Max Probability" -msgstr "" +msgstr "Maksimalt sannsynlighet." #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "August" -msgstr "" +msgstr "August." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,record_name:0 msgid "Name get of the related document." -msgstr "" +msgstr "Navngi få av relaterte dokument." #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 msgid "Normal" -msgstr "" +msgstr "Normal." #. module: crm_partner_assign #: view:res.partner:0 @@ -581,38 +586,38 @@ msgstr "" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "June" -msgstr "" +msgstr "Juni." #. module: crm_partner_assign #: help:crm.lead.report.assign,delay_open:0 msgid "Number of Days to open the case" -msgstr "" +msgstr "Antall dager til åpningen av saken." #. module: crm_partner_assign #: field:crm.lead.report.assign,delay_open:0 msgid "Delay to Open" -msgstr "" +msgstr "Forsinkelse før åpning." #. module: crm_partner_assign #: field:crm.lead.report.assign,user_id:0 #: field:crm.partner.report.assign,user_id:0 msgid "User" -msgstr "" +msgstr "Bruker." #. module: crm_partner_assign #: field:res.partner.grade,active:0 msgid "Active" -msgstr "" +msgstr "Aktiv." #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "November" -msgstr "" +msgstr "November." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Extended Filters..." -msgstr "" +msgstr "Utvidet Filtere ..." #. module: crm_partner_assign #: field:crm.lead,partner_longitude:0 @@ -623,7 +628,7 @@ msgstr "" #. module: crm_partner_assign #: field:crm.partner.report.assign,opp:0 msgid "# of Opportunity" -msgstr "" +msgstr "#Av muligheter." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -633,7 +638,7 @@ msgstr "" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "October" -msgstr "" +msgstr "Oktober." #. module: crm_partner_assign #: view:crm.lead:0 @@ -643,59 +648,59 @@ msgstr "" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "January" -msgstr "" +msgstr "Januar." #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 msgid "Send Mail" -msgstr "" +msgstr "Send e-post." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,date:0 msgid "Date" -msgstr "" +msgstr "Dato." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Planned Revenues" -msgstr "" +msgstr "Planlagt omsetning" #. module: crm_partner_assign #: view:res.partner:0 msgid "Partner Review" -msgstr "" +msgstr "Partner anmeldelse." #. module: crm_partner_assign #: field:crm.partner.report.assign,period_id:0 msgid "Invoice Period" -msgstr "" +msgstr "Faktura periode." #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_res_partner_grade msgid "res.partner.grade" -msgstr "" +msgstr "Res.partner.nivå." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,message_id:0 msgid "Message-Id" -msgstr "" +msgstr "Melding - ID." #. module: crm_partner_assign #: view:crm.lead.forward.to.partner:0 #: field:crm.lead.forward.to.partner,attachment_ids:0 msgid "Attachments" -msgstr "" +msgstr "Vedlegg." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,record_name:0 msgid "Message Record Name" -msgstr "" +msgstr "Melding rekord navn." #. module: crm_partner_assign #: field:res.partner.activation,sequence:0 #: field:res.partner.grade,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Sekvens." #. module: crm_partner_assign #: code:addons/crm_partner_assign/partner_geo_assign.py:37 @@ -708,12 +713,12 @@ msgstr "" #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "September" -msgstr "" +msgstr "September." #. module: crm_partner_assign #: field:res.partner.grade,name:0 msgid "Grade Name" -msgstr "" +msgstr "Nivå navn." #. module: crm_partner_assign #: help:crm.lead,date_assign:0 @@ -724,7 +729,7 @@ msgstr "" #: selection:crm.lead.report.assign,state:0 #: view:res.partner:0 msgid "Open" -msgstr "" +msgstr "Åpen." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,subtype_id:0 @@ -739,12 +744,12 @@ msgstr "" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Current" -msgstr "" +msgstr "Nåværende." #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead msgid "Lead/Opportunity" -msgstr "" +msgstr "Fører/Mulighet." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,notified_partner_ids:0 @@ -755,18 +760,18 @@ msgstr "" #: 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 "" +msgstr "Fram til partner." #. module: crm_partner_assign #: field:crm.lead.report.assign,section_id:0 #: field:crm.partner.report.assign,section_id:0 msgid "Sales Team" -msgstr "" +msgstr "Salgslag." #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "May" -msgstr "" +msgstr "Mai." #. module: crm_partner_assign #: field:crm.lead.report.assign,probable_revenue:0 @@ -780,44 +785,44 @@ msgstr "" #: field:res.partner,activation:0 #: view:res.partner.activation:0 msgid "Activation" -msgstr "" +msgstr "Aktivering." #. module: crm_partner_assign #: view:crm.lead:0 #: field:crm.lead,partner_assigned_id:0 msgid "Assigned Partner" -msgstr "" +msgstr "Tilordnet partner." #. module: crm_partner_assign #: field:res.partner,grade_id:0 msgid "Partner Level" -msgstr "" +msgstr "Partner nivå." #. module: crm_partner_assign #: selection:crm.lead.report.assign,type:0 msgid "Opportunity" -msgstr "" +msgstr "Muligheter." #. module: crm_partner_assign #: field:crm.lead.report.assign,partner_id:0 msgid "Customer" -msgstr "" +msgstr "Kunde." #. module: crm_partner_assign #: selection:crm.lead.report.assign,month:0 msgid "February" -msgstr "" +msgstr "Februar." #. module: crm_partner_assign #: field:res.partner.activation,name:0 msgid "Name" -msgstr "" +msgstr "Navn." #. 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 "" +msgstr "Partner aktiveringer." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -825,18 +830,18 @@ msgstr "" #: view:crm.partner.report.assign:0 #: field:crm.partner.report.assign,country_id:0 msgid "Country" -msgstr "" +msgstr "Land." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 #: field:crm.lead.report.assign,year:0 msgid "Year" -msgstr "" +msgstr "År." #. module: crm_partner_assign #: view:res.partner:0 msgid "Convert to Opportunity" -msgstr "" +msgstr "Konverter til mulighet." #. module: crm_partner_assign #: view:crm.lead:0 @@ -846,13 +851,13 @@ msgstr "" #. module: crm_partner_assign #: view:crm.lead.report.assign:0 msgid "Delay to open" -msgstr "" +msgstr "Forsinket til åpning." #. 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 "" +msgstr "Partnerskap analyse." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,notification_ids:0 @@ -864,12 +869,12 @@ msgstr "" #. module: crm_partner_assign #: view:crm.partner.report.assign:0 msgid "Partner assigned Analysis" -msgstr "" +msgstr "Partner tilordnet analyse." #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign msgid "CRM Lead Report" -msgstr "" +msgstr "CRM fører rapport." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,composition_mode:0 @@ -879,12 +884,12 @@ msgstr "" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,model:0 msgid "Related Document Model" -msgstr "" +msgstr "Relatert dokument modell." #. module: crm_partner_assign #: selection:crm.lead.forward.to.partner,history_mode:0 msgid "Case Information" -msgstr "" +msgstr "Sakinformasjon." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,to_read:0 @@ -894,17 +899,17 @@ msgstr "" #. module: crm_partner_assign #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign msgid "CRM Partner Report" -msgstr "" +msgstr "CRM partner rapport." #. module: crm_partner_assign #: selection:crm.lead.report.assign,priority:0 msgid "High" -msgstr "" +msgstr "Høy." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,partner_ids:0 msgid "Additional contacts" -msgstr "" +msgstr "Flere kontakter." #. module: crm_partner_assign #: help:crm.lead.forward.to.partner,parent_id:0 @@ -914,12 +919,12 @@ msgstr "" #. module: crm_partner_assign #: field:crm.lead.report.assign,create_date:0 msgid "Create Date" -msgstr "" +msgstr "Opprettet dato." #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,filter_id:0 msgid "Filters" -msgstr "" +msgstr "Filtere." #. module: crm_partner_assign #: view:crm.lead.report.assign:0 @@ -928,4 +933,4 @@ msgstr "" #: field:crm.partner.report.assign,partner_id:0 #: model:ir.model,name:crm_partner_assign.model_res_partner msgid "Partner" -msgstr "" +msgstr "Partner." diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po index 0c59e331aa6..77cc2d41ff8 100644 --- a/addons/crm_profiling/i18n/it.po +++ b/addons/crm_profiling/i18n/it.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-12-03 16:03+0000\n" -"PO-Revision-Date: 2012-05-10 17:38+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-12-09 20:35+0000\n" +"Last-Translator: Sergio Corato \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:40+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -74,7 +74,7 @@ msgstr "Risposta" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire_line msgid "open.questionnaire.line" -msgstr "" +msgstr "Copy text \t open.questionnaire.line" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_crm_segmentation @@ -107,7 +107,7 @@ msgstr "Risposte" #. module: crm_profiling #: model:ir.model,name:crm_profiling.model_open_questionnaire msgid "open.questionnaire" -msgstr "" +msgstr "open.questionnaire" #. module: crm_profiling #: field:open.questionnaire,questionnaire_id:0 @@ -122,7 +122,7 @@ msgstr "Utilizza un Questionario" #. module: crm_profiling #: field:open.questionnaire,question_ans_ids:0 msgid "Question / Answers" -msgstr "" +msgstr "Domande / Risposte" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -150,7 +150,7 @@ msgstr "Utilizza Regole Peofilatura" #. module: crm_profiling #: constraint:crm.segmentation:0 msgid "Error ! You cannot create recursive profiles." -msgstr "" +msgstr "Errore ! Non è possibile creare profili ricorsivi." #. module: crm_profiling #: field:crm.segmentation,answer_yes:0 @@ -199,7 +199,7 @@ msgstr "Salva Dati" #. module: crm_profiling #: view:open.questionnaire:0 msgid "or" -msgstr "" +msgstr "o" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" 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_profiling/i18n/zh_CN.po b/addons/crm_profiling/i18n/zh_CN.po index 5acae2f4c97..8438456e357 100644 --- a/addons/crm_profiling/i18n/zh_CN.po +++ b/addons/crm_profiling/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:03+0000\n" -"PO-Revision-Date: 2012-05-10 17:53+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2012-12-08 13: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-04 05:40+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -144,7 +144,7 @@ msgstr "使用这客户特征的规则" #. module: crm_profiling #: constraint:crm.segmentation:0 msgid "Error ! You cannot create recursive profiles." -msgstr "" +msgstr "错误！你不能创建循环的档案。" #. module: crm_profiling #: field:crm.segmentation,answer_yes:0 @@ -193,7 +193,7 @@ msgstr "保存日期" #. module: crm_profiling #: view:open.questionnaire:0 msgid "or" -msgstr "" +msgstr "or" #~ msgid "" #~ "The Object name must start with x_ and not contain any special character !" diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po index b761c2b39d3..a5601e7e790 100644 --- a/addons/delivery/i18n/de.po +++ b/addons/delivery/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:03+0000\n" -"PO-Revision-Date: 2012-02-08 09:10+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-09 21:56+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:11+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: delivery #: report:sale.shipping:0 @@ -64,7 +65,7 @@ msgstr "Volumen" #. module: delivery #: view:delivery.carrier:0 msgid "Zip" -msgstr "" +msgstr "PLZ" #. module: delivery #: field:delivery.grid,line_ids:0 @@ -100,12 +101,31 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie zur Erstellung einer neuen Liefermethode. \n" +"

\n" +" Jeder Paketversender (z.B. UPS) bietet unterschiedliche " +"Liefermethoden an (z.B.\n" +" UPS Express, UPS Standard) mit verschiedenen Regelwerken für " +"die Preisberechnung \n" +" der Methoden. \n" +"

\n" +" Die Methoden ermöglichen es nun, automatisch auf Basis " +"Ihrer Einstellungen den Lieferpreis \n" +" für die Auslieferung zu berechnen, und den Verkauf " +"(bezieht sich auf dieses Angebot) oder die \n" +" Rechnung (basierend auf den Lieferscheinen) automatisch " +"inklusive dieser Kosten zu erstellen.\n" +"

\n" +" " #. module: delivery #: code:addons/delivery/delivery.py:221 #, python-format msgid "No line matched this product or order in the chosen delivery grid." msgstr "" +"Keine Zeile entspricht dem Produkt oder dem Auftrag mit dieser ausgewählten " +"Liefertabelle." #. module: delivery #: model:ir.actions.act_window,name:delivery.action_picking_tree4 @@ -145,6 +165,20 @@ msgid "" "

\n" " " msgstr "" +"p class=\"oe_view_nocontent_create\">\n" +"\n" +"Klicken Sie um eine Preisliste für spezifische Regionen zu definieren.\n" +"

\n" +" Der Preis für Auslieferungen ermöglicht die Berechnung von " +"Kosten\n" +"und Verkaufspreisen auf der Basis von Gewichten und weiterer Kriterien bei " +"der \n" +"Auslieferung. Sie können verschiedene Preislisten für Liefermethoden " +"anlegen: \n" +"Pro Land oder Region in einem spezifischen Land durch einen bestimmten \n" +"Bereich der PLZ.\n" +"

\n" +" " #. module: delivery #: report:sale.shipping:0 @@ -164,7 +198,7 @@ msgstr "Betrag" #. module: delivery #: view:sale.order:0 msgid "Add in Quote" -msgstr "" +msgstr "Erweitern um Angebot" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -217,7 +251,7 @@ msgstr "Definition Auslieferungstarif" #: code:addons/delivery/stock.py:89 #, python-format msgid "Warning!" -msgstr "" +msgstr "Warnung !" #. module: delivery #: field:delivery.grid.line,operator:0 @@ -237,7 +271,7 @@ msgstr "Verkaufsauftrag" #. module: delivery #: model:ir.model,name:delivery.model_stock_picking_out msgid "Delivery Orders" -msgstr "" +msgstr "Auslieferung Aufträge" #. module: delivery #: view:sale.order: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/document_directory.py b/addons/document/document_directory.py index ec51d9bcc6c..58492b87222 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -53,7 +53,7 @@ class document_directory(osv.osv): 'ressource_type_id': fields.many2one('ir.model', 'Resource model', change_default=True, help="Select an object here and there will be one folder per record of that resource."), 'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'), - 'resource_find_all': fields.boolean('Find all resources', required=True, + 'resource_find_all': fields.boolean('Find all resources', help="If true, all attachments that match this resource will " \ " be located. If false, only ones that have this as parent." ), 'ressource_parent_type_id': fields.many2one('ir.model', 'Parent Model', change_default=True, diff --git a/addons/document/document_storage.py b/addons/document/document_storage.py index 21cb4f9dcf4..a4b37b126b2 100644 --- a/addons/document/document_storage.py +++ b/addons/document/document_storage.py @@ -349,7 +349,7 @@ class document_storage(osv.osv): 'type': fields.selection([('db', 'Database'), ('filestore', 'Internal File storage'), ('realstore','External file storage'),], 'Type', required=True), 'path': fields.char('Path', size=250, select=1, help="For file storage, the root path of the storage"), - 'online': fields.boolean('Online', help="If not checked, media is currently offline and its contents not available", required=True), + 'online': fields.boolean('Online', help="If not checked, media is currently offline and its contents not available"), 'readonly': fields.boolean('Read Only', help="If set, media is for reading only"), } diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po index d0ee7d3bdfe..77c4d65086d 100644 --- a/addons/document/i18n/zh_CN.po +++ b/addons/document/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-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-06-07 03:33+0000\n" -"Last-Translator: 开阖软件 Jeff Wang \n" +"PO-Revision-Date: 2012-12-08 13:11+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-11-25 06:17+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: document #: field:document.directory,parent_id:0 @@ -40,7 +40,7 @@ msgstr "流程节点" #. module: document #: sql_constraint:document.directory:0 msgid "Directory must have a parent or a storage." -msgstr "" +msgstr "目录必须有一个上级或者存储器" #. module: document #: view:document.directory:0 @@ -274,7 +274,7 @@ msgstr "内容类型" #. module: document #: view:ir.attachment:0 msgid "Modification" -msgstr "" +msgstr "修改" #. module: document #: view:document.directory:0 @@ -289,7 +289,7 @@ msgstr "类型" #: code:addons/document/document_directory.py:234 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (副本)" #. module: document #: help:document.directory,ressource_type_id:0 @@ -307,7 +307,7 @@ msgstr "如果要自动筛选可见的资源，请使用过滤条件" #. module: document #: constraint:document.directory:0 msgid "Error! You cannot create recursive directories." -msgstr "" +msgstr "错误！你不能创建循环目录。" #. module: document #: field:document.directory,resource_field:0 @@ -395,7 +395,7 @@ msgstr "最近修改用户" #: model:ir.actions.act_window,name:document.action_view_files_by_user_graph #: view:report.document.user:0 msgid "Files by User" -msgstr "" +msgstr "用户文件" #. module: document #: view:ir.attachment:0 @@ -460,7 +460,7 @@ msgstr "如果没有选中，那么介质目前是脱机的且里面的内容不 #. module: document #: field:report.document.user,user:0 msgid "unknown" -msgstr "" +msgstr "未知" #. module: document #: view:document.directory:0 @@ -508,12 +508,12 @@ msgstr "" #: model:ir.actions.act_window,name:document.open_board_document_manager #: model:ir.ui.menu,name:document.menu_reports_document msgid "Knowledge" -msgstr "" +msgstr "知识管理" #. module: document #: view:document.storage:0 msgid "Document Storage" -msgstr "" +msgstr "文档存储器" #. module: document #: view:document.configuration:0 @@ -555,7 +555,7 @@ msgstr "跟随上级对象，这个ID把这个目录附加在上级对象的一 #: code:addons/document/static/src/js/document.js:6 #, python-format msgid "Attachment(s)" -msgstr "" +msgstr "附件" #. module: document #: selection:report.document.user,month:0 @@ -565,7 +565,7 @@ msgstr "8月" #. module: document #: view:ir.attachment:0 msgid "My Document(s)" -msgstr "" +msgstr "我的文档" #. module: document #: sql_constraint:document.directory:0 @@ -652,7 +652,7 @@ msgstr "目录名必须唯一！" #. module: document #: view:ir.attachment:0 msgid "Attachments" -msgstr "" +msgstr "附件" #. module: document #: field:document.directory,create_uid:0 @@ -842,7 +842,7 @@ msgstr "只有这些用户组的成员才有权限访问该目录和其中的文 #: code:addons/document/static/src/js/document.js:17 #, python-format msgid "%s (%s)" -msgstr "" +msgstr "%s (%s)" #. module: document #: field:document.directory.content,sequence:0 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/document_page/i18n/zh_CN.po b/addons/document_page/i18n/zh_CN.po index 84bb234fd68..a934b92203f 100644 --- a/addons/document_page/i18n/zh_CN.po +++ b/addons/document_page/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-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-08-13 12:13+0000\n" -"Last-Translator: Wei \"oldrev\" Li \n" +"PO-Revision-Date: 2012-12-08 13:10+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-11-25 06:32+0000\n" -"X-Generator: Launchpad (build 16293)\n" +"X-Launchpad-Export-Date: 2012-12-09 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: document_page #: view:document.page:0 @@ -22,7 +22,7 @@ msgstr "" #: selection:document.page,type:0 #: model:ir.actions.act_window,name:document_page.action_category msgid "Category" -msgstr "" +msgstr "类别" #. module: document_page #: view:document.page:0 @@ -68,7 +68,7 @@ msgstr "分组..." #. module: document_page #: view:document.page:0 msgid "Template" -msgstr "" +msgstr "模版" #. module: document_page #: view:document.page:0 @@ -89,7 +89,7 @@ msgstr "向导创建菜单" #. module: document_page #: field:document.page,type:0 msgid "Type" -msgstr "" +msgstr "类型" #. module: document_page #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff @@ -99,7 +99,7 @@ msgstr "" #. module: document_page #: field:document.page.history,create_uid:0 msgid "Modified By" -msgstr "" +msgstr "修改者" #. module: document_page #: view:document.page.create.menu:0 @@ -155,7 +155,7 @@ msgstr "页面" #. module: document_page #: model:ir.ui.menu,name:document_page.menu_category msgid "Categories" -msgstr "" +msgstr "分类" #. module: document_page #: field:document.page.create.menu,menu_parent_id:0 @@ -186,7 +186,7 @@ msgstr "摘要" #. module: document_page #: model:ir.actions.act_window,help:document_page.action_page msgid "Create web pages" -msgstr "" +msgstr "创建网页" #. module: document_page #: view:document.page.history:0 @@ -206,7 +206,7 @@ msgstr "" #. module: document_page #: field:document.page,history_ids:0 msgid "History" -msgstr "" +msgstr "历史" #. module: document_page #: field:document.page,write_date:0 @@ -223,7 +223,7 @@ msgstr "创建菜单" #. module: document_page #: field:document.page,display_content:0 msgid "Displayed Content" -msgstr "" +msgstr "显示内容" #. module: document_page #: code:addons/document_page/document_page.py:129 diff --git a/addons/edi/i18n/hr.po b/addons/edi/i18n/hr.po new file mode 100644 index 00000000000..be940c5e295 --- /dev/null +++ b/addons/edi/i18n/hr.po @@ -0,0 +1,89 @@ +# Croatian 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-09 20:08+0000\n" +"Last-Translator: Goran Kliska \n" +"Language-Team: Croatian \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-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: edi +#. openerp-web +#: code:addons/edi/static/src/js/edi.js:67 +#, python-format +msgid "Reason:" +msgstr "Razlog:" + +#. module: edi +#. openerp-web +#: code:addons/edi/static/src/js/edi.js:60 +#, python-format +msgid "The document has been successfully imported!" +msgstr "Dokument uspješno učitan!" + +#. module: edi +#. openerp-web +#: code:addons/edi/static/src/js/edi.js:65 +#, python-format +msgid "Sorry, the document could not be imported." +msgstr ":), dokument nije učitan." + +#. module: edi +#: model:ir.model,name:edi.model_res_company +msgid "Companies" +msgstr "Organizacije" + +#. module: edi +#: model:ir.model,name:edi.model_res_currency +msgid "Currency" +msgstr "Valuta" + +#. module: edi +#. openerp-web +#: code:addons/edi/static/src/js/edi.js:71 +#, python-format +msgid "Document Import Notification" +msgstr "Obavijest o uvozu dokumenta" + +#. module: edi +#: code:addons/edi/models/edi.py:130 +#, python-format +msgid "Missing application." +msgstr "Nedostaje aplikacija (modul)." + +#. module: edi +#: code:addons/edi/models/edi.py:131 +#, python-format +msgid "" +"The document you are trying to import requires the OpenERP `%s` application. " +"You can install it by connecting as the administrator and opening the " +"configuration assistant." +msgstr "" +"Pokušavate učitati dokument koji zahtjeva OpenERPovu aplikaciju `%s`. " +"Korisnik sa administratorskim ovlastima je može instalirati." + +#. module: edi +#: code:addons/edi/models/edi.py:47 +#, python-format +msgid "'%s' is an invalid external ID" +msgstr "'%s' nije ispravan eksterni ID" + +#. module: edi +#: model:ir.model,name:edi.model_res_partner +msgid "Partner" +msgstr "Partner" + +#. module: edi +#: model:ir.model,name:edi.model_edi_edi +msgid "EDI Subsystem" +msgstr "Sistem EDI razmjene podataka" 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/i18n/de.po b/addons/event/i18n/de.po index 84f2ed8f9b7..35db6383200 100644 --- a/addons/event/i18n/de.po +++ b/addons/event/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:03+0000\n" -"PO-Revision-Date: 2012-01-14 15:07+0000\n" -"Last-Translator: Ferdinand @ Camptocamp \n" +"PO-Revision-Date: 2012-12-09 21:00+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:13+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: event #: view:event.event:0 @@ -25,12 +26,12 @@ msgstr "Meine Veranstaltungen" #. module: event #: field:event.registration,nb_register:0 msgid "Number of Participants" -msgstr "" +msgstr "Anzahl Teilnehmer" #. module: event #: field:event.event,register_attended:0 msgid "# of Participations" -msgstr "" +msgstr "Anzahl Teilnahmen" #. module: event #: field:event.event,main_speaker_id:0 @@ -56,12 +57,15 @@ msgid "" "enough registrations you are not able to confirm your event. (put 0 to " "ignore this rule )" msgstr "" +"Sie können eine Mindestanzahl für die erforderlichen Anmeldungen festlegen. " +"Bei geringer Anzahl Anmeldungen kann die Veranstaltung nicht bestätigt " +"werden (tragen Sie einfach 0 ein, um diese Regel zu umgehen)" #. module: event #: code:addons/event/event.py:305 #, python-format msgid "Event has been cancelled." -msgstr "" +msgstr "Veranstaltung wurde abgebrochen." #. module: event #: field:event.registration,date_open:0 @@ -71,12 +75,12 @@ msgstr "Anmeldedatum" #. module: event #: help:event.registration,origin:0 msgid "Name of the sale order which create the registration" -msgstr "" +msgstr "Bezeichnung des Auftrags der Vorlage für Anmeldung ist" #. module: event #: field:event.event,type:0 msgid "Type of Event" -msgstr "" +msgstr "Typ der Veranstaltung" #. module: event #: model:event.event,name:event.event_0 @@ -88,7 +92,7 @@ msgstr "Konzert von Bon Jovi" #: selection:event.registration,state:0 #: selection:report.event.registration,registration_state:0 msgid "Attended" -msgstr "" +msgstr "Teilgenommen" #. module: event #: selection:report.event.registration,month:0 @@ -98,7 +102,7 @@ msgstr "März" #. module: event #: view:event.registration:0 msgid "Send Email" -msgstr "" +msgstr "Sende EMail" #. module: event #: field:event.event,company_id:0 @@ -112,12 +116,12 @@ msgstr "Unternehmen" #: field:event.event,email_confirmation_id:0 #: field:event.type,default_email_event:0 msgid "Event Confirmation Email" -msgstr "" +msgstr "Veranstaltung Bestätigungsemail" #. module: event #: field:event.type,default_registration_max:0 msgid "Default Maximum Registration" -msgstr "" +msgstr "Standard maximale Anmeldungen" #. module: event #: help:event.event,message_unread:0 @@ -128,7 +132,7 @@ msgstr "" #. module: event #: field:event.event,register_avail:0 msgid "Available Registrations" -msgstr "" +msgstr "Verfügbare Anmeldungen" #. module: event #: view:event.registration:0 @@ -139,12 +143,12 @@ msgstr "Veranstaltung Anmeldung" #. module: event #: model:ir.module.category,description:event.module_category_event_management msgid "Helps you manage your Events." -msgstr "" +msgstr "Hilfe zum Management von Veranstaltungen" #. module: event #: view:report.event.registration:0 msgid "Day" -msgstr "" +msgstr "Tag" #. module: event #: view:report.event.registration:0 @@ -173,12 +177,14 @@ msgstr "Auswertung Veranstaltungen" #: help:event.type,default_registration_max:0 msgid "It will select this default maximum value when you choose this event" msgstr "" +"Dieser Standard für die maximale Teilnehmerzahl wird bei der Auswahl " +"angezeigt." #. module: event #: view:report.event.registration:0 #: field:report.event.registration,user_id_registration:0 msgid "Register" -msgstr "" +msgstr "Anmelden" #. module: event #: field:event.event,message_ids:0 @@ -226,7 +232,7 @@ msgstr "Abgebrochen" #. module: event #: view:event.event:0 msgid "ticket" -msgstr "" +msgstr "Ticket" #. module: event #: model:event.event,name:event.event_1 @@ -236,33 +242,33 @@ msgstr "Verdi Oper" #. module: event #: view:report.event.registration:0 msgid "Display" -msgstr "" +msgstr "Anzeige" #. module: event #: view:report.event.registration:0 #: field:report.event.registration,registration_state:0 msgid "Registration State" -msgstr "" +msgstr "Anmeldestatus" #. module: event #: view:event.event:0 msgid "tickets" -msgstr "" +msgstr "Tickets" #. module: event #: view:res.partner:0 msgid "False" -msgstr "" +msgstr "Ungültig" #. module: event #: model:mail.message.subtype,name:event.mt_event_registration msgid "New Registrations" -msgstr "" +msgstr "Neue Anmeldungen" #. module: event #: field:event.registration,event_end_date:0 msgid "Event End Date" -msgstr "" +msgstr "Ende der Veranstaltung" #. module: event #: help:event.event,message_summary:0 @@ -271,6 +277,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 "" +"Beinhaltet die Chatter Zusammenfassung (Anzahl der Nachrichten, ...). Diese " +"Zusammenfassung ist im HTML-Format, um in Kanban Karten Ansichten eingefügt " +"zu werden." #. module: event #: selection:report.event.registration,month:0 @@ -287,7 +296,7 @@ msgstr "Bestätigte oder erledigte Registrierungen" #: code:addons/event/event.py:116 #, python-format msgid "Warning!" -msgstr "" +msgstr "Warnung !" #. module: event #: view:event.event:0 @@ -305,7 +314,7 @@ msgstr "Partner" #. module: event #: model:ir.actions.server,name:event.actions_server_event_event_read msgid "Event: Mark read" -msgstr "" +msgstr "Veranstaltung: Als ungelesen markieren" #. module: event #: model:ir.model,name:event.model_event_type @@ -335,7 +344,7 @@ msgstr "Bestätigt" #. module: event #: view:event.registration:0 msgid "Participant" -msgstr "" +msgstr "Teilnehmer" #. module: event #: view:event.registration:0 @@ -346,12 +355,12 @@ msgstr "Bestätigen" #. module: event #: view:event.event:0 msgid "Organized by" -msgstr "" +msgstr "Organisiert durch" #. module: event #: view:event.event:0 msgid "Register with this event" -msgstr "" +msgstr "Anmeldung zu Veranstaltung" #. module: event #: help:event.type,default_email_registration:0 @@ -359,17 +368,19 @@ msgid "" "It will select this default confirmation registration mail value when you " "choose this event" msgstr "" +"Diese Bestätigung Email wird bei tatsächlicher Anmeldung zur Veranstaltung " +"ausgewählt." #. module: event #: view:event.event:0 msgid "Only" -msgstr "" +msgstr "Nur" #. module: event #: field:event.event,message_follower_ids:0 #: field:event.registration,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Followers" #. module: event #: view:event.event:0 @@ -382,7 +393,7 @@ msgstr "Ort" #: view:event.registration:0 #: field:event.registration,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Ungelesene Mitteilungen" #. module: event #: view:event.registration:0 @@ -404,12 +415,12 @@ msgstr "EMail" #: code:addons/event/event.py:367 #, python-format msgid "New registration confirmed: %s." -msgstr "" +msgstr "Neue Anmeldebestätigung: %s" #. module: event #: view:event.event:0 msgid "Upcoming" -msgstr "" +msgstr "Bevorstehend" #. module: event #: field:event.registration,create_date:0 @@ -420,7 +431,7 @@ msgstr "Datum Erstellung" #: view:report.event.registration:0 #: field:report.event.registration,user_id:0 msgid "Event Responsible" -msgstr "" +msgstr "Veranstaltungsmanager" #. module: event #: view:event.event:0 @@ -437,7 +448,7 @@ msgstr "Juli" #. module: event #: field:event.event,reply_to:0 msgid "Reply-To Email" -msgstr "" +msgstr "Antwort an EMail" #. module: event #: view:event.registration:0 @@ -447,7 +458,7 @@ msgstr "Bestätigte Registrierungen" #. module: event #: view:event.event:0 msgid "Starting Date" -msgstr "" +msgstr "Start Datum" #. module: event #: view:event.event:0 @@ -473,7 +484,7 @@ msgstr "Vortragender der Veranstaltung" #: code:addons/event/event.py:457 #, python-format msgid "Registration has been created." -msgstr "" +msgstr "Anmeldung wurde erstellt." #. module: event #: view:event.event:0 @@ -484,12 +495,12 @@ msgstr "Veranstaltung stornieren" #: code:addons/event/event.py:398 #, python-format msgid "State set to Done" -msgstr "" +msgstr "Status geändert auf erledigt" #. module: event #: model:ir.actions.server,name:event.actions_server_event_registration_read msgid "Event registration : Mark read" -msgstr "" +msgstr "Anmeldung zu Veranstaltung: Markiere als gelesen" #. module: event #: model:ir.actions.act_window,name:event.act_event_reg @@ -500,7 +511,7 @@ msgstr "Veranstaltungsbelegung" #. module: event #: view:event.event:0 msgid "Event Category" -msgstr "" +msgstr "Kategorien Veranstaltungen" #. module: event #: field:event.event,register_prospect:0 @@ -510,13 +521,13 @@ msgstr "Nicht bestätigte Anmeldungen" #. module: event #: model:ir.actions.client,name:event.action_client_event_menu msgid "Open Event Menu" -msgstr "" +msgstr "Öffnen Veranstaltungen Menü" #. module: event #: view:report.event.registration:0 #: field:report.event.registration,event_state:0 msgid "Event State" -msgstr "" +msgstr "Veranstaltungen Status" #. module: event #: field:event.registration,log_ids:0 @@ -547,7 +558,7 @@ msgstr " # Anmeldungen im Entwurf" #: field:event.event,email_registration_id:0 #: field:event.type,default_email_registration:0 msgid "Registration Confirmation Email" -msgstr "" +msgstr "Anmeldebestätigung EMail" #. module: event #: view:report.event.registration:0 @@ -558,12 +569,12 @@ msgstr "Monat" #. module: event #: field:event.registration,date_closed:0 msgid "Attended Date" -msgstr "" +msgstr "Teilnahme Datum" #. module: event #: view:event.event:0 msgid "Finish Event" -msgstr "" +msgstr "Beende Veranstaltung" #. module: event #: view:event.registration:0 @@ -573,7 +584,7 @@ msgstr "Unbestätigte Registrierungen" #. module: event #: view:event.event:0 msgid "Event Description" -msgstr "" +msgstr "Veranstaltung Beschreibung" #. module: event #: field:event.event,date_begin:0 @@ -583,24 +594,24 @@ msgstr "Beginn am" #. module: event #: view:event.confirm:0 msgid "or" -msgstr "" +msgstr "oder" #. module: event #: code:addons/event/event.py:315 #, python-format msgid "Event has been done." -msgstr "" +msgstr "Veranstaltung wurde beendet." #. module: event #: help:res.partner,speaker:0 msgid "Check this box if this contact is a speaker." -msgstr "" +msgstr "Aktivieren Sie dieses Feld, wenn der Kontakt ein Referent ist" #. module: event #: code:addons/event/event.py:116 #, python-format msgid "No Tickets Available!" -msgstr "" +msgstr "Keine Tickets verfügbar !" #. module: event #: help:event.event,state:0 @@ -610,6 +621,10 @@ msgid "" "status is set to 'Done'.If event is cancelled the status is set to " "'Cancelled'." msgstr "" +"Wenn eine Veranstaltung erzeugt wird ist der Status zunächst 'Entwurf'. " +"Durch die Bestätigung wechselt der Status auf 'Bestätigt'. Zum Ende der " +"Veranstaltung ist der Status 'Beendet'. Bei Absage der Veranstaltung " +"wechselt der Status zu 'Abgebrochen'." #. module: event #: model:ir.actions.act_window,help:event.action_event_view @@ -625,6 +640,16 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Klicken Sie um eine neue Veranstaltung zu erstellen.\n" +"

\n" +" OpenERP hilft bei der Terminierung und effizienten " +"Organisation von Veranstaltungen:\n" +" Verfolgen Sie die Anmeldungen und Teilnahmen, automatisieren " +"Sie den EMail Versand\n" +" von Anmeldebestätigungen, verkaufen Sie Tickets für " +"Veranstaltungen, etc..

\n" +" " #. module: event #: help:event.event,register_max:0 @@ -633,12 +658,16 @@ msgid "" "much registrations you are not able to confirm your event. (put 0 to ignore " "this rule )" msgstr "" +"Sie können für alle Veranstaltungen die maximale Teilnehmer Anzahl " +"festlegen. Wenn Sie zu viele Anmeldungen erhalten, können Sie die " +"Veranstaltung auch nicht bestätigen (tragen Sie 0 ein, um diese Regel zu " +"ignorieren)." #. module: event #: code:addons/event/event.py:462 #, python-format msgid "Registration has been set as draft." -msgstr "" +msgstr "Die Anmeldung ist erfasst als Entwurf." #. module: event #: code:addons/event/event.py:108 @@ -648,6 +677,9 @@ msgid "" "expected minimum/maximum. Please reconsider those limits before going " "further." msgstr "" +"Die Gesamtanzahl der bestätigten Anmeldungen für die Veranstaltung '%s' " +"entspricht nicht dem erwarteten Minimum / Maximum. Bitte bedenken Sie diese " +"Teilnehmergrenzen bevor Sie weitere Schritte in die Wege leiten." #. module: event #: help:event.event,email_confirmation_id:0 @@ -655,11 +687,13 @@ msgid "" "If you set an email template, each participant will receive this email " "announcing the confirmation of the event." msgstr "" +"Wenn Sie eine EMail Vorlage hinterlegen, können Sie jedem angemeldeten " +"Teilnehmer eine Anmeldebestätigung per EMail senden." #. module: event #: view:board.board:0 msgid "Events Filling By Status" -msgstr "" +msgstr "Teilnehmerzahlen nach Status" #. module: event #: selection:report.event.registration,event_state:0 @@ -681,7 +715,7 @@ msgstr "Neue Veranstaltungen" #: code:addons/event/event.py:404 #, python-format msgid "State set to Cancel" -msgstr "" +msgstr "Status geändert zu Abgebrochen" #. module: event #: view:event.event:0 @@ -707,7 +741,7 @@ msgstr "Status" #. module: event #: field:event.event,city:0 msgid "city" -msgstr "" +msgstr "Stadt" #. module: event #: selection:report.event.registration,month:0 @@ -717,7 +751,7 @@ msgstr "August" #. module: event #: field:event.event,zip:0 msgid "zip" -msgstr "" +msgstr "PLZ" #. module: event #: field:res.partner,event_ids:0 @@ -728,7 +762,7 @@ msgstr "unbekannt" #. module: event #: field:event.event,street2:0 msgid "Street2" -msgstr "" +msgstr "Straße 2" #. module: event #: selection:report.event.registration,month:0 @@ -742,17 +776,21 @@ msgid "" "emails sent automatically at event or registrations confirmation. You can " "also put your email address of your mail gateway if you use one." msgstr "" +"Die Email Anschrift des Veranstalters, die als Antwort An EMail für alle " +"automatisch versendeten Anmelde- oder Teilnahme Bestätigungen hinterlegt " +"wurde. Sie können auch die EMail Ihres EMail Gateways hinterlegen, wenn " +"dieses zum Zweck des EMail Versands konfiguriert wurde." #. module: event #: help:event.event,message_ids:0 #: help:event.registration,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Nachrichten und Kommunikation" #. module: event #: field:event.registration,phone:0 msgid "Phone" -msgstr "" +msgstr "Telefon" #. module: event #: model:email.template,body_html:event.confirmation_event @@ -767,6 +805,16 @@ msgid "" "

Thank you for your participation!

\n" "

Best regards

" msgstr "" +"\n" +"

Hallo ${object.name},

\n" +"

die Veranstaltung ${object.event_id.name} zu der Sie sich " +"angemeldet haben, wurde bestätigt und wird \n" +" planmäßig stattfinden vom ${object.event_id.date_begin} bis zum " +"${object.event_id.date_end}.\n" +" Für weitere Informationen zu dieser Veranstaltung kontaktieren Sie " +"bitte unsere Event Abteilung.

\n" +"

Vielen Dank für die Teilnahme an unserer Veranstaltung !

\n" +"

Viele Grüße

" #. module: event #: field:event.event,message_is_follower:0 @@ -778,7 +826,7 @@ msgstr "" #: field:event.registration,user_id:0 #: model:res.groups,name:event.group_event_user msgid "User" -msgstr "" +msgstr "Benutzer" #. module: event #: view:event.confirm:0 @@ -792,7 +840,7 @@ msgstr "" #. module: event #: view:event.event:0 msgid "(confirmed:" -msgstr "" +msgstr "(bestätigt:" #. module: event #: view:event.registration:0 @@ -803,7 +851,7 @@ msgstr "Meine Anmeldungen" #: code:addons/event/event.py:310 #, python-format msgid "Event has been set to draft." -msgstr "" +msgstr "Die Veranstaltung wurde geändert auf draft." #. module: event #: view:report.event.registration:0 @@ -816,7 +864,7 @@ msgstr "Erweiterter Filter..." #: field:event.registration,message_comment_ids:0 #: help:event.registration,message_comment_ids:0 msgid "Comments and emails" -msgstr "" +msgstr "Kommentare und EMails" #. module: event #: selection:report.event.registration,month:0 @@ -826,7 +874,7 @@ msgstr "Oktober" #. module: event #: model:ir.actions.server,name:event.actions_server_event_registration_unread msgid "Event registration : Mark unread" -msgstr "" +msgstr "Veranstaltung Anmeldung: Markiere als ungelesen" #. module: event #: view:event.event:0 @@ -846,6 +894,9 @@ msgid "" "You have already set a registration for this event as 'Attended'. Please " "reset it to draft if you want to cancel this event." msgstr "" +"Sie haben bereits eine bestätigte Anmeldung für diese Veranstaltung auf " +"'Teilnahme' geändert. Bitte setzen Sie diese Teilnahme zurück, um die " +"Veranstaltung abzubrechen." #. module: event #: view:res.partner:0 @@ -855,18 +906,18 @@ msgstr "Datum" #. module: event #: view:event.event:0 msgid "Email Configuration" -msgstr "" +msgstr "EMail Konfiguration" #. module: event #: field:event.type,default_registration_min:0 msgid "Default Minimum Registration" -msgstr "" +msgstr "Standard Mindestanzahl Anmeldungen" #. module: event #: code:addons/event/event.py:368 #, python-format msgid "Registration confirmed." -msgstr "" +msgstr "Anmeldung bestätigt" #. module: event #: field:event.event,address_id:0 @@ -885,11 +936,13 @@ msgid "" "This field contains the template of the mail that will be automatically sent " "each time a registration for this event is confirmed." msgstr "" +"Dieses Feld enthält die hinterlegte EMail Vorlage, die automatisch gesendet " +"wird, sobald eine Anmeldung für diese Veranstaltung bestätigt wird." #. module: event #: view:event.event:0 msgid "Attended the Event" -msgstr "" +msgstr "An Veranstaltung teilgenommen" #. module: event #: constraint:event.event:0 @@ -901,6 +954,7 @@ msgstr "Fehler ! Ende der Veranstaltung kann nicht vor Beginn sein." #, python-format msgid "You must wait for the starting day of the event to do this action." msgstr "" +"Sie müssen für diese Aktion bis zum Start Datum der Veranstaltung warten." #. module: event #: field:event.event,user_id:0 @@ -916,7 +970,7 @@ msgstr "Erledigt" #. module: event #: view:report.event.registration:0 msgid "Show Confirmed Registrations" -msgstr "" +msgstr "Zeigen Sie die bereits bestätigten Anmeldungen" #. module: event #: view:event.confirm:0 @@ -926,35 +980,35 @@ msgstr "Abbruch" #. module: event #: field:event.registration,reply_to:0 msgid "Reply-to Email" -msgstr "" +msgstr "Antwort An EMail" #. module: event #: code:addons/event/event.py:114 #, python-format msgid "Only %d Seats are Available!" -msgstr "" +msgstr "Nur %d Teilnahmeplätze sind verfügbar !" #. module: event #: model:email.template,subject:event.confirmation_event #: model:email.template,subject:event.confirmation_registration msgid "Your registration at ${object.event_id.name}" -msgstr "" +msgstr "Ihre Anmeldung an ${object.event_id.name}" #. module: event #: view:event.registration:0 msgid "Set To Unconfirmed" -msgstr "" +msgstr "Ändere auf unbestätigt" #. module: event #: view:event.event:0 #: field:event.event,is_subscribed:0 msgid "Subscribed" -msgstr "" +msgstr "Abonniert" #. module: event #: view:event.event:0 msgid "Unsubscribe" -msgstr "" +msgstr "Abmelden" #. module: event #: view:event.event:0 @@ -965,7 +1019,7 @@ msgstr "Verantwortlich" #. module: event #: view:report.event.registration:0 msgid "Registration contact" -msgstr "" +msgstr "Kontakt für Anmeldung" #. module: event #: view:report.event.registration:0 @@ -977,23 +1031,23 @@ msgstr "Referent" #. module: event #: view:event.event:0 msgid "Upcoming events from today" -msgstr "" +msgstr "Zukünftige Veranstaltungen ab heute" #. module: event #: code:addons/event/event.py:300 #, python-format msgid "Event has been created." -msgstr "" +msgstr "Veranstaltung wurde erstellt." #. module: event #: model:event.event,name:event.event_2 msgid "Conference on ERP Business" -msgstr "" +msgstr "Konferenz für ERP in Unternehmen" #. module: event #: model:ir.actions.act_window,name:event.act_event_view_registration msgid "New Registration" -msgstr "" +msgstr "Neue Anmeldung" #. module: event #: field:event.event,note:0 @@ -1008,13 +1062,13 @@ msgstr " # Anz. Bestätigungen" #. module: event #: field:report.event.registration,name_registration:0 msgid "Participant / Contact Name" -msgstr "" +msgstr "Teilnehmer / Kontakt Name" #. module: event #: code:addons/event/event.py:320 #, python-format msgid "Event has been confirmed." -msgstr "" +msgstr "Veranstaltung wurde bestätigt." #. module: event #: view:res.partner:0 @@ -1024,12 +1078,14 @@ msgstr "Anmeldung Veranstaltung" #. module: event #: view:event.event:0 msgid "No ticket available." -msgstr "" +msgstr "Kein Ticket vorhanden" #. module: event #: help:event.type,default_registration_min:0 msgid "It will select this default minimum value when you choose this event" msgstr "" +"Die minimale Anzahl der Teilnehmer wird als Standard bei der Auswahl der " +"Veranstaltung hinterlegt" #. module: event #: selection:report.event.registration,month:0 @@ -1089,7 +1145,7 @@ msgstr "Beende Anmeldung" #. module: event #: field:event.registration,origin:0 msgid "Source Document" -msgstr "" +msgstr "Herkunftsbeleg" #. module: event #: selection:report.event.registration,month:0 @@ -1102,6 +1158,8 @@ msgid "" "It will select this default confirmation event mail value when you choose " "this event" msgstr "" +"Es wird diese Standard EMail für die Anmeldebestätigung bei Auswahl dieser " +"Veranstaltung hinterlegt und verwendet." #. module: event #: view:report.event.registration:0 @@ -1131,7 +1189,7 @@ msgstr "ID" #. module: event #: field:event.type,default_reply_to:0 msgid "Default Reply-To" -msgstr "" +msgstr "Standard Antwort An Adresse" #. module: event #: view:event.event:0 @@ -1142,7 +1200,7 @@ msgstr "Abonnieren" #. module: event #: view:event.event:0 msgid "available." -msgstr "" +msgstr "verfügbar." #. module: event #: field:event.registration,event_begin_date:0 @@ -1153,12 +1211,12 @@ msgstr "Beginn am" #. module: event #: view:report.event.registration:0 msgid "Participant / Contact" -msgstr "" +msgstr "Teilnehmer / Kontakt" #. module: event #: view:event.event:0 msgid "Current Registrations" -msgstr "" +msgstr "Aktuelle Anmeldungen" #. module: event #: model:email.template,body_html:event.confirmation_registration @@ -1173,6 +1231,15 @@ msgid "" "

Thank you for your participation!

\n" "

Best regards

" msgstr "" +"\n" +"

Hallo ${object.name},

\n" +"

wir bestätigen Ihre Anmeldung zur Veranstaltung " +"${object.event_id.name}, die wir gerne \n" +" entgegengenommen haben. Sie erhalten automatisch eine EMail mit " +"weiterführenden Informationen, \n" +" sobald die Veranstaltung bestätigt wird. \n" +"

Danke für Ihre Anmeldung !

\n" +"

Freundliche Grüsse

" #. module: event #: help:event.event,reply_to:0 @@ -1182,21 +1249,26 @@ msgid "" "registrations confirmation. You can also put the email address of your mail " "gateway if you use one." msgstr "" +"Die E-Mail-Adresse des Organisators soll hier eingestellt werden, damit " +"diese in der \"Antwort-An\" Adresse der EMails zur automatischen Bestätigung " +"der Veranstaltung eingesetzt werden kann. Sie können z.B. auch die E-Mail-" +"Adresse Ihres eigenen Mail-Gateways hinterlegen, falls Sie ein solches " +"Gateway verwenden möchten." #. module: event #: model:ir.actions.server,name:event.actions_server_event_event_unread msgid "Event: Mark unread" -msgstr "" +msgstr "Veranstaltung: Markiere als ungelesen" #. module: event #: model:res.groups,name:event.group_event_manager msgid "Manager" -msgstr "" +msgstr "Manager" #. module: event #: field:event.event,street:0 msgid "Street" -msgstr "" +msgstr "Straße" #. module: event #: view:event.confirm:0 diff --git a/addons/event/i18n/nb.po b/addons/event/i18n/nb.po index dc6ad490e87..fda7661f8f8 100644 --- a/addons/event/i18n/nb.po +++ b/addons/event/i18n/nb.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-07-25 13:20+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-12-09 20:25+0000\n" +"Last-Translator: Kaare Pettersen \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-04 05:13+0000\n" -"X-Generator: Launchpad (build 16335)\n" +"X-Launchpad-Export-Date: 2012-12-10 04:37+0000\n" +"X-Generator: Launchpad (build 16341)\n" #. module: event #: view:event.event:0 @@ -62,7 +62,7 @@ msgstr "" #: code:addons/event/event.py:305 #, python-format msgid "Event has been cancelled." -msgstr "" +msgstr "Arrangementet har blitt kansellert ." #. module: event #: field:event.registration,date_open:0 @@ -77,7 +77,7 @@ msgstr "" #. module: event #: field:event.event,type:0 msgid "Type of Event" -msgstr "" +msgstr "Arrangement Type." #. module: event #: model:event.event,name:event.event_0 @@ -89,7 +89,7 @@ msgstr "Konsert med Bon Jovi" #: selection:event.registration,state:0 #: selection:report.event.registration,registration_state:0 msgid "Attended" -msgstr "" +msgstr "Deltok." #. module: event #: selection:report.event.registration,month:0 @@ -99,7 +99,7 @@ msgstr "Mars" #. module: event #: view:event.registration:0 msgid "Send Email" -msgstr "" +msgstr "Send e-post." #. module: event #: field:event.event,company_id:0 @@ -113,7 +113,7 @@ msgstr "Firma" #: field:event.event,email_confirmation_id:0 #: field:event.type,default_email_event:0 msgid "Event Confirmation Email" -msgstr "" +msgstr "Arrangementet epost bekreftelse." #. module: event #: field:event.type,default_registration_max:0 @@ -124,12 +124,12 @@ msgstr "" #: help:event.event,message_unread:0 #: help:event.registration,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Hvis det er merket nye meldinger så krever dette din oppmerksomhet." #. module: event #: field:event.event,register_avail:0 msgid "Available Registrations" -msgstr "" +msgstr "Tilgjengelige registreringer." #. module: event #: view:event.registration:0 @@ -140,12 +140,12 @@ msgstr "Hendelseregistrering" #. module: event #: model:ir.module.category,description:event.module_category_event_management msgid "Helps you manage your Events." -msgstr "" +msgstr "Hjelper deg å administrere dine arrangementer." #. module: event #: view:report.event.registration:0 msgid "Day" -msgstr "" +msgstr "Dag." #. module: event #: view:report.event.registration:0 @@ -179,7 +179,7 @@ msgstr "" #: view:report.event.registration:0 #: field:report.event.registration,user_id_registration:0 msgid "Register" -msgstr "" +msgstr "Registrer." #. module: event #: field:event.event,message_ids:0 @@ -203,7 +203,7 @@ msgstr "Registreringer" #: code:addons/event/event.py:400 #, python-format msgid "Error!" -msgstr "" +msgstr "Feil!" #. module: event #: view:event.event:0 @@ -227,7 +227,7 @@ msgstr "Kansellert" #. module: event #: view:event.event:0 msgid "ticket" -msgstr "" +msgstr "Billett." #. module: event #: model:event.event,name:event.event_1 @@ -237,33 +237,33 @@ msgstr "Verdis opera" #. module: event #: view:report.event.registration:0 msgid "Display" -msgstr "" +msgstr "Skjerm." #. module: event #: view:report.event.registration:0 #: field:report.event.registration,registration_state:0 msgid "Registration State" -msgstr "" +msgstr "Registrerings stat." #. module: event #: view:event.event:0 msgid "tickets" -msgstr "" +msgstr "Billetter." #. module: event #: view:res.partner:0 msgid "False" -msgstr "" +msgstr "Usant." #. module: event #: model:mail.message.subtype,name:event.mt_event_registration msgid "New Registrations" -msgstr "" +msgstr "Nye registreringer." #. module: event #: field:event.registration,event_end_date:0 msgid "Event End Date" -msgstr "" +msgstr "Arrangement sluttdato." #. module: event #: help:event.event,message_summary:0 @@ -288,7 +288,7 @@ msgstr "Registreringer i bekreftet eller gjort staten." #: code:addons/event/event.py:116 #, python-format msgid "Warning!" -msgstr "" +msgstr "Advarsel!" #. module: event #: view:event.event:0 @@ -306,7 +306,7 @@ msgstr "Partner" #. module: event #: model:ir.actions.server,name:event.actions_server_event_event_read msgid "Event: Mark read" -msgstr "" +msgstr "Arrangementet: Merk lest." #. module: event #: model:ir.model,name:event.model_event_type @@ -347,12 +347,12 @@ msgstr "Bekreft" #. module: event #: view:event.event:0 msgid "Organized by" -msgstr "" +msgstr "Organisert av." #. module: event #: view:event.event:0 msgid "Register with this event" -msgstr "" +msgstr "Registrer deg hos dette arrangementet." #. module: event #: help:event.type,default_email_registration:0 @@ -364,13 +364,13 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Only" -msgstr "" +msgstr "Bare." #. module: event #: field:event.event,message_follower_ids:0 #: field:event.registration,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Følgere." #. module: event #: view:event.event:0 @@ -383,7 +383,7 @@ msgstr "Plassering" #: view:event.registration:0 #: field:event.registration,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Uleste meldinger." #. module: event #: view:event.registration:0 @@ -405,12 +405,12 @@ msgstr "E-post" #: code:addons/event/event.py:367 #, python-format msgid "New registration confirmed: %s." -msgstr "" +msgstr "Ny registrering bekreftet: %s." #. module: event #: view:event.event:0 msgid "Upcoming" -msgstr "" +msgstr "Kommende." #. module: event #: field:event.registration,create_date:0 @@ -421,7 +421,7 @@ msgstr "Opprettelsesdato" #: view:report.event.registration:0 #: field:report.event.registration,user_id:0 msgid "Event Responsible" -msgstr "" +msgstr "Ansvarlig for arrangementet." #. module: event #: view:event.event:0 @@ -438,7 +438,7 @@ msgstr "Juli" #. module: event #: field:event.event,reply_to:0 msgid "Reply-To Email" -msgstr "" +msgstr "Svar til e-post." #. module: event #: view:event.registration:0 @@ -448,7 +448,7 @@ msgstr "Bekreftede registreringer" #. module: event #: view:event.event:0 msgid "Starting Date" -msgstr "" +msgstr "Startdato." #. module: event #: view:event.event:0 @@ -474,7 +474,7 @@ msgstr "Foredragsholder som skal gi tale på arrangementet." #: code:addons/event/event.py:457 #, python-format msgid "Registration has been created." -msgstr "" +msgstr "Registreringen har blittOpprettet." #. module: event #: view:event.event:0 @@ -485,12 +485,12 @@ msgstr "Kanseller arrangement" #: code:addons/event/event.py:398 #, python-format msgid "State set to Done" -msgstr "" +msgstr "Stat er satt som ferdig." #. module: event #: model:ir.actions.server,name:event.actions_server_event_registration_read msgid "Event registration : Mark read" -msgstr "" +msgstr "Arrangement registrering : Merk som lest." #. module: event #: model:ir.actions.act_window,name:event.act_event_reg @@ -501,7 +501,7 @@ msgstr "Hendelser Påfyllings Status" #. module: event #: view:event.event:0 msgid "Event Category" -msgstr "" +msgstr "Arrangement kategori." #. module: event #: field:event.event,register_prospect:0 @@ -511,13 +511,13 @@ msgstr "Ubekreftede registreringer" #. module: event #: model:ir.actions.client,name:event.action_client_event_menu msgid "Open Event Menu" -msgstr "" +msgstr "Åpne arrangement meny." #. module: event #: view:report.event.registration:0 #: field:report.event.registration,event_state:0 msgid "Event State" -msgstr "" +msgstr "Arrangement stat." #. module: event #: field:event.registration,log_ids:0 @@ -548,7 +548,7 @@ msgstr " # Antall foreløpige registreringer" #: field:event.event,email_registration_id:0 #: field:event.type,default_email_registration:0 msgid "Registration Confirmation Email" -msgstr "" +msgstr "Registrerings bekreftelse epost." #. module: event #: view:report.event.registration:0 @@ -559,12 +559,12 @@ msgstr "Måned" #. module: event #: field:event.registration,date_closed:0 msgid "Attended Date" -msgstr "" +msgstr "Deltatt dato." #. module: event #: view:event.event:0 msgid "Finish Event" -msgstr "" +msgstr "Fullfør Arrangementet." #. module: event #: view:event.registration:0 @@ -574,7 +574,7 @@ msgstr "Registreringer i ubekreftet staten." #. module: event #: view:event.event:0 msgid "Event Description" -msgstr "" +msgstr "Beskrivelse av Arrangementet." #. module: event #: field:event.event,date_begin:0 @@ -584,13 +584,13 @@ msgstr "Startdato" #. module: event #: view:event.confirm:0 msgid "or" -msgstr "" +msgstr "Eller." #. module: event #: code:addons/event/event.py:315 #, python-format msgid "Event has been done." -msgstr "" +msgstr "Arrangementet har blittferdig." #. module: event #: help:res.partner,speaker:0 @@ -601,7 +601,7 @@ msgstr "" #: code:addons/event/event.py:116 #, python-format msgid "No Tickets Available!" -msgstr "" +msgstr "Ingen billetter tilgjengelig!" #. module: event #: help:event.event,state:0 @@ -639,7 +639,7 @@ msgstr "" #: code:addons/event/event.py:462 #, python-format msgid "Registration has been set as draft." -msgstr "" +msgstr "Registreringen er angitt som utkast ." #. module: event #: code:addons/event/event.py:108 @@ -660,7 +660,7 @@ msgstr "" #. module: event #: view:board.board:0 msgid "Events Filling By Status" -msgstr "" +msgstr "arrangement fylling av status." #. module: event #: selection:report.event.registration,event_state:0 @@ -682,7 +682,7 @@ msgstr "Hendelser som er i ny staten." #: code:addons/event/event.py:404 #, python-format msgid "State set to Cancel" -msgstr "" +msgstr "Stat satt til kanseller." #. module: event #: view:event.event:0 @@ -703,12 +703,12 @@ msgstr "Arrangementer" #: view:event.registration:0 #: field:event.registration,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: event #: field:event.event,city:0 msgid "city" -msgstr "" +msgstr "By." #. module: event #: selection:report.event.registration,month:0 @@ -718,7 +718,7 @@ msgstr "August" #. module: event #: field:event.event,zip:0 msgid "zip" -msgstr "" +msgstr "Zip." #. module: event #: field:res.partner,event_ids:0 @@ -729,7 +729,7 @@ msgstr "ukjent" #. module: event #: field:event.event,street2:0 msgid "Street2" -msgstr "" +msgstr "Gate2." #. module: event #: selection:report.event.registration,month:0 @@ -748,12 +748,12 @@ msgstr "" #: help:event.event,message_ids:0 #: help:event.registration,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Meldinger og kommunikasjon historie." #. module: event #: field:event.registration,phone:0 msgid "Phone" -msgstr "" +msgstr "Telefon." #. module: event #: model:email.template,body_html:event.confirmation_event @@ -773,13 +773,13 @@ msgstr "" #: field:event.event,message_is_follower:0 #: field:event.registration,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Er en følger." #. module: event #: field:event.registration,user_id:0 #: model:res.groups,name:event.group_event_user msgid "User" -msgstr "" +msgstr "Bruker." #. module: event #: view:event.confirm:0 @@ -793,7 +793,7 @@ msgstr "" #. module: event #: view:event.event:0 msgid "(confirmed:" -msgstr "" +msgstr "(bekreftet:" #. module: event #: view:event.registration:0 @@ -804,7 +804,7 @@ msgstr "Mine registreringer" #: code:addons/event/event.py:310 #, python-format msgid "Event has been set to draft." -msgstr "" +msgstr "Arrangementet har blitt satt tilkladd." #. module: event #: view:report.event.registration:0 @@ -817,7 +817,7 @@ msgstr "Utvidede filtre ..." #: field:event.registration,message_comment_ids:0 #: help:event.registration,message_comment_ids:0 msgid "Comments and emails" -msgstr "" +msgstr "Kommentarer og E-poster." #. module: event #: selection:report.event.registration,month:0 @@ -827,7 +827,7 @@ msgstr "Oktober" #. module: event #: model:ir.actions.server,name:event.actions_server_event_registration_unread msgid "Event registration : Mark unread" -msgstr "" +msgstr "Arrangementregistrering: Merk som ulest." #. module: event #: view:event.event:0 @@ -856,7 +856,7 @@ msgstr "Dato" #. module: event #: view:event.event:0 msgid "Email Configuration" -msgstr "" +msgstr "E-post konfigurasjon." #. module: event #: field:event.type,default_registration_min:0 @@ -867,7 +867,7 @@ msgstr "" #: code:addons/event/event.py:368 #, python-format msgid "Registration confirmed." -msgstr "" +msgstr "Registrering bekreftet." #. module: event #: field:event.event,address_id:0 diff --git a/addons/event_moodle/__init__.py b/addons/event_moodle/__init__.py index 87ba4f10024..2814f9d514b 100644 --- a/addons/event_moodle/__init__.py +++ b/addons/event_moodle/__init__.py @@ -20,7 +20,6 @@ ############################################################################## import event_moodle -import wizard # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/event_moodle/i18n/hr.po b/addons/event_moodle/i18n/hr.po new file mode 100644 index 00000000000..2fb9065e184 --- /dev/null +++ b/addons/event_moodle/i18n/hr.po @@ -0,0 +1,185 @@ +# Croatian 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-09 20:12+0000\n" +"Last-Translator: Goran Kliska \n" +"Language-Team: Croatian \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-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "Connection with username and password" +msgstr "" + +#. module: event_moodle +#: model:ir.model,name:event_moodle.model_event_moodle_config_wiz +msgid "event.moodle.config.wiz" +msgstr "" + +#. module: event_moodle +#: help:event.moodle.config.wiz,server_moodle:0 +msgid "" +"URL where you have your moodle server. For exemple: 'http://127.0.0.1' or " +"'http://localhost'" +msgstr "" + +#. module: event_moodle +#: field:event.registration,moodle_user_password:0 +msgid "Password for Moodle User" +msgstr "Lozinka za Moodle korisnika" + +#. module: event_moodle +#: field:event.moodle.config.wiz,moodle_password:0 +msgid "Moodle Password" +msgstr "Moodle lozinka" + +#. module: event_moodle +#: code:addons/event_moodle/event_moodle.py:137 +#, python-format +msgid "Your email '%s' is wrong." +msgstr "Vaša email adresa '%s' nije ispravna." + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "Connection with a Token" +msgstr "" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "" +"The easiest way to connect OpenERP with a moodle server is to create a " +"'token' in Moodle. It will be used to authenticate OpenERP as a trustable " +"application." +msgstr "" + +#. module: event_moodle +#: field:event.moodle.config.wiz,url:0 +msgid "URL to Moodle Server" +msgstr "URL Moodle poslužitelja" + +#. module: event_moodle +#: help:event.moodle.config.wiz,url:0 +msgid "The url that will be used for the connection with moodle in xml-rpc" +msgstr "" + +#. module: event_moodle +#: model:ir.model,name:event_moodle.model_event_registration +msgid "Event Registration" +msgstr "" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "" +"Another approach is to create a user for OpenERP in Moodle. If you do so, " +"make sure that this user has appropriate access rights." +msgstr "" + +#. module: event_moodle +#: field:event.registration,moodle_uid:0 +msgid "Moodle User ID" +msgstr "" + +#. module: event_moodle +#: field:event.moodle.config.wiz,server_moodle:0 +msgid "Moodle Server" +msgstr "Moodle poslužitelj" + +#. module: event_moodle +#: field:event.event,moodle_id:0 +msgid "Moodle ID" +msgstr "Moodle ID" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "Server" +msgstr "Poslužitelj" + +#. module: event_moodle +#: code:addons/event_moodle/event_moodle.py:57 +#: code:addons/event_moodle/event_moodle.py:105 +#: code:addons/event_moodle/event_moodle.py:137 +#, python-format +msgid "Error!" +msgstr "Greška!" + +#. module: event_moodle +#: code:addons/event_moodle/event_moodle.py:105 +#, python-format +msgid "You must configure your moodle connection." +msgstr "" + +#. module: event_moodle +#: field:event.moodle.config.wiz,moodle_username:0 +#: field:event.registration,moodle_username:0 +msgid "Moodle Username" +msgstr "Moodle korisničko ime" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +#: model:ir.actions.act_window,name:event_moodle.configure_moodle +msgid "Configure Moodle" +msgstr "Moodle postavke" + +#. module: event_moodle +#: field:event.moodle.config.wiz,moodle_token:0 +msgid "Moodle Token" +msgstr "Moodle token" + +#. module: event_moodle +#: help:event.moodle.config.wiz,moodle_username:0 +msgid "" +"You can also connect with your username that you define when you create a " +"token" +msgstr "" + +#. module: event_moodle +#: help:event.event,moodle_id:0 +msgid "The identifier of this event in Moodle" +msgstr "" + +#. module: event_moodle +#: help:event.moodle.config.wiz,moodle_token:0 +msgid "Put your token that you created in your moodle server" +msgstr "" + +#. module: event_moodle +#: model:ir.ui.menu,name:event_moodle.wizard_moodle +msgid "Moodle Configuration" +msgstr "" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "or" +msgstr "ili" + +#. module: event_moodle +#: code:addons/event_moodle/event_moodle.py:57 +#, python-format +msgid "First configure your moodle connection." +msgstr "" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "Apply" +msgstr "Primjeni" + +#. module: event_moodle +#: view:event.moodle.config.wiz:0 +msgid "Cancel" +msgstr "Odustani" + +#. module: event_moodle +#: model:ir.model,name:event_moodle.model_event_event +msgid "Event" +msgstr "Event" 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/__openerp__.py b/addons/fetchmail/__openerp__.py index 8d46bcb225c..84a26d5ec40 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -63,7 +63,7 @@ For more specific needs, you may also assign custom-defined actions ], 'demo': [], 'installable': True, - 'auto_install': False, + 'auto_install': True, 'images': ['images/1_email_servers.jpeg'], } 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/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 6202701714c..8bbdeb26f6d 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -93,6 +93,20 @@ + + + General Settings + base.config.settings + + +
+
+ + + 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/hr.po b/addons/fleet/i18n/hr.po new file mode 100644 index 00000000000..4bccf15b5bf --- /dev/null +++ b/addons/fleet/i18n/hr.po @@ -0,0 +1,1895 @@ +# Croatian 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-11-24 02:52+0000\n" +"PO-Revision-Date: 2012-12-09 20:20+0000\n" +"Last-Translator: Goran Kliska \n" +"Language-Team: Croatian \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-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: fleet +#: selection:fleet.vehicle,fuel_type:0 +msgid "Hybrid" +msgstr "Hibridno" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_compact +msgid "Compact" +msgstr "Kompaktno" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_1 +msgid "A/C Compressor Replacement" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,vin_sn:0 +msgid "Unique number written on the vehicle motor (VIN/SN number)" +msgstr "Broj šasije/motora (VIN/SN number)" + +#. module: fleet +#: selection:fleet.service.type,category:0 +#: view:fleet.vehicle.log.contract:0 +#: view:fleet.vehicle.log.services:0 +msgid "Service" +msgstr "Servis" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,cost_frequency:0 +msgid "Monthly" +msgstr "Mjesečno" + +#. module: fleet +#: code:addons/fleet/fleet.py:62 +#, python-format +msgid "Unknown" +msgstr "Nepoznato" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_20 +msgid "Engine/Drive Belt(s) Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Vehicle costs" +msgstr "Troškovi vozila" + +#. module: fleet +#: selection:fleet.vehicle,fuel_type:0 +msgid "Diesel" +msgstr "Diesel" + +#. module: fleet +#: code:addons/fleet/fleet.py:421 +#, python-format +msgid "License Plate: from '%s' to '%s'" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_38 +msgid "Resurface Rotors" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Group By..." +msgstr "Grupiraj po..." + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_32 +msgid "Oil Pump Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_18 +msgid "Engine Belt Inspection" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,cost_frequency:0 +msgid "No" +msgstr "Ne" + +#. module: fleet +#: help:fleet.vehicle,power:0 +msgid "Power in kW of the vehicle" +msgstr "Snaga vozila u kW" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_2 +msgid "Depreciation and Interests" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,insurer_id:0 +#: field:fleet.vehicle.log.fuel,vendor_id:0 +#: field:fleet.vehicle.log.services,vendor_id:0 +msgid "Supplier" +msgstr "Dobavljač" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_35 +msgid "Power Steering Hose Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Odometer details" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "Has Alert(s)" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.fuel,liter:0 +msgid "Liter" +msgstr "Litra" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +#: field:fleet.vehicle.cost,parent_id:0 +msgid "Parent" +msgstr "Nadređeni" + +#. module: fleet +#: view:board.board:0 +msgid "Fuel Costs" +msgstr "Troškovi goriva" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_9 +msgid "Battery Inspection" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,company_id:0 +msgid "Company" +msgstr "Organizacija" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Invoice Date" +msgstr "Datum računa" + +#. module: fleet +#: view:fleet.vehicle.log.fuel:0 +msgid "Refueling Details" +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:655 +#, python-format +msgid "%s contract(s) need(s) to be renewed and/or closed!" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Indicative Costs" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_16 +msgid "Charging System Diagnosis" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,car_value:0 +msgid "Value of the bought vehicle" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_44 +msgid "Tie Rod End Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_24 +msgid "Head Gasket(s) Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +#: selection:fleet.vehicle.cost,cost_type:0 +msgid "Services" +msgstr "Servisi" + +#. module: fleet +#: help:fleet.vehicle,odometer:0 +#: help:fleet.vehicle.cost,odometer:0 +#: help:fleet.vehicle.cost,odometer_id:0 +msgid "Odometer measure of the vehicle at the moment of this log" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +#: field:fleet.vehicle.log.contract,notes:0 +msgid "Terms and Conditions" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_kanban +msgid "Vehicles with alerts" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_costs_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_costs_menu +msgid "Vehicle Costs" +msgstr "Troškovi vozila" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Total Cost" +msgstr "Ukupni trošak" + +#. module: fleet +#: selection:fleet.service.type,category:0 +msgid "Both" +msgstr "Oboje" + +#. module: fleet +#: field:fleet.vehicle.log.contract,cost_id:0 +#: field:fleet.vehicle.log.fuel,cost_id:0 +#: field:fleet.vehicle.log.services,cost_id:0 +msgid "Automatically created field to link to parent fleet.vehicle.cost" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Terminate Contract" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.cost,parent_id:0 +msgid "Parent cost to this current cost" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.log.contract,cost_frequency:0 +msgid "Frequency of the recuring cost" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_1 +msgid "Calculation Benefit In Kind" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.log.contract,expiration_date:0 +msgid "" +"Date when the coverage of the contract expirates (by default, one year after " +"begin date)" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.fuel:0 +#: field:fleet.vehicle.log.fuel,notes:0 +#: view:fleet.vehicle.log.services:0 +#: field:fleet.vehicle.log.services,notes:0 +msgid "Notes" +msgstr "Bilješke" + +#. module: fleet +#: code:addons/fleet/fleet.py:47 +#, python-format +msgid "Operation not allowed!" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,message_ids:0 +msgid "Messages" +msgstr "Poruke" + +#. module: fleet +#: help:fleet.vehicle.cost,vehicle_id:0 +msgid "Vehicle concerned by this log" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,cost_amount:0 +#: field:fleet.vehicle.log.fuel,cost_amount:0 +#: field:fleet.vehicle.log.services,cost_amount:0 +msgid "Amount" +msgstr "Iznos" + +#. module: fleet +#: field:fleet.vehicle,message_unread:0 +msgid "Unread Messages" +msgstr "Nepročitane poruke" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_6 +msgid "Air Filter Replacement" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_tag +msgid "fleet.vehicle.tag" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "show the services logs for this vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,contract_renewal_name:0 +msgid "Name of contract to renew soon" +msgstr "" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_senior +msgid "Senior" +msgstr "Stariji" + +#. module: fleet +#: help:fleet.vehicle.log.contract,state:0 +msgid "Choose wheter the contract is still valid or not" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle,transmission:0 +msgid "Automatic" +msgstr "Automatski mjenjač" + +#. module: fleet +#: help:fleet.vehicle,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:414 +#, python-format +msgid "Driver: from '%s' to '%s'" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "and" +msgstr "i" + +#. module: fleet +#: field:fleet.vehicle.model.brand,image_medium:0 +msgid "Medium-sized photo" +msgstr "Fotografija srednje veličine" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_34 +msgid "Oxygen Sensor Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.services:0 +msgid "Service Type" +msgstr "Tip usluge" + +#. module: fleet +#: help:fleet.vehicle,transmission:0 +msgid "Transmission Used by the vehicle" +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:726 +#: view:fleet.vehicle.log.contract:0 +#: model:ir.actions.act_window,name:fleet.act_renew_contract +#, python-format +msgid "Renew Contract" +msgstr "Obnovi ugovor" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "show the odometer logs for this vehicle" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,odometer_unit:0 +msgid "Unit of the odometer " +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.services:0 +msgid "Services Costs Per Month" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Effective Costs" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_8 +msgid "Repair and maintenance" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.log.contract,purchaser_id:0 +msgid "Person to which the contract is signed for" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_contract_act +msgid "" +"

\n" +" Click to create a new contract. \n" +"

\n" +" Manage all your contracts (leasing, insurances, etc.) with\n" +" their related services, costs. OpenERP will automatically " +"warn\n" +" you when some contracts have to be renewed.\n" +"

\n" +" Each contract (e.g.: leasing) may include several services\n" +" (reparation, insurances, periodic maintenance).\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_service_type +msgid "Type of services available on a vehicle" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_service_types_menu +msgid "Service Types" +msgstr "" + +#. module: fleet +#: view:board.board:0 +msgid "Contracts Costs" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_services_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_services_menu +msgid "Vehicles Services Logs" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_fuel_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_fuel_menu +msgid "Vehicles Fuel Logs" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.model.brand:0 +msgid "" +"$('.oe_picture').load(function() { if($(this).width() > $(this).height()) { " +"$(this).addClass('oe_employee_picture_wide') } });" +msgstr "" + +#. module: fleet +#: view:board.board:0 +msgid "Vehicles With Alerts" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_costs_act +msgid "" +"

\n" +" Click to create a new cost.\n" +"

\n" +" OpenERP helps you managing the costs for your different\n" +" vehicles. Costs are created automatically from services,\n" +" contracts (fixed or recurring) and fuel logs.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "show the fuel logs for this vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,purchaser_id:0 +msgid "Contractor" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,license_plate:0 +msgid "License Plate" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,cost_frequency:0 +msgid "Recurring Cost Frequency" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.fuel,inv_ref:0 +#: field:fleet.vehicle.log.services,inv_ref:0 +msgid "Invoice Reference" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,message_follower_ids:0 +msgid "Followers" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,location:0 +msgid "Location" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Costs Per Month" +msgstr "" + +#. module: fleet +#: field:fleet.contract.state,name:0 +msgid "Contract Status" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,contract_renewal_total:0 +msgid "Total of contracts due or overdue minus one" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,cost_subtype:0 +msgid "Type" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,contract_renewal_overdue:0 +msgid "Has Contracts Overdued" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,amount:0 +msgid "Total Price" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_27 +msgid "Heater Core Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_14 +msgid "Car Wash" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,driver:0 +msgid "Driver of the vehicle" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "other(s)" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_refueling +msgid "Refueling" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_5 +msgid "A/C Recharge" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_log_fuel +msgid "Fuel log for vehicles" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "Engine Options" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.fuel:0 +msgid "Fuel Costs Per Month" +msgstr "" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_sedan +msgid "Sedan" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,seats:0 +msgid "Seats Number" +msgstr "" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_convertible +msgid "Convertible" +msgstr "" + +#. module: fleet +#: model:ir.ui.menu,name:fleet.fleet_configuration +msgid "Configuration" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +#: field:fleet.vehicle.log.contract,sum_cost:0 +msgid "Indicative Costs Total" +msgstr "" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_junior +msgid "Junior" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,model_id:0 +msgid "Model of the vehicle" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_state_act +msgid "" +"

\n" +" Click to create a vehicule status.\n" +"

\n" +" You can customize available status to track the evolution " +"of\n" +" each vehicule. Example: Active, Being Repaired, Sold.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +#: field:fleet.vehicle,log_fuel:0 +#: view:fleet.vehicle.log.fuel:0 +msgid "Fuel Logs" +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:409 +#: code:addons/fleet/fleet.py:413 +#: code:addons/fleet/fleet.py:417 +#: code:addons/fleet/fleet.py:420 +#, python-format +msgid "None" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs_non_effective +#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_indicative_costs +msgid "Indicative Costs Analysis" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_12 +msgid "Brake Inspection" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,state:0 +msgid "Current state of the vehicle" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle,transmission:0 +msgid "Manual" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_52 +msgid "Wheel Bearing Replacement" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.cost,cost_subtype:0 +msgid "Cost type purchased with this cost" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle,fuel_type:0 +msgid "Gasoline" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_brand_act +msgid "" +"

\n" +" Click to create a new brand.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,start_date:0 +msgid "Contract Start Date" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,odometer_unit:0 +msgid "Odometer Unit" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_30 +msgid "Intake Manifold Gasket Replacement" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,cost_frequency:0 +msgid "Daily" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_6 +msgid "Snow tires" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.cost,date:0 +msgid "Date when the cost has been executed" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.state,sequence:0 +msgid "Order" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Vehicles costs" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_log_services +msgid "Services for vehicles" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Indicative Cost" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_26 +msgid "Heater Control Valve Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "" +"Create a new contract automatically with all the same informations except " +"for the date that will start at the end of current contract" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,state:0 +msgid "Terminated" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_cost +msgid "Cost related to a vehicle" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_33 +msgid "Other Maintenance" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.model,brand:0 +#: view:fleet.vehicle.model.brand:0 +msgid "Model Brand" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.model.brand,image_small:0 +msgid "Smal-sized photo" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,state:0 +#: view:fleet.vehicle.state:0 +msgid "State" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,cost_generated:0 +msgid "Recurring Cost Amount" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_49 +msgid "Transmission Replacement" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_fuel_act +msgid "" +"

\n" +" Click to create a new fuel log. \n" +"

\n" +" Here you can add refuelling entries for all vehicles. You " +"can\n" +" also filter logs of a particular vehicle using the search\n" +" field.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_11 +msgid "Brake Caliper Replacement" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,odometer:0 +msgid "Last Odometer" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_menu +msgid "Vehicle Model" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,doors:0 +msgid "Doors Number" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,acquisition_date:0 +msgid "Date when the vehicle has been bought" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.model:0 +msgid "Models" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "amount" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,fuel_type:0 +msgid "Fuel Used by the vehicle" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Set Contract In Progress" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,odometer_unit:0 +#: field:fleet.vehicle.odometer,unit:0 +msgid "Unit" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,message_is_follower:0 +msgid "Is a Follower" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,horsepower:0 +msgid "Horsepower" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,image:0 +#: field:fleet.vehicle,image_medium:0 +#: field:fleet.vehicle,image_small:0 +#: field:fleet.vehicle.model,image:0 +#: field:fleet.vehicle.model,image_medium:0 +#: field:fleet.vehicle.model,image_small:0 +#: field:fleet.vehicle.model.brand,image:0 +msgid "Logo" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,horsepower_tax:0 +msgid "Horsepower Taxation" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,log_services:0 +#: view:fleet.vehicle.log.services:0 +msgid "Services Logs" +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:47 +#, python-format +msgid "Emptying the odometer value of a vehicle is not allowed." +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_43 +msgid "Thermostat Replacement" +msgstr "" + +#. module: fleet +#: field:fleet.service.type,category:0 +msgid "Category" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_fuel_graph +msgid "Fuel Costs by Month" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.model.brand,image:0 +msgid "" +"This field holds the image used as logo for the brand, limited to " +"1024x1024px." +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_11 +msgid "Management Fee" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "All vehicles" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.fuel:0 +#: view:fleet.vehicle.log.services:0 +msgid "Additional Details" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_services_graph +msgid "Services Costs by Month" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_9 +msgid "Assistance" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.fuel,price_per_liter:0 +msgid "Price Per Liter" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_17 +msgid "Door Window Motor/Regulator Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_46 +msgid "Tire Service" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_8 +msgid "Ball Joint Replacement" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,fuel_type:0 +msgid "Fuel Type" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_22 +msgid "Fuel Injector Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_50 +msgid "Water Pump Replacement" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,location:0 +msgid "Location of the vehicle (garage, ...)" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_28 +msgid "Heater Hose Replacement" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,state:0 +msgid "Status" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_40 +msgid "Rotor Replacement" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.model,brand:0 +msgid "Brand of the vehicle" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.log.contract,start_date:0 +msgid "Date when the coverage of the contract begins" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle,fuel_type:0 +msgid "Electric" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,tag_ids:0 +msgid "Tags" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +#: field:fleet.vehicle,log_contracts:0 +msgid "Contracts" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_13 +msgid "Brake Pad(s) Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.fuel:0 +#: view:fleet.vehicle.log.services:0 +msgid "Odometer Details" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,driver:0 +msgid "Driver" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.model.brand,image_small:0 +msgid "" +"Small-sized photo of the brand. It is automatically resized as a 64x64px " +"image, with aspect ratio preserved. Use this field anywhere a small image is " +"required." +msgstr "" + +#. module: fleet +#: view:board.board:0 +msgid "Fleet Dashboard" +msgstr "" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_break +msgid "Break" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_contract_omnium +msgid "Omnium" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.services:0 +msgid "Services Details" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_15 +msgid "Residual value (Excluding VAT)" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_7 +msgid "Alternator Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_3 +msgid "A/C Diagnosis" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_23 +msgid "Fuel Pump Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Activation Cost" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Cost Type" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_4 +msgid "A/C Evaporator Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "show all the costs for this vehicle" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.odometer:0 +msgid "Odometer Values Per Month" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,message_comment_ids:0 +#: help:fleet.vehicle,message_comment_ids:0 +msgid "Comments and emails" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_act +msgid "" +"

\n" +" Click to create a new vehicle. \n" +"

\n" +" You will be able to manage your fleet by keeping track of " +"the\n" +" contracts, services, fixed and recurring costs, odometers " +"and\n" +" fuel logs associated to each vehicle.\n" +"

\n" +" OpenERP will warn you when services or contract have to be\n" +" renewed.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_13 +msgid "Entry into service tax" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,expiration_date:0 +msgid "Contract Expiration Date" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Cost Subtype" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.open_board_fleet +msgid "" +"
\n" +"

\n" +" Fleet dashboard is empty.\n" +"

\n" +" To add your first report into this dashboard, go to any\n" +" menu, switch to list or graph view, and click 'Add " +"to\n" +" Dashboard' in the extended search options.\n" +"

\n" +" You can filter and group data before inserting into the\n" +" dashboard using the search options.\n" +"

\n" +"
\n" +" " +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_12 +msgid "Rent (Excluding VAT)" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle,odometer_unit:0 +msgid "Kilometers" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.fuel:0 +msgid "Vehicle Details" +msgstr "" + +#. module: fleet +#: selection:fleet.service.type,category:0 +#: field:fleet.vehicle.cost,contract_id:0 +#: selection:fleet.vehicle.cost,cost_type:0 +msgid "Contract" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu +msgid "Model brand of Vehicle" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_10 +msgid "Battery Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +#: field:fleet.vehicle.cost,date:0 +#: field:fleet.vehicle.odometer,date:0 +msgid "Date" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_menu +#: model:ir.ui.menu,name:fleet.fleet_vehicles +msgid "Vehicles" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle,odometer_unit:0 +msgid "Miles" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.log.contract,cost_generated:0 +msgid "" +"Costs paid at regular intervals, depending on the cost frequency. If the " +"cost frequency is set to unique, the cost will be logged at the start date" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_17 +msgid "Emissions" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs +#: model:ir.actions.act_window,help:fleet.action_fleet_reporting_costs_non_effective +msgid "" +"

\n" +" OpenERP helps you managing the costs for your different vehicles\n" +" Costs are generally created from services and contract and appears " +"here.\n" +"

\n" +"

\n" +" Thanks to the different filters, OpenERP can only print the " +"effective\n" +" costs, sort them by type and by vehicle.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,car_value:0 +msgid "Car Value" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.open_board_fleet +#: model:ir.ui.menu,name:fleet.menu_fleet_dashboard +#: model:ir.ui.menu,name:fleet.menu_fleet_reporting +#: model:ir.ui.menu,name:fleet.menu_root +msgid "Fleet" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_14 +msgid "Total expenses (Excluding VAT)" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,odometer_id:0 +msgid "Odometer" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_45 +msgid "Tire Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.service.type:0 +msgid "Service types" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.fuel,purchaser_id:0 +#: field:fleet.vehicle.log.services,purchaser_id:0 +msgid "Purchaser" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_3 +msgid "Tax roll" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.model:0 +#: field:fleet.vehicle.model,vendors:0 +msgid "Vendors" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_contract_leasing +msgid "Leasing" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.model.brand,image_medium:0 +msgid "" +"Medium-sized logo of the brand. It is automatically resized as a 128x128px " +"image, with aspect ratio preserved. Use this field in form views or some " +"kanban views." +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,cost_frequency:0 +msgid "Weekly" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +#: view:fleet.vehicle.odometer:0 +msgid "Odometer Logs" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,acquisition_date:0 +msgid "Acquisition Date" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_odometer +msgid "Odometer log for a vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,cost_type:0 +msgid "Category of the cost" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_5 +#: model:fleet.service.type,name:fleet.type_service_service_7 +msgid "Summer tires" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,contract_renewal_due_soon:0 +msgid "Has Contracts to renew" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_31 +msgid "Oil Change" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,state:0 +msgid "To Close" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_model_brand +msgid "Brand model of the vehicle" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_51 +msgid "Wheel Alignment" +msgstr "" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased +msgid "Purchased" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act +msgid "" +"

\n" +" Here you can add various odometer entries for all vehicles.\n" +" You can also show odometer value for a particular vehicle " +"using\n" +" the search field.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_model_act +msgid "" +"

\n" +" Click to create a new model.\n" +"

\n" +" You can define several models (e.g. A3, A4) for each brand " +"(Audi).\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "General Properties" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_21 +msgid "Exhaust Manifold Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_47 +msgid "Transmission Filter Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_10 +msgid "Replacement Vehicle" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,state:0 +msgid "In Progress" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.log.contract,cost_frequency:0 +msgid "Yearly" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu +msgid "States of Vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.model,modelname:0 +msgid "Model name" +msgstr "" + +#. module: fleet +#: view:board.board:0 +#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph +msgid "Costs by Month" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_18 +msgid "Touring Assistance" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,power:0 +msgid "Power (kW)" +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:418 +#, python-format +msgid "State: from '%s' to '%s'" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_2 +msgid "A/C Condenser Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_19 +msgid "Engine Coolant Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +msgid "Cost Details" +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:410 +#, python-format +msgid "Model: from '%s' to '%s'" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.cost,cost_type:0 +msgid "Other" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Contract details" +msgstr "" + +#. module: fleet +#: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing +msgid "Employee Car" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,auto_generated:0 +msgid "Automatically Generated" +msgstr "" + +#. module: fleet +#: selection:fleet.vehicle.cost,cost_type:0 +msgid "Fuel" +msgstr "" + +#. module: fleet +#: sql_constraint:fleet.vehicle.state:0 +msgid "State name already exists" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_37 +msgid "Radiator Repair" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_log_contract +msgid "Contract information on a vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,days_left:0 +msgid "Warning Date" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_19 +msgid "Residual value in %" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "Additional Properties" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_state +msgid "fleet.vehicle.state" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Contract Costs Per Month" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu +msgid "Vehicles Contracts" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_48 +msgid "Transmission Fluid Replacement" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.model.brand,name:0 +msgid "Brand Name" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_36 +msgid "Power Steering Pump Replacement" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.cost,contract_id:0 +msgid "Contract attached to this cost" +msgstr "" + +#. module: fleet +#: code:addons/fleet/fleet.py:397 +#, python-format +msgid "Vehicle %s has been added to the fleet!" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +#: view:fleet.vehicle.log.fuel:0 +#: view:fleet.vehicle.log.services:0 +msgid "Price" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +#: view:fleet.vehicle.cost:0 +#: field:fleet.vehicle.cost,vehicle_id:0 +#: field:fleet.vehicle.odometer,vehicle_id:0 +msgid "Vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,cost_ids:0 +#: view:fleet.vehicle.log.contract:0 +#: view:fleet.vehicle.log.services:0 +msgid "Included Services" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.action_fleet_vehicle_kanban +msgid "" +"

\n" +" Here are displayed vehicles for which one or more contracts need " +"to be renewed. If you see this message, then there is no contracts to " +"renew.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_15 +msgid "Catalytic Converter Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_25 +msgid "Heater Blower Motor Replacement" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act +#: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu +msgid "Vehicles Odometer" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.log.contract,notes:0 +msgid "Write here all supplementary informations relative to this contract" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_29 +msgid "Ignition Coil Replacement" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_service_16 +msgid "Options" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_contract_repairing +msgid "Repairing" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs +#: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs +msgid "Costs Analysis" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.log.contract,ins_ref:0 +msgid "Contract Reference" +msgstr "" + +#. module: fleet +#: field:fleet.service.type,name:0 +#: field:fleet.vehicle,name:0 +#: field:fleet.vehicle.cost,name:0 +#: field:fleet.vehicle.log.contract,name:0 +#: field:fleet.vehicle.model,name:0 +#: field:fleet.vehicle.odometer,name:0 +#: field:fleet.vehicle.state,name:0 +#: field:fleet.vehicle.tag,name:0 +msgid "Name" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,doors:0 +msgid "Number of doors of the vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,transmission:0 +msgid "Transmission" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,vin_sn:0 +msgid "Chassis Number" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,color:0 +msgid "Color of the vehicle" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_log_services_act +msgid "" +"

\n" +" Click to create a new service entry. \n" +"

\n" +" OpenERP helps you keeping track of all the services done\n" +" on your vehicle. Services can be of many type: occasional\n" +" repair, fixed maintenance, etc.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,co2:0 +msgid "CO2 Emissions" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +msgid "Contract logs" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "Costs" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_log_contract_graph +msgid "Contracts Costs by Month" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,model_id:0 +#: view:fleet.vehicle.model:0 +msgid "Model" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_41 +msgid "Spark Plug Replacement" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle +msgid "Information on a vehicle" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,co2:0 +msgid "CO2 emissions of the vehicle" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_53 +msgid "Windshield Wiper(s) Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.contract:0 +#: field:fleet.vehicle.log.contract,generated_cost_ids:0 +msgid "Generated Costs" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle,color:0 +msgid "Color" +msgstr "" + +#. module: fleet +#: model:ir.actions.act_window,help:fleet.fleet_vehicle_service_types_act +msgid "" +"

\n" +" Click to create a new type of service.\n" +"

\n" +" Each service can used in contracts, as a standalone service " +"or both.\n" +"

\n" +" " +msgstr "" + +#. module: fleet +#: view:board.board:0 +msgid "Services Costs" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_vehicle_model +msgid "Model of a vehicle" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,seats:0 +msgid "Number of seats of the vehicle" +msgstr "" + +#. module: fleet +#: field:fleet.vehicle.cost,odometer:0 +#: field:fleet.vehicle.odometer,value:0 +msgid "Odometer Value" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.services:0 +msgid "Cost" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_39 +msgid "Rotate Tires" +msgstr "" + +#. module: fleet +#: model:fleet.service.type,name:fleet.type_service_42 +msgid "Starter Replacement" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.cost:0 +#: field:fleet.vehicle.cost,year:0 +msgid "Year" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle,license_plate:0 +msgid "License plate number of the vehicle (ie: plate number for a car)" +msgstr "" + +#. module: fleet +#: model:ir.model,name:fleet.model_fleet_contract_state +msgid "Contains the different possible status of a leasing contract" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle:0 +msgid "show the contract for this vehicle" +msgstr "" + +#. module: fleet +#: view:fleet.vehicle.log.services:0 +msgid "Total" +msgstr "" + +#. module: fleet +#: help:fleet.service.type,category:0 +msgid "" +"Choose wheter the service refer to contracts, vehicle services or both" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.cost,cost_type:0 +msgid "For internal purpose only" +msgstr "" + +#. module: fleet +#: help:fleet.vehicle.state,sequence:0 +msgid "Used to order the note stages" +msgstr "" diff --git a/addons/fleet/i18n/nl.po b/addons/fleet/i18n/nl.po index 36f6916a39d..7409b86c910 100644 --- a/addons/fleet/i18n/nl.po +++ b/addons/fleet/i18n/nl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-11-24 02:52+0000\n" -"PO-Revision-Date: 2012-12-05 17:59+0000\n" +"PO-Revision-Date: 2012-12-09 18:21+0000\n" "Last-Translator: Leen Sonneveld \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-12-06 04:41+0000\n" +"X-Launchpad-Export-Date: 2012-12-10 04:39+0000\n" "X-Generator: Launchpad (build 16341)\n" #. module: fleet @@ -565,7 +565,7 @@ msgstr "" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_14 msgid "Car Wash" -msgstr "" +msgstr "Car Wash" #. module: fleet #: help:fleet.vehicle,driver:0 @@ -588,6 +588,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 "" +"Bevat de samenvatting van de chatter (aantal berichten,...). Deze " +"samenvatting is direct in html formaat om zo in de kanban weergave te worden " +"ingevoegd." #. module: fleet #: model:fleet.service.type,name:fleet.type_service_5 @@ -900,7 +903,7 @@ msgstr "" #: field:fleet.vehicle.cost,odometer_unit:0 #: field:fleet.vehicle.odometer,unit:0 msgid "Unit" -msgstr "" +msgstr "Eenheid" #. module: fleet #: field:fleet.vehicle,message_is_follower:0 @@ -1221,7 +1224,7 @@ msgstr "" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_12 msgid "Rent (Excluding VAT)" -msgstr "" +msgstr "Huur (excl. BTW)" #. module: fleet #: selection:fleet.vehicle,odometer_unit:0 @@ -1231,7 +1234,7 @@ msgstr "Kilometers" #. module: fleet #: view:fleet.vehicle.log.fuel:0 msgid "Vehicle Details" -msgstr "" +msgstr "Voertuig details" #. module: fleet #: selection:fleet.service.type,category:0 @@ -1244,7 +1247,7 @@ msgstr "Contract" #: model:ir.actions.act_window,name:fleet.fleet_vehicle_model_brand_act #: model:ir.ui.menu,name:fleet.fleet_vehicle_model_brand_menu msgid "Model brand of Vehicle" -msgstr "" +msgstr "Modelmerk van het voertuig" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_10 @@ -1347,12 +1350,12 @@ msgstr "" #: view:fleet.vehicle.model:0 #: field:fleet.vehicle.model,vendors:0 msgid "Vendors" -msgstr "" +msgstr "Fabrikanten" #. module: fleet #: model:fleet.service.type,name:fleet.type_contract_leasing msgid "Leasing" -msgstr "" +msgstr "Leasing" #. module: fleet #: help:fleet.vehicle.model.brand,image_medium:0 @@ -1365,7 +1368,7 @@ msgstr "" #. module: fleet #: selection:fleet.vehicle.log.contract,cost_frequency:0 msgid "Weekly" -msgstr "" +msgstr "Wekelijks" #. module: fleet #: view:fleet.vehicle:0 @@ -1376,12 +1379,12 @@ msgstr "" #. module: fleet #: field:fleet.vehicle,acquisition_date:0 msgid "Acquisition Date" -msgstr "" +msgstr "Aankoopdatum" #. module: fleet #: model:ir.model,name:fleet.model_fleet_vehicle_odometer msgid "Odometer log for a vehicle" -msgstr "" +msgstr "Kilometertellerlog van een voertuig" #. module: fleet #: field:fleet.vehicle.cost,cost_type:0 @@ -1392,22 +1395,22 @@ msgstr "" #: model:fleet.service.type,name:fleet.type_service_service_5 #: model:fleet.service.type,name:fleet.type_service_service_7 msgid "Summer tires" -msgstr "" +msgstr "Zomerbanden" #. module: fleet #: field:fleet.vehicle,contract_renewal_due_soon:0 msgid "Has Contracts to renew" -msgstr "" +msgstr "Heeft te vernieuwen contracten" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_31 msgid "Oil Change" -msgstr "" +msgstr "Olie verversen" #. module: fleet #: selection:fleet.vehicle.log.contract,state:0 msgid "To Close" -msgstr "" +msgstr "Te sluiten" #. module: fleet #: model:ir.model,name:fleet.model_fleet_vehicle_model_brand @@ -1417,12 +1420,12 @@ msgstr "" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_51 msgid "Wheel Alignment" -msgstr "" +msgstr "Wielen uitlijnen" #. module: fleet #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_purchased msgid "Purchased" -msgstr "" +msgstr "Ingekocht" #. module: fleet #: model:ir.actions.act_window,help:fleet.fleet_vehicle_odometer_act @@ -1451,49 +1454,49 @@ msgstr "" #. module: fleet #: view:fleet.vehicle:0 msgid "General Properties" -msgstr "" +msgstr "Algemene eigenschappen" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_21 msgid "Exhaust Manifold Replacement" -msgstr "" +msgstr "Uitlaat spruitstuk vervangen" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_47 msgid "Transmission Filter Replacement" -msgstr "" +msgstr "Transmissie filter vervangen" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_10 msgid "Replacement Vehicle" -msgstr "" +msgstr "Vervangend voertuig" #. module: fleet #: selection:fleet.vehicle.log.contract,state:0 msgid "In Progress" -msgstr "" +msgstr "In behandeling" #. module: fleet #: selection:fleet.vehicle.log.contract,cost_frequency:0 msgid "Yearly" -msgstr "" +msgstr "Jaarlijks" #. module: fleet #: model:ir.actions.act_window,name:fleet.fleet_vehicle_state_act #: model:ir.ui.menu,name:fleet.fleet_vehicle_state_menu msgid "States of Vehicle" -msgstr "" +msgstr "Voertuig statussen" #. module: fleet #: field:fleet.vehicle.model,modelname:0 msgid "Model name" -msgstr "" +msgstr "Modelnaam" #. module: fleet #: view:board.board:0 #: model:ir.actions.act_window,name:fleet.action_fleet_vehicle_costs_graph msgid "Costs by Month" -msgstr "" +msgstr "Kosten per maand" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_18 @@ -1503,44 +1506,44 @@ msgstr "" #. module: fleet #: field:fleet.vehicle,power:0 msgid "Power (kW)" -msgstr "" +msgstr "Vermogen (kW)" #. module: fleet #: code:addons/fleet/fleet.py:418 #, python-format msgid "State: from '%s' to '%s'" -msgstr "" +msgstr "Status: van '%s' naar '%s'" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_2 msgid "A/C Condenser Replacement" -msgstr "" +msgstr "Airco condensator vervangen" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_19 msgid "Engine Coolant Replacement" -msgstr "" +msgstr "Koelvloeistof vervangen" #. module: fleet #: view:fleet.vehicle.cost:0 msgid "Cost Details" -msgstr "" +msgstr "Kostendetails" #. module: fleet #: code:addons/fleet/fleet.py:410 #, python-format msgid "Model: from '%s' to '%s'" -msgstr "" +msgstr "Model: van '%s' tto '%s'" #. module: fleet #: selection:fleet.vehicle.cost,cost_type:0 msgid "Other" -msgstr "" +msgstr "Overig" #. module: fleet #: view:fleet.vehicle.log.contract:0 msgid "Contract details" -msgstr "" +msgstr "Contract details" #. module: fleet #: model:fleet.vehicle.tag,name:fleet.vehicle_tag_leasing @@ -1550,17 +1553,17 @@ msgstr "" #. module: fleet #: field:fleet.vehicle.cost,auto_generated:0 msgid "Automatically Generated" -msgstr "" +msgstr "Automatisch gegenereerde" #. module: fleet #: selection:fleet.vehicle.cost,cost_type:0 msgid "Fuel" -msgstr "" +msgstr "Brandstof" #. module: fleet #: sql_constraint:fleet.vehicle.state:0 msgid "State name already exists" -msgstr "" +msgstr "Status naam bestaat al" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_37 @@ -1570,7 +1573,7 @@ msgstr "" #. module: fleet #: model:ir.model,name:fleet.model_fleet_vehicle_log_contract msgid "Contract information on a vehicle" -msgstr "" +msgstr "Contract informatie van een voertuig" #. module: fleet #: field:fleet.vehicle.log.contract,days_left:0 @@ -1590,33 +1593,33 @@ msgstr "" #. module: fleet #: model:ir.model,name:fleet.model_fleet_vehicle_state msgid "fleet.vehicle.state" -msgstr "" +msgstr "fleet.vehicle.state" #. module: fleet #: view:fleet.vehicle.log.contract:0 msgid "Contract Costs Per Month" -msgstr "" +msgstr "Contractkosten per maand" #. module: fleet #: model:ir.actions.act_window,name:fleet.fleet_vehicle_log_contract_act #: model:ir.ui.menu,name:fleet.fleet_vehicle_log_contract_menu msgid "Vehicles Contracts" -msgstr "" +msgstr "Voertuig contracten" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_48 msgid "Transmission Fluid Replacement" -msgstr "" +msgstr "Transmissievloeistof vervangen" #. module: fleet #: field:fleet.vehicle.model.brand,name:0 msgid "Brand Name" -msgstr "" +msgstr "Merknaam" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_36 msgid "Power Steering Pump Replacement" -msgstr "" +msgstr "Stuurbekrachtigingspomp vervangen" #. module: fleet #: help:fleet.vehicle.cost,contract_id:0 @@ -1634,7 +1637,7 @@ msgstr "Voertuig %s is toegevoegd aan het wagenpark!" #: view:fleet.vehicle.log.fuel:0 #: view:fleet.vehicle.log.services:0 msgid "Price" -msgstr "" +msgstr "Prijs" #. module: fleet #: view:fleet.vehicle:0 @@ -1642,7 +1645,7 @@ msgstr "" #: field:fleet.vehicle.cost,vehicle_id:0 #: field:fleet.vehicle.odometer,vehicle_id:0 msgid "Vehicle" -msgstr "" +msgstr "Voertuig" #. module: fleet #: field:fleet.vehicle.cost,cost_ids:0 @@ -1665,33 +1668,33 @@ msgstr "" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_15 msgid "Catalytic Converter Replacement" -msgstr "" +msgstr "Katalysator vervangen" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_25 msgid "Heater Blower Motor Replacement" -msgstr "" +msgstr "Aanjager motor vervangen" #. module: fleet #: model:ir.actions.act_window,name:fleet.fleet_vehicle_odometer_act #: model:ir.ui.menu,name:fleet.fleet_vehicle_odometer_menu msgid "Vehicles Odometer" -msgstr "" +msgstr "Voertuigen kilometerteller" #. module: fleet #: help:fleet.vehicle.log.contract,notes:0 msgid "Write here all supplementary informations relative to this contract" -msgstr "" +msgstr "Geef hier alle aanvullende informatie m.b.t. dit contract" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_29 msgid "Ignition Coil Replacement" -msgstr "" +msgstr "Bobine vervangen" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_service_16 msgid "Options" -msgstr "" +msgstr "Opties" #. module: fleet #: model:fleet.service.type,name:fleet.type_contract_repairing @@ -1702,7 +1705,7 @@ msgstr "" #: model:ir.actions.act_window,name:fleet.action_fleet_reporting_costs #: model:ir.ui.menu,name:fleet.menu_fleet_reporting_costs msgid "Costs Analysis" -msgstr "" +msgstr "Kostenanalyse" #. module: fleet #: field:fleet.vehicle.log.contract,ins_ref:0 @@ -1798,7 +1801,7 @@ msgstr "Berichten en communicatie historie" #. module: fleet #: model:ir.model,name:fleet.model_fleet_vehicle msgid "Information on a vehicle" -msgstr "" +msgstr "Informatie op een voertuig" #. module: fleet #: help:fleet.vehicle,co2:0 @@ -1857,7 +1860,7 @@ msgstr "Kilometerstand" #. module: fleet #: view:fleet.vehicle.log.services:0 msgid "Cost" -msgstr "" +msgstr "Kosten" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_39 diff --git a/addons/google_base_account/i18n/hr.po b/addons/google_base_account/i18n/hr.po new file mode 100644 index 00000000000..23505ff5e0b --- /dev/null +++ b/addons/google_base_account/i18n/hr.po @@ -0,0 +1,109 @@ +# Croatian 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-09 20:22+0000\n" +"Last-Translator: Goran Kliska \n" +"Language-Team: Croatian \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-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: google_base_account +#: field:res.users,gmail_user:0 +msgid "Username" +msgstr "Korisničko ime" + +#. module: google_base_account +#: model:ir.actions.act_window,name:google_base_account.act_google_login_form +msgid "Google Login" +msgstr "Google prijava" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "Google Contacts Import Error!" +msgstr "" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_res_users +msgid "Users" +msgstr "Korisnici" + +#. module: google_base_account +#: view:google.login:0 +msgid "or" +msgstr "ili" + +#. module: google_base_account +#: view:google.login:0 +msgid "Google login" +msgstr "Google prijava" + +#. module: google_base_account +#: field:google.login,password:0 +msgid "Google Password" +msgstr "Google lozinka" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:77 +#, python-format +msgid "Error!" +msgstr "Greška!" + +#. module: google_base_account +#: view:res.users:0 +msgid "Google Account" +msgstr "Google Račun" + +#. module: google_base_account +#: view:res.users:0 +msgid "Synchronization" +msgstr "Sinkronizacija" + +#. 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 "" + +#. module: google_base_account +#: code:addons/google_base_account/wizard/google_login.py:29 +#, python-format +msgid "" +"Please install gdata-python-client from http://code.google.com/p/gdata-" +"python-client/downloads/list" +msgstr "" + +#. module: google_base_account +#: model:ir.model,name:google_base_account.model_google_login +msgid "Google Contact" +msgstr "" + +#. module: google_base_account +#: view:google.login:0 +msgid "Cancel" +msgstr "Odustani" + +#. module: google_base_account +#: field:google.login,user:0 +msgid "Google Username" +msgstr "" + +#. module: google_base_account +#: field:res.users,gmail_password:0 +msgid "Password" +msgstr "Lozinka" + +#. module: google_base_account +#: view:google.login:0 +msgid "_Login" +msgstr "" 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/google_docs.py b/addons/google_docs/google_docs.py index 462c8240810..1f6af0378ca 100644 --- a/addons/google_docs/google_docs.py +++ b/addons/google_docs/google_docs.py @@ -17,10 +17,15 @@ # along with this program. If not, see . # ############################################################################## +import logging from datetime import datetime + from tools import DEFAULT_SERVER_DATETIME_FORMAT from osv import osv, fields from tools.translate import _ + +_logger = logging.getLogger(__name__) + try: import gdata.docs.data import gdata.docs.client @@ -29,8 +34,6 @@ try: import gdata.auth from gdata.docs.data import Resource except ImportError: - import logging - _logger = logging.getLogger(__name__) _logger.warning("Please install latest gdata-python-client from http://code.google.com/p/gdata-python-client/downloads/list") class google_docs_ir_attachment(osv.osv): diff --git a/addons/google_docs/i18n/hr.po b/addons/google_docs/i18n/hr.po new file mode 100644 index 00000000000..570863480ea --- /dev/null +++ b/addons/google_docs/i18n/hr.po @@ -0,0 +1,190 @@ +# Croatian 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-11-24 02:52+0000\n" +"PO-Revision-Date: 2012-12-09 20:25+0000\n" +"Last-Translator: Goran Kliska \n" +"Language-Team: Croatian \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-10 04:39+0000\n" +"X-Generator: Launchpad (build 16341)\n" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:136 +#, python-format +msgid "Key Error!" +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a presentation (slide show) document with url like " +"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id" +".p`, the ID is `presentation:123456789`" +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a text document with url like " +"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is " +"`document:123456789`" +msgstr "" + +#. module: google_docs +#: field:google.docs.config,gdocs_resource_id:0 +msgid "Google Resource ID to Use as Template" +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a drawing document with url like " +"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is " +"`drawings:123456789`" +msgstr "" + +#. module: google_docs +#. openerp-web +#: code:addons/google_docs/static/src/xml/gdocs.xml:6 +#, python-format +msgid "Add Google Doc..." +msgstr "Dodaj Google Doc..." + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"This is the id of the template document, on google side. You can find it " +"thanks to its URL:" +msgstr "" + +#. module: google_docs +#: model:ir.model,name:google_docs.model_google_docs_config +msgid "Google Docs templates config" +msgstr "" + +#. module: google_docs +#. openerp-web +#: code:addons/google_docs/static/src/js/gdocs.js:25 +#, python-format +msgid "" +"The user google credentials are not set yet. Contact your administrator for " +"help." +msgstr "" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "" +"for a spreadsheet document with url like " +"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, " +"the ID is `spreadsheet:123456789`" +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:98 +#, python-format +msgid "" +"Your resource id is not correct. You can find the id in the google docs URL." +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:122 +#, python-format +msgid "Creating google docs may only be done by one at a time." +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:53 +#: code:addons/google_docs/google_docs.py:98 +#: code:addons/google_docs/google_docs.py:122 +#, python-format +msgid "Google Docs Error!" +msgstr "Google Docs greška!" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:53 +#, python-format +msgid "Check your google configuration in Users/Users/Synchronization tab." +msgstr "" + +#. module: google_docs +#: model:ir.ui.menu,name:google_docs.menu_gdocs_config +msgid "Google Docs configuration" +msgstr "Postave Google Docs-a" + +#. module: google_docs +#: model:ir.actions.act_window,name:google_docs.action_google_docs_users_config +#: model:ir.ui.menu,name:google_docs.menu_gdocs_model_config +msgid "Models configuration" +msgstr "" + +#. module: google_docs +#: field:google.docs.config,model_id:0 +msgid "Model" +msgstr "Model" + +#. module: google_docs +#. openerp-web +#: code:addons/google_docs/static/src/js/gdocs.js:28 +#, python-format +msgid "User Google credentials are not yet set." +msgstr "" + +#. module: google_docs +#: code:addons/google_docs/google_docs.py:136 +#, python-format +msgid "Your Google Doc Name Pattern's key does not found in object." +msgstr "" + +#. module: google_docs +#: help:google.docs.config,name_template:0 +msgid "" +"Choose how the new google docs will be named, on google side. Eg. " +"gdoc_%(field_name)s" +msgstr "" +"Odaberite kako će se nazivati novi google dokumenti, on google side. Eg. " +"gdoc_%(field_name)s" + +#. module: google_docs +#: view:google.docs.config:0 +msgid "Google Docs Configuration" +msgstr "" + +#. module: google_docs +#: help:google.docs.config,gdocs_resource_id:0 +msgid "" +"\n" +"This is the id of the template document, on google side. You can find it " +"thanks to its URL: \n" +"*for a text document with url like " +"`https://docs.google.com/a/openerp.com/document/d/123456789/edit`, the ID is " +"`document:123456789`\n" +"*for a spreadsheet document with url like " +"`https://docs.google.com/a/openerp.com/spreadsheet/ccc?key=123456789#gid=0`, " +"the ID is `spreadsheet:123456789`\n" +"*for a presentation (slide show) document with url like " +"`https://docs.google.com/a/openerp.com/presentation/d/123456789/edit#slide=id" +".p`, the ID is `presentation:123456789`\n" +"*for a drawing document with url like " +"`https://docs.google.com/a/openerp.com/drawings/d/123456789/edit`, the ID is " +"`drawings:123456789`\n" +"...\n" +msgstr "" + +#. module: google_docs +#: model:ir.model,name:google_docs.model_ir_attachment +msgid "ir.attachment" +msgstr "" + +#. module: google_docs +#: field:google.docs.config,name_template:0 +msgid "Google Doc Name Pattern" +msgstr "" 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/__init__.py b/addons/hr/__init__.py index 1ed86ab58bb..80becc6af70 100644 --- a/addons/hr/__init__.py +++ b/addons/hr/__init__.py @@ -23,7 +23,6 @@ import hr_department import hr import report -import wizard import res_config # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: 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 @@

-
@@ -112,7 +112,7 @@ - + diff --git a/addons/hr_attendance/hr_attendance.py b/addons/hr_attendance/hr_attendance.py index a2ee3650a2f..5de1bc5f3bc 100644 --- a/addons/hr_attendance/hr_attendance.py +++ b/addons/hr_attendance/hr_attendance.py @@ -137,7 +137,7 @@ class hr_employee(osv.osv): _columns = { 'state': fields.function(_state, type='selection', selection=[('absent', 'Absent'), ('present', 'Present')], string='Attendance'), 'last_sign': fields.function(_last_sign, type='datetime', string='Last Sign'), - 'attendance_access': fields.function(_attendance_access, type='boolean'), + 'attendance_access': fields.function(_attendance_access, string='Attendance Access', type='boolean'), } def _action_check(self, cr, uid, emp_id, dt=False, context=None): diff --git a/addons/hr_evaluation/__init__.py b/addons/hr_evaluation/__init__.py index 0f403959cd9..af89630a94b 100644 --- a/addons/hr_evaluation/__init__.py +++ b/addons/hr_evaluation/__init__.py @@ -20,7 +20,6 @@ ############################################################################## import hr_evaluation -import wizard import report # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index eece0c7497e..63d831e34c7 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -106,41 +106,24 @@ class hr_employee(osv.osv): 'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Appraisal Plan'), 'evaluation_date': fields.date('Next Appraisal Date', help="The date of the next appraisal is computed by the appraisal plan's dates (first appraisal + periodicity)."), } - def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None): + now = parser.parse(datetime.now().strftime('%Y-%m-%d')) obj_evaluation = self.pool.get('hr_evaluation.evaluation') - for id in self.browse(cr, uid, self.search(cr, uid, [], context=context), context=context): - if id.evaluation_plan_id and id.evaluation_date: - if (parser.parse(id.evaluation_date) + relativedelta(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"): - self.write(cr, uid, id.id, {'evaluation_date': (parser.parse(id.evaluation_date) + relativedelta(months =+ int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d')}, context=context) - obj_evaluation.create(cr, uid, {'employee_id': id.id, 'plan_id': id.evaluation_plan_id}, context=context) + emp_ids =self.search(cr, uid, [ ('evaluation_plan_id','<>',False), ('evaluation_date','=', False)], context=context) + for emp in self.browse(cr, uid, emp_ids, context=context): + first_date = (now+ relativedelta(months=emp.evaluation_plan_id.month_first)).strftime('%Y-%m-%d') + self.write(cr, uid, [emp.id], {'evaluation_date': first_date}, context=context) + + emp_ids =self.search(cr, uid, [ + ('evaluation_plan_id','<>',False), ('evaluation_date','<=', time.strftime("%Y-%m-%d")), + ], context=context) + for emp in self.browse(cr, uid, emp_ids, context=context): + next_date = (now + relativedelta(months=emp.evaluation_plan_id.month_next)).strftime('%Y-%m-%d') + self.write(cr, uid, [emp.id], {'evaluation_date': next_date}, context=context) + plan_id = obj_evaluation.create(cr, uid, {'employee_id': emp.id, 'plan_id': emp.evaluation_plan_id.id}, context=context) + obj_evaluation.button_plan_in_progress(cr, uid, [plan_id], context=context) return True - def onchange_evaluation_plan_id(self, cr, uid, ids, evaluation_plan_id, evaluation_date, context=None): - if evaluation_plan_id: - evaluation_plan_obj=self.pool.get('hr_evaluation.plan') - obj_evaluation = self.pool.get('hr_evaluation.evaluation') - flag = False - evaluation_plan = evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0] - if not evaluation_date: - evaluation_date=(parser.parse(datetime.now().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d') - flag = True - else: - if (parser.parse(evaluation_date) + relativedelta(months = int(evaluation_plan.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"): - evaluation_date=(parser.parse(evaluation_date)+ relativedelta(months=+evaluation_plan.month_next)).strftime('%Y-%m-%d') - flag = True - if ids and flag: - obj_evaluation.create(cr, uid, {'employee_id': ids[0], 'plan_id': evaluation_plan_id}, context=context) - return {'value': {'evaluation_date': evaluation_date}} - - def create(self, cr, uid, vals, context=None): - id = super(hr_employee, self).create(cr, uid, vals, context=context) - if vals.get('evaluation_plan_id', False): - self.pool.get('hr_evaluation.evaluation').create(cr, uid, {'employee_id': id, 'plan_id': vals['evaluation_plan_id']}, context=context) - return id - -hr_employee() - class hr_evaluation(osv.osv): _name = "hr_evaluation.evaluation" _inherit = "mail.thread" @@ -187,13 +170,14 @@ class hr_evaluation(osv.osv): return res def onchange_employee_id(self, cr, uid, ids, employee_id, context=None): - evaluation_plan_id=False + vals = {} + vals['plan_id'] = False if employee_id: - employee_obj=self.pool.get('hr.employee') + employee_obj = self.pool.get('hr.employee') for employee in employee_obj.browse(cr, uid, [employee_id], context=context): if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id: - evaluation_plan_id=employee.evaluation_plan_id.id - return {'value': {'plan_id':evaluation_plan_id}} + vals.update({'plan_id': employee.evaluation_plan_id.id}) + return {'value': vals} def button_plan_in_progress(self, cr, uid, ids, context=None): mail_message = self.pool.get('mail.message') diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index de0a9714763..82ef2aa83f4 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -124,7 +124,7 @@ hr_evaluation.plan.phase - + @@ -290,7 +290,7 @@