diff --git a/addons/account/account.py b/addons/account/account.py index 7cce45ad006..6a5b9b1cbae 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -585,12 +585,12 @@ class account_journal(osv.osv): _columns = { 'name': fields.char('Journal Name', size=64, required=True, translate=True), 'code': fields.char('Code', size=16, required=True, help="The code will be used to generate the numbers of the journal entries of this journal."), - 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True, + 'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True, help="Select 'Sale' for Sale journal to be used at the time of making invoice."\ " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\ " Select 'Cash' to be used at the time of making payment."\ - " Select 'General' to be used at the time of stock input/output."\ - " Select 'Situation' to be used at the time of making vouchers."), + " Select 'General' for miscellaneous operations."\ + " Select 'Opening/Closing Situation' to be used at the time of new fiscal year creation or end of year entries generation."), 'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'), 'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]), 'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]), @@ -2533,8 +2533,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True), 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), - "sale_tax": fields.many2one("account.tax.template", "Sale Tax"), - "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"), + "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"), + "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} @@ -2542,12 +2542,12 @@ class wizard_multi_charts_accounts(osv.osv_memory): res['value']["sale_tax"] = False res['value']["purchase_tax"] = False if chart_template_id: - ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" - , "=", chart_template_id)], order="sequence") - if len(ids) > 0: - id=ids[0] - res['value']["sale_tax"] = id - res['value']["purchase_tax"] = id + sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence") + purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence") + res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False + res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False return res def _get_chart(self, cr, uid, context={}): diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index ded29c27e89..8ee449e2fc9 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -272,13 +272,10 @@ class account_bank_statement(osv.osv): if st_line.account_id and st_line.account_id.currency_id and st_line.account_id.currency_id.id <> company_currency_id: val['currency_id'] = st_line.account_id.currency_id.id - if company_currency_id==st_line.account_id.currency_id.id: - amount_cur = st_line.amount - else: - amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, - st_line.account_id.currency_id.id, amount, context=context, - account=acc_cur) - val['amount_currency'] = amount_cur + amount_cur = res_currency_obj.compute(cr, uid, company_currency_id, + st_line.account_id.currency_id.id, amount, context=context, + account=acc_cur) + val['amount_currency'] = -amount_cur move_line_id = account_move_line_obj.create(cr, uid, val, context=context) torec.append(move_line_id) @@ -498,4 +495,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/account_end_fy.xml b/addons/account/account_end_fy.xml index d0c966898d6..5f4ed44adfe 100644 --- a/addons/account/account_end_fy.xml +++ b/addons/account/account_end_fy.xml @@ -8,7 +8,7 @@ form {'search_default_draft': 1} - After closing a period, you will no longer be able to post entries to the period once it has been closed. + A period is a fiscal period of time during which accounting entries should be recorded for accounting related activities. Monthly period is the norm but depending on your countries or company needs, you could also have quarterly periods. Closing a period will make it impossible to record new accounting entries, all new entries should then be made on the following open period. Close a period when you do not want to record new entries and want to lock this period for tax related calculation. form tree,form + A recurring entry is a payment related entry that occurs on a recurrent basis from a specific date corresponding to the signature of a contract or an agreement with a customer or a supplier. With Define Recurring Entries, you can create them in the system in order to automate their entries in the system. - - + +
@@ -2466,7 +2467,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) New Company Financial Setting - STOCK_JUSTIFY_FILL + STOCK_EXECUTE diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index f45a9a30f4f..c4b19224e57 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.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: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-14 07:28+0000\n" -"Last-Translator: OpenERP Administrators \n" +"PO-Revision-Date: 2010-11-04 08:55+0000\n" +"Last-Translator: Goran Kliska (Aplikacija d.o.o.) \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: 2010-10-30 05:26+0000\n" +"X-Launchpad-Export-Date: 2010-11-06 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -1020,7 +1020,7 @@ msgstr "Ukupno netto:" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Mapping" -msgstr "" +msgstr "Fiskalno mapiranje" #. module: account #: field:account.analytic.line,product_uom_id:0 @@ -1163,7 +1163,7 @@ msgstr "Iznos je predstavljen opciono u drugoj valuti" #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Mapping Template" -msgstr "" +msgstr "Predložak fiskalnog mapiranja" #. module: account #: field:account.payment.term,line_ids:0 @@ -3675,7 +3675,7 @@ msgstr "Sekvenca" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template msgid "Template for Fiscal Mapping" -msgstr "" +msgstr "Predložak fiskalnog mapiranja" #. module: account #: view:account.bank.statement:0 @@ -3907,7 +3907,7 @@ msgstr "Po razdoblju" #. module: account #: help:account.invoice,date_invoice:0 msgid "Keep empty to use the current date" -msgstr "" +msgstr "Ostavite prazno za trenutni datum" #. module: account #: rml:account.overdue:0 @@ -4611,7 +4611,7 @@ msgstr "Unos stavaka po temeljnicama" #. module: account #: wizard_view:account.analytic.account.chart,init:0 msgid "Analytic Account Charts" -msgstr "" +msgstr "Analitički kontni planovi" #. module: account #: wizard_field:account.aged.trial.balance,init,result_selection:0 diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 0e9314dd4f4..51fa2f55019 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: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-11-01 11:04+0000\n" -"Last-Translator: Lorenzo Battistini \n" +"PO-Revision-Date: 2010-11-05 08:21+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-11-02 04:50+0000\n" +"X-Launchpad-Export-Date: 2010-11-06 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -3300,7 +3300,7 @@ msgstr "Nessuno" #: model:ir.actions.wizard,name:account.wizard_fiscalyear_close #: model:ir.ui.menu,name:account.menu_wizard_fy_close msgid "Generate Fiscal Year Opening Entries" -msgstr "" +msgstr "Genera le scritture di apertura anno fiscale" #. module: account #: model:ir.actions.wizard,name:account.wizard_reconcile @@ -3491,6 +3491,7 @@ msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." msgstr "" +"L'importo espresso in un'altra valuta opzionale, se c'è una voce multivaluta." #. module: account #: field:account.tax,parent_id:0 @@ -3518,7 +3519,7 @@ msgstr "Titolare conto bancario" #: wizard_view:account.partner.balance.report,init:0 #: wizard_view:account.third_party_ledger.report,init:0 msgid "Filter on Periods" -msgstr "" +msgstr "Filtro su: Periodi" #. module: account #: field:res.partner,property_account_receivable:0 @@ -3559,7 +3560,7 @@ msgstr "Anno fiscale" #. module: account #: rml:account.overdue:0 msgid "Balance :" -msgstr "" +msgstr "Saldo:" #. module: account #: selection:account.account.balance.report,checktype,display_account:0 @@ -3759,12 +3760,12 @@ msgstr "" #. module: account #: selection:account.print.journal.report,init,sort_selection:0 msgid "By date" -msgstr "" +msgstr "Per data" #. module: account #: model:ir.actions.act_window,name:account.action_account_config_wizard_form msgid "Account Configure Wizard " -msgstr "" +msgstr "Wizard configurazione conto " #. module: account #: field:account.config.wizard,date1:0 @@ -4357,7 +4358,7 @@ msgstr "Tipo interno" #. module: account #: selection:account.automatic.reconcile,init,power:0 msgid "9" -msgstr "" +msgstr "9" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_running @@ -4959,7 +4960,7 @@ msgstr "Tutti i Mesi" #. module: account #: wizard_field:account.invoice.refund,init,date:0 msgid "Operation date" -msgstr "" +msgstr "Data operazione" #. module: account #: field:account.invoice,invoice_line:0 @@ -5482,7 +5483,7 @@ msgstr "Registro generale" #: rml:account.third_party_ledger:0 #: rml:account.third_party_ledger_other:0 msgid "Balance" -msgstr "" +msgstr "Saldo" #. module: account #: rml:account.invoice:0 @@ -5516,6 +5517,8 @@ msgid "" "Invalid period ! Some periods overlap or the date period is not in the scope " "of the fiscal year. " msgstr "" +"Periodo non valido! Alcuni periodi si sovrappongono oppure la data non è " +"nell'ambito dell'anno fiscale. " #. module: account #: help:account.journal,invoice_sequence_id:0 @@ -5644,7 +5647,7 @@ msgstr "Inizio Periodo" #. module: account #: model:ir.ui.menu,name:account.account_template_folder msgid "Templates" -msgstr "" +msgstr "Modelli" #. module: account #: wizard_button:account.vat.declaration,init,report:0 @@ -5720,7 +5723,7 @@ msgstr "" #. module: account #: selection:account.automatic.reconcile,init,power:0 msgid "5" -msgstr "" +msgstr "5" #. module: account #: field:product.category,property_account_income_categ:0 @@ -5998,7 +6001,7 @@ msgstr "" #. module: account #: view:board.board:0 msgid "Draft invoices" -msgstr "" +msgstr "Fatture bozza" #. module: account #: model:ir.actions.act_window,name:account.open_board_account @@ -6056,7 +6059,7 @@ msgstr "" #. module: account #: selection:account.balance.account.balance.report,init,account_choice:0 msgid "All accounts" -msgstr "" +msgstr "Tutti i conti" #. module: account #: wizard_field:account.balance.account.balance.report,init,period_manner:0 @@ -6140,7 +6143,7 @@ msgstr "" #. module: account #: wizard_field:account.balance.account.balance.report,init,landscape:0 msgid "Show Report in Landscape Form" -msgstr "" +msgstr "Visualizza il report in formato orizzontale" #. module: account #: rml:account.account.balance.landscape:0 @@ -6161,7 +6164,7 @@ msgstr "Selezionare periodo" #. module: account #: wizard_view:account.balance.account.balance.report,init:0 msgid "Report Options" -msgstr "" +msgstr "Opzioni Report" #. module: account #: selection:account.balance.account.balance.report,init,compare_pattern:0 diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 91b6ba1459d..2ffe5160696 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-10-31 08:11+0000\n" +"PO-Revision-Date: 2010-11-04 08:09+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-11-01 05:11+0000\n" +"X-Launchpad-Export-Date: 2010-11-06 04:52+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -528,7 +528,7 @@ msgstr "Нийлүүлэгчийн нэхэмжлэл" #: model:process.transition,name:account.process_transition_reconcilepaid0 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "Reconcile Paid" -msgstr "Төлсөн тулгалт" +msgstr "Төлж гүйцээх" #. module: account #: wizard_field:account.chart,init,target_move:0 @@ -1356,7 +1356,7 @@ msgstr "Төлөх нэхэмжлэл сонгох" #: selection:account.analytic.account,type:0 #: field:account.journal,view_id:0 msgid "View" -msgstr "Дэлгэц" +msgstr "Харах" #. module: account #: selection:account.account.balance.report,checktype,display_account:0 diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index 20d8ca5644d..a6411b91788 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-09-29 08:58+0000\n" +"PO-Revision-Date: 2010-11-03 07:59+0000\n" "Last-Translator: OpenERP Administrators \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-10-30 05:27+0000\n" +"X-Launchpad-Export-Date: 2010-11-04 04:51+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -56,7 +56,7 @@ msgstr "Tài sản" #. module: account #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Tên mẫu không hợp lệ khi định nghĩa hành động" #. module: account #: help:account.journal,currency:0 @@ -251,12 +251,12 @@ msgstr "khách hàng mua hàng" #. module: account #: field:product.template,supplier_taxes_id:0 msgid "Supplier Taxes" -msgstr "" +msgstr "Thuế đầu vào" #. module: account #: view:account.move:0 msgid "Total Debit" -msgstr "" +msgstr "Tổng Nợ" #. module: account #: rml:account.tax.code.entries:0 @@ -345,7 +345,7 @@ msgstr "" #: field:account.invoice,amount_tax:0 #: field:account.move.line,account_tax_id:0 msgid "Tax" -msgstr "" +msgstr "Thuế" #. module: account #: rml:account.general.journal:0 @@ -472,7 +472,7 @@ msgstr "Ngân hàng hòa giải(reconniliation)" #. module: account #: rml:account.invoice:0 msgid "Disc.(%)" -msgstr "" +msgstr "Giảm giá (%)" #. module: account #: rml:account.general.ledger:0 @@ -685,7 +685,7 @@ msgstr "" #. module: account #: selection:account.subscription,period_type:0 msgid "month" -msgstr "" +msgstr "tháng" #. module: account #: field:account.analytic.account,partner_id:0 diff --git a/addons/account/installer.py b/addons/account/installer.py index 83ddff6065d..a9c459cec86 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -86,8 +86,8 @@ class account_installer(osv.osv_memory): return 'configurable' _defaults = { - 'date_start': time.strftime('%Y-01-01'), - 'date_stop': time.strftime('%Y-12-31'), + 'date_start': lambda *a: time.strftime('%Y-01-01'), + 'date_stop': lambda *a: time.strftime('%Y-12-31'), 'period': 'month', 'sale_tax': 0.0, 'purchase_tax': 0.0, @@ -749,4 +749,4 @@ class account_installer_modules(osv.osv_memory): account_installer_modules() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 44ebafb9bbd..3da77df9194 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -823,9 +823,9 @@ class account_invoice(osv.osv): # one move line per invoice line iml = self._get_analytic_lines(cr, uid, inv.id) # check if taxes are all computed - - context.update({'lang': inv.partner_id.lang}) - compute_taxes = ait_obj.compute(cr, uid, inv.id, context=context) + ctx = context.copy() + ctx.update({'lang': inv.partner_id.lang}) + compute_taxes = ait_obj.compute(cr, uid, inv.id, context=ctx) self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj) if inv.type in ('in_invoice', 'in_refund') and abs(inv.check_total - inv.amount_total) >= (inv.currency_id.rounding/2.0): diff --git a/addons/account/wizard/account_fiscalyear_close_state.xml b/addons/account/wizard/account_fiscalyear_close_state.xml index c8210dfbdf1..a4200d69c2d 100644 --- a/addons/account/wizard/account_fiscalyear_close_state.xml +++ b/addons/account/wizard/account_fiscalyear_close_state.xml @@ -26,6 +26,7 @@ tree,form new + If no additional entries should be recorded on a fiscal year, you can close it from here. It will close all opened periods in this year that will make impossible any new entry record. Close a fiscal year when you need to finalize your end of year results definitive. {'record_id' : active_id} new + This wizard will validate all journal entries of a particular journal and period. Once journal entries are validated, you can not update them anymore. diff --git a/addons/account_analytic_analysis/i18n/de.po b/addons/account_analytic_analysis/i18n/de.po index da61db88db9..bbcb0312616 100644 --- a/addons/account_analytic_analysis/i18n/de.po +++ b/addons/account_analytic_analysis/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 09:48+0000\n" +"PO-Revision-Date: 2010-11-06 07:06+0000\n" "Last-Translator: OpenERP Administrators \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: 2010-10-31 05:02+0000\n" +"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -51,7 +51,7 @@ msgstr "Berechnet durch die folgende Formel: Max Menge - Gesamtstunden" #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 #, python-format msgid "AccessError" -msgstr "" +msgstr "Verbindungsfehler" #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 @@ -71,7 +71,7 @@ msgstr "Datum der letzten Rechnungserfassung auf diesem analytischen Konto." #. module: account_analytic_analysis #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fehler ! Sie können kein rekursives Menü erstellen." #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 @@ -100,7 +100,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing msgid "Billing" -msgstr "" +msgstr "Abrechnung" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 @@ -177,7 +177,7 @@ msgstr "report_account_analytic" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user msgid "Hours Summary by User" -msgstr "" +msgstr "Arbeitsstunden nach Benutzer" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 diff --git a/addons/account_analytic_analysis/i18n/es_EC.po b/addons/account_analytic_analysis/i18n/es_EC.po index 988c3b9888e..18e867d2f2c 100644 --- a/addons/account_analytic_analysis/i18n/es_EC.po +++ b/addons/account_analytic_analysis/i18n/es_EC.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-09-17 17:33+0000\n" -"Last-Translator: Ana Juaristi Olalde \n" +"PO-Revision-Date: 2010-11-06 15:38+0000\n" +"Last-Translator: Cristian Salamea (Gnuthink) \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: 2010-10-30 05:32+0000\n" +"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -53,7 +53,7 @@ msgstr "Calculado utilizando la fórmula: Cantidad máxima - Horas totales." #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 #, python-format msgid "AccessError" -msgstr "" +msgstr "Error de acceso" #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 @@ -73,7 +73,7 @@ msgstr "Fecha de la última factura creada para esta cuenta analítica." #. module: account_analytic_analysis #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "¡Error! No puede crear menús recursivos" #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 @@ -102,7 +102,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing msgid "Billing" -msgstr "" +msgstr "Facturación" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 @@ -178,7 +178,7 @@ msgstr "Informes contabilidad analítica" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user msgid "Hours Summary by User" -msgstr "" +msgstr "Resumen de horas por usuario" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 @@ -189,7 +189,7 @@ msgstr "Importe facturado" #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 #, python-format msgid "You try to bypass an access rule (Document type: %s)." -msgstr "" +msgstr "Ha intentado saltarse una regla de acceso (tipo de documento: %s)." #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_invoiced_date:0 diff --git a/addons/account_analytic_analysis/i18n/it.po b/addons/account_analytic_analysis/i18n/it.po index c34d6153bd5..78b71c3b47a 100644 --- a/addons/account_analytic_analysis/i18n/it.po +++ b/addons/account_analytic_analysis/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 09:02+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-11-08 08:16+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-10-31 05:02+0000\n" +"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -53,7 +53,7 @@ msgstr "Calcolato usando la formula: Quantità massima - Ore Totali." #: code:addons/account_analytic_analysis/account_analytic_analysis.py:0 #, python-format msgid "AccessError" -msgstr "" +msgstr "Errore di Accesso" #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 @@ -73,7 +73,7 @@ msgstr "Data dell'ultima fattura creata per questo conto analitico" #. module: account_analytic_analysis #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Errore! Non è possibile creare un menù ricorsivo." #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 @@ -102,7 +102,7 @@ msgstr "" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing msgid "Billing" -msgstr "" +msgstr "Fatturando" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 @@ -178,7 +178,7 @@ msgstr "report_account_analytic" #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user msgid "Hours Summary by User" -msgstr "" +msgstr "Riepilogo ore per utente" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 diff --git a/addons/account_analytic_default/i18n/de.po b/addons/account_analytic_default/i18n/de.po index 1cab0c7486f..12e62021ea0 100644 --- a/addons/account_analytic_default/i18n/de.po +++ b/addons/account_analytic_default/i18n/de.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2009-11-22 18:40+0000\n" -"Last-Translator: Ferdinand @ ChriCar \n" +"PO-Revision-Date: 2010-11-06 07:19+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-10-30 05:36+0000\n" +"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information msgid "Account Analytic Default" -msgstr "Standard Analytisches Konto" +msgstr "Analyt. Buchungsvorlage" #. module: account_analytic_default #: constraint:ir.model:0 @@ -32,7 +32,7 @@ msgstr "" #. module: account_analytic_default #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fehler ! Sie können keine rekursiven Menüs erzeugen." #. module: account_analytic_default #: help:account.analytic.default,partner_id:0 @@ -41,48 +41,51 @@ msgid "" "default (eg. create new cutomer invoice or Sale order if we select this " "partner, it will automatically take this as an analytical account)" msgstr "" +"Auswahl eines Partners, auf dessen hier definiertes analyt. Konto " +"automatisch bei einem Verkaufauftrag oder einer Ausgangsrechnung gebucht " +"wird." #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_product #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_user msgid "Analytic Rules" -msgstr "Analytische Regeln" +msgstr "Analyt. Kontierungsrichtlinie" #. module: account_analytic_default #: help:account.analytic.default,analytic_id:0 msgid "Analytical Account" -msgstr "" +msgstr "Analytisches Konto" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Current" -msgstr "" +msgstr "Aktuell" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Group By..." -msgstr "" +msgstr "Gruppierung..." #. module: account_analytic_default #: help:account.analytic.default,date_stop:0 msgid "Default end date for this Analytical Account" -msgstr "" +msgstr "Gültig bis Datum für das Analytische Konto" #. module: account_analytic_default #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Ungültiger Modellname in der Aktionsdefinition." +msgstr "Ungültiger Modulname in der Aktionsdefinition." #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_stock_picking msgid "Picking List" -msgstr "" +msgstr "Lieferschein" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Conditions" -msgstr "Konditionen" +msgstr "Bedingungen" #. module: account_analytic_default #: help:account.analytic.default,company_id:0 @@ -91,16 +94,19 @@ msgid "" "default (eg. create new cutomer invoice or Sale order if we select this " "company, it will automatically take this as an analytical account)" msgstr "" +"Auswahl eines Partners, auf dessen hier definiertes analyt. Konto " +"automatisch bei einem Verkaufauftrag oder einer Ausgangsrechnung gebucht " +"wird." #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_sale_order_line msgid "Sale Order Line" -msgstr "" +msgstr "Auftragsposition" #. module: account_analytic_default #: help:account.analytic.default,date_start:0 msgid "Default start date for this Analytical Account" -msgstr "" +msgstr "Gültig ab Datum des Analyt. Kontos" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -111,13 +117,13 @@ msgstr "Produkt" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_analytic_default msgid "Analytic Distribution" -msgstr "" +msgstr "Analyt. Verrechnung" #. module: account_analytic_default #: view:account.analytic.default:0 #: field:account.analytic.default,company_id:0 msgid "Company" -msgstr "Firma" +msgstr "Unternehmen" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -128,7 +134,7 @@ msgstr "Benutzer" #. module: account_analytic_default #: model:ir.actions.act_window,name:account_analytic_default.act_account_acount_move_line_open msgid "Entries" -msgstr "Buchungen nach Journal" +msgstr "Buchungen" #. module: account_analytic_default #: field:account.analytic.default,date_stop:0 @@ -145,13 +151,16 @@ msgstr "Fehlerhafter xml Code für diese Ansicht!" msgid "" "select a user which will use analytical account specified in analytic default" msgstr "" +"Auswahl eines Verkäufers, auf dessen hier definiertes analyt. Konto " +"automatisch bei einem Verkaufauftrag oder einer Ausgangsrechnung gebucht " +"wird." #. module: account_analytic_default #: view:account.analytic.default:0 #: model:ir.actions.act_window,name:account_analytic_default.action_analytic_default_list #: model:ir.ui.menu,name:account_analytic_default.menu_analytic_default_list msgid "Analytic Defaults" -msgstr "Analyse Standards" +msgstr "Analyt. Buchungsvorlage" #. module: account_analytic_default #: help:account.analytic.default,product_id:0 @@ -160,16 +169,19 @@ msgid "" "default (eg. create new cutomer invoice or Sale order if we select this " "product, it will automatically take this as an analytical account)" msgstr "" +"Auswahl eines Produkts, auf dessen hier definiertes analyt. Konto " +"automatisch bei einem Verkaufauftrag oder einer Ausgangsrechnung gebucht " +"wird." #. module: account_analytic_default #: field:account.analytic.default,sequence:0 msgid "Sequence" -msgstr "Sequenz" +msgstr "Reihenfolge" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "Rechungsposition" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -180,7 +192,7 @@ msgstr "Analytisches Konto" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Accounts" -msgstr "" +msgstr "Konten" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -198,6 +210,8 @@ msgstr "Von Datum" msgid "" "Gives the sequence order when displaying a list of analytic distribution" msgstr "" +"Zeigt eine Liste analytischer Konten, in der Reihenfolge wie von Ihnen " +"festgelegt." #~ msgid "Seq" #~ msgstr "Seq" diff --git a/addons/account_analytic_default/i18n/it.po b/addons/account_analytic_default/i18n/it.po index 23c22324303..da7d70508a2 100644 --- a/addons/account_analytic_default/i18n/it.po +++ b/addons/account_analytic_default/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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-08-17 10:02+0000\n" +"PO-Revision-Date: 2010-11-08 08:28+0000\n" "Last-Translator: OpenERP Administrators \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: 2010-10-30 05:36+0000\n" +"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_default @@ -57,7 +57,7 @@ msgstr "" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Current" -msgstr "" +msgstr "Corrente" #. module: account_analytic_default #: view:account.analytic.default:0 diff --git a/addons/account_analytic_plans/i18n/de.po b/addons/account_analytic_plans/i18n/de.po index a106464716d..1fbe576621f 100644 --- a/addons/account_analytic_plans/i18n/de.po +++ b/addons/account_analytic_plans/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 14:31+0000\n" +"PO-Revision-Date: 2010-11-07 07:48+0000\n" "Last-Translator: OpenERP Administrators \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: 2010-10-31 05:02+0000\n" +"X-Launchpad-Export-Date: 2010-11-08 05:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_plans @@ -24,7 +24,7 @@ msgstr "Konto4 ID" #. module: account_analytic_plans #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fehler ! Sie können kein rekursives Menü erstellen." #. module: account_analytic_plans #: constraint:ir.model:0 @@ -32,7 +32,7 @@ msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen " -"beinhalten" +"beinhalten !" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -40,7 +40,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_analytic_plans.action_account_crossovered_analytic #: model:ir.actions.report.xml,name:account_analytic_plans.account_analytic_account_crossovered_analytic msgid "Crossovered Analytic" -msgstr "Kreuzanalyse" +msgstr "Quervergleich Analyse" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account5_ids:0 @@ -60,7 +60,7 @@ msgstr "Konto3 ID" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,rate:0 msgid "Rate (%)" -msgstr "Rate (%)" +msgstr "Anteil (%)" #. module: account_analytic_plans #: view:account.analytic.plan:0 @@ -70,29 +70,29 @@ msgstr "Rate (%)" #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_plan_action msgid "Analytic Plan" -msgstr "Konten Analyse (Kontenplan)" +msgstr "Analytische Verrechnung" #. module: account_analytic_plans #: view:analytic.plan.create.model:0 msgid "" "This distribution model has been saved.You will be able to reuse it later." -msgstr "" +msgstr "Die Verrechnungsvorlage wurde gesichert und ist nunmehr verwendbar." #. module: account_analytic_plans #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 #, python-format msgid "Please put a name and a code before saving the model !" -msgstr "Name und Code vor Speichern eingeben" +msgstr "Bezeichnung und Kurzbezeichnung vor Speichern eingeben" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance_line msgid "Analytic Instance Line" -msgstr "Analyt. Beispielbuchungen" +msgstr "Analyt. Buchungspsoitionen" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 msgid "Analytic Distribution Lines" -msgstr "Analyt. Verkaufsbuchungen" +msgstr "Analyt. Verrechnungspositionen" #. module: account_analytic_plans #: view:account.crossovered.analytic:0 @@ -112,27 +112,27 @@ msgstr "Plan ID" #. module: account_analytic_plans #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action msgid "Analytic Distribution's Models" -msgstr "Analyt. Vertriebsdaten" +msgstr "Analyt. Verrechnungsvorlagen" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 msgid "Account Name" -msgstr "Kontoname" +msgstr "Konto Bez." #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 msgid "Analytic Distribution Line" -msgstr "Analyt." +msgstr "Analyt. Verrechnungsvorlage" #. module: account_analytic_plans #: field:account.analytic.plan.instance,code:0 msgid "Distribution Code" -msgstr "Verkaufscode /ID" +msgstr "Kurzbezeichnung" #. module: account_analytic_plans #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Ungültiger Modellname in der Aktionsdefinition." +msgstr "Ungültiger Modulname in der Aktionsdefinition." #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -147,7 +147,7 @@ msgstr "Prozent" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_sale_order_line msgid "Sale Order Line" -msgstr "" +msgstr "Auftragsposition" #. module: account_analytic_plans #: field:account.crossovered.analytic,empty_line:0 @@ -163,7 +163,7 @@ msgstr "" #: code:addons/account_analytic_plans/account_analytic_plans.py:0 #, python-format msgid "A model having this name and code already exists !" -msgstr "Ein Module mit diesem Namen eixistiert bereits" +msgstr "Ein Modul mit diesem Namen eixistiert bereits" #. module: account_analytic_plans #: field:account.analytic.plan.instance,journal_id:0 @@ -180,7 +180,7 @@ msgstr "100,00 %" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 msgid "Currency" -msgstr "" +msgstr "Währung" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -191,13 +191,13 @@ msgstr "Analytisches Konto" #: view:account.analytic.plan.line:0 #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_line msgid "Analytic Plan Line" -msgstr "Analyt. Planungspositionen" +msgstr "Analyt. Verrechnungspositionen" #. module: account_analytic_plans #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0 #, python-format msgid "No analytic plan defined !" -msgstr "Kein Kontenplan für analyitsche Konten definiert" +msgstr "Kein Kontenplan für analytische Konten definiert" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -207,12 +207,12 @@ msgstr "Analyt. Konto Referenz:" #. module: account_analytic_plans #: field:account.analytic.plan.line,name:0 msgid "Plan Name" -msgstr "Planung Bezeichnung" +msgstr "Verrechnungsposition" #. module: account_analytic_plans #: field:account.analytic.plan,default_instance_id:0 msgid "Default Entries" -msgstr "Default Buchungen" +msgstr "Vorlage Verrechnung" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:0 @@ -226,7 +226,7 @@ msgstr "Fehler" #: field:account.analytic.plan,plan_ids:0 #: field:account.journal,plan_id:0 msgid "Analytic Plans" -msgstr "Analyt. Plan" +msgstr "Analyt. Verrechnung" #. module: account_analytic_plans #: code:addons/account_analytic_plans/wizard/account_crossovered_analytic.py:0 @@ -237,7 +237,7 @@ msgstr "Benutzerfehler" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_move_line msgid "Journal Items" -msgstr "" +msgstr "Journal Einträge" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model @@ -264,12 +264,12 @@ msgstr "Oberstes Konto" #: view:analytic.plan.create.model:0 #, python-format msgid "Distribution Model Saved" -msgstr "Vertrieb Strategie gespeichert" +msgstr "Verrechnungsvorlage gespeichert" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_analytic_plan_instance msgid "Analytic Plan Instance" -msgstr "Analyt. Plan" +msgstr "Analyt. Verrechnungsvorgang" #. module: account_analytic_plans #: constraint:ir.ui.view:0 @@ -279,22 +279,22 @@ msgstr "Fehlerhafter xml Code für diese Ansicht!" #. module: account_analytic_plans #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_instance_model_open msgid "Distribution Models" -msgstr "Umlage Modelle" +msgstr "Vorlage Verrechnung" #. module: account_analytic_plans #: view:analytic.plan.create.model:0 msgid "Ok" -msgstr "" +msgstr "OK" #. module: account_analytic_plans #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information msgid "Multiple-plans management in Analytic Accounting" -msgstr "Mulitiple Pläne für analyitsche Konten" +msgstr "Mehrstufige Verrechnung auf analytische Konten" #. module: account_analytic_plans #: view:account.analytic.plan.line:0 msgid "Analytic Plan Lines" -msgstr "Analyt. Planpositionen" +msgstr "Analyt. Verrechnung Positionen" #. module: account_analytic_plans #: field:account.analytic.plan.line,min_required:0 @@ -304,7 +304,7 @@ msgstr "Min. Erlaubt (100%)" #. module: account_analytic_plans #: field:account.analytic.plan.instance,plan_id:0 msgid "Model's Plan" -msgstr "Strategische Planung" +msgstr "Vorgabe Verrechnung" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account2_ids:0 @@ -315,12 +315,12 @@ msgstr "Konto2 ID" #: code:addons/account_analytic_plans/account_analytic_plans.py:0 #, python-format msgid "The Total Should be Between %s and %s" -msgstr "" +msgstr "Der Wert sollte zwischen %s und %s sein." #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line msgid "Bank Statement Line" -msgstr "" +msgstr "Bankauszug Buchungen" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -330,7 +330,7 @@ msgstr "Wert" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_crossovered_analytic msgid "Print Crossovered Analytic" -msgstr "" +msgstr "Druck Kreuzanalyse" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account6_ids:0 @@ -374,11 +374,47 @@ msgid "" "of distribution models.\n" " " msgstr "" +"Das Modul ermöglicht die Definition von Verrechnungsvorlagen für Buchungen " +"aus der Fibu,\n" +"um gegebenenfalls automatische Buchungen auf mehrere Analyt. Konten " +"vorzunehmen,\n" +"z.B. bei der Erstellung einer Rechnung.\n" +"Zum Beispiel ist auch folgendes Verrechnungsschema denkbar:\n" +" Projekte\n" +" Projekt 1\n" +" Teilprojekt 1.1\n" +" Teilprojekt 1.2\n" +" Projekt 2\n" +" Verkäufer\n" +" Eric\n" +" Fabien\n" +"\n" +"In diesem Beispiel haben wir zwei Verrechnungen zu buchen: Projekte und " +"Verkäufer. Eine Rechnungszeile\n" +"soll anal. Buchungen auf diesen zwei Konten erstellen: Teilprojekt 1.1 und\n" +"Fabien. Der verrechnete Betrag kann dann nochmals weiter aufgeteilt werden. " +"Das folgende Beispiel\n" +"ist für eine Abrechnung von zwei Teilprojekten mit einem zugewiesenen " +"Verkäufer:\n" +"\n" +"Verrechnung1:\n" +" SubProject 1.1 : 50%\n" +" SubProject 1.2 : 50%\n" +"Verrechnung:\n" +" Eric: 100%\n" +"\n" +"Wenn diese Rechnungsposition jetzt gebucht werden, entstehen 3 " +"Buchungszeilen auf Analyt. Konten,\n" +"für jeweils einenBuchungssatz aus der Fibu.\n" +"Die Analyt. Verrechnung prüft ausserdem dei min. und max. Prozentwerte zum " +"Zeitpunkt der Erstellung \n" +" von Verrechnungsvorlagen.\n" +" " #. module: account_analytic_plans #: view:analytic.plan.create.model:0 msgid "Save This Distribution as a Model" -msgstr "" +msgstr "Speichere Verrechnung als Vorlage" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 @@ -388,7 +424,7 @@ msgstr "Menge" #. module: account_analytic_plans #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action msgid "Multi Plans" -msgstr "" +msgstr "Analytische Verrechnung" #. module: account_analytic_plans #: field:account.analytic.plan.instance,account_ids:0 @@ -398,24 +434,25 @@ msgstr "Konto ID" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 msgid "Code" -msgstr "Code/ID" +msgstr "Kurzbez." #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_journal msgid "Journal" -msgstr "" +msgstr "Journal" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:0 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" msgstr "" +"Sie müssen noch ein anal. Journal für das %s Journal der Fibu erzeugen." #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:0 #, python-format msgid "No Analytic Journal !" -msgstr "" +msgstr "Kein Analytisches Journal !" #. module: account_analytic_plans #: field:account.analytic.plan.line,sequence:0 @@ -425,12 +462,12 @@ msgstr "Sequenz" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "Rechnungszeile" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_bank_statement msgid "Bank Statement" -msgstr "" +msgstr "Bank Auszug" #. module: account_analytic_plans #: field:account.analytic.plan.instance.line,analytic_account_id:0 @@ -446,7 +483,7 @@ msgstr "Analytische Konten" #: field:account.move.line,analytics_id:0 #: model:ir.model,name:account_analytic_plans.model_account_analytic_default msgid "Analytic Distribution" -msgstr "Analyt. Verkaufsvorgänge" +msgstr "Analyt. Verrrechnung" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:0 @@ -457,17 +494,17 @@ msgstr "Wertefehler" #. module: account_analytic_plans #: help:account.analytic.plan.line,root_analytic_id:0 msgid "Root account of this plan." -msgstr "Stammkonto dieses Plans" +msgstr "Basiskonto der Verrechnung" #. module: account_analytic_plans #: field:account.crossovered.analytic,ref:0 msgid "Analytic Account Reference" -msgstr "" +msgstr "Analyt. Konto Referenz" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Rechnung" #. module: account_analytic_plans #: view:account.crossovered.analytic:0 @@ -488,7 +525,7 @@ msgstr "bei" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 msgid "Company" -msgstr "" +msgstr "Unternehmen" #. module: account_analytic_plans #: report:account.analytic.account.crossovered.analytic:0 diff --git a/addons/account_anglo_saxon/i18n/it.po b/addons/account_anglo_saxon/i18n/it.po index 40131e39517..7e1a9b4cb47 100644 --- a/addons/account_anglo_saxon/i18n/it.po +++ b/addons/account_anglo_saxon/i18n/it.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-02-27 18:15+0000\n" -"Last-Translator: phede92 \n" +"PO-Revision-Date: 2010-11-08 08:22+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-10-30 05:52+0000\n" +"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_anglo_saxon @@ -25,23 +25,25 @@ msgstr "XML non valido per visualizzare l'Achitettura!" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_product_category msgid "Product Category" -msgstr "" +msgstr "Categoria prodotto" #. module: account_anglo_saxon #: constraint:ir.model:0 msgid "" "The Object name must start with x_ and not contain any special character !" msgstr "" +"Il nome dell'oggetto deve cominciare con \"x_\" e non deve contenere " +"caratteri speciali!" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "Linea fattura" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_purchase_order msgid "Purchase Order" -msgstr "" +msgstr "Ordine D'Aquisto" #. module: account_anglo_saxon #: model:ir.model,name:account_anglo_saxon.model_product_template diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index 414c4cbfde1..3915463d8a2 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -192,6 +192,7 @@ tree,form + A budget is a forecast of your company's income and expenses expected for a period in the future. With a budget, a company is able to carefully look at how much money they are taking in during a given period, and figure out the best way to divide it among various categories. By keeping track of where your money goes, you may be less likely to overspend, and more likely to meet your financial goals. Forecast a budget by detailing the expected revenue per analytic account and monitor its evolution based on the actuals realised during that period. \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: 2010-10-31 05:04+0000\n" +"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget @@ -35,7 +35,7 @@ msgstr "Budget Positionen" #. module: account_budget #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Ungültiger Modellname in der Aktionsdefinition." +msgstr "Ungültiger Modulname in der Aktionsdefinition." #. module: account_budget #: report:account.budget:0 @@ -46,17 +46,17 @@ msgstr "Druck am:" #. module: account_budget #: view:crossovered.budget:0 msgid "Confirm" -msgstr "Manuelle Bestätigung" +msgstr "Bestätigung" #. module: account_budget #: field:crossovered.budget,validating_user_id:0 msgid "Validate User" -msgstr "Validiere Benutzer" +msgstr "Genehmige Benutzer" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report msgid "Print Summary" -msgstr "" +msgstr "Drucke Finanzbudget" #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 @@ -69,7 +69,7 @@ msgstr "Zahldatum" #: field:account.budget.crossvered.summary.report,date_to:0 #: field:account.budget.report,date_to:0 msgid "End of period" -msgstr "Periodenende:" +msgstr "Periodenende" #. module: account_budget #: view:crossovered.budget:0 @@ -86,7 +86,7 @@ msgstr "bei" #. module: account_budget #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fehler ! Sie können kein rekursives Menü erstellen." #. module: account_budget #: report:account.budget:0 @@ -105,7 +105,7 @@ msgstr "" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_crossvered_report msgid "Account Budget crossvered report" -msgstr "" +msgstr "Budget Auswertung Kreuzanalyse" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -125,7 +125,7 @@ msgstr "Status" #. module: account_budget #: view:account.budget.crossvered.summary.report:0 msgid "This wizard is used to print summary of budgets" -msgstr "" +msgstr "Dieser Assistent druckt eine Zusammenfassung des Budgets" #. module: account_budget #: report:crossovered.budget.report:0 @@ -143,12 +143,12 @@ msgstr "Beschreibung" #: field:crossovered.budget,company_id:0 #: field:crossovered.budget.lines,company_id:0 msgid "Company" -msgstr "" +msgstr "Unternehmen" #. module: account_budget #: view:crossovered.budget:0 msgid "Reset to Draft" -msgstr "" +msgstr "Zurücksetzen" #. module: account_budget #: view:account.budget.post:0 @@ -173,7 +173,7 @@ msgstr "Fertig" #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Practical Amt" -msgstr "" +msgstr "Ist" #. module: account_budget #: view:account.budget.post:0 @@ -197,7 +197,7 @@ msgstr "Fehlerhafter xml Code für diese Ansicht!" #: 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 "Budget Auswertung Analyt. Konto" #. module: account_budget #: view:account.budget.post:0 @@ -210,12 +210,12 @@ msgstr "Planwert" #: field:account.budget.post,name:0 #: field:crossovered.budget,name:0 msgid "Name" -msgstr "Name" +msgstr "Bezeichnung" #. module: account_budget #: model:ir.model,name:account_budget.model_crossovered_budget_lines msgid "Budget Line" -msgstr "" +msgstr "Budgetposition" #. module: account_budget #: view:account.analytic.account:0 @@ -249,7 +249,7 @@ msgstr "Kurzbez." #: view:account.budget.analytic:0 #: view:account.budget.crossvered.report:0 msgid "This wizard is used to print budget" -msgstr "" +msgstr "Dieser Assistent wird genutzt, um Budgets zu drucken." #. module: account_budget #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view @@ -267,7 +267,7 @@ msgstr "Budgets" #: code:addons/account_budget/account_budget.py:0 #, python-format msgid "The General Budget '%s' has no Accounts!" -msgstr "" +msgstr "Das Allgemeine Budget '%s' beinhaltet keine Konten" #. module: account_budget #: selection:crossovered.budget,state:0 @@ -277,12 +277,12 @@ msgstr "Abgebrochen" #. module: account_budget #: view:crossovered.budget:0 msgid "Approve" -msgstr "" +msgstr "Genehmige" #. module: account_budget #: view:crossovered.budget:0 msgid "To Approve" -msgstr "" +msgstr "Zur Genehmigung" #. module: account_budget #: view:account.budget.post:0 @@ -309,18 +309,18 @@ msgstr "Druck Budgets..." #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report msgid "Account Budget crossvered summary report" -msgstr "" +msgstr "Budget" #. module: account_budget #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Theoretical Amt" -msgstr "" +msgstr "Soll" #. module: account_budget #: constraint:ir.rule:0 msgid "Rules are not supported for osv_memory objects !" -msgstr "" +msgstr "Rules werden nicht unterstützt für osv_memory Objekte" #. module: account_budget #: view:account.budget.analytic:0 @@ -366,6 +366,32 @@ msgid "" "Budgets per Budgets.\n" "\n" msgstr "" +"Dieses Modul ermöglicht Buchhaltern die Budgetierung von analytischen " +"Konten.\n" +"\n" +"Zuerst müssen die zu budgetierenden Einzelpositionen unter Finanzen/Budgets " +"definiert werden,\n" +"bevor dann die Projekt- und Abteilungsleiter die Planwert für die " +"analytischen Konten definieren können.\n" +"Der Finanzbuchhalter hat dann die Möglichkeit alle geplanten Positionen im " +"Gesamtüberblick des \n" +"Budgets nachzuvollziehen und sicherzustellen, dass die Summe aller einzelnen " +"Planungspositionen \n" +"bestimmte festgesetzte Grenzwerte nicht übersteigt. Jedes Budget mit seinen " +"Einzelposten \n" +"kann auch in einer grafischen Balkendiagramm Ansicht angesehen werden.\n" +"\n" +"Drei Auswertungen sind vorhanden:\n" +" 1. Die erste Auswertung zeigt ein zusammengefasstes Budget aufgeteilt " +"nach seinen einzelnen in einer Zeile zusammengefassten Analyt. Konten. \n" +"\n" +" 2. Die zweite Auswertung zeigt zusätzlich Zeile für Zeile alle einzelnen " +"Planungspositionen für die Analyt. Konten.\n" +"\n" +" 3. Der dritte Bericht wird über das Analytische Konto selbst erstellt. " +"Angezeigt werden alle einzelnen Planungspositionen zu einem einzelnen " +"Analysekonto.\n" +"\n" #. module: account_budget #: field:crossovered.budget.lines,analytic_account_id:0 @@ -383,7 +409,7 @@ msgstr "Budget:" #: report:account.budget:0 #: report:crossovered.budget.report:0 msgid "Planned Amt" -msgstr "" +msgstr "Plan" #. module: account_budget #: view:account.budget.post:0 diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po index e7e2234ddd8..8d55dd57d2b 100644 --- a/addons/account_budget/i18n/it.po +++ b/addons/account_budget/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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 15:07+0000\n" +"PO-Revision-Date: 2010-11-08 08:28+0000\n" "Last-Translator: OpenERP Administrators \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: 2010-10-31 05:04+0000\n" +"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_budget @@ -56,7 +56,7 @@ msgstr "Validazione utente" #. module: account_budget #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report msgid "Print Summary" -msgstr "" +msgstr "Stampa Sommario" #. module: account_budget #: field:crossovered.budget.lines,paid_date:0 @@ -143,7 +143,7 @@ msgstr "Descrizione" #: field:crossovered.budget,company_id:0 #: field:crossovered.budget.lines,company_id:0 msgid "Company" -msgstr "" +msgstr "Compagnia" #. module: account_budget #: view:crossovered.budget:0 diff --git a/addons/account_coda/i18n/it.po b/addons/account_coda/i18n/it.po index d51b1fb0a8e..19bb7eb2a34 100644 --- a/addons/account_coda/i18n/it.po +++ b/addons/account_coda/i18n/it.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-09-29 11:21+0000\n" +"PO-Revision-Date: 2010-11-08 08:27+0000\n" "Last-Translator: OpenERP Administrators \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: 2010-10-30 05:52+0000\n" +"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_coda @@ -74,7 +74,7 @@ msgstr "Importa il log" #. module: account_coda #: view:account.coda.import:0 msgid "Import" -msgstr "" +msgstr "Importa" #. module: account_coda #: view:account.coda:0 @@ -98,7 +98,7 @@ msgstr "" #: view:account.coda:0 #: field:account.coda,company_id:0 msgid "Company" -msgstr "" +msgstr "Compagnia" #. module: account_coda #: help:account.coda.import,def_payable:0 @@ -122,7 +122,7 @@ msgstr "Utente" #: view:account.coda:0 #: field:account.coda,date:0 msgid "Date" -msgstr "" +msgstr "Data" #. module: account_coda #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement diff --git a/addons/account_followup/i18n/de.po b/addons/account_followup/i18n/de.po index 48969fdc92d..a798c0f7be0 100644 --- a/addons/account_followup/i18n/de.po +++ b/addons/account_followup/i18n/de.po @@ -7,36 +7,37 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-08-02 21:31+0000\n" -"Last-Translator: Ferdinand-chricar \n" +"PO-Revision-Date: 2010-11-07 07:48+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: 2010-10-30 05:21+0000\n" +"X-Launchpad-Export-Date: 2010-11-08 05:12+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:0 #, python-format msgid "Follwoup Summary" -msgstr "" +msgstr "Zahlungserinnerung Zusammenfassung" #. module: account_followup #: view:account_followup.followup:0 msgid "Search Followup" -msgstr "" +msgstr "Suche Zahlungserinnerung" #. module: account_followup #: view:account_followup.stat:0 msgid "Group By..." -msgstr "" +msgstr "Gruppierung..." #. module: account_followup #: view:res.company:0 #: field:res.company,follow_up_msg:0 msgid "Follow-up Message" -msgstr "" +msgstr "Zahlungserinnerung Benachrichtigung" #. module: account_followup #: view:account_followup.followup:0 @@ -49,7 +50,7 @@ msgstr "Zahlungserinnerung" #: view:account_followup.stat:0 #: field:account_followup.stat,company_id:0 msgid "Company" -msgstr "Firma" +msgstr "Unternehmen" #. module: account_followup #: report:account_followup.followup.print:0 @@ -70,7 +71,7 @@ msgstr "Legende" #. module: account_followup #: view:account.followup.print.all:0 msgid "Ok" -msgstr "&OK" +msgstr "OK" #. module: account_followup #: field:account.followup.print,date:0 @@ -106,7 +107,7 @@ msgstr "%(heading)s: Buchungsposition Kopf" #. module: account_followup #: field:account.followup.print,followup_id:0 msgid "Follow-up" -msgstr "Mahnung" +msgstr "Erinnerung" #. module: account_followup #: field:account_followup.stat,name:0 @@ -126,7 +127,7 @@ msgstr "Partner" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup msgid "Account Follow Up" -msgstr "" +msgstr "Zahlungserinnerung" #. module: account_followup #: selection:account_followup.followup.line,start:0 @@ -136,7 +137,7 @@ msgstr "Ende Monat" #. module: account_followup #: view:account_followup.stat:0 msgid "Not Litigation" -msgstr "" +msgstr "Kein Verzug" #. module: account_followup #: view:account.followup.print.all:0 @@ -162,17 +163,18 @@ msgstr "Ref." #: help:account_followup.followup.line,sequence:0 msgid "Gives the sequence order when displaying a list of follow-up lines." msgstr "" +"Zeigt die Reihenfolge bei der Anzeige einer Liste von Zahlungserinnerungen" #. module: account_followup #: view:account.followup.print.all:0 #: field:account.followup.print.all,email_body:0 msgid "Email body" -msgstr "Email body" +msgstr "Email Haupttext" #. module: account_followup #: field:account.move.line,followup_line_id:0 msgid "Follow-up Level" -msgstr "Spät. Follow-Up erled." +msgstr "Zahlungsvorschlag Ebene" #. module: account_followup #: field:account_followup.stat,date_followup:0 @@ -202,6 +204,24 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Sehr geehrte(r) %(partner_name)s,\n" +"\n" +"Wir sehen trotz Zusendung einer Mahnung, dass Ihr Konto längst überfällig " +"ist.\n" +"\n" +"Es ist wichtig, dass Sie unmittelbar bezahlen, ansonst müssten wir Ihr Konto " +"sperren, sodass wir Ihre Firma nicht mehr belieferen können.\n" +"\n" +"BItte überweisen Sie in den nächsten 8 Tagen.\n" +"\n" +"Sollte es ein uns unbekanntes Problem mit der Bezahlung geben, kontaktieren " +"Sie bitte unsere Buchhaltung, damit wir so rasch wie möglich handeln " +"können.\n" +"\n" +"Details der überfälligen Rechungen sind unten angedruckt.\n" +"\n" +"Hochachtungsvoll,\n" #. module: account_followup #: constraint:ir.ui.view:0 @@ -211,12 +231,12 @@ msgstr "Fehlerhafter xml Code für diese Ansicht!" #. module: account_followup #: field:account.followup.print.all,partner_lang:0 msgid "Send Email in Partner Language" -msgstr "" +msgstr "Sende EMail in Sprache d. Partners" #. module: account_followup #: view:account.followup.print.all:0 msgid "Select partners to remind" -msgstr "Drücken, um den Dateinamen für den Export zu wählen" +msgstr "Auswahl des Dateinamens für den Export" #. module: account_followup #: view:account.followup.print.all:0 @@ -259,6 +279,20 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Sehr geehrter %(partner_name)s,\n" +"\n" +"Vorausgesetzt wir haben aktuelle Daten, sind scheinbar folgende Rechnungen " +"immer noch nicht ausgeglichen. Bitte bezahlen Sie diese bitte unmittelbar " +"in den nächsten 8 Tagen.\n" +"\n" +"\n" +"Sollte eine Zeitüberschneidung aufgetreten sein, und Sie demnach bereits den " +"offenen Betrag bezahlt haben, sehen Sie diese Erinnerung und damit die " +"Angelegenheit bitte als abgeschlossen an. Ansonsten kontaktieren Sie bei " +"Rückfragen Telefon (+32).10.68.94.39.\n" +"\n" +"Viele Grüsse\n" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:0 @@ -267,6 +301,8 @@ msgid "" "All E-mails have been successfully sent to Partners:.\n" "\n" msgstr "" +"Alle EMails wurden erfolgreich versendet an folgende Partner:\n" +"\n" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line3 @@ -287,32 +323,46 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Sehr geehrte(r) %(partner_name)s,\n" +"\n" +"Vorbehaltlich eines Fehlers unsererseits, sieht es so aus, dass der folgende " +"Betrag nicht beglichen wurde. Bitte zahlen sie innerhalb der nächsten 8 " +"Tage:\n" +"\n" +"Wenn Sie dieses EMail nach der Bezahlung erreicht hat, betrachten sie diese " +"Mail als hinfällig.\n" +" In Zweifelsfragen kontaktieren sie bite unser Rechnungswesen. \n" +"\n" +"Hochachtungsvoll\n" #. module: account_followup #: view:account.followup.print.all:0 msgid "Send Mails" -msgstr "" +msgstr "Versende EMails" #. module: account_followup #: report:account_followup.followup.print:0 msgid "Currency" -msgstr "" +msgstr "Währung" #. module: account_followup #: model:ir.module.module,shortdesc:account_followup.module_meta_information msgid "Accounting follow-ups management" -msgstr "Buchhaltung Mahnwesen" +msgstr "Buchhaltung Zahlungserinnerung" #. module: account_followup #: field:account_followup.stat,blocked:0 msgid "Blocked" -msgstr "" +msgstr "Abgewiesen" #. module: account_followup #: help:account.followup.print,date:0 msgid "" "This field allow you to select a forecast date to plan your follow-ups" -msgstr "Dieses Feld erlaubt ein Planungsdatum für die Mahnungen zu wählen" +msgstr "" +"Dieses Feld erlaubt ein geplantes Ausführungsdatum für die Mahnungen zu " +"wählen" #. module: account_followup #: report:account_followup.followup.print:0 @@ -323,12 +373,12 @@ msgstr "Nächste Fälligkeit am:" #: code:addons/account_followup/wizard/account_followup_print.py:0 #, python-format msgid "Select Partners" -msgstr "" +msgstr "Wähle Partner" #. module: account_followup #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fehler! Sie können kein rekursives Menü erstellen." #. module: account_followup #: view:account.followup.print.all:0 @@ -338,17 +388,17 @@ msgstr "E-Mail-Einstellungen" #. module: account_followup #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Ungültiger Modellname in der Aktionsdefinition." +msgstr "Ungültiger Modulname in der Aktionsdefinition." #. module: account_followup #: view:account.followup.print.all:0 msgid "Print Follow Ups" -msgstr "" +msgstr "Drucke Erinnerungen" #. module: account_followup #: field:account.move.line,followup_date:0 msgid "Latest Follow-up" -msgstr "Spätestes Follow-Up Datum" +msgstr "Spätestes Datum Zahlungserinnerung" #. module: account_followup #: report:account_followup.followup.print:0 @@ -363,7 +413,7 @@ msgstr "Saldo:" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_stat msgid "Followup Statistics" -msgstr "" +msgstr "Erinnerungen Statistik" #. module: account_followup #: report:account_followup.followup.print:0 @@ -373,12 +423,12 @@ msgstr "Bezahlt" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(user_signature)s: User Name" -msgstr "" +msgstr "%(user_signature)s: Name Benutzer" #. module: account_followup #: model:ir.model,name:account_followup.model_account_move_line msgid "Journal Items" -msgstr "" +msgstr "Journal Zeilen" #. module: account_followup #: field:account.followup.print.all,email_conf:0 @@ -393,12 +443,12 @@ msgstr "%(company_name)s: Name der Firma" #. module: account_followup #: model:ir.model,name:account_followup.model_res_company msgid "Companies" -msgstr "" +msgstr "Unternehmen" #. module: account_followup #: view:account_followup.followup:0 msgid "Followup Lines" -msgstr "" +msgstr "Zahlungserinnerungen Positionen" #. module: account_followup #: field:account_followup.stat,credit:0 @@ -413,7 +463,7 @@ msgstr "Datum Fällig" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(partner_name)s: Partner Name" -msgstr "" +msgstr "%(partner_name)s: Partner Name" #. module: account_followup #: view:account_followup.stat:0 @@ -440,7 +490,7 @@ msgstr "Zahlungsbedingungen" #: model:ir.model,name:account_followup.model_account_followup_print #: model:ir.model,name:account_followup.model_account_followup_print_all msgid "Print Followup & Send Mail to Customers" -msgstr "" +msgstr "Drucke Erinnerung & Sende EMail zu Kunden" #. module: account_followup #: field:account_followup.stat,date_move_last:0 @@ -455,7 +505,7 @@ msgstr "Bericht Zahlungserinnerungen" #. module: account_followup #: field:account_followup.stat,period_id:0 msgid "Period" -msgstr "" +msgstr "Periode" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:0 @@ -474,7 +524,7 @@ msgstr "Abbrechen" #. module: account_followup #: view:account_followup.followup.line:0 msgid "Follow-Up Lines" -msgstr "Mahnung Zeilen" +msgstr "Zahlungserinnerung Zeilen" #. module: account_followup #: code:addons/account_followup/wizard/account_followup_print.py:0 @@ -485,11 +535,15 @@ msgid "" "E-Mail sent to following Partners successfully. !\n" "\n" msgstr "" +"\n" +"\n" +"Email, wurde erfolgreich an Partnern versendet.\n" +"\n" #. module: account_followup #: view:account_followup.stat:0 msgid "Litigation" -msgstr "" +msgstr "In Verzug" #. module: account_followup #: constraint:ir.model:0 @@ -502,12 +556,12 @@ msgstr "" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all msgid "Payable Items" -msgstr "" +msgstr "Zahlbare Beträge" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(followup_amount)s: Total Amount Due" -msgstr "%(followup_amount)s: Gesamtbetrag Forderungen" +msgstr "%(followup_amount)s: Gesamtbetrag Verbindkichk." #. module: account_followup #: view:account.followup.print.all:0 @@ -518,7 +572,7 @@ msgstr "%(date)s: aktuelles Datum" #. module: account_followup #: view:account_followup.stat:0 msgid "Followup Level" -msgstr "" +msgstr "Stufe Zahlungserinnerung" #. module: account_followup #: view:account_followup.followup:0 @@ -530,7 +584,7 @@ msgstr "Beschreibung" #. module: account_followup #: view:account_followup.stat:0 msgid "This Fiscal year" -msgstr "" +msgstr "Dieses Fiskaljahr" #. module: account_followup #: view:account.move.line:0 @@ -543,18 +597,20 @@ msgid "" "Do not change message text, if you want to send email in partner language, " "or configure from company" msgstr "" +"Wechseln Sie nicht diese Text Message, wenn EMails in einer Fremdsprache, " +"an Partner gesendet werden sollen" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all msgid "Receivable Items" -msgstr "" +msgstr "Forderungen" #. module: account_followup #: view:account_followup.stat:0 #: model:ir.actions.act_window,name:account_followup.action_followup_stat #: model:ir.ui.menu,name:account_followup.menu_action_followup_stat_follow msgid "Follow-ups Sent" -msgstr "" +msgstr "Versendete Erinnerungen" #. module: account_followup #: field:account_followup.followup,name:0 @@ -606,7 +662,7 @@ msgstr "Gesamt Haben" #. module: account_followup #: view:account.followup.print.all:0 msgid "%(line)s: Ledger Posting lines" -msgstr "" +msgstr "%(Zeile): Sachkontenbuchungen" #. module: account_followup #: field:account_followup.followup.line,sequence:0 @@ -616,7 +672,7 @@ msgstr "Folge" #. module: account_followup #: view:account_followup.followup.line:0 msgid "%(company_name)s: User's Company Name" -msgstr "" +msgstr "% Unternehmensname" #. module: account_followup #: report:account_followup.followup.print:0 @@ -631,12 +687,12 @@ msgstr "%(partner_name)s: Partner name" #. module: account_followup #: view:account_followup.stat:0 msgid "Latest Followup Date" -msgstr "" +msgstr "Letzte Aktualisierung" #. module: account_followup #: model:ir.model,name:account_followup.model_account_followup_followup_line msgid "Follow-Up Criteria" -msgstr "" +msgstr "Zahlungserinnerung Kriterien" #~ msgid "All payable entries" #~ msgstr "Alle offenen Posten" diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 4d1cd131619..c601aaac13c 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -37,13 +37,12 @@ class report_rappel(report_sxw.rml_parse): 'get_text': self._get_text }) - def _ids_to_objects(self, partners_ids): + def _ids_to_objects(self, partner_ids): pool = pooler.get_pool(self.cr.dbname) all_partners = [] - for partner in partners_ids: - partners = pool.get('account_followup.stat').browse(self.cr, self.uid, [partner]) - for par in partners: - all_partners.append(par.name) + for partner in pool.get('res.partner').browse(self.cr, self.uid, partner_ids): + if partner not in all_partners: + all_partners.append(partner) return all_partners def _adr_get(self, partner, type): diff --git a/addons/account_followup/report/account_followup_report.py b/addons/account_followup/report/account_followup_report.py index 00dfe3a9998..0cfc5cd4671 100644 --- a/addons/account_followup/report/account_followup_report.py +++ b/addons/account_followup/report/account_followup_report.py @@ -22,20 +22,13 @@ from osv import fields, osv import tools -def _code_get(self, cr, uid, context={}): - acc_type_obj = self.pool.get('account.account.type') - ids = acc_type_obj.search(cr, uid, []) - res = acc_type_obj.read(cr, uid, ids, ['code', 'name'], context) - return [(r['code'], r['name']) for r in res] - - class account_followup_stat(osv.osv): _name = "account_followup.stat" _description = "Followup Statistics" + _rec_name = 'partner_id' _auto = False _columns = { - 'name': fields.many2one('res.partner', 'Partner', readonly=True), - 'account_type': fields.selection(_code_get, 'Account Type', readonly=True), + 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), 'date_move':fields.date('First move', readonly=True), 'date_move_last':fields.date('Last move', readonly=True), 'date_followup':fields.date('Latest followup', readonly=True), @@ -58,10 +51,7 @@ class account_followup_stat(osv.osv): current_year = self.pool.get('account.fiscalyear').find(cr, uid) ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] args.append(['period_id','in',ids]) - for a in [['period_id','in','current_year']]: - temp_args = tuple(a) - if temp_args in args: - args.remove(temp_args) + args.remove(arg) return super(account_followup_stat, self).search(cr, uid, args=args, offset=offset, limit=limit, order=order, context=context, count=count) @@ -72,47 +62,37 @@ class account_followup_stat(osv.osv): current_year = self.pool.get('account.fiscalyear').find(cr, uid) ids = self.pool.get('account.fiscalyear').read(cr, uid, [current_year], ['period_ids'])[0]['period_ids'] domain.append(['period_id','in',ids]) - todel.append(arg) - for a in [['period_id','in','current_year']]: - temp_args = tuple(a) - if temp_args in domain: - domain.remove(temp_args) + domain.remove(arg) return super(account_followup_stat, self).read_group(cr, uid, domain, fields, groupby, offset, limit, context) def init(self, cr): tools.drop_view_if_exists(cr, 'account_followup_stat') cr.execute(""" create or replace view account_followup_stat as ( - select - l.partner_id as id, - l.partner_id as name, - min(l.date) as date_move, - max(l.date) as date_move_last, - max(l.followup_date) as date_followup, - max(l.followup_line_id) as followup_id, - sum(l.debit) as debit, - sum(l.credit) as credit, - sum(l.debit - l.credit) as balance, - a.type as account_type, - l.company_id as company_id, - l.blocked, - am.period_id as period_id - from + SELECT + l.id AS id, + l.partner_id AS partner_id, + min(l.date) AS date_move, + max(l.date) AS date_move_last, + max(l.followup_date) AS date_followup, + max(l.followup_line_id) AS followup_id, + sum(l.debit) AS debit, + sum(l.credit) AS credit, + sum(l.debit - l.credit) AS balance, + l.company_id AS company_id, + l.blocked as blocked, + l.period_id AS period_id + FROM account_move_line l - LEFT JOIN account_account a ON (l.account_id=a.id) - LEFT JOIN res_company c ON (l.company_id=c.id) - LEFT JOIN account_move am ON (am.id=l.move_id) - LEFT JOIN account_period p ON (am.period_id=p.id) - where - l.reconcile_id is NULL and - a.type = 'receivable' - and a.active and - l.partner_id is not NULL and - l.company_id is not NULL and - l.blocked is not NULL - group by - l.partner_id, a.type, l.company_id,l.blocked,am.period_id + LEFT JOIN account_account a ON (l.account_id = a.id) + WHERE + a.active AND + a.type = 'receivable' AND + l.reconcile_id is NULL AND + l.partner_id IS NOT NULL + GROUP BY + l.id, l.partner_id, l.company_id, l.blocked, l.period_id )""") account_followup_stat() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 73b2740a43b..fdde1f9300f 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -8,15 +8,15 @@ tree - + - - + + @@ -30,7 +30,7 @@ graph - + @@ -51,18 +51,20 @@ domain="[('blocked','=', False)]" help = "Including journal entries marked as a litigation"/> - + - - + + + + @@ -76,9 +78,8 @@ {'search_default_followup_level':1,'search_default_fiscalyear':1} - - + diff --git a/addons/account_followup/security/ir.model.access.csv b/addons/account_followup/security/ir.model.access.csv index 60d179d3cbe..7b7e2af7ba8 100644 --- a/addons/account_followup/security/ir.model.access.csv +++ b/addons/account_followup/security/ir.model.access.csv @@ -4,3 +4,4 @@ "access_account_followup_followup_line_manager","account_followup.followup.line.manager","model_account_followup_followup_line","account.group_account_manager",1,1,1,1 "access_account_followup_followup_accountant","account_followup.followup user","model_account_followup_followup","account.group_account_user",1,0,0,0 "access_account_followup_stat_invoice","account_followup.stat.invoice","model_account_followup_stat","account.group_account_invoice",1,1,1,1 +"access_account_followup_stat_by_partner_manager","account_followup.stat.by.partner","model_account_followup_stat_by_partner","account.group_account_manager",1,1,1,1 diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index be353220e99..270bba8a647 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -67,14 +67,55 @@ class account_followup_print(osv.osv_memory): 'date': time.strftime('%Y-%m-%d'), 'followup_id': _get_followup, } - account_followup_print() +class account_followup_stat_by_partner(osv.osv): + _name = "account_followup.stat.by.partner" + _description = "Followup Statistics by Partner" + _rec_name = 'partner_id' + _auto = False + _columns = { + 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), + 'date_move':fields.date('First move', readonly=True), + 'date_move_last':fields.date('Last move', readonly=True), + 'date_followup':fields.date('Latest followup', readonly=True), + 'max_followup_id': fields.many2one('account_followup.followup.line', + 'Max Follow Up Level', readonly=True, ondelete="cascade"), + 'balance':fields.float('Balance', readonly=True), + 'company_id': fields.many2one('res.company', 'Company', readonly=True), + } + + def init(self, cr): + tools.drop_view_if_exists(cr, 'account_followup_stat_by_partner') + cr.execute(""" + create or replace view account_followup_stat_by_partner as ( + SELECT + l.partner_id AS id, + l.partner_id AS partner_id, + min(l.date) AS date_move, + max(l.date) AS date_move_last, + max(l.followup_date) AS date_followup, + max(l.followup_line_id) AS max_followup_id, + sum(l.debit - l.credit) AS balance, + l.company_id as company_id + FROM + account_move_line l + LEFT JOIN account_account a ON (l.account_id = a.id) + WHERE + a.active AND + a.type = 'receivable' AND + l.reconcile_id is NULL AND + l.partner_id IS NOT NULL + GROUP BY + l.partner_id, l.company_id + )""") +account_followup_stat_by_partner() + class account_followup_print_all(osv.osv_memory): _name = 'account.followup.print.all' _description = 'Print Followup & Send Mail to Customers' _columns = { - 'partner_ids': fields.many2many('account_followup.stat', 'partner_stat_rel', 'followup_id', 'stat_id', 'Partners', required=True), + 'partner_ids': fields.many2many('account_followup.stat.by.partner', 'partner_stat_rel', 'osv_memory_id', 'partner_id', 'Partners', required=True, domain="[('account_id.type', '=', 'receivable'), ('account_id.reconcile', '=', True), ('reconcile_id','=', False), ('state', '!=', 'draft'), ('account_id.active', '=' True), ('debit', '>', 0)]"), 'email_conf': fields.boolean('Send email confirmation'), 'email_subject': fields.char('Email Subject', size=64), 'partner_lang': fields.boolean('Send Email in Partner Language', help='Do not change message text, if you want to send email in partner language, or configure from company'), @@ -94,7 +135,7 @@ class account_followup_print_all(osv.osv_memory): _defaults = { 'email_body': _get_msg, - 'email_subject': 'Invoices Reminder', + 'email_subject': _('Invoices Reminder'), 'partner_lang': True, 'partner_ids': _get_partners, 'summary': _get_summary, @@ -295,4 +336,4 @@ class account_followup_print_all(osv.osv_memory): account_followup_print_all() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index d21a1162a41..f647c569358 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -36,8 +36,38 @@ parent="account.menu_finance_periodical_processing_billing" sequence="10"/> + + account_followup.stat.by.partner.search + account_followup.stat.by.partner + search + + + + + + + + + + + + + account_followup.stat.by.partner.tree + account_followup.stat.by.partner + tree + + + + + + + + + + + account.followup.print.all.form @@ -48,8 +78,8 @@ - - + + diff --git a/addons/account_invoice_layout/i18n/de.po b/addons/account_invoice_layout/i18n/de.po index 11eecae6c43..8559af12de8 100644 --- a/addons/account_invoice_layout/i18n/de.po +++ b/addons/account_invoice_layout/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 08:37+0000\n" +"PO-Revision-Date: 2010-11-06 06:56+0000\n" "Last-Translator: OpenERP Administrators \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: 2010-10-31 05:02+0000\n" +"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout @@ -84,7 +84,7 @@ msgstr "Preis pro Einheit" #. module: account_invoice_layout #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fehler ! Sie können kein rekursives Menü erstellen." #. module: account_invoice_layout #: model:notify.message,msg:account_invoice_layout.demo_message1 @@ -143,7 +143,7 @@ msgstr "Preis" #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 msgid "Invoice Date" -msgstr "" +msgstr "Datum Rechnung" #. module: account_invoice_layout #: report:account.invoice.layout:0 @@ -193,7 +193,7 @@ msgstr "Menge" #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 msgid "Partner Ref." -msgstr "" +msgstr "Partner Ref." #. module: account_invoice_layout #: constraint:ir.ui.view:0 @@ -211,7 +211,7 @@ msgstr "Rechnung" #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 msgid "Total:" -msgstr "" +msgstr "Summe:" #. module: account_invoice_layout #: view:account.invoice.special.msg:0 @@ -244,7 +244,7 @@ msgstr "Betrag" #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 msgid "Tel. :" -msgstr "" +msgstr "Tel. :" #. module: account_invoice_layout #: report:account.invoice.layout:0 @@ -298,7 +298,7 @@ msgstr "Druck" #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 msgid "VAT :" -msgstr "" +msgstr "USt.:" #. module: account_invoice_layout #: report:account.invoice.layout:0 @@ -309,13 +309,13 @@ msgstr "Steuer" #. module: account_invoice_layout #: model:ir.model,name:account_invoice_layout.model_account_invoice_line msgid "Invoice Line" -msgstr "" +msgstr "Rechnungszeile" #. module: account_invoice_layout #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 msgid "Net Total:" -msgstr "" +msgstr "Netto:" #. module: account_invoice_layout #: view:notify.message:0 @@ -326,7 +326,7 @@ msgstr "Schreibe eine Benachrichtigung." #: report:account.invoice.layout:0 #: report:notify_account.invoice:0 msgid "Fax :" -msgstr "" +msgstr "Fax:" #. module: account_invoice_layout #: view:account.invoice.special.msg:0 diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 750edccf389..3e4de9ff87d 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -32,7 +32,7 @@ class payment_mode(osv.osv): 'bank_id': fields.many2one('res.partner.bank', "Bank account", required=True,help='Bank Account for the Payment Mode'), 'journal': fields.many2one('account.journal', 'Journal', required=True, - domain=[('type', '=', 'cash')], help='Cash Journal for the Payment Mode'), + domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'), 'company_id': fields.many2one('res.company', 'Company', required=True), } _defaults = { @@ -452,4 +452,4 @@ class payment_line(osv.osv): payment_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index fed50bdd749..d0543d72242 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -221,6 +221,7 @@ form tree,form + A payment order is a payment request that your company does in order to pay a supplier invoice or a customer credit note. Here you can register all payment orders that should be done, keep track of all payment orders and mention the invoice reference and the partner the payment should be done for. diff --git a/addons/account_payment/i18n/de.po b/addons/account_payment/i18n/de.po index 9f0949bd817..1f865b4d381 100644 --- a/addons/account_payment/i18n/de.po +++ b/addons/account_payment/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 09:20+0000\n" -"Last-Translator: Ferdinand-chricar \n" +"PO-Revision-Date: 2010-11-06 06:59+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-10-31 05:02+0000\n" +"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment @@ -40,7 +40,7 @@ msgstr "Wähle anzuwendenden Zahlungsmodus" #: view:payment.mode:0 #: view:payment.order:0 msgid "Group By..." -msgstr "" +msgstr "Gruppierung..." #. module: account_payment #: constraint:ir.actions.act_window:0 @@ -329,12 +329,12 @@ msgstr "Zu zahlender Betrag" #. module: account_payment #: report:payment.order:0 msgid "Currency" -msgstr "" +msgstr "Währung" #. module: account_payment #: view:account.payment.make.payment:0 msgid "Yes" -msgstr "" +msgstr "Ja" #. module: account_payment #: help:payment.line,info_owner:0 @@ -344,7 +344,7 @@ msgstr "Adresse des Partners" #. module: account_payment #: field:payment.mode,company_id:0 msgid "Company" -msgstr "" +msgstr "Unternehmen" #. module: account_payment #: model:ir.model,name:account_payment.model_account_payment_populate_statement @@ -442,7 +442,7 @@ msgstr "" #. module: account_payment #: view:payment.order.create:0 msgid "Search" -msgstr "" +msgstr "Suche" #. module: account_payment #: field:payment.line,date:0 @@ -452,7 +452,7 @@ msgstr "Datum Zahlung" #. module: account_payment #: report:payment.order:0 msgid "Total:" -msgstr "" +msgstr "Summe:" #. module: account_payment #: field:payment.order,date_created:0 @@ -462,7 +462,7 @@ msgstr "erzeugt am" #. module: account_payment #: view:account.payment.populate.statement:0 msgid "ADD" -msgstr "" +msgstr "Hinzuf." #. module: account_payment #: view:account.bank.statement:0 @@ -492,7 +492,7 @@ msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Invoice Ref" -msgstr "" +msgstr "Rechungsref." #. module: account_payment #: field:payment.line,name:0 @@ -524,7 +524,7 @@ msgstr "Erledigt" #. module: account_payment #: model:ir.model,name:account_payment.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Rechnung" #. module: account_payment #: field:payment.line,communication:0 @@ -620,7 +620,7 @@ msgstr "Zahlungsausgleich" #. module: account_payment #: report:payment.order:0 msgid "Payment Order / Payment" -msgstr "" +msgstr "Zahlungsvorschlag" #. module: account_payment #: field:payment.line,move_line_id:0 @@ -644,7 +644,7 @@ msgstr "Bezeichnung" #. module: account_payment #: report:payment.order:0 msgid "Bank Account" -msgstr "" +msgstr "Bank Konto" #. module: account_payment #: view:payment.line:0 @@ -687,7 +687,7 @@ msgstr "Partner" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_create_payment_order msgid "Populate Payment" -msgstr "" +msgstr "Erzeuge Zahlungsvorschlag" #. module: account_payment #: help:payment.mode,bank_id:0 diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 6b8e0276610..4892cd102ef 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -577,8 +577,6 @@ class account_voucher(osv.osv): tax_obj = self.pool.get('account.tax') seq_obj = self.pool.get('ir.sequence') for inv in self.browse(cr, uid, ids): - if not inv.line_ids: - raise osv.except_osv(_('No Lines !'), _('Please create some lines')) if inv.move_id: continue if inv.number: @@ -604,21 +602,22 @@ class account_voucher(osv.osv): #create the first line manually company_currency = inv.journal_id.company_id.currency_id.id + current_currency = inv.currency_id.id debit = 0.0 credit = 0.0 # TODO: is there any other alternative then the voucher type ?? # -for sale, purchase we have but for the payment and receipt we do not have as based on the bank/cash journal we can not know its payment or receipt if inv.type in ('purchase', 'payment'): - credit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount) + credit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount) elif inv.type in ('sale', 'receipt'): - debit = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, inv.amount) + debit = currency_pool.compute(cr, uid, current_currency, company_currency, inv.amount) if debit < 0: credit = -debit debit = 0.0 if credit < 0: debit = -credit credit = 0.0 - + sign = debit - credit < 0 and -1 or 1 move_line = { 'name': inv.name or '/', 'debit': debit, @@ -628,8 +627,8 @@ class account_voucher(osv.osv): 'journal_id': inv.journal_id.id, 'period_id': inv.period_id.id, 'partner_id': inv.partner_id.id, - 'currency_id': inv.currency_id.id, - 'amount_currency': inv.amount, + 'currency_id': company_currency <> current_currency and current_currency or False, + 'amount_currency': company_currency <> current_currency and sign * inv.amount or 0.0, 'date': inv.date, 'date_maturity': inv.date_due } @@ -647,7 +646,7 @@ class account_voucher(osv.osv): for line in inv.line_ids: if not line.amount: continue - amount = currency_pool.compute(cr, uid, inv.currency_id.id, company_currency, line.amount) + amount = currency_pool.compute(cr, uid, current_currency, company_currency, line.amount) move_line = { 'journal_id': inv.journal_id.id, 'period_id': inv.period_id.id, @@ -655,8 +654,7 @@ class account_voucher(osv.osv): 'account_id': line.account_id.id, 'move_id': move_id, 'partner_id': inv.partner_id.id, - 'currency_id': inv.currency_id.id, - 'amount_currency': line.amount, + 'currency_id': company_currency <> current_currency and current_currency or False, 'analytic_account_id': line.account_analytic_id and line.account_analytic_id.id or False, 'quantity': 1, 'credit': 0.0, @@ -685,6 +683,8 @@ class account_voucher(osv.osv): tax_data = tax_obj.browse(cr, uid, [move_line['account_tax_id']], context=context)[0] if not (tax_data.base_code_id and tax_data.tax_code_id): raise osv.except_osv(_('No Account Base Code and Account Tax Code!'),_("You have to configure account base code and account tax code on the '%s' tax!") % (tax_data.name)) + sign = (move_line['debit'] - move_line['credit']) < 0 and -1 or 1 + move_line['amount_currency'] = company_currency <> current_currency and sign * line.amount or 0.0 master_line = move_line_pool.create(cr, uid, move_line) if line.move_line_id.id: rec_ids = [master_line, line.move_line_id.id] @@ -700,6 +700,8 @@ class account_voucher(osv.osv): 'date': inv.date, 'credit': diff > 0 and diff or 0.0, 'debit': diff < 0 and -diff or 0.0, + 'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1) or 0.0, + 'currency_id': company_currency <> current_currency and current_currency or False, } account_id = False if inv.type in ('sale', 'receipt'): @@ -844,8 +846,6 @@ class account_voucher_line(osv.osv): elif context.get('type') == 'receipt': account_id = partner.property_account_receivable.id - if (not account_id) and 'account_id' in fields_list: - raise osv.except_osv(_('Invalid Error !'), _('Please change partner and try again !')) values.update({ 'account_id':account_id, 'type':ttype @@ -928,4 +928,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher/i18n/de.po b/addons/account_voucher/i18n/de.po index 6ab51c6d77e..e027b51072b 100644 --- a/addons/account_voucher/i18n/de.po +++ b/addons/account_voucher/i18n/de.po @@ -7,34 +7,34 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 14:35+0000\n" +"PO-Revision-Date: 2010-11-08 08:19+0000\n" "Last-Translator: OpenERP Administrators \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: 2010-10-31 05:04+0000\n" +"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher #: view:account.voucher.unreconcile:0 msgid "Unreconciliation transactions" -msgstr "" +msgstr "Storno Rechnungsausgleich" #. module: account_voucher #: view:account.voucher:0 msgid "Form view not available for Payment Lines" -msgstr "" +msgstr "Formular Ansicht nicht verfügbar für Zahlungspositionen" #. module: account_voucher #: view:account.voucher:0 msgid "Payment Ref" -msgstr "" +msgstr "Zahlungsreferenz" #. module: account_voucher #: view:account.voucher:0 msgid "Open Customer Journal Entries" -msgstr "" +msgstr "Offene Posten Kunden" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -45,18 +45,18 @@ msgstr "Personendaten" #. module: account_voucher #: view:account.voucher:0 msgid "Group By..." -msgstr "" +msgstr "Gruppierung..." #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:0 #, python-format msgid "Cannot delete Voucher(s) which are already opened or paid !" -msgstr "" +msgstr "Kann keine offenen oder ausgeglichen Zahlungsbelege löschen." #. module: account_voucher #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "Ungültiger Modellname in der Aktionsdefinition." +msgstr "Ungültiger Modulname in der Aktionsdefinition." #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -66,12 +66,12 @@ msgstr "Bez. :" #. module: account_voucher #: view:account.voucher:0 msgid "Supplier" -msgstr "" +msgstr "Lieferant" #. module: account_voucher #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher_print msgid "Voucher Print" -msgstr "" +msgstr "Druck Auszug" #. module: account_voucher #: model:ir.module.module,description:account_voucher.module_meta_information @@ -84,17 +84,24 @@ msgid "" " * Cheque Register\n" " " msgstr "" +"Die Rechnungsausgleich Module beinhalten alle grundsätzlichen Erfordernisse " +"für\n" +" Offene Posten Ausgleiche für Bank, Kasse, Debitoren, Kreditoren, " +"Aufwendungen, Erlöse ...\n" +" * Erstellen eines Zahlungsbelegs * Zahlungseingangsbuchung * " +"Scheckzahlung und Rechnungsausgleich\n" +" " #. module: account_voucher #: view:account.voucher:0 #: model:ir.actions.act_window,name:account_voucher.act_pay_bills msgid "Bill Payment" -msgstr "" +msgstr "Rechnungsausgleich" #. module: account_voucher #: field:account.voucher.line,amount_original:0 msgid "Originial Amount" -msgstr "" +msgstr "Geldbetrag" #. module: account_voucher #: view:account.statement.from.invoice.lines:0 @@ -102,23 +109,23 @@ msgstr "" #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice_lines #, python-format msgid "Import Entries" -msgstr "" +msgstr "Importiere Buchungen" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_voucher_unreconcile msgid "Account voucher unreconcile" -msgstr "" +msgstr "Storno Zahlungsausgleich" #. module: account_voucher #: view:account.voucher:0 msgid "Pay Bill" -msgstr "" +msgstr "Bezahle Rechnung" #. module: account_voucher #: field:account.voucher,company_id:0 #: field:account.voucher.line,company_id:0 msgid "Company" -msgstr "Firma" +msgstr "Unternehmen" #. module: account_voucher #: view:account.voucher:0 @@ -128,27 +135,27 @@ msgstr "Entwurf" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile msgid "Unreconcile entries" -msgstr "" +msgstr "Storno Zahlungsausgleich" #. module: account_voucher #: view:account.voucher:0 msgid "Voucher Statistics" -msgstr "" +msgstr "Statistik Zahlungsausgleich" #. module: account_voucher #: view:account.voucher:0 msgid "Validate" -msgstr "" +msgstr "Genehmigung" #. module: account_voucher #: view:account.voucher:0 msgid "Search Vouchers" -msgstr "" +msgstr "Suche Zahlungen" #. module: account_voucher #: selection:account.voucher,type:0 msgid "Purchase" -msgstr "" +msgstr "Einkauf" #. module: account_voucher #: field:account.voucher,account_id:0 @@ -159,38 +166,38 @@ msgstr "Konto" #. module: account_voucher #: field:account.voucher,line_dr_ids:0 msgid "Debits" -msgstr "" +msgstr "Forderungsbetrag" #. module: account_voucher #: view:account.statement.from.invoice.lines:0 msgid "Ok" -msgstr "" +msgstr "OK" #. module: account_voucher #: field:account.voucher,date_due:0 #: field:account.voucher.line,date_due:0 msgid "Due Date" -msgstr "" +msgstr "Fälligkeitsdatum" #. module: account_voucher #: field:account.voucher,narration:0 msgid "Notes" -msgstr "" +msgstr "Anmerkungen" #. module: account_voucher #: selection:account.voucher,type:0 msgid "Sale" -msgstr "" +msgstr "Verkauf" #. module: account_voucher #: field:account.voucher.line,move_line_id:0 msgid "Journal Item" -msgstr "" +msgstr "Journal Buchung" #. module: account_voucher #: field:account.voucher,reference:0 msgid "Ref #" -msgstr "" +msgstr "Ref #" #. module: account_voucher #: field:account.voucher.line,amount:0 @@ -201,22 +208,22 @@ msgstr "Betrag" #. module: account_voucher #: view:account.voucher:0 msgid "Payment Options" -msgstr "" +msgstr "Zahlungsalternativen" #. module: account_voucher #: view:account.voucher:0 msgid "Bill Information" -msgstr "" +msgstr "Rechnungsinformation" #. module: account_voucher #: selection:account.voucher,state:0 msgid "Cancelled" -msgstr "" +msgstr "Abgebrochen" #. module: account_voucher #: field:account.statement.from.invoice,date:0 msgid "Date payment" -msgstr "" +msgstr "Datum Zahlung" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -227,18 +234,18 @@ msgstr "Empfänger Unterschrift" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_bank_statement_line msgid "Bank Statement Line" -msgstr "" +msgstr "Bankauszug Buchungen" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt msgid "Supplier Vouchers" -msgstr "" +msgstr "Zahlungen Lieferanten" #. module: account_voucher #: field:account.voucher,tax_id:0 msgid "Tax" -msgstr "" +msgstr "Steuer" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -254,17 +261,17 @@ msgstr "Analytisches Konto" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 msgid "Journal:" -msgstr "" +msgstr "Journal:" #. module: account_voucher #: view:account.voucher:0 msgid "Payment Information" -msgstr "" +msgstr "Zahlungsinformation" #. module: account_voucher #: view:account.statement.from.invoice:0 msgid "Go" -msgstr "" +msgstr "Starte" #. module: account_voucher #: view:account.voucher:0 @@ -276,7 +283,7 @@ msgstr "Partner" #. module: account_voucher #: view:account.bank.statement:0 msgid "Import Invoices" -msgstr "" +msgstr "Importiere Rechnungen" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:0 @@ -284,6 +291,7 @@ msgstr "" msgid "" "You have to configure account base code and account tax code on the '%s' tax!" msgstr "" +"Sie müssen die Finanzkonten und Steuern für die Steuer '%s' konfigurieren." #. module: account_voucher #: report:voucher.print:0 @@ -293,7 +301,7 @@ msgstr "Konto:" #. module: account_voucher #: selection:account.voucher,type:0 msgid "Receipt" -msgstr "" +msgstr "Quittung" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -304,13 +312,13 @@ msgstr "Bezug Konto:" #. module: account_voucher #: view:account.voucher:0 msgid "Sales Lines" -msgstr "" +msgstr "Auftragspositionen" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 #: report:voucher.print:0 msgid "Date:" -msgstr "" +msgstr "Datum:" #. module: account_voucher #: view:account.voucher:0 @@ -339,17 +347,17 @@ msgstr "Belegzeilen" #: code:addons/account_voucher/account_voucher.py:0 #, python-format msgid "Error !" -msgstr "" +msgstr "Fehler !" #. module: account_voucher #: view:account.voucher:0 msgid "Supplier Voucher" -msgstr "" +msgstr "Lieferanten OP Ausgleich" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list msgid "Vouchers Entries" -msgstr "" +msgstr "Buchungen Offene Posten" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -362,7 +370,7 @@ msgstr "Autorisierte Signatur" #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt msgid "Sales Receipt" -msgstr "" +msgstr "Zahlungsbeleg" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:0 @@ -373,12 +381,12 @@ msgstr "Fehlerhafte Aktion" #. module: account_voucher #: view:account.voucher:0 msgid "Other Information" -msgstr "" +msgstr "Weitere Informationen" #. module: account_voucher #: view:account.voucher.unreconcile:0 msgid "Unreconciliation" -msgstr "" +msgstr "Ausgleich OP zurücksetzen" #. module: account_voucher #: constraint:ir.ui.view:0 @@ -389,51 +397,51 @@ msgstr "Fehlerhafter xml Code für diese Ansicht!" #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment msgid "Vendor Payment" -msgstr "" +msgstr "Lieferanten Zahlungseingang" #. module: account_voucher #: view:account.invoice:0 #: code:addons/account_voucher/invoice.py:0 #, python-format msgid "Pay Invoice" -msgstr "" +msgstr "Zahle Rechnung" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:0 #, python-format msgid "No Account Base Code and Account Tax Code!" -msgstr "" +msgstr "Kein Steuerfinanzkonto und Steuer definiert!" #. module: account_voucher #: field:account.voucher,tax_amount:0 msgid "Tax Amount" -msgstr "" +msgstr "Steuerbetrag" #. module: account_voucher #: view:account.voucher:0 msgid "Voucher Entry" -msgstr "" +msgstr "Zahlungseingangsbeleg" #. module: account_voucher #: view:account.voucher:0 msgid "Paid Amount" -msgstr "" +msgstr "Gesamtzahlbetrag" #. module: account_voucher #: selection:account.voucher,pay_now:0 msgid "Pay Directly" -msgstr "" +msgstr "Zahle Direkt und Bar" #. module: account_voucher #: field:account.statement.from.invoice,line_ids:0 #: field:account.statement.from.invoice.lines,line_ids:0 msgid "Invoices" -msgstr "" +msgstr "Rechnungen" #. module: account_voucher #: field:account.voucher.unreconcile,remove:0 msgid "Want to remove accounting entries too ?" -msgstr "" +msgstr "Möchsten Sie die Finanzbuchungen automatisch entfernen?" #. module: account_voucher #: field:account.voucher,line_ids:0 @@ -449,12 +457,12 @@ msgstr "Währung" #. module: account_voucher #: view:account.statement.from.invoice.lines:0 msgid "Payable and Receivables" -msgstr "" +msgstr "Kreditoren und Debitoren" #. module: account_voucher #: selection:account.voucher,pay_now:0 msgid "Pay Later or Group Funds" -msgstr "" +msgstr "Bezahle später oder eröffne Finanzfunds" #. module: account_voucher #: view:account.voucher:0 @@ -467,17 +475,17 @@ msgstr "Entwurf" #. module: account_voucher #: constraint:ir.ui.menu:0 msgid "Error ! You can not create recursive Menu." -msgstr "" +msgstr "Fehler ! Sie können kein rekursives Menü erstellen." #. module: account_voucher #: report:voucher.print:0 msgid "Currency:" -msgstr "" +msgstr "Währung:" #. module: account_voucher #: field:account.move.line,amount_unreconciled:0 msgid "Unreconciled Amount" -msgstr "" +msgstr "Nicht ausgeglichene Beträge" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -488,32 +496,32 @@ msgstr "PRO-FORMA" #. module: account_voucher #: view:account.voucher:0 msgid "Total Amount" -msgstr "" +msgstr "Gesamtbetrag" #. module: account_voucher #: field:account.voucher.line,type:0 msgid "Cr/Dr" -msgstr "" +msgstr "Buchung" #. module: account_voucher #: field:account.voucher,audit:0 msgid "Audit Complete ?" -msgstr "" +msgstr "Betriebsprüfung komplett?" #. module: account_voucher #: view:account.voucher:0 msgid "Vendor" -msgstr "" +msgstr "Lieferant" #. module: account_voucher #: view:account.voucher:0 msgid "Payment Terms" -msgstr "" +msgstr "Zahlungsbedingungen" #. module: account_voucher #: view:account.voucher:0 msgid "Compute Tax" -msgstr "" +msgstr "Berechne Steuer" #. module: account_voucher #: field:account.voucher,date:0 @@ -524,34 +532,34 @@ msgstr "Datum" #. module: account_voucher #: view:account.voucher:0 msgid "Post" -msgstr "" +msgstr "Sende" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 #: report:voucher.print:0 msgid "Number:" -msgstr "" +msgstr "Nummer:" #. module: account_voucher #: field:account.bank.statement.line,amount_reconciled:0 msgid "Amount reconciled" -msgstr "" +msgstr "Betrag Ausgeglichen" #. module: account_voucher #: view:account.voucher:0 msgid "Expense Lines" -msgstr "" +msgstr "Aufwandspositionen" #. module: account_voucher #: field:account.voucher,pre_line:0 msgid "Previous Payments ?" -msgstr "" +msgstr "Vorherige Zahlungen?" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_voucher_list #: model:ir.ui.menu,name:account_voucher.menu_encode_entries_by_voucher msgid "Journal Vouchers" -msgstr "" +msgstr "Journale Rechnungsausgleich" #. module: account_voucher #: selection:account.voucher.line,type:0 @@ -562,13 +570,13 @@ msgstr "Guthaben" #. module: account_voucher #: view:account.voucher:0 msgid "Extended options..." -msgstr "" +msgstr "Erweiterte Optionen.." #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:0 #, python-format msgid "Please define a sequence on the journal !" -msgstr "" +msgstr "Definieren Sie bitte eine Reihenfolge für das Journal !" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 @@ -579,23 +587,23 @@ msgstr "Durch :" #. module: account_voucher #: help:account.voucher,reference:0 msgid "Transaction reference number." -msgstr "" +msgstr "Transaktion Referenz" #. module: account_voucher #: view:account.voucher:0 msgid "Invoices and outstanding transactions" -msgstr "" +msgstr "Rechnungen und unausgeglichene Vorgänge" #. module: account_voucher #: view:account.voucher:0 msgid "Bill Date" -msgstr "" +msgstr "Rechnungsdatum" #. module: account_voucher #: view:account.voucher:0 #: view:account.voucher.unreconcile:0 msgid "Unreconcile" -msgstr "" +msgstr "Storno Ausgleich" #. module: account_voucher #: view:account.voucher:0 @@ -611,22 +619,22 @@ msgstr "Nummer" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_bank_statement msgid "Bank Statement" -msgstr "" +msgstr "Bank Auszug" #. module: account_voucher #: view:account.voucher:0 msgid "To Review" -msgstr "" +msgstr "Zu Prüfen" #. module: account_voucher #: view:account.voucher:0 msgid "Sales Information" -msgstr "" +msgstr "Verkaufsinformation" #. module: account_voucher #: view:account.voucher:0 msgid "Open Vendor Journal Entries" -msgstr "" +msgstr "Offene Lieferanten Journalpositionen" #. module: account_voucher #: field:account.voucher.line,voucher_id:0 @@ -638,12 +646,12 @@ msgstr "Beleg" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Rechnung" #. module: account_voucher #: view:account.voucher:0 msgid "Voucher Items" -msgstr "" +msgstr "Zahlungspositionen" #. module: account_voucher #: view:account.statement.from.invoice:0 @@ -663,7 +671,7 @@ msgstr "Pro-forma" #: field:account.voucher,move_ids:0 #: model:ir.model,name:account_voucher.model_account_move_line msgid "Journal Items" -msgstr "" +msgstr "Journaleinträge" #. module: account_voucher #: view:account.voucher:0 @@ -671,7 +679,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt msgid "Customer Payment" -msgstr "" +msgstr "Kundenzahlungen" #. module: account_voucher #: constraint:ir.model:0 @@ -685,12 +693,12 @@ msgstr "" #: view:account.statement.from.invoice:0 #: model:ir.actions.act_window,name:account_voucher.action_view_account_statement_from_invoice msgid "Import Invoices in Statement" -msgstr "" +msgstr "Rechungen in Beleg importieren" #. module: account_voucher #: view:account.voucher:0 msgid "Pay" -msgstr "" +msgstr "Zahlen" #. module: account_voucher #: selection:account.voucher.line,type:0 @@ -701,7 +709,7 @@ msgstr "Belastung" #. module: account_voucher #: view:account.voucher:0 msgid "Payment Method" -msgstr "" +msgstr "Zahlungsmethode" #. module: account_voucher #: field:account.voucher.line,name:0 @@ -718,7 +726,7 @@ msgstr "Abgebrochen" #: code:addons/account_voucher/account_voucher.py:0 #, python-format msgid "Please change partner and try again !" -msgstr "" +msgstr "Bitte ändern Sie den Partner und versuchen Sie es dann nochmals !" #. module: account_voucher #: field:account.statement.from.invoice,journal_ids:0 @@ -735,19 +743,19 @@ msgstr "-" #. module: account_voucher #: view:account.voucher:0 msgid "Internal Notes" -msgstr "" +msgstr "Interne Hinweise" #. module: account_voucher #: view:account.voucher:0 #: field:account.voucher,line_cr_ids:0 msgid "Credits" -msgstr "" +msgstr "Ausleihungen" #. module: account_voucher #: report:voucher.cash_receipt.drcr:0 #: report:voucher.print:0 msgid "State:" -msgstr "" +msgstr "Status:" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -756,7 +764,7 @@ msgstr "" #: field:account.voucher,pay_now:0 #: selection:account.voucher,type:0 msgid "Payment" -msgstr "" +msgstr "Zahlung" #. module: account_voucher #: view:account.voucher:0 @@ -769,18 +777,18 @@ msgstr "Versendet" #. module: account_voucher #: view:account.voucher:0 msgid "Customer" -msgstr "" +msgstr "Kunde" #. module: account_voucher #: field:account.voucher,type:0 msgid "Default Type" -msgstr "" +msgstr "Standard Typ" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_statement_from_invoice #: model:ir.model,name:account_voucher.model_account_statement_from_invoice_lines msgid "Entries by Statement from Invoices" -msgstr "" +msgstr "Einträge bei Auszug nach Rechnungen" #. module: account_voucher #: field:account.voucher,move_id:0 @@ -790,18 +798,18 @@ msgstr "Buchungssatz" #. module: account_voucher #: constraint:ir.rule:0 msgid "Rules are not supported for osv_memory objects !" -msgstr "" +msgstr "Regeln werden für osv_memory Objekt nicht unterstützt" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:0 #, python-format msgid "Invalid Error !" -msgstr "" +msgstr "Invalid !Fehler" #. module: account_voucher #: help:account.voucher,date:0 msgid "Effective date for accounting entries" -msgstr "" +msgstr "Effektives Datum für Buchungen" #. module: account_voucher #: view:account.voucher.unreconcile:0 @@ -809,33 +817,35 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disable" msgstr "" +"Wenn Sie Zahlungen stornieren, müssen Sie dann auch die ursprüngliche " +"Rechnung überprüfen, da diese nicht ausgeglichen ist." #. module: account_voucher #: view:account.voucher:0 msgid "Vendor Invoices and Outstanding transactions" -msgstr "" +msgstr "Eingangsrechnung und offene Transaktionen" #. module: account_voucher #: field:account.voucher.line,untax_amount:0 msgid "Untax Amount" -msgstr "" +msgstr "Nicht versteuerter Betrag" #. module: account_voucher #: view:account.voucher:0 #: field:account.voucher.line,amount_unreconciled:0 msgid "Open Balance" -msgstr "" +msgstr "Endsaldo" #. module: account_voucher #: view:account.voucher:0 #: field:account.voucher,amount:0 msgid "Total" -msgstr "" +msgstr "Summe" #. module: account_voucher #: field:account.voucher,name:0 msgid "Memo" -msgstr "" +msgstr "Memo" #~ msgid "State :" #~ msgstr "Status" diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po index c4eddbc57c2..ca1bf9ed592 100644 --- a/addons/account_voucher/i18n/it.po +++ b/addons/account_voucher/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: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-11-01 11:17+0000\n" +"PO-Revision-Date: 2010-11-02 07:21+0000\n" "Last-Translator: Lorenzo Battistini \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: 2010-11-02 04:50+0000\n" +"X-Launchpad-Export-Date: 2010-11-03 05:00+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher diff --git a/addons/analytic/i18n/fr.po b/addons/analytic/i18n/fr.po new file mode 100644 index 00000000000..59e44dba646 --- /dev/null +++ b/addons/analytic/i18n/fr.po @@ -0,0 +1,235 @@ +# French translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2010-10-18 17:46+0000\n" +"PO-Revision-Date: 2010-11-03 16:43+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-11-04 04:51+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "" + +#. module: analytic +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "" +"Module for defining analytic accounting object.\n" +" " +msgstr "" + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +msgid "Account currency" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "" + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "" + +#. module: analytic +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "" + +#. module: analytic +#: constraint:ir.rule:0 +msgid "Rules are not supported for osv_memory objects !" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "" diff --git a/addons/analytic_journal_billing_rate/i18n/de.po b/addons/analytic_journal_billing_rate/i18n/de.po index ec802654ee2..b79613a9c3d 100644 --- a/addons/analytic_journal_billing_rate/i18n/de.po +++ b/addons/analytic_journal_billing_rate/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2009-11-17 09:14+0000\n" -"Last-Translator: Ferdinand-chricar \n" +"PO-Revision-Date: 2010-11-06 06:53+0000\n" +"Last-Translator: OpenERP Administrators \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: 2010-10-30 05:45+0000\n" +"X-Launchpad-Export-Date: 2010-11-07 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate @@ -65,7 +65,7 @@ msgstr "" #. module: analytic_journal_billing_rate #: model:ir.model,name:analytic_journal_billing_rate.model_account_invoice msgid "Invoice" -msgstr "" +msgstr "Rechnung" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,rate_id:0 @@ -75,7 +75,7 @@ msgstr "Abrechnungsquote" #. module: analytic_journal_billing_rate #: model:ir.model,name:analytic_journal_billing_rate.model_hr_analytic_timesheet msgid "Timesheet Line" -msgstr "" +msgstr "Zeiterfassung Positionen" #~ msgid "Analytic Journal Billing Rate" #~ msgstr "Analytisches Journal Verrechnungssatz" diff --git a/addons/analytic_user_function/i18n/it.po b/addons/analytic_user_function/i18n/it.po index dd42564ff79..143d486ae80 100644 --- a/addons/analytic_user_function/i18n/it.po +++ b/addons/analytic_user_function/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-10-18 17:46+0000\n" -"PO-Revision-Date: 2010-10-30 13:37+0000\n" -"Last-Translator: Fabien (Open ERP) \n" +"PO-Revision-Date: 2010-11-08 20:14+0000\n" +"Last-Translator: Nicola Riolini - Micronaet \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: 2010-10-31 05:04+0000\n" +"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_user_function @@ -30,7 +30,7 @@ msgstr "Errore !" #. module: analytic_user_function #: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet msgid "Timesheet Line" -msgstr "" +msgstr "Linea del Timesheet" #. module: analytic_user_function #: constraint:ir.model:0 diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml index 6213cc07f9a..e55938d2ecd 100644 --- a/addons/auction/auction_view.xml +++ b/addons/auction/auction_view.xml @@ -278,6 +278,7 @@ +