diff --git a/addons/account/account.py b/addons/account/account.py index bf072507aa0..46cfaf645a8 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -155,6 +155,7 @@ class account_account_type(osv.osv): return res def _save_report_type(self, cr, uid, account_type_id, field_name, field_value, arg, context=None): + field_value = field_value or 'none' obj_data = self.pool.get('ir.model.data') obj_financial_report = self.pool.get('account.financial.report') #unlink if it exists somewhere in the financial reports related to BS or PL @@ -299,7 +300,6 @@ class account_account(osv.osv): if aml_query.strip(): wheres.append(aml_query.strip()) filters = " AND ".join(wheres) - _logger.debug('Filters: %s',(filters)) # IN might not work ideally in case there are too many # children_and_consolidated, in that case join on a # values() e.g.: @@ -315,7 +315,6 @@ class account_account(osv.osv): " GROUP BY l.account_id") params = (tuple(children_and_consolidated),) + query_params cr.execute(request, params) - _logger.debug('Status: %s',(cr.statusmessage)) for row in cr.dictfetchall(): accounts[row['id']] = row @@ -596,10 +595,7 @@ class account_account(osv.osv): return res def copy(self, cr, uid, id, default=None, context=None, done_list=None, local=False): - if default is None: - default = {} - else: - default = default.copy() + default = {} if default is None else default.copy() if done_list is None: done_list = [] account = self.browse(cr, uid, id, context=context) @@ -781,10 +777,7 @@ class account_journal(osv.osv): ] def copy(self, cr, uid, id, default=None, context=None, done_list=None, local=False): - if default is None: - default = {} - else: - default = default.copy() + default = {} if default is None else default.copy() if done_list is None: done_list = [] journal = self.browse(cr, uid, id, context=context) @@ -1185,6 +1178,7 @@ class account_fiscalyear(osv.osv): } def copy(self, cr, uid, id, default=None, context=None): + default = {} if default is None else default.copy() default.update({ 'period_ids': [], 'end_journal_period_id': False @@ -1444,14 +1438,8 @@ class account_move(osv.osv): return result def copy(self, cr, uid, id, default=None, context=None): - if context is None: - default = {} - else: - default = default.copy() - if context is None: - context = {} - else: - context = context.copy() + default = {} if default is None else default.copy() + context = {} if context is None else context.copy() default.update({ 'state':'draft', 'name':'/', diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index b4fc2388a68..549363ce269 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -461,10 +461,10 @@ class account_bank_statement(osv.osv): return {} balance_start = self._compute_balance_end_real(cr, uid, journal_id, context=context) - journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['default_debit_account_id', 'company_id'], context=context) - account_id = journal_data['default_debit_account_id'] + journal_data = self.pool.get('account.journal').read(cr, uid, journal_id, ['company_id', 'currency'], context=context) company_id = journal_data['company_id'] - return {'value': {'balance_start': balance_start, 'account_id': account_id, 'company_id': company_id}} + currency_id = journal_data['currency'] or self.pool.get('res.company').browse(cr, uid, company_id[0], context=context).currency_id.id + return {'value': {'balance_start': balance_start, 'company_id': company_id, 'currency': currency_id}} def unlink(self, cr, uid, ids, context=None): stat = self.read(cr, uid, ids, ['state'], context=context) diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index c543b493831..57f16473b82 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1360,6 +1360,7 @@ class account_invoice_line(osv.osv): _columns = { 'name': fields.text('Description', required=True), 'origin': fields.char('Source', size=256, help="Reference of the document that produced this invoice."), + 'sequence': fields.integer('Sequence', help="Gives the sequence of this line when displaying the invoice."), 'invoice_id': fields.many2one('account.invoice', 'Invoice Reference', ondelete='cascade', select=True), 'uos_id': fields.many2one('product.uom', 'Unit of Measure', ondelete='set null'), 'product_id': fields.many2one('product.product', 'Product', ondelete='set null'), diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 17ebfe1f744..8516fcd96ae 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -189,7 +189,7 @@ - + @@ -211,17 +211,17 @@ - +
- - + + - +
@@ -322,7 +322,7 @@ + options='{"always_reload": True}'/> @@ -368,16 +368,16 @@ - +
- - - + + + @@ -458,7 +458,6 @@ - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 1fbda80a0fe..d98b53ebbbd 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -633,13 +633,10 @@
+ - @@ -1130,8 +1127,8 @@ - - + + @@ -1177,8 +1174,8 @@ - - + + @@ -1549,10 +1546,7 @@ account_reconciliation_list

- Good job! -

- There is nothing to reconcile. All invoices and payments - have been reconciled, your partner balance is clean. + No journal items found.

@@ -2570,7 +2564,7 @@ action = pool.get('res.config').next(cr, uid, [], context) - + @@ -2632,12 +2626,12 @@ action = pool.get('res.config').next(cr, uid, [], context) - - - + + + - + diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 38e567be40d..ee0edf06553 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:35+0000\n" -"PO-Revision-Date: 2012-06-25 09:07+0000\n" +"PO-Revision-Date: 2012-10-12 23:18+0000\n" "Last-Translator: Ferdinand @ Camptocamp \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-08-28 06:10+0000\n" -"X-Generator: Launchpad (build 15864)\n" +"X-Launchpad-Export-Date: 2012-10-14 04:39+0000\n" +"X-Generator: Launchpad (build 16137)\n" #. module: account #: view:account.invoice.report:0 @@ -25,7 +25,7 @@ msgstr "letzten Monat" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 msgid "System payment" -msgstr "Zahlungssystematik" +msgstr "Zahlungsmothode" #. module: account #: view:account.journal:0 @@ -39,7 +39,7 @@ msgid "" "Generic Reporting \\ Taxes \\ Taxes Report'" msgstr "" "Legen Sie die Reihenfolge der Anzeige im Report 'Finanz \\ Berichte \\ " -"generische Reports \\ Steuern \\ Steuererklärung' fest" +"Allgemeine Berichte \\ Steuern \\ Steuererklärung' fest" #. module: account #: view:account.move.reconcile:0 @@ -57,12 +57,12 @@ msgstr "Statistische Auswertungen" #. module: account #: view:account.invoice:0 msgid "Proforma/Open/Paid Invoices" -msgstr "Proforoma/Offene/Bezahlte Rechnungen" +msgstr "Proforma / offene bzw. bezahlte Rechnungen" #. module: account #: field:report.invoice.created,residual:0 msgid "Residual" -msgstr "Restwert" +msgstr "Verbleibend" #. module: account #: constraint:account.period:0 @@ -72,7 +72,7 @@ msgstr "Fehler! Die Dauer der Periode(n) ist ungültig " #. module: account #: field:account.analytic.line,currency_id:0 msgid "Account currency" -msgstr "Währung" +msgstr "Währung des Kontos" #. module: account #: view:account.tax:0 @@ -83,7 +83,7 @@ msgstr "Definition untergeordneter Steuern" #: code:addons/account/account_bank_statement.py:302 #, python-format msgid "Journal item \"%s\" is not valid." -msgstr "Journalzeile \"%s\" ist ungültig" +msgstr "Buchung \"%s\" ist ungültig" #. module: account #: model:ir.model,name:account.model_report_aged_receivable @@ -103,7 +103,7 @@ msgstr "wizard.multi.charts.accounts" #. module: account #: view:account.move:0 msgid "Total Debit" -msgstr "Summe Soll" +msgstr "Forderungsgesamtsumme" #. module: account #: view:account.unreconcile:0 @@ -111,7 +111,7 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disabled" msgstr "" -"Wenn Sie Zahlungen stornieren, sollten Sie alle zugehörigen Belege und " +"Wenn Sie Zahlungen stornieren, müssen Sie alle zugehörigen Belege und " "Buchungen prüfen, da diese nicht automatisch mit gelöscht oder deaktiviert " "werden." @@ -122,13 +122,13 @@ msgid "" "accounts too." msgstr "" "Konfigurationsfehler! Die gewählte Währung muss auch bei den Standardkonten " -"verwendet werden" +"verwendet werden." #. module: account #: report:account.invoice:0 #: field:account.invoice.line,origin:0 msgid "Origin" -msgstr "Bezug" +msgstr "Herkunft" #. module: account #: view:account.account:0 @@ -137,7 +137,7 @@ msgstr "Bezug" #: view:account.move.line.reconcile:0 #: view:account.move.line.reconcile.writeoff:0 msgid "Reconcile" -msgstr "Ausgleich Nummer" +msgstr "Ausgleich von Offenen Posten" #. module: account #: field:account.bank.statement.line,ref:0 @@ -146,6 +146,7 @@ msgstr "Ausgleich Nummer" #: field:account.move,ref:0 #: field:account.move.line,ref:0 #: field:account.subscription,ref:0 +#: xsl:account.transfer:0 msgid "Reference" msgstr "Referenz" @@ -164,13 +165,13 @@ msgstr "" "angezeigt." #. module: account -#: code:addons/account/account_invoice.py:1428 +#: code:addons/account/account_invoice.py:1430 #, python-format msgid "Warning!" msgstr "Achtung!" #. module: account -#: code:addons/account/account.py:3112 +#: code:addons/account/account.py:3129 #, python-format msgid "Miscellaneous Journal" msgstr "\"verschiedenes\" Journal" @@ -195,7 +196,7 @@ msgstr "Spaltenbeschriftung" #: code:addons/account/wizard/account_move_journal.py:95 #, python-format msgid "Journal: %s" -msgstr "Journal: %s" +msgstr "Journal %s" #. module: account #: help:account.analytic.journal,type:0 @@ -204,16 +205,16 @@ msgid "" "invoice) to create analytic entries, OpenERP will look for a matching " "journal of the same type." msgstr "" -"Definiert Typ für das analytische Journal. Wenn ein Beleg (z.B. eine " -"Rechnung) dann zusätzlich zu den Finanzbuchungen weitere analytische " -"Buchungen erzeugen soll , prüft OpenERP inwieweit ein analytisches Journal " -"mit dem identischem Typ (z.B. Verkauf) existiert." +"Definiert die Art des analytischen Journals. Wenn ein Beleg (z. B. eine " +"Rechnung), zusätzlich zu den Finanzbuchungen, weitere analytische Buchungen " +"erzeugen soll, prüft OpenERP ob ein analytischer Bericht der gleichen Art " +"(z.B. Verkauf) vorliegt." #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form msgid "Tax Templates" -msgstr "Umsatzsteuer Vorlagen" +msgstr "-Vorlagen für Steuerkonten" #. module: account #: model:ir.model,name:account.model_account_tax @@ -232,16 +233,14 @@ msgid "" "Check this box if you don't want any VAT related to this Tax Code to appear " "on invoices" msgstr "" -"Aktivieren, wenn KEINE umsatzsteuerlich relevanten Bezeichnungen auf der " -"Rechnung erscheinen sollen" +"Aktivieren, wenn etwaige, in diesen Steuerschlüssel einbezogene, " +"Steuerbeträge auf der Rechnung nicht erscheinen sollen" #. module: account -#: code:addons/account/account_invoice.py:1241 +#: code:addons/account/account_invoice.py:1254 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" -msgstr "" -"Rechnung '%s' ist teilweise bezahlt: %s%s von %s%s (%s%s verbleiben als " -"offen)" +msgstr "Rechnung '%s' ist teilweise bezahlt: %s%s von %s%s (%s%s verbleiben)" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 @@ -254,12 +253,12 @@ msgid "Belgian Reports" msgstr "Auswertungen für Belgien" #. module: account -#: code:addons/account/account_move_line.py:1200 +#: code:addons/account/account_move_line.py:1215 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "" "Sie können in einem abgeschlossenen Journal keine Buchung vornehmen oder " -"ändern ." +"ändern." #. module: account #: help:account.account,user_type:0 @@ -269,13 +268,13 @@ msgid "" "entries." msgstr "" "Der Kontentyp hat Informationscharakter und wird verwendet, um " -"länderspezifsche Reports zu generieren sowie um den Jahresabschluss zu " -"steuern und Eröffnungsbilanzbuchungen zu generieren" +"länderspezifsche Berichte zu generieren sowie den Jahresabschluss zu steuern " +"und Eröffnungsbilanzbuchungen zu generieren" #. module: account #: report:account.overdue:0 msgid "Sub-Total :" -msgstr "Zwischensumme" +msgstr "Zwischensumme:" #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry @@ -287,7 +286,7 @@ msgstr "Wiederkehrende Buchungen (Manuell)" #. module: account #: view:account.fiscalyear.close.state:0 msgid "Close Fiscalyear" -msgstr "Beende Geschäftsjahr" +msgstr "Geschäftsjahr abschließen" #. module: account #: field:account.automatic.reconcile,allow_write_off:0 @@ -297,7 +296,7 @@ msgstr "Erlaube Abschreibung" #. module: account #: view:account.analytic.chart:0 msgid "Select the Period for Analysis" -msgstr "Auswahl Periode" +msgstr "Periode zur Analyse auswählen" #. module: account #: view:account.move.line:0 @@ -305,16 +304,17 @@ msgid "St." msgstr "Beleg" #. module: account -#: code:addons/account/account_invoice.py:551 +#: code:addons/account/account_invoice.py:560 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" -"Unternehmen (Mandant) ist bei Rechnung und Rechnungszeile nicht identisch." +"Das Kundenkonto ist einem anderen Unternehmen (Mandant) zugewiesen als der " +"Rechnungssteller." #. module: account #: field:account.journal.column,field:0 msgid "Field Name" -msgstr "Bezeichnung Feld" +msgstr "Feldname" #. module: account #: help:account.installer,charts:0 @@ -322,8 +322,8 @@ msgid "" "Installs localized accounting charts to match as closely as possible the " "accounting needs of your company based on your country." msgstr "" -"Installiert Kontenplan für Ihr Land, um soweit wie möglich eine Vorlage für " -"Ihr Unternehmen zu bieten." +"Installiert landesspezifische Kontenpläne, um soweit wie möglich den Bedarf " +"Ihres Unternehmens abzudecken." #. module: account #: code:addons/account/wizard/account_move_journal.py:63 @@ -334,10 +334,10 @@ msgid "" "You can create one in the menu: \n" "Configuration/Financial Accounting/Accounts/Journals." msgstr "" -"Konnte kein Journal mit dem Typ %s für Unternehmen finden.\n" +"Konnte kein Journal mit dem Typ %s für dieses Unternehmen finden.\n" "\n" -"Sie können ein Journal definieren:\n" -"Konfiguration/Finanzbuchhaltung/Finanzkonten/Journale" +"Hier können Sie einen Bericht anlegen:\n" +"Finanzen / Konfiguration / Finanzen / Buchungsjournale" #. module: account #: model:ir.model,name:account.model_account_unreconcile @@ -364,7 +364,7 @@ msgstr "" #. module: account #: view:account.installer:0 msgid "Configure" -msgstr "Konfigurieren" +msgstr "Einrichten" #. module: account #: selection:account.entries.report,month:0 @@ -389,7 +389,7 @@ msgstr "" #. module: account #: constraint:account.move.line:0 msgid "You can not create journal items on an account of type view." -msgstr "You can not create journal items on an account of type view." +msgstr "Sie können keine Buchungen in einem Ansichtskonto vornehmen." #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -405,7 +405,7 @@ msgstr "account.bank.accounts.wizard" #: field:account.move.line,date_created:0 #: field:account.move.reconcile,create_date:0 msgid "Creation date" -msgstr "Erzeugt am" +msgstr "Erstellungsdatum" #. module: account #: selection:account.journal,type:0 @@ -433,19 +433,19 @@ msgid "" "This field contains the informatin related to the numbering of the journal " "entries of this journal." msgstr "" -"Dieses Feld enthält die Sequenz für die Buchungen in diesem Journal. " -"Hierdurch kann dann die chronologische Reihenfolge der Buchungen " -"nachvollzogen werden." +"Dieses Feld enthält beschreibt die Nummerierung für die Buchungen in diesem " +"Journal. Hierdurch kann dann die chronologische Reihenfolge der Buchungen " +"sichergestellt werden." #. module: account #: field:account.journal,default_debit_account_id:0 msgid "Default Debit Account" -msgstr "Standard Sollkonto" +msgstr "Standard Debitorenkonto" #. module: account #: view:account.move:0 msgid "Total Credit" -msgstr "Summe Haben" +msgstr "Habensumme" #. module: account #: view:account.move.line.unreconcile.select:0 @@ -463,7 +463,7 @@ msgstr "Kontenplan Vorlage" #. module: account #: help:account.model.line,amount_currency:0 msgid "The amount expressed in an optional other currency." -msgstr "Der optionale Betrag in anderer Währung" +msgstr "In alternativer Währung dargestellter Betrag" #. module: account #: field:accounting.report,enable_filter:0 @@ -477,10 +477,10 @@ msgid "" "it comes to 'Printed' state. When all transactions are done, it comes in " "'Done' state." msgstr "" -"Bei Erstellung einer Periode für das Journal ist der Status 'Entwurf'. Wenn " -"dann ein Report für das Journal ausgedruckt wird, wechselt der Status auf " -"'Gedruckt'. Auf 'Fertig' wechselt dann der Status, wenn alle erforderlichen " -"Transaktionen hierzu erledigt sind." +"Bei Erstellung einer Periode für den Bericht ist dieser im Zustand " +"'Entwurf'. Wenn der Bericht ausgedruckt wird, wechselt der Status auf " +"\"Gedruckt\". Auf 'Fertig' wechselt dann der Status, wenn alle Transaktionen " +"hierzu abgschlossen sind." #. module: account #: model:ir.actions.act_window,help:account.action_account_tax_chart @@ -490,11 +490,11 @@ msgid "" "amount of each area of the tax declaration for your country. It’s presented " "in a hierarchical structure, which can be modified to fit your needs." msgstr "" -"Der Kontenplan Umsatzsteuer ist eine hierachische Ansicht der Steuern über " -"mehrere Dimensionen. Angezeigt wird nicht nur die Struktur der Steuern, " -"sondern auch die aktuellen Verkehrszahlen der jeweiligen Steuern für den " -"Monat und kummuliert für das Jahr. Die hierachische Struktur kann für Ihren " -"Bedarf angepasst werden." +"Der Steuer-Kontenplan ist eine hierachische Ansicht der Steuern über mehrere " +"Ebenen. Angezeigt werden nicht nur die Struktur der Steuern, sondern auch " +"die aktuellen Verkehrszahlen der jeweiligen Steuern für den Monat und " +"kummuliert für das Jahr. Die hierachische Struktur kann Ihrem Bedarf " +"angepasst werden." #. module: account #: view:account.analytic.line:0 @@ -529,7 +529,7 @@ msgstr "Journal" #. module: account #: model:ir.model,name:account.model_account_invoice_confirm msgid "Confirm the selected invoices" -msgstr "Bestätige die ausgewählten Rechnungen" +msgstr "Ausgewählte Rechnungen bestätigen" #. module: account #: field:account.addtmpl.wizard,cparent_id:0 @@ -557,12 +557,12 @@ msgstr "Finanzkonto für dieses Journal" #: help:account.vat.declaration,chart_account_id:0 #: help:accounting.report,chart_account_id:0 msgid "Select Charts of Accounts" -msgstr "Wähle Kontenplan" +msgstr "Kontenplan wählen" #. module: account #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "Der Name der Firma darf nur einmal vorkommen!" +msgstr "Der Unternehmensname muss eindeutig sein!" #. module: account #: model:ir.model,name:account.model_account_invoice_refund @@ -577,7 +577,7 @@ msgstr "Limit" #. module: account #: field:account.automatic.reconcile,unreconciled:0 msgid "Not reconciled transactions" -msgstr "Nicht ausgeglichene Posten" +msgstr "Unausgeglichener Geschäftsvorgang" #. module: account #: report:account.general.ledger:0 @@ -590,13 +590,13 @@ msgstr "Gegenbuchung" #: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" -msgstr "Steuer Zuordnung" +msgstr "Steuerzuordnung" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state #: model:ir.ui.menu,name:account.menu_wizard_fy_close_state msgid "Close a Fiscal Year" -msgstr "Beende Geschäftsjahr" +msgstr "Geschäftsjahr abschließen" #. module: account #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0 @@ -604,8 +604,10 @@ msgid "The accountant confirms the statement." msgstr "Der Buchhalter bestätigt den Bankauszug." #. module: account +#: report:account.account.balance:0 #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 +#: report:account.general.ledger_landscape:0 #: selection:account.report.general.ledger,display_account:0 #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 @@ -646,12 +648,12 @@ msgstr "Sequenzen" #: field:account.financial.report,account_report_id:0 #: selection:account.financial.report,type:0 msgid "Report Value" -msgstr "Bericht Wert" +msgstr "Berichtswert" #. module: account #: view:account.fiscal.position.template:0 msgid "Taxes Mapping" -msgstr "Steuern Zuordnung" +msgstr "Steuerzuordnung" #. module: account #: report:account.central.journal:0 @@ -661,10 +663,11 @@ msgstr "Zentraljournal" #. module: account #: sql_constraint:account.sequence.fiscalyear:0 msgid "Main Sequence must be different from current !" -msgstr "Die Hauptsequenz sollte sich von der derzeitigen unterscheiden !" +msgstr "" +"Die übergeordnete Nummerierung muss sich von der derzeitigen unterscheiden!" #. module: account -#: code:addons/account/account_move_line.py:1251 +#: code:addons/account/account_move_line.py:1266 #, python-format msgid "No period found or more than one period found for the given date." msgstr "Keine oder meherere Perioden für dieses Datum gefunden." @@ -675,7 +678,7 @@ msgid "Tax Code Amount" msgstr "Steuerbetrag" #. module: account -#: code:addons/account/account.py:3116 +#: code:addons/account/account.py:3133 #, python-format msgid "SAJ" msgstr "VK" @@ -684,26 +687,26 @@ msgstr "VK" #: view:account.period:0 #: view:account.period.close:0 msgid "Close Period" -msgstr "Periode beenden" +msgstr "Periode abschließen" #. module: account #: model:ir.model,name:account.model_account_common_partner_report msgid "Account Common Partner Report" -msgstr "Auswertung Partnerkonto" +msgstr "Auswertung Partnerkonto (Sammelkonto)" #. module: account #: field:account.fiscalyear.close,period_id:0 msgid "Opening Entries Period" -msgstr "Start Periode im neuen Geschäftsjahr" +msgstr "Startbuchungen der Periode" #. module: account #: model:ir.model,name:account.model_account_journal_period msgid "Journal Period" -msgstr "Journal Periode" +msgstr "Berichtsperiode" #. module: account -#: code:addons/account/account_move_line.py:750 -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:766 +#: code:addons/account/account_move_line.py:819 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -716,18 +719,18 @@ msgid "" "The date of your Journal Entry is not in the defined period! You should " "change the date or remove this constraint from the journal." msgstr "" -"The date of your Journal Entry is not in the defined period! You should " -"change the date or remove this constraint from the journal." +"Das Datum Ihrer Buchung fällt nicht in die festgelegte Periode. Sie müssen " +"das Datum anpassen, oder diese Einschränkung vom Bericht entfernen." #. module: account #: model:ir.model,name:account.model_account_report_general_ledger msgid "General Ledger Report" -msgstr "Kontoauszug und Saldenliste" +msgstr "Umsätze nach Konten und Perioden" #. module: account #: view:account.invoice:0 msgid "Re-Open" -msgstr "Wiederöffnen" +msgstr "Wiedereröffnen" #. module: account #: view:account.use.model:0 @@ -747,16 +750,15 @@ msgstr "Heute ausgeglichene Partner" #. module: account #: view:report.hr.timesheet.invoice.journal:0 msgid "Sale journal in this year" -msgstr "Verkaufsjournal dieses Jshres" +msgstr "Verkaufsbericht dieses Jahres" #. module: account #: selection:account.financial.report,display_detail:0 msgid "Display children with hierarchy" -msgstr "Zeige Kinder abhängige in der Hierarchie" +msgstr "Zeige Hierarchie der Kinder" #. module: account #: selection:account.payment.term.line,value:0 -#: selection:account.tax.template,type:0 msgid "Percent" msgstr "Prozent" @@ -781,9 +783,10 @@ msgstr "Gutschriftmethode" #: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice !" -msgstr "Sie können die Währung nur bei Rechnungen" +msgstr "Sie können die Währung nur bei Rechnungsentwürfen ändern" #. module: account +#: model:ir.actions.report.xml,name:account.account_financial_report #: model:ir.ui.menu,name:account.menu_account_report msgid "Financial Report" msgstr "Finanzbericht" @@ -799,12 +802,13 @@ msgstr "Finanzbericht" #: view:account.journal:0 #: field:account.journal,type:0 #: field:account.move.reconcile,type:0 +#: xsl:account.transfer:0 #: field:report.invoice.created,type:0 msgid "Type" msgstr "Typ" #. module: account -#: code:addons/account/account_invoice.py:738 +#: code:addons/account/account_invoice.py:747 #, python-format msgid "" "Taxes are missing!\n" @@ -826,7 +830,7 @@ msgstr "Referenz des Partners für diese Rechnung." #. module: account #: view:account.invoice.report:0 msgid "Supplier Invoices And Refunds" -msgstr "Lieferanten Rechnungen und Gutschriften" +msgstr "Lieferantenrechnungen und -gutschriften" #. module: account #: view:account.move.line.unreconcile.select:0 @@ -834,7 +838,7 @@ msgstr "Lieferanten Rechnungen und Gutschriften" #: view:account.unreconcile.reconcile:0 #: model:ir.model,name:account.model_account_move_line_unreconcile_select msgid "Unreconciliation" -msgstr "Storno Ausgleich Offene Posten" +msgstr "Stornierung des OP-Ausgleichs" #. module: account #: view:account.payment.term.line:0 @@ -864,10 +868,10 @@ msgid "" "or Loss you'd realized if those transactions were ended today. Only for " "accounts having a secondary currency set." msgstr "" -"Bei Transaktionen mit mehreren Währungen fallen ggf. Währungsgewinne oder " -"Verluste an. Dieses Menü gibt Ihnen einen Überblick über Gewinne und " -"Verluste, wenn diese heute realisiert würden. Nur für Konten mit definierter " -"2.Währung." +"Bei Geschäftsvorfällen mit mehreren Währungen fallen ggf. Währungsgewinne " +"oder -verluste an. Dieses Menü gibt Ihnen einen Überblick über Gewinne und " +"Verluste, wenn diese heute realisiert würden. Betrifft nur Konten mit " +"Alternativwährung." #. module: account #: selection:account.entries.report,month:0 @@ -887,7 +891,7 @@ msgstr "Tage" #: help:account.account.template,nocreate:0 msgid "" "If checked, the new chart of accounts will not contain this by default." -msgstr "Bei Aktivierung, ist dieses nicht im neuen Kontenplan beiinhaltet." +msgstr "Bei Aktivierung, ist dieses nicht im neuen Kontenplan enthalten." #. module: account #: code:addons/account/wizard/account_invoice_refund.py:110 @@ -896,9 +900,8 @@ msgid "" "Can not %s invoice which is already reconciled, invoice should be " "unreconciled first. You can only Refund this invoice" msgstr "" -"Kann keine Rechnung %s erzeugen, die bereits ausgeglichen wurde, hierzu muss " -"die Zahlung zuerst storniert werden. Sie können lediglich diese Rechnung " -"ausgleichen." +"Kann eine bereits beglichene Rechnung nicht %s, dazu muss die Zahlung " +"zunächst storniert werden. Sie können diese Rechnung lediglich rückerstatten." #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -924,7 +927,7 @@ msgstr "Werte" #: view:account.invoice.report:0 #: field:account.invoice.report,delay_to_pay:0 msgid "Avg. Delay To Pay" -msgstr "Durch. Zahlungsdauer" +msgstr "Mittlerer Zahlungsverzug" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_chart @@ -936,15 +939,16 @@ msgstr "Kontenplan Umsatzsteuer" #. module: account #: view:account.fiscalyear:0 msgid "Create 3 Months Periods" -msgstr "Erzeuge 3 Monats Periode" +msgstr "Lege Quartal an" #. module: account +#: report:account.aged_trial_balance:0 #: report:account.overdue:0 msgid "Due" msgstr "Fällig" #. module: account -#: code:addons/account/account.py:1345 +#: code:addons/account/account.py:1353 #, python-format msgid "" "You cannot validate this journal entry because account \"%s\" does not " @@ -960,8 +964,8 @@ msgid "" "This account does not allow reconciliation! You should update the account " "definition to change this." msgstr "" -"Dieses Konto kann nicht ausgeziffert werden. Sie können dies jedoch om Konto " -"einstellen." +"Dieses Konto erlaubt keinen Ausgleich. Sie können jedoch die Konto-" +"Einstellungen diesbezüglich ändern." #. module: account #: view:account.invoice:0 @@ -995,7 +999,7 @@ msgstr "Verbindlichkeit" #. module: account #: view:account.entries.report:0 msgid "Extended Filters..." -msgstr "Erweiterter Filter..." +msgstr "Erweiterte Filter..." #. module: account #: model:ir.ui.menu,name:account.menu_account_central_journal @@ -1005,12 +1009,12 @@ msgstr "Zentrales Buchungsjournal" #. module: account #: selection:account.journal,type:0 msgid "Sale Refund" -msgstr "Gutschrift Verkauf" +msgstr "Rückerstattung aus Verkauf" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 msgid "Bank statement" -msgstr "Bank Auszug" +msgstr "Bankauszug" #. module: account #: field:account.analytic.line,move_id:0 @@ -1030,7 +1034,7 @@ msgstr "" "dann die Basis für die Steuerberechnung ist." #. module: account -#: code:addons/account/account.py:2596 +#: code:addons/account/account.py:2613 #, python-format msgid "I can not locate a parent code for the template account!" msgstr "Finde keinen Code für das übergeordnete Vorlagekonto" @@ -1060,17 +1064,17 @@ msgstr "Buchungsvorlage" #: report:account.partner.balance:0 #: field:account.period,code:0 msgid "Code" -msgstr "Kurzbezeichnung" +msgstr "Kurzbez." #. module: account -#: code:addons/account/account.py:2268 +#: code:addons/account/account.py:2285 #: code:addons/account/account_bank_statement.py:357 #: code:addons/account/account_invoice.py:73 -#: code:addons/account/account_invoice.py:688 +#: code:addons/account/account_invoice.py:697 #: code:addons/account/account_move_line.py:173 #, python-format msgid "No Analytic Journal !" -msgstr "Kein Analytisches Journal!" +msgstr "Kein Analytischer Bericht!" #. module: account #: report:account.partner.balance:0 @@ -1084,23 +1088,23 @@ msgstr "Partner Saldenliste" #. module: account #: field:account.bank.accounts.wizard,acc_name:0 msgid "Account Name." -msgstr "Konto Bezeichnung" +msgstr "Kontobezeichnung" #. module: account #: field:account.chart.template,property_reserve_and_surplus_account:0 #: field:res.company,property_reserve_and_surplus_account:0 msgid "Reserve and Profit/Loss Account" -msgstr "Konto für vorläufigen Gewinn / Verlust" +msgstr "Konto für Rücklagen und vorläufigen Gewinn / Verlust" #. module: account #: field:report.account.receivable,name:0 msgid "Week of Year" -msgstr "Woche eines Jahres" +msgstr "Kalenderwoche (KW)" #. module: account #: field:account.report.general.ledger,landscape:0 msgid "Landscape Mode" -msgstr "Überblick" +msgstr "Querformat" #. module: account #: code:addons/account/account.py:645 @@ -1109,17 +1113,18 @@ msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " "journal items!" msgstr "" -"Sie können den Typ des Kontos mit Buchungen nicht von '%s' auf '%s' ändern." +"Sie können den Typ des Kontos nicht von '%s' auf '%s' ändern, da es " +"Buchungen enthält." #. module: account #: field:account.report.general.ledger,sortby:0 msgid "Sort by" -msgstr "Sortiere nach" +msgstr "Sortieren nach" #. module: account #: help:account.fiscalyear.close,fy_id:0 msgid "Select a Fiscal year to close" -msgstr "Wähle zu beendendes Geschäftsjahr" +msgstr "Wählen Sie das abzuschließende Geschäftsjahr" #. module: account #: help:account.account.template,user_type:0 @@ -1128,11 +1133,11 @@ msgid "" "information about the account and its specificities." msgstr "" "Die Kontotypen wurden für die Abbildung von regionalen Besonderheiten " -"definiert. Hierdurch können Sie Ihre landestypischen Konto(art)typen " +"definiert. Hierdurch können Sie Ihre landestypischen Kontoarten/-typen " "definieren." #. module: account -#: code:addons/account/account_move_line.py:842 +#: code:addons/account/account_move_line.py:856 #, python-format msgid "" "You have to provide an account for the write off/exchange difference entry !" @@ -1147,7 +1152,7 @@ msgstr "Anwendbare Optionen" #. module: account #: report:account.partner.balance:0 msgid "In dispute" -msgstr "Nn Vollstreckung" +msgstr "In Anfechtung" #. module: account #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree @@ -1171,17 +1176,17 @@ msgstr "Verantwortl. Mitarbeiter" #. module: account #: view:account.subscription.generate:0 msgid "Generate Entries before:" -msgstr "Buche alle wiederkehrenden Buchungen vor dem:" +msgstr "Anlegen der wiederkehrenden Buchungen vor dem:" #. module: account #: view:account.move.line:0 msgid "Unbalanced Journal Items" -msgstr "OP Buchungen" +msgstr "Unausgeglichene Buchungen" #. module: account #: model:account.account.type,name:account.data_account_type_bank #: selection:account.bank.accounts.wizard,account_type:0 -#: code:addons/account/account.py:3003 +#: code:addons/account/account.py:3020 #, python-format msgid "Bank" msgstr "Bank" @@ -1189,7 +1194,7 @@ msgstr "Bank" #. module: account #: field:account.period,date_start:0 msgid "Start of Period" -msgstr "Beginn der Periode" +msgstr "Periodenbeginn" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 @@ -1202,13 +1207,14 @@ msgid "" "Total amount (in Secondary currency) for transactions held in secondary " "currency for this account." msgstr "" -"Gesamtbetrag der Buchungen dieses Kontos in der definierten 2.Währung" +"Gesamtbetrag der Buchungen in Alternativwährung in der Alternativwährung " +"dieses Kontos ausgegeben." #. module: account #: field:account.fiscal.position.tax,tax_dest_id:0 #: field:account.fiscal.position.tax.template,tax_dest_id:0 msgid "Replacement Tax" -msgstr "Steuer Zuordnung" +msgstr "Steuerzuordnung" #. module: account #: selection:account.move.line,centralisation:0 @@ -1218,7 +1224,7 @@ msgstr "Haben Zentralisierung" #. module: account #: view:report.account_type.sales:0 msgid "All Months Sales by type" -msgstr "Alle Verkäufe nach Typ" +msgstr "Alle Verkäufe des Monats nach Typ" #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree2 @@ -1230,15 +1236,15 @@ msgid "" msgstr "" "Über das Menü Eingangsrechnungen können Sie Rechnungen Ihrer Lieferanten " "eingeben und verwalten. OpenERP kann ausserdem automatisch Rechnungsentwürfe " -"aus Beschaffungsaufträgen erzeugen. Über diesen Weg können Sie nicht nur den " -"Zeitpunkt der Rechnungserstellung steuern, sondern auch ob bestellte oder " -"gelieferte Mengen beim Rechnungsentwurf berücksichtigt werden sollen." +"aus Beschaffungsaufträgen oder Lieferscheinen erzeugen. Somit können Sie die " +"Eingangsrechnung mit Ihrem Bestellauftrag und der tatsächlichen Lieferung " +"überprüfen." #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form msgid "Tax Code Templates" -msgstr "Steuerausweis Vorlagen" +msgstr "Steuerausweis-Vorlagen" #. module: account #: view:account.invoice.cancel:0 @@ -1253,7 +1259,7 @@ msgstr "Dieser Code wird auf Berichten angezeigt" #. module: account #: view:account.tax.template:0 msgid "Taxes used in Purchases" -msgstr "Steuern für Einkäufe" +msgstr "Steuern aus Einkäufen (Vorsteuern)" #. module: account #: field:account.invoice.tax,tax_code_id:0 @@ -1261,12 +1267,12 @@ msgstr "Steuern für Einkäufe" #: field:account.tax.template,tax_code_id:0 #: model:ir.model,name:account.model_account_tax_code msgid "Tax Code" -msgstr "Steuer" +msgstr "Steuerschlüssel" #. module: account #: field:account.account,currency_mode:0 msgid "Outgoing Currencies Rate" -msgstr "Wechselkurse" +msgstr "Wechselkurs (Verkauf)" #. module: account #: selection:account.analytic.journal,type:0 @@ -1276,10 +1282,10 @@ msgstr "Situation" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "Der Buchungssatz dieser Buchungszeile." +msgstr "Der Buchungssatz dieser Buchungs." #. module: account -#: code:addons/account/account_move_line.py:1302 +#: code:addons/account/account_move_line.py:1317 #, python-format msgid "" "You can not use this general account in this journal, check the tab 'Entry " @@ -1291,7 +1297,7 @@ msgstr "" #. module: account #: field:account.move.line.reconcile,trans_nbr:0 msgid "# of Transaction" -msgstr "# Transaktionen" +msgstr "Transaktionsnummer" #. module: account #: report:account.general.ledger:0 @@ -1302,18 +1308,18 @@ msgid "Entry Label" msgstr "Buchungstext" #. module: account -#: code:addons/account/account.py:1129 +#: code:addons/account/account.py:1136 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "" -"Sie können kein Journal beenden ohne Buchungseintrag für diese Peridode! (-> " -"Wirtschaftsperiode)" +"Sie können ein Journal (Buch) mit Buchungen in dieser Periode nicht " +"verändern / löschen!" #. module: account #: help:account.invoice,origin:0 #: help:account.invoice.line,origin:0 msgid "Reference of the document that produced this invoice." -msgstr "Referenz des Rechnungsdokuments" +msgstr "Referenz zum Ursprungsdokuments dieser Rechnung." #. module: account #: view:account.analytic.line:0 @@ -1324,7 +1330,7 @@ msgstr "Sonstige" #. module: account #: view:account.subscription:0 msgid "Draft Subscription" -msgstr "Entwurf Abonnement" +msgstr "Abonnement im Entwurf" #. module: account #: view:account.account:0 @@ -1358,7 +1364,7 @@ msgstr "Konto" #. module: account #: field:account.tax,include_base_amount:0 msgid "Included in base amount" -msgstr "Inbegriffen in Steuergrundlage" +msgstr "Im Grundbetrag enthalten" #. module: account #: view:account.entries.report:0 @@ -1386,42 +1392,43 @@ msgstr "Ebene" #: model:ir.ui.menu,name:account.menu_tax_report #: model:ir.ui.menu,name:account.next_id_27 msgid "Taxes" -msgstr "Umsatzsteuer" +msgstr "Steuern" #. module: account -#: code:addons/account/wizard/account_financial_report.py:69 -#: code:addons/account/wizard/account_report_common.py:144 +#: code:addons/account/wizard/account_financial_report.py:70 +#: code:addons/account/wizard/account_report_common.py:145 #, python-format msgid "Select a starting and an ending period" -msgstr "Wähle eine Start und Ende Periode" +msgstr "Wähle eine Start- und eine End-Periode" #. module: account #: model:account.financial.report,name:account.account_financial_report_profitandloss0 +#: model:ir.actions.act_window,name:account.action_account_report_pl msgid "Profit and Loss" -msgstr "GuV" +msgstr "Gewinn und Verlust" #. module: account #: model:ir.model,name:account.model_account_account_template msgid "Templates for Accounts" -msgstr "Vorlage Finanzkonten" +msgstr "Finanzkontenvorlagen" #. module: account #: view:account.tax.code.template:0 msgid "Search tax template" -msgstr "Suche Kontenplan Umsatzsteuer" +msgstr "Durchsuche Steuerkontenvorlagen" #. module: account #: view:account.move.reconcile:0 #: model:ir.actions.act_window,name:account.action_account_reconcile_select #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile msgid "Reconcile Entries" -msgstr "Buchen OP Ausgleich" +msgstr "OP-Ausgleich buchen" #. module: account #: model:ir.actions.report.xml,name:account.account_overdue #: view:res.company:0 msgid "Overdue Payments" -msgstr "Fällige Rechnungen" +msgstr "Fällige Zahlungen" #. module: account #: report:account.third_party_ledger:0 @@ -1437,20 +1444,21 @@ msgstr "Zurücksetzen auf Entwurf" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Bank Information" -msgstr "Bank Informationen" +msgstr "Bankinformationen" #. module: account #: view:account.aged.trial.balance:0 #: view:account.common.report:0 msgid "Report Options" -msgstr "Report Optionen" +msgstr "Berichtsoptionen" #. module: account #: model:ir.model,name:account.model_account_entries_report msgid "Journal Items Analysis" -msgstr "Analyse der Journaleinträge" +msgstr "Analyse der Buchungen" #. module: account +#: report:account.aged_trial_balance:0 #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "Partner" @@ -1475,12 +1483,14 @@ msgid "Central Journal" msgstr "Zentrales Journal" #. module: account +#: report:account.account.balance:0 #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 +#: report:account.general.ledger_landscape:0 #: selection:account.partner.balance,display_partner:0 #: selection:account.report.general.ledger,display_account:0 msgid "With balance is not equal to 0" -msgstr "Konten mit Saldo" +msgstr "Konten mit Saldo ungeleich 0" #. module: account #: view:account.tax:0 @@ -1495,17 +1505,17 @@ msgstr "Analytisches Konto f. Kosten" #. module: account #: view:account.model:0 msgid "Create entries" -msgstr "Erzeuge Buchungen" +msgstr "Buchungen anlegen" #. module: account #: field:account.entries.report,nbr:0 msgid "# of Items" -msgstr "# Buchungen" +msgstr "Buchungsanzahl" #. module: account #: field:account.automatic.reconcile,max_amount:0 msgid "Maximum write-off amount" -msgstr "Max. Abschreibung" +msgstr "Höchstbetrag f. Abschreibungen" #. module: account #: view:account.invoice:0 @@ -1516,7 +1526,7 @@ msgstr "Berechne Steuern" #: field:account.chart.template,code_digits:0 #: field:wizard.multi.charts.accounts,code_digits:0 msgid "# of Digits" -msgstr "# Stellenanzahl" +msgstr "Stellenanzahl" #. module: account #: field:account.journal,entry_posted:0 @@ -1545,7 +1555,7 @@ msgstr "" #. module: account #: view:account.entries.report:0 msgid "# of Entries " -msgstr "# Einzelposten " +msgstr "Anz. Positionen " #. module: account #: help:account.fiscal.position,active:0 @@ -1553,13 +1563,13 @@ msgid "" "By unchecking the active field, you may hide a fiscal position without " "deleting it." msgstr "" -"Durch Deaktivierung des Aktive Feldes können Sie die Finanzposition " -"deaktivieren ohne diese zu löschen.." +"Durch Deaktivierung des Feldes \"Aktiv\" können Sie die Finanzposition " +"verbergen ohne diese zu löschen." #. module: account #: model:ir.model,name:account.model_temp_range msgid "A Temporary table used for Dashboard view" -msgstr "Eine temporäre Tabelle für Pinnwand Ansichten etc." +msgstr "Eine temporäre Tabelle für Pinnwand-Ansichten" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree4 @@ -1576,7 +1586,7 @@ msgstr "Lieferantengutschriften" #: selection:account.fiscalyear,state:0 #: selection:account.period,state:0 msgid "Closed" -msgstr "Beendet" +msgstr "Abgeschlossen" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries @@ -1586,12 +1596,12 @@ msgstr "Wiederkehrende Buchungen" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template msgid "Template for Fiscal Position" -msgstr "Steuerzuordnung Vorlage" +msgstr "Vorlagen für die Bilanz" #. module: account #: field:account.automatic.reconcile,reconciled:0 msgid "Reconciled transactions" -msgstr "Buchungen OP Ausgleich" +msgstr "Ausgeglichene Geschäftsvorfälle" #. module: account #: field:account.journal.view,columns_id:0 @@ -1617,7 +1627,7 @@ msgstr "Gruppen" #: field:account.invoice,amount_untaxed:0 #: field:report.invoice.created,amount_untaxed:0 msgid "Untaxed" -msgstr "Nettobetrag" +msgstr "Nicht versteuert" #. module: account #: view:account.partner.reconcile.process:0 @@ -1627,7 +1637,7 @@ msgstr "Gehe zu nächstem Partner" #. module: account #: view:account.bank.statement:0 msgid "Search Bank Statements" -msgstr "Suche Bankauszug" +msgstr "Bankauszüge durchsuchen" #. module: account #: view:account.move.line:0 @@ -1644,13 +1654,13 @@ msgstr "Kreditorenkonto" #: field:account.tax,account_paid_id:0 #: field:account.tax.template,account_paid_id:0 msgid "Refund Tax Account" -msgstr "Gutschrift Steuerkonto" +msgstr "Rückvergütung vom Steuerkonto" #. module: account #: view:account.bank.statement:0 #: field:account.bank.statement,line_ids:0 msgid "Statement lines" -msgstr "Belegzeilen" +msgstr "Belegpositionen" #. module: account #: model:ir.actions.act_window,help:account.action_bank_statement_tree @@ -1662,13 +1672,14 @@ msgid "" "the Payment column of a line, you can press F1 to open the reconciliation " "form." msgstr "" -"Ein Bankauszug beinhaltet alle Zahlungsvorgänge einer bestimmten Periode auf " -"einem Bankkonto, einer Kreditkarte oder anderen Konten für finanzielle " -"Transaktionen. Der Eröffnungssaldo sowie der Endsaldo wird für jeden Auszug " -"automatisch errechnet aus dem Kontosaldo zu Beginn der Buchung eines Auszugs " -"und den gebuchten finanziellen Transaktionen. Wenn Sie sich in der Spalte " -"Zahlungsausgleich einer Position in einem Bankauszugs befinden, können Sie " -"über F1 in das Fenster für den Ausgleich von offenen Posten kommen." +"Ein Bankauszug (Kontoauszug) beinhaltet alle Zahlungsvorgänge eines " +"gegebenen Zeitraumes auf einem Bankkonto, einer Kreditkarte oder anderen " +"Konten für finanzielle Transaktionen. Der Eröffnungssaldo sowie der Endsaldo " +"wird für jeden Auszug automatisch errechnet aus dem Kontosaldo zu Beginn der " +"Buchung eines Auszugs und den gebuchten finanziellen Transaktionen. Wenn Sie " +"sich in der Spalte Zahlungsausgleich einer Position in einem Bankauszugs " +"befinden, können Sie über F1 in das Fenster für den Ausgleich von offenen " +"Posten kommen." #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -1701,7 +1712,7 @@ msgstr "Rechnung" #: model:process.node,note:account.process_node_analytic0 #: model:process.node,note:account.process_node_analyticcost0 msgid "Analytic costs to invoice" -msgstr "Abrechenbare Analytische Kosten" +msgstr "Anrechenbare Analytische Kosten" #. module: account #: view:ir.sequence:0 @@ -1711,12 +1722,12 @@ msgstr "Geschäftsjahr Sequenz" #. module: account #: field:wizard.multi.charts.accounts,seq_journal:0 msgid "Separated Journal Sequences" -msgstr "Unterschiedliche Journal Sequenzen" +msgstr "Unterteilte Folge von Journalen" #. module: account #: view:account.invoice:0 msgid "Responsible" -msgstr "Mitarbeiter" +msgstr "Verantwortlicher" #. module: account #: view:account.invoice.refund:0 @@ -1724,9 +1735,9 @@ msgid "" "Cancel Invoice: Creates the refund invoice, validate and reconcile it to " "cancel the current invoice." msgstr "" -"Storno der Rechnung: Erzeugt eine Gutschrift, bestätige diese und erzeuge " -"einen Ausgleichsbuchung gegen die Ursprungsrechnung für den Ausgleich des " -"existierenden offenen Postens." +"Storno der Rechnung: Erzeugt eine Gutschrift, Sie bestätigen diese und " +"erzeugen eine Ausgleichsbuchung gegen die Ursprungsrechnung für den " +"Ausgleich des existierenden offenen Postens." #. module: account #: model:ir.ui.menu,name:account.periodical_processing_invoicing @@ -1742,10 +1753,10 @@ msgstr "Unbekannter Partner" #. module: account #: field:account.tax.code,sum:0 msgid "Year Sum" -msgstr "Summe Jahr" +msgstr "Jahressumme" #. module: account -#: code:addons/account/account_invoice.py:1429 +#: code:addons/account/account_invoice.py:1431 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." @@ -1801,7 +1812,7 @@ msgstr "Debitoren & Kreditoren" #. module: account #: model:ir.model,name:account.model_account_common_journal_report msgid "Account Common Journal Report" -msgstr "Standardauswertung von Journalen" +msgstr "Auswertung von Sammel-Journalen" #. module: account #: selection:account.partner.balance,display_partner:0 @@ -1817,7 +1828,7 @@ msgstr "Analytischer Kontenplan" #: view:account.analytic.line:0 #: view:analytic.entries.report:0 msgid "My Entries" -msgstr "Meine Buchungen" +msgstr "Eigene Buchungen" #. module: account #: report:account.overdue:0 @@ -1825,10 +1836,10 @@ msgid "Customer Ref:" msgstr "Kundenreferenz:" #. module: account -#: code:addons/account/account_cash_statement.py:292 +#: code:addons/account/account_cash_statement.py:293 #, python-format msgid "User %s does not have rights to access %s journal !" -msgstr "Benutzer %s hat keinen Zugriff auf das %s Journal!" +msgstr "Benutzer %s hat keinen Zugriff auf das Journal %s!" #. module: account #: help:account.period,special:0 @@ -1838,7 +1849,7 @@ msgstr "Diese Perioden können sich überschneiden" #. module: account #: model:process.node,name:account.process_node_draftstatement0 msgid "Draft statement" -msgstr "Beleg Entwurf" +msgstr "Belegentwurf" #. module: account #: view:account.tax:0 @@ -1873,7 +1884,7 @@ msgstr "Statistik Rechnungen" #. module: account #: model:ir.model,name:account.model_account_period_close msgid "period close" -msgstr "beende Periode" +msgstr "Periodenabschluss" #. module: account #: view:account.installer:0 @@ -1923,7 +1934,7 @@ msgstr "Fehler! Sie können keine rekursiven Unternehmen erzeugen." #. module: account #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase msgid "Sale/Purchase Journal" -msgstr "Verkauf/Einkauf Journal" +msgstr "Verkaufs-/Einkaufsbericht" #. module: account #: view:account.analytic.account:0 @@ -1935,7 +1946,7 @@ msgstr "Analytisches Konto" #, python-format msgid "Please verify that an account is defined in the journal." msgstr "" -"Bitte stellen Sie sicher dass ein Konto für das Journal definiert und " +"Bitte stellen Sie sicher, dass ein Konto für das Journal definiert und " "hinterlegt wurde." #. module: account @@ -1953,7 +1964,7 @@ msgstr "Druck Finanzjournal" #. module: account #: model:ir.model,name:account.model_product_category msgid "Product Category" -msgstr "Produkt Kategorie" +msgstr "Produktkategorie" #. module: account #: selection:account.account.type,report_type:0 @@ -1967,20 +1978,21 @@ msgid "" "will be added, Loss : Amount will be deducted.), as calculated in Profit & " "Loss Report" msgstr "" -"Dieses Konto wird automatisch als Saldo der G&V errechnet und in der Bilanz " -"dargestellt." +"Dieses Konto wird automatisch als Saldo der GuV errechnet und in der Bilanz " +"dargestellt (Bei Gewinn wird hinzugerechnet, bei Verlust entsprechend " +"abgezogen)." #. module: account #: model:process.node,note:account.process_node_reconciliation0 #: model:process.node,note:account.process_node_supplierreconciliation0 msgid "Comparison between accounting and payment entries" -msgstr "Abgleich Fibukonten mit Zahlungseingängen" +msgstr "Vergleich zwischen Fibu-Konten und Zahlungseingängen" #. module: account #: view:account.tax:0 #: view:account.tax.template:0 msgid "Tax Definition" -msgstr "Steuer Definition" +msgstr "Steuerdefinition" #. module: account #: help:wizard.multi.charts.accounts,seq_journal:0 @@ -1988,8 +2000,9 @@ msgid "" "Check this box if you want to use a different sequence for each created " "journal. Otherwise, all will use the same sequence." msgstr "" -"Hake diese Box an falls Sie unterschiedliche Sequenzen für jedes neue " -"Journal haben möchten. Ansonsten wird immer das gleiche Journal verwendet." +"Diese Box anwählen, falls Sie unterschiedliche Sequenzen für jedes neue " +"Journal verwenden möchten. Ansonsten wird immer die gleiche Folgen-" +"Nummerierung verwendet." #. module: account #: help:account.partner.ledger,amount_currency:0 @@ -1998,8 +2011,8 @@ msgid "" "It adds the currency column if the currency is different then the company " "currency" msgstr "" -"Zusätzliche Anzeige der Währung, wenn die Währung anders ist als die " -"eingestellte Währung des Unternehmens" +"Zusätzliche Anzeige der Währung, wenn die Währung sich von der eingestellten " +"Währung des Unternehmens unterscheidet" #. module: account #: help:account.journal,allow_date:0 @@ -2014,7 +2027,7 @@ msgstr "" #: code:addons/account/account_invoice.py:73 #, python-format msgid "You must define an analytic journal of type '%s'!" -msgstr "Sie müssen eine Analyse Journal vom Typ '%s' definieren" +msgstr "Sie müssen eine Analysebericht vom Typ '%s' definieren!" #. module: account #: field:account.installer,config_logo:0 @@ -2029,9 +2042,10 @@ msgid "" "currency. You should remove the secondary currency on the account or select " "a multi-currency view on the journal." msgstr "" -"The selected account of your Journal Entry forces to provide a secondary " -"currency. You should remove the secondary currency on the account or select " -"a multi-currency view on the journal." +"Das ausgewählte Konto Ihrer Buchung erzwingt die Angabe einer " +"Alternativwährung. Sie müssen die Verwendung einer Alternativwährung in den " +"Einstellungen des Kontos ausschalten oder aber Mehrwährungsfähigkeit im " +"Bericht einschalten." #. module: account #: model:ir.actions.act_window,help:account.action_account_financial_report_tree @@ -2124,7 +2138,7 @@ msgstr "Januar" #. module: account #: view:account.journal:0 msgid "Validations" -msgstr "Prüfvorgänge" +msgstr "Prüfungen" #. module: account #: view:account.entries.report:0 @@ -2142,7 +2156,7 @@ msgid "" "Invalid period ! Some periods overlap or the date period is not in the scope " "of the fiscal year. " msgstr "" -"Ungültige Periode! Diese überlappen oder liegen außerhalb des " +"Ungültige Periode! Manche überlappen sich oder liegen außerhalb des " "Geschäftsjahres " #. module: account @@ -2157,10 +2171,10 @@ msgstr "Sie müssen ein Analyse-Journal für das Journal '%s' deinieren!" #: selection:account.invoice.report,state:0 #: selection:report.invoice.created,state:0 msgid "Pro-forma" -msgstr "Pro-Forma" +msgstr "Proforma" #. module: account -#: code:addons/account/account.py:1461 +#: code:addons/account/account.py:1478 #, python-format msgid "" "There is no default default debit account defined \n" @@ -2189,10 +2203,10 @@ msgstr "" #. module: account #: view:account.chart.template:0 msgid "Search Chart of Account Templates" -msgstr "Suche Kontenplan Vorlage" +msgstr "Durchsuche Kontenplan-Vorlagen" #. module: account -#: code:addons/account/account_move_line.py:1277 +#: code:addons/account/account_move_line.py:1292 #, python-format msgid "" "Can not create an automatic sequence for this piece!\n" @@ -2249,7 +2263,7 @@ msgid "Description" msgstr "Buchungstext" #. module: account -#: code:addons/account/account.py:3119 +#: code:addons/account/account.py:3136 #, python-format msgid "ECNJ" msgstr "GSE" @@ -2258,7 +2272,7 @@ msgstr "GSE" #: view:account.subscription:0 #: selection:account.subscription,state:0 msgid "Running" -msgstr "In Weiterbearbeitung" +msgstr "Laufend" #. module: account #: view:account.chart.template:0 @@ -2268,7 +2282,7 @@ msgid "Income Account" msgstr "Erlöskonto" #. module: account -#: code:addons/account/account_invoice.py:370 +#: code:addons/account/account_invoice.py:379 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "" @@ -2300,16 +2314,17 @@ msgstr "Änderung zu" #. module: account #: view:account.entries.report:0 msgid "# of Products Qty " -msgstr "# Menge v. Produkt " +msgstr "Menge des Produkts Anz. " #. module: account #: model:ir.model,name:account.model_product_template msgid "Product Template" -msgstr "Vorlage f. Produkte" +msgstr "Produktvorlage" #. module: account #: report:account.account.balance:0 #: field:account.aged.trial.balance,fiscalyear_id:0 +#: report:account.aged_trial_balance:0 #: field:account.balance.report,fiscalyear_id:0 #: report:account.central.journal:0 #: field:account.central.journal,fiscalyear_id:0 @@ -2319,6 +2334,7 @@ msgstr "Vorlage f. Produkte" #: field:account.common.report,fiscalyear_id:0 #: view:account.entries.report:0 #: field:account.entries.report,fiscalyear_id:0 +#: report:account.financial.report:0 #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: field:account.general.journal,fiscalyear_id:0 @@ -2366,10 +2382,10 @@ msgstr "Lasse leer für alle offenen Geschäftsjahre" #. module: account #: field:account.invoice.report,account_line_id:0 msgid "Account Line" -msgstr "Buchungszeile" +msgstr "Kontobuchung" #. module: account -#: code:addons/account/account.py:1468 +#: code:addons/account/account.py:1485 #, python-format msgid "" "There is no default default credit account defined \n" @@ -2405,7 +2421,7 @@ msgid "Main Sequence" msgstr "Haupt Sequenz" #. module: account -#: code:addons/account/account_bank_statement.py:402 +#: code:addons/account/account_bank_statement.py:403 #, python-format msgid "" "In order to delete a bank statement, you must first cancel it to delete " @@ -2430,7 +2446,7 @@ msgstr "Zahlungsbedingung" #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form msgid "Fiscal Positions" -msgstr "Steuerzuordnung" +msgstr "Bilanzpositionen" #. module: account #: constraint:account.account:0 @@ -2467,7 +2483,7 @@ msgstr "Offen" #: model:process.node,note:account.process_node_draftinvoices0 #: model:process.node,note:account.process_node_supplierdraftinvoices0 msgid "Draft state of an invoice" -msgstr "Entwurf Status bei Rechnung" +msgstr "Entwurfsstatus einer Rechnung" #. module: account #: view:account.partner.reconcile.process:0 @@ -2478,10 +2494,10 @@ msgstr "Offene Posten Ausgleich bei Partnern" #: field:account.tax,tax_code_id:0 #: view:account.tax.code:0 msgid "Account Tax Code" -msgstr "Umsatzsteuer" +msgstr "Steuerschlüssel" #. module: account -#: code:addons/account/account_invoice.py:572 +#: code:addons/account/account_invoice.py:581 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" @@ -2498,7 +2514,7 @@ msgstr "" #: model:account.payment.term,name:account.account_payment_term_advance #: model:account.payment.term,note:account.account_payment_term_advance msgid "30% Advance End 30 Days" -msgstr "30% Anzahlung, Rest in 30 Tagen" +msgstr "30% Anzahlung, Rest innerhalb von 30 Tagen" #. module: account #: view:account.entries.report:0 @@ -2546,13 +2562,13 @@ msgstr "" #. module: account #: selection:account.move.line,centralisation:0 msgid "Debit Centralisation" -msgstr "Zentrales Gegenkonto" +msgstr "Zentrales Soll-Gegenkonto" #. module: account #: view:account.invoice.confirm:0 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm msgid "Confirm Draft Invoices" -msgstr "Bestätige Rechnung" +msgstr "Bestätige Rechnungsentwurf" #. module: account #: field:account.entries.report,day:0 @@ -2574,7 +2590,7 @@ msgid "Account Model Entries" msgstr "Buchungsvorlage" #. module: account -#: code:addons/account/account.py:3117 +#: code:addons/account/account.py:3134 #, python-format msgid "EXJ" msgstr "EK" @@ -2582,7 +2598,7 @@ msgstr "EK" #. module: account #: field:product.template,supplier_taxes_id:0 msgid "Supplier Taxes" -msgstr "Steuern Einkauf" +msgstr "Steuern des Einkaufs (Vorsteuer)" #. module: account #: view:account.entries.report:0 @@ -2611,7 +2627,7 @@ msgstr "Periode auswählen" #. module: account #: model:ir.ui.menu,name:account.menu_account_pp_statements msgid "Statements" -msgstr "Abstimmung von Konten" +msgstr "Abstimmung von Konten (Ausweis)" #. module: account #: report:account.analytic.account.journal:0 @@ -2632,13 +2648,13 @@ msgstr "" msgid "" "This report gives you an overview of the situation of a specific journal" msgstr "" -"Diese Auswertung ermöglicht einen Überblick über den Saldo das spezifizierte " +"Diese Auswertung ermöglicht einen Überblick über den Saldo des angegebenen " "Journals." #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff msgid "Account move line reconcile (writeoff)" -msgstr "OP-Ausgleich (mit Differenz)" +msgstr "OP-Ausgleich (Abschreibung)" #. module: account #: model:account.account.type,name:account.account_type_tax @@ -2673,10 +2689,10 @@ msgid "Accounts" msgstr "Finanzkonten" #. module: account -#: code:addons/account/account_invoice.py:369 +#: code:addons/account/account_invoice.py:378 #, python-format msgid "Configuration Error!" -msgstr "Konfigurationsfehler !" +msgstr "Konfigurationsfehler!" #. module: account #: field:account.invoice.report,price_average:0 @@ -2692,7 +2708,7 @@ msgstr "Datum:" #: report:account.journal.period.print:0 #: report:account.journal.period.print.sale.purchase:0 msgid "Label" -msgstr "Produktbeschriftung" +msgstr "Etikett" #. module: account #: view:account.tax:0 @@ -2746,7 +2762,7 @@ msgstr "Automatischer Kontenausgleich" #. module: account #: field:account.invoice,reconciled:0 msgid "Paid/Reconciled" -msgstr "Bezahlt / OP Ausgleich" +msgstr "Bezahlt/Beglichen" #. module: account #: field:account.tax,ref_base_code_id:0 @@ -2777,7 +2793,7 @@ msgstr "Übergeordnete Kontenplan Vorlage" #: field:account.tax,parent_id:0 #: field:account.tax.template,parent_id:0 msgid "Parent Tax Account" -msgstr "Oberkonto Steuer" +msgstr "Übergeordnetes Steuerkonto" #. module: account #: code:addons/account/wizard/account_change_currency.py:59 @@ -2796,6 +2812,7 @@ msgstr "" #. module: account #: view:account.aged.trial.balance:0 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view +#: model:ir.actions.report.xml,name:account.account_aged_partner_balance #: model:ir.ui.menu,name:account.menu_aged_trial_balance msgid "Aged Partner Balance" msgstr "Saldo Partner nach Alter" @@ -2845,21 +2862,21 @@ msgstr "Konfigurieren Sie Ihren Kontenplan" #. module: account #: view:account.use.model:0 msgid "This wizard will create recurring accounting entries" -msgstr "Diese Assistent erzeugt wiederkehrende Buchungen." +msgstr "Dieser Assistent erzeugt wiederkehrende Buchungen." #. module: account -#: code:addons/account/account.py:1321 +#: code:addons/account/account.py:1329 #, python-format msgid "No sequence defined on the journal !" -msgstr "Keine Sequenz für dieses Journal definiert !" +msgstr "Keine Sequenz für dieses Journal definiert!" #. module: account -#: code:addons/account/account.py:2268 -#: code:addons/account/account_invoice.py:688 +#: code:addons/account/account.py:2285 +#: code:addons/account/account_invoice.py:697 #: code:addons/account/account_move_line.py:173 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" -msgstr "Sie sollten ein analytisches Journal im '%s' Journal definieren!" +msgstr "Sie müssen ein analytisches Journal im '%s' Journal definieren!" #. module: account #: code:addons/account/account.py:407 @@ -2868,7 +2885,7 @@ msgid "" "You need an Opening journal with centralisation checked to set the initial " "balance!" msgstr "" -"Für die Eröffnungsbilanz benötigen sie ein Eröffnungsjournal mit " +"Für die Eröffnungsbilanz benötigen Sie ein Eröffnungsjournal mit " "Zentralisierung." #. module: account @@ -2964,10 +2981,10 @@ msgstr "" #. module: account #: field:account.invoice.tax,base_amount:0 msgid "Base Code Amount" -msgstr "Steuergrundlage Betrag" +msgstr "Bemessungsgrundlage Betrag" #. module: account -#: code:addons/account/account_invoice.py:392 +#: code:addons/account/account_invoice.py:401 #, python-format msgid "" "You can not delete an invoice which is open or paid. We suggest you to " @@ -2982,7 +2999,7 @@ msgid "Default Sale Tax" msgstr "Standard Steuer Verkauf" #. module: account -#: code:addons/account/account_invoice.py:1013 +#: code:addons/account/account_invoice.py:1025 #, python-format msgid "Invoice '%s' is validated." msgstr "Rechnung '%s' ist validiert." @@ -3001,7 +3018,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_accounting msgid "Financial Accounting" -msgstr "Finanzen" +msgstr "Finanzbuchhaltung" #. module: account #: model:ir.ui.menu,name:account.menu_account_report_pl @@ -3020,16 +3037,16 @@ msgstr "Gewinn und Verlust" #: model:ir.model,name:account.model_account_fiscal_position #: field:res.partner,property_account_position:0 msgid "Fiscal Position" -msgstr "Steuerzuordnung" +msgstr "Bilanz" #. module: account -#: code:addons/account/account_invoice.py:735 +#: code:addons/account/account_invoice.py:744 #, python-format msgid "" "Tax base different!\n" "Click on compute to update the tax base." msgstr "" -"Die Steuerbasis stimmt nicht!\n" +"Die Steuergrundlage ist geändert!\n" "Drücken Sie Berechnen!" #. module: account @@ -3068,12 +3085,12 @@ msgstr "Verantwortlicher Mitarbeiter für dieses Journal" #. module: account #: view:account.period:0 msgid "Search Period" -msgstr "Suche Periode" +msgstr "Durchsuche Periode" #. module: account #: view:account.change.currency:0 msgid "Invoice Currency" -msgstr "Währung" +msgstr "Rechnungswährung" #. module: account #: field:accounting.report,account_report_id:0 @@ -3089,7 +3106,7 @@ msgstr "Vereinbarungen" #. module: account #: field:account.bank.statement,total_entry_encoding:0 msgid "Cash Transaction" -msgstr "Barkasse Transaktionen" +msgstr "Bar-Geschäftsvorfälle" #. module: account #: view:res.partner:0 @@ -3099,7 +3116,7 @@ msgstr "Bankkonto" #. module: account #: field:account.chart.template,tax_template_ids:0 msgid "Tax Template List" -msgstr "Umsatzsteuer Vorlagenliste" +msgstr "Steuer-Vorlagenliste" #. module: account #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal @@ -3119,7 +3136,7 @@ msgstr "" "wird. In den meisten Ländern ist \"Durchhschnitt\" die legale Methode, aber " "nur wenige Systeme können dies. Für Importe von anderen Systemen muss daher " "ggf. der Tageskurs verwendet werden. Eingehende Transkationen verwenden " -"jedenfalls den Tageskurs." +"grundsätzlich den Tageskurs." #. module: account #: help:account.chart.template,code_digits:0 @@ -3130,12 +3147,12 @@ msgstr "Anzahl Stellen für Konto" #. module: account #: field:account.payment.term.line,name:0 msgid "Line Name" -msgstr "Zeile Bezeichnung" +msgstr "Zeilenbezeichnung" #. module: account #: view:account.fiscalyear:0 msgid "Search Fiscalyear" -msgstr "Suche Geschäftsjahr" +msgstr "Durchsuche Geschäftsjahr" #. module: account #: selection:account.tax,applicable_type:0 @@ -3163,7 +3180,7 @@ msgstr "Abschreibungskonto" #: view:account.subscription:0 #: field:account.subscription,model_id:0 msgid "Model" -msgstr "Standard" +msgstr "Modell" #. module: account #: help:account.invoice.tax,base_code_id:0 @@ -3179,7 +3196,7 @@ msgid "View" msgstr "Ansicht" #. module: account -#: code:addons/account/account.py:3363 +#: code:addons/account/account.py:3380 #: code:addons/account/account_bank.py:90 #, python-format msgid "BNK" @@ -3241,7 +3258,7 @@ msgid "" msgstr "" "Der Assistent wird alle Buchungen für eine bestimmtes Journal innerhalb " "einer bestimmten Periode buchen. Sobald die Buchungen erzeugt wurden, können " -"Sie nicht mehr vorher abgeändert werden." +"Sie nicht mehr abgeändert werden." #. module: account #: model:ir.actions.act_window,name:account.action_account_chart_template_form @@ -3388,17 +3405,17 @@ msgid "Starting Balance" msgstr "Anfangssaldo" #. module: account -#: code:addons/account/account_invoice.py:1332 +#: code:addons/account/account_invoice.py:1345 #, python-format msgid "No Partner Defined !" -msgstr "Kein Partner definiert!" +msgstr "Kein Partner festgelegt!" #. module: account #: model:ir.actions.act_window,name:account.action_account_period_close #: model:ir.actions.act_window,name:account.action_account_period_tree #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree msgid "Close a Period" -msgstr "Beende Periode" +msgstr "Periode abschließen" #. module: account #: field:account.financial.report,display_detail:0 @@ -3421,15 +3438,15 @@ msgid "" "The amount expressed in the related account currency if not equal to the " "company one." msgstr "" -"Der Betrag in einer anderen Währung, insofern normalerweise die " -"Unternehmenswährung eine andere ist." +"Der Betrag in der Währung des Kontos angegeben, sofern diese sich von der " +"Unternehmenswährung unterscheidet." #. module: account #: model:ir.actions.act_window,name:account.action_account_unreconcile #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile #: model:ir.actions.act_window,name:account.action_account_unreconcile_select msgid "Unreconcile Entries" -msgstr "Ausgleich Offene Posten zurücksetzen" +msgstr "OP-Ausgleich stornieren" #. module: account #: field:account.tax.code,notprintable:0 @@ -3444,7 +3461,7 @@ msgid "Chart of Tax" msgstr "Steuerkontenplan" #. module: account -#: code:addons/account/account_cash_statement.py:314 +#: code:addons/account/account_cash_statement.py:315 #, python-format msgid "The closing balance should be the same than the computed balance!" msgstr "Der Endsaldo muss mit dem errechneten übereinstimmen!" @@ -3452,7 +3469,7 @@ msgstr "Der Endsaldo muss mit dem errechneten übereinstimmen!" #. module: account #: view:account.journal:0 msgid "Search Account Journal" -msgstr "Suche Buchungsjournal" +msgstr "Durchsuche Buchungsjournal" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice @@ -3504,13 +3521,13 @@ msgstr "Suche Buchung" #: field:account.tax.code,name:0 #: field:account.tax.code.template,name:0 msgid "Tax Case Name" -msgstr "Umsatzsteuervorgang" +msgstr "Versteuerungsbezeichnung" #. module: account #: report:account.invoice:0 #: model:process.node,name:account.process_node_draftinvoices0 msgid "Draft Invoice" -msgstr "Entwurf Rechnung" +msgstr "Rechnungsentwurf" #. module: account #: code:addons/account/wizard/account_invoice_state.py:68 @@ -3519,8 +3536,8 @@ msgid "" "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' " "or 'Done' state!" msgstr "" -"Ausgewählte Rechnung(en) kann nicht geändert, das Sie bereits im " -"'Abgebrochen' oder 'Erledigt' Status ist." +"Ausgewählte Rechnung(en) kann/können nicht geändert, das Sie bereits im " +"'Abgebrochen' oder 'Erledigt' Status ist/sind." #. module: account #: view:account.invoice.line:0 @@ -3529,8 +3546,9 @@ msgstr "Menge:" #. module: account #: field:account.aged.trial.balance,period_length:0 +#: report:account.aged_trial_balance:0 msgid "Period Length (days)" -msgstr "Perioden Länge (Tage)" +msgstr "Periodendauer (Tage)" #. module: account #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal @@ -3546,28 +3564,28 @@ msgstr "Rechnungsstatus" #: view:account.invoice.report:0 #: field:account.invoice.report,categ_id:0 msgid "Category of Product" -msgstr "Produktkategorien" +msgstr "Produktkategorie" #. module: account #: view:account.addtmpl.wizard:0 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form msgid "Create Account" -msgstr "Erstelle Konto" +msgstr "Konto anlegen" #. module: account #: model:ir.model,name:account.model_report_account_type_sales msgid "Report of the Sales by Account Type" -msgstr "Auswertung Verkauf nach Kontentyp" +msgstr "Verkaufsauswertung nach Kontentyp" #. module: account #: view:account.move.line:0 msgid "Unreconciled Journal Items" -msgstr "Nicht ausgeglichen Buchungen" +msgstr "Nicht ausgeglichene Buchungen" #. module: account #: sql_constraint:res.currency:0 msgid "The currency code must be unique per company!" -msgstr "Der Währungscode muss je Unternehmen eindeutig sein" +msgstr "Der Währungsschlüssel muss je Unternehmen eindeutig sein" #. module: account #: selection:account.account.type,close_method:0 @@ -3575,7 +3593,7 @@ msgid "Detail" msgstr "Details" #. module: account -#: code:addons/account/account_invoice.py:839 +#: code:addons/account/account_invoice.py:850 #, python-format msgid "" "Can not create the invoice !\n" @@ -3592,12 +3610,19 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "VAT :" -msgstr "UST:" +msgstr "USt.:" #. module: account +#: report:account.account.balance:0 +#: report:account.aged_trial_balance:0 #: report:account.central.journal:0 +#: report:account.financial.report:0 +#: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,charts:0 +#: report:account.journal.period.print:0 +#: report:account.journal.period.print.sale.purchase:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -3620,11 +3645,11 @@ msgid "Centralised counterpart" msgstr "Zentralisierung Gegenkonto" #. module: account -#: code:addons/account/account_move_line.py:584 +#: code:addons/account/account_move_line.py:575 #, python-format msgid "You can not create journal items on a \"view\" account %s %s" msgstr "" -"Sie dürfen keine Buchungen vom Typ \"Sicht\" für das Konto erzeugen %s %s" +"Konten vom Typ \"Sicht\" %s %s können für Buchungen nicht verwendet werden" #. module: account #: model:ir.model,name:account.model_account_partner_reconcile_process @@ -3639,7 +3664,8 @@ msgstr "2" #. module: account #: view:account.chart:0 msgid "(If you do not select Fiscal year it will take all open fiscal years)" -msgstr "(Wenn kein Geschäftsjahr ausgewählt wird, werden alle genommen)" +msgstr "" +"(Wenn kein Geschäftsjahr ausgewählt wird, werden alle laufenden genommen)" #. module: account #: selection:account.aged.trial.balance,filter:0 @@ -3673,10 +3699,15 @@ msgstr "(Wenn kein Geschäftsjahr ausgewählt wird, werden alle genommen)" #: field:account.subscription.line,date:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 +#: xsl:account.transfer:0 #: selection:account.vat.declaration,filter:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 +#: code:addons/account/report/account_journal.py:195 +#: code:addons/account/report/account_journal.py:198 +#: code:addons/account/report/common_report_header.py:97 #: field:analytic.entries.report,date:0 +#, python-format msgid "Date" msgstr "Datum" @@ -3707,7 +3738,7 @@ msgid "Chart of Accounts Template" msgstr "Vorlage Kontenplan" #. module: account -#: code:addons/account/account.py:2280 +#: code:addons/account/account.py:2297 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " @@ -3719,7 +3750,7 @@ msgstr "" "Bitte ordnen Sie dem Partner eine Zahlungsbedingungen zu." #. module: account -#: code:addons/account/account_move_line.py:837 +#: code:addons/account/account_move_line.py:846 #, python-format msgid "Some entries are already reconciled !" msgstr "Einige Einträge wurden bereits ausgeglichen!" @@ -3750,6 +3781,8 @@ msgstr "Finanzbudgets" #: selection:account.vat.declaration,filter:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 +#: code:addons/account/report/common_report_header.py:100 +#, python-format msgid "No Filters" msgstr "Keine Filter" @@ -3783,12 +3816,12 @@ msgstr "Anzuwendender Typ (if type=code)" #: view:account.invoice.report:0 #: field:account.invoice.report,product_qty:0 msgid "Qty" -msgstr "Menge" +msgstr "Anz" #. module: account #: field:account.invoice.report,address_contact_id:0 msgid "Contact Address Name" -msgstr "Partner Kontakt Name" +msgstr "Partner Kontaktperson" #. module: account #: field:account.move.line,blocked:0 @@ -3798,7 +3831,7 @@ msgstr "Rechtsstreit" #. module: account #: view:account.analytic.line:0 msgid "Search Analytic Lines" -msgstr "Suche Analytische Buchungen" +msgstr "Durchsuche Analytische Buchungen" #. module: account #: field:res.partner,property_account_payable:0 @@ -3835,7 +3868,7 @@ msgid "Analytic Items" msgstr "Analytische Buchungen" #. module: account -#: code:addons/account/account_move_line.py:1153 +#: code:addons/account/account_move_line.py:1168 #, python-format msgid "Unable to change tax !" msgstr "Die Steuer kann nicht geändert werden!" @@ -3843,12 +3876,12 @@ msgstr "Die Steuer kann nicht geändert werden!" #. module: account #: field:analytic.entries.report,nbr:0 msgid "#Entries" -msgstr "# Buchungen" +msgstr "Anz. Buchungen" #. module: account #: selection:account.invoice.refund,filter_refund:0 msgid "Create a draft Refund" -msgstr "Erzeuge Gutschrift Entwurf" +msgstr "Erzeuge Gutschriftsentwurf" #. module: account #: view:account.state.open:0 @@ -3858,7 +3891,7 @@ msgstr "Offene Rechnung" #. module: account #: field:account.invoice.tax,factor_tax:0 msgid "Multipication factor Tax code" -msgstr "Faktor Steuerberechnung" +msgstr "Faktor für Steuerberechnung" #. module: account #: view:account.fiscal.position:0 @@ -3866,7 +3899,7 @@ msgid "Mapping" msgstr "Steuer Umschlüsselung" #. module: account -#: code:addons/account/account_invoice.py:921 +#: code:addons/account/account_invoice.py:932 #, python-format msgid "" "You cannot create an invoice on a centralised journal. Uncheck the " @@ -3882,6 +3915,7 @@ msgstr "" #: report:account.analytic.account.inverted.balance:0 #: field:account.bank.statement,name:0 #: field:account.chart.template,name:0 +#: report:account.financial.report:0 #: field:account.model.line,name:0 #: field:account.move.line,name:0 #: field:account.move.reconcile,name:0 @@ -3895,7 +3929,7 @@ msgid "Account Aged Trial balance Report" msgstr "Auswertung Altersstruktur Forderungen" #. module: account -#: code:addons/account/account_move_line.py:591 +#: code:addons/account/account_move_line.py:582 #, python-format msgid "You can not create journal items on a closed account %s %s" msgstr "" @@ -3943,7 +3977,7 @@ msgid "" "same company." msgstr "" "Das gewählte Geschäftsjahr, die Periode und das Konto müssen zum selben " -"UNternehmen gehören." +"Unternehmen gehören." #. module: account #: model:ir.actions.todo.category,name:account.category_accounting_configuration @@ -3959,7 +3993,7 @@ msgstr "Finanzen" #. module: account #: view:account.entries.report:0 msgid "Journal Entries with period in current year" -msgstr "Jaurnalbuchungen des laufenden Jahres" +msgstr "Journalbuchungen des laufenden Jahres" #. module: account #: help:account.central.journal,amount_currency:0 @@ -3970,7 +4004,7 @@ msgid "" "Print Report with the currency column if the currency is different then the " "company currency" msgstr "" -"Drucke Auswertung / Report mit der Spalte Währung für den Fall dass sich die " +"Drucke Auswertung/Bericht mit der Spalte Währung für den Fall, dass sich die " "Währung der Rechnung von der Standardwährung des Unternehmens unterscheidet" #. module: account @@ -3979,7 +4013,7 @@ msgid "" "Value of Loss or Gain due to changes in exchange rate when doing multi-" "currency transactions." msgstr "" -"Währungsgewinne oder Verluste im Zuge von Transaktionen mit mehreren " +"Währungsgewinne oder Verluste im Zuge von Geschäftsvorfällen mit mehreren " "Währungen" #. module: account @@ -4071,7 +4105,7 @@ msgstr "" #. module: account #: field:account.chart,period_from:0 msgid "Start period" -msgstr "Beginn der Periode" +msgstr "Periodenbeginn" #. module: account #: field:account.tax,name:0 @@ -4098,23 +4132,23 @@ msgid "" "If the active field is set to False, it will allow you to hide the account " "without removing it." msgstr "" -"Falls dieses Feld aktiviert wird, kann die Anzeige für das Finanzkonto " -"versteckt werden." +"Mit Aktivierung wird die Anzeige für das Finanzkonto verborgen werden. ohne " +"es löschen zu müssen." #. module: account #: view:account.move.line:0 msgid "Posted Journal Items" -msgstr "Verbuchte Buchungen" +msgstr "Quittierte Buchungen" #. module: account #: view:account.tax.template:0 msgid "Search Tax Templates" -msgstr "Suche Steuervorlage" +msgstr "Durchsuche Steuervorlagen" #. module: account #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation msgid "Draft Entries" -msgstr "Buchungen im Entwurf" +msgstr "Buchungsentwürfe" #. module: account #: view:account.payment.term.line:0 @@ -4135,7 +4169,7 @@ msgstr "Tastenkombination (Shortcut)" #. module: account #: constraint:account.fiscalyear:0 msgid "Error! The start date of the fiscal year must be before his end date." -msgstr "Fehler! Der Beginn des Jahres muss vor dem Ende liegen." +msgstr "Fehler! Der Beginn des Geschäftsjahres muss vor dem Ende liegen." #. module: account #: view:account.account:0 @@ -4156,7 +4190,7 @@ msgstr "Kontoart" #. module: account #: view:res.partner:0 msgid "Bank Account Owner" -msgstr "Bankkonto Eigentümer" +msgstr "Bankkonto-Eigentümer" #. module: account #: report:account.account.balance:0 @@ -4194,8 +4228,8 @@ msgid "" "You haven't supplied enough argument to compute the initial balance, please " "select a period and journal in the context." msgstr "" -"Sie haben nicht genug Angaben für die Berrechnung des Anfangssaldos gemacht. " -"Wählen Sie bitte eine Periode und ein Journal!" +"Sie haben unzureichende Angaben für die Berechnung des Anfangssaldos " +"gemacht. Wählen Sie bitte eine Periode und ein Journal!" #. module: account #: model:process.transition,note:account.process_transition_supplieranalyticcost0 @@ -4216,12 +4250,12 @@ msgstr "Kassenabschluss" #: view:account.invoice.report:0 #: field:account.invoice.report,due_delay:0 msgid "Avg. Due Delay" -msgstr "Durch. Zahlungsverzug" +msgstr "Durchschnittl. Zahlungsverzug" #. module: account #: view:account.entries.report:0 msgid "Acc.Type" -msgstr "Kontotyp" +msgstr "Kontoart" #. module: account #: field:account.entries.report,month:0 @@ -4235,16 +4269,16 @@ msgid "Month" msgstr "Monat" #. module: account -#: code:addons/account/account_move_line.py:1216 +#: code:addons/account/account_move_line.py:1231 #, python-format msgid "" "You can not do this modification on a confirmed entry! You can just change " "some non legal fields or you must unconfirm the journal entry first! \n" "%s" msgstr "" -"Sie dürfen diese Änderung nicht in verbuchten Buchungenmachen! \n" +"Sie dürfen diese Änderung nicht in quittierten Buchungen machen! \n" "Sei können nur einige buchungstechnisch nicht relevante Felder ändern oder " -"Sie müssen die Buchung vorher auf unbestätigt setzen.\n" +"Sie müssen die Buchung vorher auf unquittiert zurücksetzen.\n" "%s" #. module: account @@ -4255,7 +4289,7 @@ msgstr "PayPal Konto" #. module: account #: field:account.invoice.report,uom_name:0 msgid "Reference UoM" -msgstr "Referenz ME" +msgstr "Bezugs-ME" #. module: account #: field:account.account,note:0 @@ -4278,7 +4312,7 @@ msgstr "Fällige Analytische Konten" #: code:addons/account/account.py:184 #, python-format msgid "Balance Sheet (Liability account)" -msgstr "Bilanz (Verbindlichkeit)" +msgstr "Bilanz (Verbindlichkeiten)" #. module: account #: help:account.invoice,date_invoice:0 @@ -4293,10 +4327,10 @@ msgstr "Steuerbuchungen" #. module: account #: field:account.tax,base_code_id:0 msgid "Account Base Code" -msgstr "Steuergrundlage" +msgstr "Bemessungsgrundlage (Steuern & Gebühren)" #. module: account -#: code:addons/account/account_analytic_line.py:93 +#: code:addons/account/account_analytic_line.py:91 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -4306,7 +4340,7 @@ msgstr "" #. module: account #: view:res.partner:0 msgid "Customer Accounting Properties" -msgstr "Debitoren Eigenschaften" +msgstr "Debitoren-Eigenschaften" #. module: account #: help:res.company,paypal_account:0 @@ -4381,7 +4415,8 @@ msgstr "Periodische Buchungen" #. module: account #: constraint:account.analytic.line:0 msgid "You can not create analytic line on view account." -msgstr "Für Sichten dürfen keine Analysezeilen erzeugt werden" +msgstr "" +"Sicht-Konten dürfen (auch für) Analysebuchungen nicht bebucht werden." #. module: account #: help:account.move.line,state:0 @@ -4389,8 +4424,8 @@ msgid "" "When new move line is created the state will be 'Draft'.\n" "* When all the payments are done it will be in 'Valid' state." msgstr "" -"Wenn die Buchung erzeugt wird, ist der Status 'Entwurf'.\n" -"* Wenn alle Zahlungen erfolgt sind, wechselt der Status direkt zu 'Gebucht'." +"Wenn die Buchung angelegt wird, ist der Status 'Entwurf'.\n" +"* Wenn alle Zahlungen erfolgt sind, wechselt der Status auf 'Gebucht'." #. module: account #: field:account.journal,view_id:0 @@ -4516,7 +4551,7 @@ msgid "Allow Reconciliation" msgstr "Erlaube Ausgleich" #. module: account -#: code:addons/account/account.py:1077 +#: code:addons/account/account.py:1082 #, python-format msgid "" "You can not modify company of this period as some journal items exists." @@ -4532,27 +4567,27 @@ msgstr "Auswertungen Analytisches Konto" #. module: account #: report:account.vat.declaration:0 msgid "Based On" -msgstr "Basiert auf" +msgstr "Basierend auf" #. module: account #: field:account.tax,price_include:0 #: field:account.tax.template,price_include:0 msgid "Tax Included in Price" -msgstr "Steuer Inklusive" +msgstr "Preis inklusive Steuer" #. module: account #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report msgid "Account Analytic Cost Ledger For Journal Report" -msgstr "Analytisches Journal für Kosten" +msgstr "Sammelkonto der Journale analytischer Kosten" #. module: account #: model:ir.actions.act_window,name:account.action_model_form #: model:ir.ui.menu,name:account.menu_action_model_form msgid "Recurring Models" -msgstr "Wiederkehrende Buchungen" +msgstr "Wiederkehrende Modelle" #. module: account -#: code:addons/account/account_move_line.py:1251 +#: code:addons/account/account_move_line.py:1266 #, python-format msgid "Encoding error" msgstr "Kodierungsfehler" @@ -4564,8 +4599,9 @@ msgstr "4" #. module: account #: view:account.invoice:0 +#: xsl:account.transfer:0 msgid "Change" -msgstr "Ändere Währung" +msgstr "Wechselgeld" #. module: account #: selection:account.journal,type:0 @@ -4580,7 +4616,7 @@ msgstr "Kontoarten Auswahl" #. module: account #: help:account.journal,default_credit_account_id:0 msgid "It acts as a default account for credit amount" -msgstr "Fungiert als Standard Konto für die Haben Buchung in diesem Journal" +msgstr "Fungiert als Standardkonto für die Haben Buchung in diesem Journal" #. module: account #: model:ir.actions.act_window,name:account.action_validate_account_move_line @@ -4588,7 +4624,7 @@ msgstr "Fungiert als Standard Konto für die Haben Buchung in diesem Journal" #: view:validate.account.move:0 #: view:validate.account.move.lines:0 msgid "Post Journal Entries" -msgstr "Buche Journaleinträge" +msgstr "Quittiere Buchungen" #. module: account #: selection:account.invoice,state:0 @@ -4608,14 +4644,14 @@ msgid "Example" msgstr "Beispiel" #. module: account -#: code:addons/account/account_invoice.py:828 +#: code:addons/account/account_invoice.py:839 #, python-format msgid "" "Please verify the price of the invoice !\n" "The real total does not match the computed total." msgstr "" -"Bitte überprüfen Sie den Rechnungspreis !\n" -"Dieser Wert entspricht nicht dem Gesamtbetrag der Rechnung." +"Bitte überprüfen Sie die Rechnungssumme!\n" +"Dieser Wert entspricht nicht dem errechneten Gesamtbetrag der Rechnung." #. module: account #: view:account.tax:0 @@ -4624,17 +4660,17 @@ msgid "Keep empty to use the income account" msgstr "Leer lassen um das Erlöskonto zu nutzen" #. module: account -#: code:addons/account/account.py:3299 +#: code:addons/account/account.py:3316 #, python-format msgid "Purchase Tax %.2f%%" -msgstr "Einkauf Steuer %.2f%%" +msgstr "Vorsteuer %.2f%%" #. module: account #: view:account.subscription.generate:0 #: model:ir.actions.act_window,name:account.action_account_subscription_generate #: model:ir.ui.menu,name:account.menu_generate_subscription msgid "Generate Entries" -msgstr "Wiederkehrende Buchungen (Automatisch)" +msgstr "Buchungen (Automatisch)" #. module: account #: help:account.vat.declaration,chart_tax_id:0 @@ -4646,13 +4682,13 @@ msgstr "Wähle Steuerkontenplan" #: field:account.fiscal.position,account_ids:0 #: field:account.fiscal.position.template,account_ids:0 msgid "Account Mapping" -msgstr "Konten Zuordnung" +msgstr "Kontenzuordnung" #. module: account #: selection:account.bank.statement.line,type:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/account_invoice.py:337 +#: code:addons/account/account_invoice.py:346 #, python-format msgid "Customer" msgstr "Kunde" @@ -4668,7 +4704,7 @@ msgid "Cancelled Invoice" msgstr "Stornierte Rechnung" #. module: account -#: code:addons/account/account.py:1567 +#: code:addons/account/account.py:1584 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " @@ -4707,7 +4743,7 @@ msgid "" "means you won't be able to modify their accounting fields anymore." msgstr "" "Alle Buchungen dieses Journals im Status 'Entwurf' werden gebucht. Hierdurch " -"können Sie dann keine Buchungen mehr vorher abändern." +"können Sie dann keine Buchungen mehr abändern." #. module: account #: model:ir.ui.menu,name:account.menu_finance_configuration @@ -4725,7 +4761,7 @@ msgid "Income Account on Product Template" msgstr "Erlöskonto für Produktvorlage" #. module: account -#: code:addons/account/account.py:3120 +#: code:addons/account/account.py:3137 #, python-format msgid "MISC" msgstr "DIV" @@ -4752,11 +4788,13 @@ msgstr "Neues Geschäftsjahr" #: view:account.invoice:0 #: view:account.tax.template:0 #: selection:account.vat.declaration,based_on:0 +#: code:addons/account/report/account_tax_report.py:68 #: model:ir.actions.act_window,name:account.act_res_partner_2_account_invoice_opened #: model:ir.actions.act_window,name:account.action_invoice_tree #: model:ir.actions.report.xml,name:account.account_invoices #: view:report.invoice.created:0 #: field:res.partner,invoice_ids:0 +#, python-format msgid "Invoices" msgstr "Rechnung" @@ -4776,7 +4814,7 @@ msgstr "Schecks" #: view:account.invoice.report:0 #: field:account.invoice.report,user_id:0 msgid "Salesman" -msgstr "Mitarbeiter" +msgstr "Verkäufer" #. module: account #: view:account.invoice.report:0 @@ -4786,12 +4824,12 @@ msgstr "Abgerechnet" #. module: account #: view:account.move:0 msgid "Posted Journal Entries" -msgstr "Verbuchte Buchungen" +msgstr "Quittierte Buchungen" #. module: account #: view:account.use.model:0 msgid "Use Model" -msgstr "Benutze Buchungsvorlage" +msgstr "Benutze Modellvorlage" #. module: account #: help:account.invoice,partner_bank_id:0 @@ -4801,9 +4839,9 @@ msgid "" "Partner bank account number." msgstr "" "Bankkonto für die Zahlung\r\n" -"* Kundenrechnungen und Lieferantengutschriften: Ein Bankkonto des " +"* Bei Kundenrechnungen und Lieferantengutschriften ein Bankkonto des " "Unternehmens\r\n" -"* sonst: ein Bankkonto des Partners" +"* ansonsten ein Bankkonto des Partners" #. module: account #: view:account.state.open:0 @@ -4813,7 +4851,7 @@ msgstr "Nein" #. module: account #: help:account.invoice.tax,tax_code_id:0 msgid "The tax basis of the tax declaration." -msgstr "Die Steuerbasis in der Steuererklärung" +msgstr "Die Steuergrundlage in der Steuererklärung" #. module: account #: view:account.addtmpl.wizard:0 @@ -4824,7 +4862,7 @@ msgstr "Hinzufügen" #: selection:account.invoice,state:0 #: report:account.overdue:0 msgid "Paid" -msgstr "bezahlt" +msgstr "Bezahlt" #. module: account #: view:account.period.close:0 @@ -4839,7 +4877,7 @@ msgstr "Der Bankauszug für den Bankausgleich" #. module: account #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0 msgid "Draft invoices are validated. " -msgstr "Rechnungen im Entwurf wurden gebucht. " +msgstr "Rechnungentwürfe wurden genehmigt. " #. module: account #: constraint:account.account.template:0 @@ -4860,7 +4898,7 @@ msgstr "Eröffnungsperiode" #. module: account #: view:account.move:0 msgid "Journal Entries to Review" -msgstr "Buchungen zu überprüfen" +msgstr "Zu prüfende Buchungen" #. module: account #: view:account.bank.statement:0 @@ -4896,29 +4934,27 @@ msgstr "Steuer Anwendung" #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale #, python-format msgid "Journal Items" -msgstr "Journal Zeilen" +msgstr "Buchungen" #. module: account -#: code:addons/account/account.py:1088 -#: code:addons/account/account.py:1090 -#: code:addons/account/account.py:1321 -#: code:addons/account/account.py:1563 -#: code:addons/account/account.py:1567 -#: code:addons/account/account.py:3368 -#: code:addons/account/account_move_line.py:807 -#: code:addons/account/account_move_line.py:830 -#: code:addons/account/account_move_line.py:832 -#: code:addons/account/account_move_line.py:835 -#: code:addons/account/account_move_line.py:837 +#: code:addons/account/account.py:1095 +#: code:addons/account/account.py:1097 +#: code:addons/account/account.py:1329 +#: code:addons/account/account.py:1580 +#: code:addons/account/account.py:1584 +#: code:addons/account/account.py:3385 +#: code:addons/account/account_move_line.py:823 +#: code:addons/account/account_move_line.py:843 +#: code:addons/account/account_move_line.py:846 #: code:addons/account/report/common_report_header.py:92 #: code:addons/account/wizard/account_change_currency.py:38 #: code:addons/account/wizard/account_change_currency.py:59 #: code:addons/account/wizard/account_change_currency.py:64 #: code:addons/account/wizard/account_change_currency.py:70 -#: code:addons/account/wizard/account_financial_report.py:69 +#: code:addons/account/wizard/account_financial_report.py:70 #: code:addons/account/wizard/account_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_report_common.py:144 -#: code:addons/account/wizard/account_report_common.py:150 +#: code:addons/account/wizard/account_report_common.py:145 +#: code:addons/account/wizard/account_report_common.py:151 #, python-format msgid "Error" msgstr "Fehler" @@ -4930,7 +4966,7 @@ msgstr "Fehler" #: field:account.analytic.inverted.balance,date2:0 #: field:account.analytic.journal.report,date2:0 msgid "End of period" -msgstr "Ende Periode" +msgstr "Periodenende" #. module: account #: view:res.partner:0 @@ -4943,8 +4979,8 @@ msgid "" "This report is analysis by partner. It is a PDF report containing one line " "per partner representing the cumulative credit balance." msgstr "" -"Der Report erzeugt Analysen nach Partner. Es handelt sich dabei um einen pdf " -"Report mit jeweils einer Zeile für den Partner" +"Der Report erzeugt Analysen nach Partner. Es handelt sich dabei um einen PDF-" +"Report mit jeweils einer Zeile pro Partner" #. module: account #: model:ir.actions.act_window,help:account.action_account_analytic_journal_tree @@ -5010,7 +5046,7 @@ msgstr "Verkaufsjournal in diesem Monat" #: model:ir.actions.act_window,name:account.action_account_vat_declaration #: model:ir.model,name:account.model_account_vat_declaration msgid "Account Vat Declaration" -msgstr "Auswertung Umsatzsteuer" +msgstr "Umsatzsteuererklärung (-voranmeldung)" #. module: account #: report:account.invoice:0 @@ -5020,15 +5056,15 @@ msgstr "Preis" #. module: account #: view:account.period:0 msgid "To Close" -msgstr "Zu Beendigen" +msgstr "Abzuschließen" #. module: account #: field:account.treasury.report,date:0 msgid "Beginning of Period Date" -msgstr "Beginn Periode" +msgstr "Datum des Periodebeginns" #. module: account -#: code:addons/account/account.py:1351 +#: code:addons/account/account.py:1361 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -5047,18 +5083,18 @@ msgstr "Vorlagen" #. module: account #: field:account.invoice.tax,name:0 msgid "Tax Description" -msgstr "Steuer Beschreibung" +msgstr "Steuerbezeichnung" #. module: account #: field:account.tax,child_ids:0 msgid "Child Tax Accounts" -msgstr "untergeordnete Steuerkonten" +msgstr "Untergeordnete Steuerkonten" #. module: account -#: code:addons/account/account.py:1090 +#: code:addons/account/account.py:1097 #, python-format msgid "Start period should be smaller then End period" -msgstr "Beginn der Periode sollte kleiner sein als Ende der Periode" +msgstr "Periodenbeginn muss vor dem Periodenende liegen" #. module: account #: help:account.tax,price_include:0 @@ -5067,7 +5103,7 @@ msgid "" "Check this if the price you use on the product and invoices includes this " "tax." msgstr "" -"Aktivieren, wenn der Preis bei Produkt und Rechnung die Steuer beinhaltet" +"Aktivieren, wenn der Preis bei Produkt und Rechnung diese Steuer beinhaltet" #. module: account #: report:account.analytic.account.balance:0 @@ -5077,6 +5113,7 @@ msgstr "Saldo (Anal.)" #. module: account #: report:account.account.balance:0 #: field:account.aged.trial.balance,target_move:0 +#: report:account.aged_trial_balance:0 #: field:account.balance.report,target_move:0 #: report:account.central.journal:0 #: field:account.central.journal,target_move:0 @@ -5120,8 +5157,10 @@ msgstr "Periodentyp" #: view:account.invoice:0 #: field:account.invoice,payment_ids:0 #: selection:account.vat.declaration,based_on:0 +#: code:addons/account/report/account_tax_report.py:70 +#, python-format msgid "Payments" -msgstr "Anzeige Zahlungen" +msgstr "Zahlungen" #. module: account #: view:account.tax:0 @@ -5198,7 +5237,7 @@ msgid "Line 1:" msgstr "Zeile 1:" #. module: account -#: code:addons/account/account.py:1307 +#: code:addons/account/account.py:1315 #, python-format msgid "Integrity Error !" msgstr "Integritätsfehler!" @@ -5216,7 +5255,7 @@ msgstr "Monat" #. module: account #: field:account.partner.reconcile.process,next_partner_id:0 msgid "Next Partner to Reconcile" -msgstr "Nächster Partner für Offene Posten Ausgleich" +msgstr "Nächster Partner zum Ausgleich offener Posten" #. module: account #: field:account.invoice.tax,account_id:0 @@ -5231,6 +5270,7 @@ msgstr "Ergebnis Kontoabstimmung" #. module: account #: model:account.financial.report,name:account.account_financial_report_balancesheet0 +#: model:ir.actions.act_window,name:account.action_account_report_bs #: model:ir.ui.menu,name:account.menu_account_report_bs msgid "Balance Sheet" msgstr "Bilanz" @@ -5295,7 +5335,7 @@ msgstr "Verkauf" #. module: account #: view:account.financial.report:0 msgid "Report" -msgstr "Report" +msgstr "Bericht" #. module: account #: view:account.analytic.line:0 @@ -5307,6 +5347,7 @@ msgstr "Report" #: view:account.move.line:0 #: field:account.tax,amount:0 #: field:account.tax.template,amount:0 +#: xsl:account.transfer:0 #: view:analytic.entries.report:0 #: field:analytic.entries.report,amount:0 msgid "Amount" @@ -5320,7 +5361,7 @@ msgstr "Betrag" #: model:process.transition,name:account.process_transition_suppliervalidentries0 #: model:process.transition,name:account.process_transition_validentries0 msgid "Validation" -msgstr "Buchung" +msgstr "Prüfung" #. module: account #: field:account.tax,child_depend:0 @@ -5331,7 +5372,7 @@ msgstr "Steuer auf untergeordnete Datensätze" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template msgid "Template Tax Fiscal Position" -msgstr "Steuer Zuordnung Vorlage" +msgstr "Vorlage zur Steuerzuordnung in der Bilanz" #. module: account #: field:account.journal,update_posted:0 @@ -5356,7 +5397,7 @@ msgstr "Personenkonto" #. module: account #: view:account.bank.statement:0 msgid "Transaction" -msgstr "Transaktion" +msgstr "Geschäftsvorfall" #. module: account #: help:account.tax,base_code_id:0 @@ -5368,7 +5409,7 @@ msgstr "Transaktion" #: help:account.tax.template,ref_tax_code_id:0 #: help:account.tax.template,tax_code_id:0 msgid "Use this code for the VAT declaration." -msgstr "Benutze diese ID für die Ust. - Voranmeldung" +msgstr "Benutze diese ID für die Umsatzsteuervoranmeldung" #. module: account #: field:account.partner.reconcile.process,progress:0 @@ -5383,7 +5424,7 @@ msgstr "Analyt. Buchungen Statistik" #. module: account #: field:wizard.multi.charts.accounts,bank_accounts_id:0 msgid "Cash and Banks" -msgstr "Geld und Banken" +msgstr "Bargeld und Banken" #. module: account #: model:ir.model,name:account.model_account_installer @@ -5393,7 +5434,7 @@ msgstr "account.installer" #. module: account #: field:account.tax.template,include_base_amount:0 msgid "Include in Base Amount" -msgstr "In Basis Betrag inkludieren" +msgstr "In Grundbetrag einbeziehen" #. module: account #: help:account.payment.term.line,days:0 @@ -5401,7 +5442,7 @@ msgid "" "Number of days to add before computation of the day of month.If Date=15/01, " "Number of Days=22, Day of Month=-1, then the due date is 28/02." msgstr "" -"Anzahl der Tage befor das Monatsende berechnet wird. \r\n" +"Anzahl der zu addierenden Tage bevor das Monatsende berechnet wird. \r\n" "Datum = 15.1\r\n" "Anzahl Tage = 22\r\n" "Tag des Monats = -1\r\n" @@ -5492,22 +5533,22 @@ msgid "End of Year Entries Journal" msgstr "Journal Eröffnungsbuchungen" #. module: account -#: code:addons/account/account.py:3446 +#: code:addons/account/account.py:3463 #: code:addons/account/account_bank_statement.py:338 -#: code:addons/account/account_invoice.py:427 -#: code:addons/account/account_invoice.py:527 -#: code:addons/account/account_invoice.py:542 -#: code:addons/account/account_invoice.py:550 -#: code:addons/account/account_invoice.py:572 +#: code:addons/account/account_invoice.py:436 +#: code:addons/account/account_invoice.py:536 +#: code:addons/account/account_invoice.py:551 +#: code:addons/account/account_invoice.py:559 +#: code:addons/account/account_invoice.py:581 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" -msgstr "Fehler Konfiguration !" +msgstr "Konfigurationsfehler!" #. module: account #: field:account.payment.term.line,value_amount:0 msgid "Amount To Pay" -msgstr "Zahlungsbetrag" +msgstr "Zahlbetrag" #. module: account #: help:account.partner.reconcile.process,to_reconcile:0 @@ -5522,12 +5563,12 @@ msgstr "" #. module: account #: view:account.subscription.line:0 msgid "Subscription lines" -msgstr "Automatische Buchungen" +msgstr "Automatische Wiederholungs-Buchungen" #. module: account #: field:account.entries.report,quantity:0 msgid "Products Quantity" -msgstr "Produkt Menge" +msgstr "Produktmenge" #. module: account #: view:account.entries.report:0 @@ -5536,7 +5577,7 @@ msgstr "Produkt Menge" #: selection:account.move,state:0 #: view:account.move.line:0 msgid "Unposted" -msgstr "Nicht gebucht" +msgstr "Nicht quittiert" #. module: account #: view:account.change.currency:0 @@ -5559,7 +5600,7 @@ msgstr "Buchungen" #. module: account #: view:account.invoice:0 msgid "Payment Date" -msgstr "Datum Zahlung" +msgstr "Zahlungsdatum" #. module: account #: view:account.analytic.account:0 @@ -5588,13 +5629,13 @@ msgid "" "Specified Journal does not have any account move entries in draft state for " "this period" msgstr "" -"Spezielles Journal hat keine Buchungspositionen im Entwurfsstadium für diese " -"Periode." +"Angegebenes Journal enthält keine Buchungspositionen im Entwurfsstadium für " +"diese Periode." #. module: account #: model:ir.actions.act_window,name:account.action_view_move_line msgid "Lines to reconcile" -msgstr "Auszugleichende Buchungen" +msgstr "Zu begleichende Buchungen" #. module: account #: report:account.analytic.account.balance:0 @@ -5604,6 +5645,8 @@ msgstr "Auszugleichende Buchungen" #: field:account.invoice.line,quantity:0 #: field:account.model.line,quantity:0 #: field:account.move.line,quantity:0 +#: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 #: view:analytic.entries.report:0 #: field:analytic.entries.report,unit_amount:0 #: field:report.account.sales,quantity:0 @@ -5637,9 +5680,9 @@ msgid "" "Number of partial amounts that can be combined to find a balance point can " "be chosen as the power of the automatic reconciliation" msgstr "" -"Anzahl der maximalen Teilbeträge die für einen gegenseitigen Ausgleich von " -"Rechnungen und Zahlungen kombiniert werden dürfen, um automatisch eine " -"Saldenausgleich für das ausgewählte Konto herbeizuführen." +"Anzahl der gleichen Teilbeträge die, in der Summe, zum Ausgleich von " +"Rechnungen aufgebracht werden müssen, um die Stärke des automatischen " +"Saldenausgleichs für das ausgewählte Konto zu nutzen." #. module: account #: help:account.payment.term.line,sequence:0 @@ -5647,14 +5690,14 @@ msgid "" "The sequence field is used to order the payment term lines from the lowest " "sequences to the higher ones" msgstr "" -"Die Sequenz Feld wird benutzt, um in diesem Fall die Zahlungsbedingungen von " -"der geringsten Sequenz zu höheren Sequenzen sukzessiv durchzuführen." +"Die Sequenz Feld wird benutzt, um die Zahlungsbedingungen von der geringsten " +"Sequenz- bzw. Folgennummer beginnend zu sortieren." #. module: account #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Position Template" -msgstr "Steuerzuordnung Vorlage" +msgstr "Bilanz-Vorlage" #. module: account #: view:account.analytic.chart:0 @@ -5672,10 +5715,10 @@ msgid "" "finalize your end of year results definitive " msgstr "" "Wenn keine weiteren Buchungen für dieses Geschäftsjahr generiert werden " -"sollen können Sie das Jahr abschliessen. Hierdurch werden alle noch offenen " -"Perioden beendet, wodurch weitere Buchungen in diesem Jahr nicht mehr " -"möglich sind. Beenden Sie das Jahr erst, wenn Sie definitv keine weiteren " -"Buchungen mehr tätigen müssen. " +"sollen, können Sie das Jahr abschliessen. Hierdurch werden alle noch offenen " +"Perioden beendet. Weitere Buchungen in diesem Jahr sind nicht mehr möglich. " +"Beenden Sie das Jahr erst, wenn Sie definitv keine weiteren Buchungen mehr " +"tätigen müssen. " #. module: account #: field:account.central.journal,amount_currency:0 @@ -5704,18 +5747,19 @@ msgid "" "No fiscal year defined for this date !\n" "Please create one from the configuration of the accounting menu." msgstr "" -"Es gibt kein Geschäftsjahr für dieses Datum !\n" +"Es ist kein Geschäftsjahr für dieses Datum angelegt!\n" "Bitte legen Sie ein Geschäftsjahr im Konfigurationsmenü des Finanzbereiches " "an." #. module: account #: view:account.move.line.reconcile:0 msgid "Reconcile With Write-Off" -msgstr "Ausgleichen mit Abschreibung" +msgstr "Ausgleichen durch Abschreibung" #. module: account #: selection:account.payment.term.line,value:0 #: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 msgid "Fixed Amount" msgstr "Fester Betrag" @@ -5752,13 +5796,14 @@ msgid "Generate Opening Entries" msgstr "Erstelle Vortragsbuchungen" #. module: account -#: code:addons/account/account_move_line.py:759 +#: code:addons/account/account_move_line.py:775 #, python-format msgid "Already Reconciled!" msgstr "Bereits ausgeglichen" #. module: account #: help:account.tax,type:0 +#: help:account.tax.template,type:0 msgid "The computation method for the tax amount." msgstr "Die Berechnungsmethode für die Höhe der Steuern." @@ -5785,14 +5830,14 @@ msgid "Child Accounts" msgstr "untergeordnete Konten" #. module: account -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1229 #, python-format msgid "Move name (id): %s (%s)" msgstr "Buchungsnummer (id): %s (%s)" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:857 +#: code:addons/account/account_move_line.py:871 #, python-format msgid "Write-Off" msgstr "Abschreibung" @@ -5812,7 +5857,7 @@ msgstr "Erlöse" #: selection:account.bank.statement.line,type:0 #: view:account.invoice:0 #: view:account.invoice.report:0 -#: code:addons/account/account_invoice.py:339 +#: code:addons/account/account_invoice.py:348 #, python-format msgid "Supplier" msgstr "Lieferant" @@ -5842,7 +5887,7 @@ msgid "Account n°" msgstr "Kontonummer" #. module: account -#: code:addons/account/account_invoice.py:88 +#: code:addons/account/account_invoice.py:91 #, python-format msgid "Free Reference" msgstr "Freie Referenz" @@ -5857,7 +5902,9 @@ msgstr "Berechnungsform" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:376 #: code:addons/account/report/account_partner_balance.py:301 +#: code:addons/account/report/account_partner_ledger.py:398 #, python-format msgid "Receivable and Payable Accounts" msgstr "Debitoren und Kreditoren" @@ -5876,12 +5923,12 @@ msgstr "Status Offen" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 msgid "Max Qty:" -msgstr "Max. Menge" +msgstr "Max. Menge:" #. module: account #: view:account.invoice.refund:0 msgid "Refund Invoice" -msgstr "Gutschrift Rechnung" +msgstr "Rechnungsgutschrift" #. module: account #: field:account.invoice,address_invoice_id:0 @@ -5895,10 +5942,10 @@ msgid "" "document shows your debit and credit taking in consideration some criteria " "you can choose by using the search tool." msgstr "" -"Durch diese Ansicht können Sie multidimensionale Ansichten auf Ihre " -"Finanzkonten vornehmen. Diese Perspektive zeigt Ihnen Ihre Salden und " -"Verkehrszahlen sowie diverse andere Kriterien und Werte die beim Suchdialog " -"gewählt werden können." +"Durch diese Ansicht erhalten Sie mehrdimensionale Ansichten auf Ihre " +"Finanzkonten. Diese Perspektive zeigt Ihnen Ihre Salden und Verkehrszahlen " +"sowie diverse andere Kriterien und Werte die im Auswahldialog gewählt werden " +"können." #. module: account #: model:ir.actions.act_window,help:account.action_tax_code_list @@ -5907,9 +5954,9 @@ msgid "" "OpenERP allows you to define the tax structure and manage it from this menu. " "You can define both numeric and alphanumeric tax codes." msgstr "" -"Die Definition der Umsatzsteuern richtet sich nach der im jeweiligen Land " -"gültigen Regelung für die Abgabe von Steuererklärungen OpenERP ermöglicht " -"Ihnen dabei die Struktur der Steuern zu definieren und über dieses Menü zu " +"Die Definition der Steuern richtet sich nach der im jeweiligen Land gültigen " +"Regelung für die Abgabe von Steuererklärungen. OpenERP ermöglicht Ihnen " +"dabei die Struktur der Steuern zu definieren und über dieses Menü zu " "verwalten. Sie können sowohl numerische als auch alphanumerische " "Zeichenfolgen für die Definition verwenden." @@ -5931,8 +5978,8 @@ msgid "" "that you should have your last line with the type 'Balance' to ensure that " "the whole amount will be threated." msgstr "" -"Wählen Sie hier die Berechnungsart dieser Zeile Ihrer Zahlungsbedingung. Sie " -"sollten dabei mindestens eine letzte Zeile mit der Berechnungsart " +"Wählen Sie hier die Berechnungsart dieser Position Ihrer Zahlungsbedingung. " +"Sie sollten dabei mindestens eine letzte Zeile mit der Berechnungsart " "'Saldoausgleich' definiert haben." #. module: account @@ -5947,7 +5994,7 @@ msgstr "Erzwinge Periode" #: view:account.invoice.report:0 #: field:account.invoice.report,nbr:0 msgid "# of Lines" -msgstr "# Positionen" +msgstr "Anz. Positionen" #. module: account #: field:account.aged.trial.balance,filter:0 @@ -5969,10 +6016,10 @@ msgid "Filter by" msgstr "Filter durch" #. module: account -#: code:addons/account/account.py:2256 +#: code:addons/account/account.py:2273 #, python-format msgid "You have a wrong expression \"%(...)s\" in your model !" -msgstr "Sie haben einen falschen Ausdruck \"%(...)s\" in Ihrem Model !" +msgstr "Sie haben einen falschen Ausdruck \"%(...)s\" in Ihrem Modell!" #. module: account #: field:account.bank.statement.line,date:0 @@ -5980,8 +6027,8 @@ msgid "Entry Date" msgstr "Buchungsdatum" #. module: account -#: code:addons/account/account_move_line.py:1155 -#: code:addons/account/account_move_line.py:1238 +#: code:addons/account/account_move_line.py:1170 +#: code:addons/account/account_move_line.py:1253 #, python-format msgid "You can not use an inactive account!" msgstr "Sie können kein inaktives Konto verwenden!" @@ -6010,7 +6057,7 @@ msgstr "Die aktuelle Währung ist nicht richtig konfiguriert!" #: field:account.tax,account_collected_id:0 #: field:account.tax.template,account_collected_id:0 msgid "Invoice Tax Account" -msgstr "Rechnung Steuerkonto" +msgstr "Konto der Rechnungssteuer" #. module: account #: model:ir.actions.act_window,name:account.action_account_general_journal @@ -6024,12 +6071,12 @@ msgid "Number of Days" msgstr "Anzahl Tage" #. module: account -#: code:addons/account/account_bank_statement.py:402 -#: code:addons/account/account_invoice.py:392 +#: code:addons/account/account_bank_statement.py:403 +#: code:addons/account/account_invoice.py:401 #: code:addons/account/wizard/account_period_close.py:51 #, python-format msgid "Invalid action !" -msgstr "Fehlerhafte Aktion" +msgstr "Ungültige Aktion!" #. module: account #: code:addons/account/wizard/account_move_journal.py:102 @@ -6045,13 +6092,13 @@ msgstr "Überprüfen Sie Ihre Finanzjournale" #. module: account #: help:account.tax,name:0 msgid "This name will be displayed on reports" -msgstr "Dieser Name wird in Reports angezeigt" +msgstr "Dieser Name wird in Berichten angezeigt" #. module: account #: report:account.analytic.account.cost_ledger:0 #: report:account.analytic.account.quantity_cost_ledger:0 msgid "Printing date" -msgstr "Datum Druck" +msgstr "Druckdatum" #. module: account #: selection:account.account.type,close_method:0 @@ -6079,7 +6126,7 @@ msgstr "Fremdwährung Saldo" #. module: account #: field:account.journal.period,name:0 msgid "Journal-Period Name" -msgstr "Journal Periode Bezeichnung" +msgstr "Bezeichnung der Journal-Periode" #. module: account #: field:account.invoice.tax,factor_base:0 @@ -6087,7 +6134,7 @@ msgid "Multipication factor for Base code" msgstr "Multiplikationsfaktor für Steuergrundbetrag" #. module: account -#: code:addons/account/wizard/account_report_common.py:150 +#: code:addons/account/wizard/account_report_common.py:151 #, python-format msgid "not implemented" msgstr "nicht implementiert" @@ -6105,27 +6152,29 @@ msgid "" "Forma' state!" msgstr "" "Ausgewählte Rechnung kann nicht bestätigt werden bevor Sie nicht im Status " -"'Entwurf' oder 'Pro Forma' ist !" +"'Entwurf' oder 'Proforma' ist !" #. module: account #: view:account.subscription:0 msgid "Running Subscription" -msgstr "aktuelle Abonnements" +msgstr "Laufende Abonnements" #. module: account #: report:account.invoice:0 msgid "Fiscal Position Remark :" -msgstr "Hinweis Steuerzuordnung" +msgstr "Hinweis zum Finanzbericht:" #. module: account #: view:analytic.entries.report:0 #: model:ir.actions.act_window,name:account.action_analytic_entries_report #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report msgid "Analytic Entries Analysis" -msgstr "Statistik Analysebuchungen" +msgstr "Statistik der Analysebuchungen" #. module: account #: selection:account.aged.trial.balance,direction_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:381 +#, python-format msgid "Past" msgstr "Vergangenheit" @@ -6137,7 +6186,7 @@ msgid "" "\"View\"! " msgstr "" "Konfigurationsfehler!\n" -"Das übergeordnete Konto muss den Typ View haben. " +"Das übergeordnete Konto muss den Typ Sicht haben. " #. module: account #: help:res.partner.bank,journal_id:0 @@ -6156,7 +6205,7 @@ msgstr "Buchung Analysekonto" #: view:res.company:0 #: field:res.company,overdue_msg:0 msgid "Overdue Payments Message" -msgstr "Text Zahlungserinnerung" +msgstr "Nachricht der Zahlungserinnerung" #. module: account #: model:ir.actions.act_window,help:account.action_account_moves_all_a @@ -6194,13 +6243,13 @@ msgid "" "(i.e. paid) in the system." msgstr "" "Sobald der Zahlungsausgleich erfolgt ist, wechselt der Status der Rechnung " -"zu 'Erledigt' ( d.h. Bezahlt)." +"zu 'Erledigt' (d. h. Bezahlt)." #. module: account #: view:account.chart.template:0 #: field:account.chart.template,account_root_id:0 msgid "Root Account" -msgstr "Oberstes Konto" +msgstr "Stammkonto" #. module: account #: field:res.partner,last_reconciliation_date:0 @@ -6215,7 +6264,7 @@ msgstr "Analytische Buchung" #. module: account #: field:product.template,taxes_id:0 msgid "Customer Taxes" -msgstr "Produkt Steuern" +msgstr "Umsatzsteuern" #. module: account #: help:account.model,name:0 @@ -6236,7 +6285,7 @@ msgstr "Erstelle ein Konto auf Basis der Vorlage" #: view:account.account.type:0 #: view:account.tax.code:0 msgid "Reporting Configuration" -msgstr "Konfiguration Auswertungen" +msgstr "Berichtseinstellungen" #. module: account #: field:account.tax,type:0 @@ -6248,7 +6297,7 @@ msgstr "Steuerart" #: model:ir.actions.act_window,name:account.action_account_template_form #: model:ir.ui.menu,name:account.menu_action_account_template_form msgid "Account Templates" -msgstr "Konto Vorlagen" +msgstr "Konto-Vorlagen" #. module: account #: help:wizard.multi.charts.accounts,complete_tax_set:0 @@ -6258,14 +6307,14 @@ msgid "" "choice assumes that the set of tax defined for the chosen template is " "complete" msgstr "" -"Diese Auswähl erlaubt Ihnen die Einkaufs und Verkaufssteuern zu definieren " +"Diese Auswähl erlaubt Ihnen die Einkaufs- und Verkaufssteuern zu definieren " "oder aus einer Liste auszuwählen. Letzteres setzt voraus, dass die Vorlage " -"komplett ist." +"vollständig ist." #. module: account #: report:account.vat.declaration:0 msgid "Tax Statement" -msgstr "Auswertung Steueranmeldung" +msgstr "Steueranmeldung" #. module: account #: model:ir.model,name:account.model_res_company @@ -6289,13 +6338,13 @@ msgid "" "You can not remove/desactivate an account which is set on a customer or " "supplier." msgstr "" -"Sie können dieses Konto nicht deaktivieren oder löschen, da es bei einem " -"Kunden oder Lieferanten verwendet wird." +"Sie können dieses Konto nicht deaktivieren oder löschen, da es einem Kunden " +"oder Lieferanten zugeordnet ist." #. module: account #: help:account.fiscalyear.close.state,fy_id:0 msgid "Select a fiscal year to close" -msgstr "Wähle Geschäftsjahr für Beendigung" +msgstr "Wähle abzuschließendes Geschäftsjahr" #. module: account #: help:account.chart.template,tax_template_ids:0 @@ -6310,7 +6359,7 @@ msgstr "IntraCom" #. module: account #: view:account.move.line.reconcile.writeoff:0 msgid "Information addendum" -msgstr "Informationsbeilage" +msgstr "Informationsanhang" #. module: account #: field:account.chart,fiscalyear:0 @@ -6320,7 +6369,7 @@ msgstr "Geschäftsjahr" #. module: account #: view:account.move.reconcile:0 msgid "Partial Reconcile Entries" -msgstr "Teilausgleich Rechnungen" +msgstr "Rechnungen mit Teilzahlungen" #. module: account #: view:account.addtmpl.wizard:0 @@ -6375,7 +6424,7 @@ msgstr "Debitor" #. module: account #: constraint:account.move.line:0 msgid "Company must be the same for its related account and period." -msgstr "Company must be the same for its related account and period." +msgstr "Das Unternehmen muss für Konto wie auch Periode das gleiche sein." #. module: account #: view:account.invoice:0 @@ -6400,15 +6449,16 @@ msgstr "Aktuell" #. module: account #: view:account.bank.statement:0 msgid "CashBox" -msgstr "Kassenbuch" +msgstr "Barkasse" #. module: account #: model:account.account.type,name:account.account_type_cash_equity msgid "Equity" -msgstr "Eigenkapital" +msgstr "Buchwert" #. module: account #: selection:account.tax,type:0 +#: selection:account.tax.template,type:0 msgid "Percentage" msgstr "Prozentsatz" @@ -6420,13 +6470,13 @@ msgstr "Journal & Partner" #. module: account #: field:account.automatic.reconcile,power:0 msgid "Power" -msgstr "Power" +msgstr "Stärke" #. module: account -#: code:addons/account/account.py:3368 +#: code:addons/account/account.py:3385 #, python-format msgid "Cannot generate an unused journal code." -msgstr "Kann keine nicht verwendeten Journal Code erzeugen." +msgstr "Kann keinen nicht verwendeten Journal Code erzeugen." #. module: account #: view:project.account.analytic.line:0 @@ -6445,8 +6495,8 @@ msgid "" "Indicates if the amount of tax must be included in the base amount for the " "computation of the next taxes" msgstr "" -"Anzeige, inwieweit diese Steuer im Steuergrundbetrag für die weitere " -"Berechnung inbegriffen ist, oder nicht." +"Anzeige, inwieweit diese Steuer im Grundbetrag für die weitere Berechnung " +"enthalten sein muß, oder nicht." #. module: account #: model:ir.actions.act_window,name:account.action_account_partner_reconcile @@ -6462,12 +6512,12 @@ msgstr "Umgekehrter Saldo (Anal.)" #. module: account #: field:account.tax.template,applicable_type:0 msgid "Applicable Type" -msgstr "Anwendb. Typ" +msgstr "Anwendbare Art" #. module: account #: field:account.invoice.line,invoice_id:0 msgid "Invoice Reference" -msgstr "Rechnungsreferenz" +msgstr "Rechnungsbezug" #. module: account #: help:account.tax.template,sequence:0 @@ -6476,16 +6526,16 @@ msgid "" "higher ones. The order is important if you have a tax that has several tax " "children. In this case, the evaluation order is important." msgstr "" -"Die Sequenz ist für die Sortierung einzelner Steuerpositionen. Die Sequenz " -"ist wichtig, wenn es mehrere untergeordnete Steuern zu einer " -"übergeordetneten Obersteuer gibt." +"Die Sequenz dient der Sortierung einzelner Steuerpositionen. Die Sequenz ist " +"wichtig, wenn mehrere untergeordnete Steuern zu einer übergeordneten Steuer " +"vorliegen." #. module: account #: selection:account.account,type:0 #: selection:account.account.template,type:0 #: view:account.journal:0 msgid "Liquidity" -msgstr "Finanzmittel" +msgstr "Liquidität" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form @@ -6518,7 +6568,7 @@ msgid "" "the tool search to analyse information about analytic entries generated in " "the system." msgstr "" -"Durch dieses Ansicht können Sie ihre unterschiedlichen analytischen Konten " +"Durch diese Ansicht können Sie ihre unterschiedlichen analytischen Konten " "unter Berücksichtigung Ihres individullen Informationsbedarfs auswerten. " "Benutzen Sie dieses Werkzeug für die Auswertung, der von Ihnen gebuchten " "Beträge auf Analysekonten." @@ -6526,7 +6576,7 @@ msgstr "" #. module: account #: sql_constraint:account.journal:0 msgid "The name of the journal must be unique per company !" -msgstr "Die Journalbezeichnung sollte pro Unternehmen eindeutig sein." +msgstr "Die Journalbezeichnung muss pro Unternehmen eindeutig sein." #. module: account #: field:account.account.template,nocreate:0 @@ -6547,7 +6597,7 @@ msgstr "" #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 #, python-format msgid "Enter a Start date !" -msgstr "Geben Sie ein Startdatum ein !" +msgstr "Geben Sie ein Startdatum ein!" #. module: account #: report:account.invoice:0 @@ -6555,7 +6605,7 @@ msgstr "Geben Sie ein Startdatum ein !" #: selection:account.invoice.report,type:0 #: selection:report.invoice.created,type:0 msgid "Supplier Refund" -msgstr "Lieferanten Gutschrift" +msgstr "Lieferantengutschrift" #. module: account #: field:account.bank.statement,move_line_ids:0 @@ -6603,7 +6653,7 @@ msgstr " Bewertung: Saldo" #. module: account #: field:account.invoice.line,uos_id:0 msgid "Unit of Measure" -msgstr "ME" +msgstr "Mengeneinheit" #. module: account #: constraint:account.payment.term.line:0 @@ -6612,7 +6662,7 @@ msgid "" "2% " msgstr "" "Prozentwert für eine Position der Zahlungsbedingung muss zwischen 0 und 1 " -"sein, z.B. 0.02 für 2% " +"sein, z. B. 0.02 für 2% " #. module: account #: field:account.installer,has_default_company:0 @@ -6655,7 +6705,7 @@ msgstr "Steuergrundbetrag" #. module: account #: field:account.model,name:0 msgid "Model Name" -msgstr "Buchungsvorlage Bezeichnung" +msgstr "Modell-Bezeichnung" #. module: account #: field:account.chart.template,property_account_expense_categ:0 @@ -6698,8 +6748,8 @@ msgid "You can not remove an account containing journal items." msgstr "Sie dürfen kein Konto löschen, das Buchungen beinhaltet" #. module: account -#: code:addons/account/account_analytic_line.py:145 -#: code:addons/account/account_move_line.py:933 +#: code:addons/account/account_analytic_line.py:143 +#: code:addons/account/account_move_line.py:947 #, python-format msgid "Entries: " msgstr "Buchungen: " @@ -6715,7 +6765,7 @@ msgid "Currency of the related account journal." msgstr "Währung des verwendten Buchungsjournals" #. module: account -#: code:addons/account/account.py:1563 +#: code:addons/account/account.py:1580 #, python-format msgid "Couldn't create move between different companies" msgstr "Konnte keine überbetriebliche Buchung erzeugen" @@ -6731,14 +6781,14 @@ msgid "" "account. From this view, you can create and manage the account types you " "need for your company." msgstr "" -"Über Kontoarten wird gesteuert mit welcher Logik in den verschiedenen " +"Über Kontoarten wird gesteuert, mit welcher Logik in den verschiedenen " "Journalen gebucht wird. Die Methode für die Abgrenzung beim Jahreswechsel " "steuert dabei den Prozess der Buchung beim Jahresabschluss. Die GuV & Bilanz " "Positionen steuern den Ausweis für die Auswertungen Bilanz sowie Gewinn und " "Verlust. Zum Beispiel könnte eine Kontoart entweder mit einem Konto aus dem " "Anlagevermögen, einem Aufwands- oder einem Kreditorenkonto verbunden sein. " "Über diese Ansicht können Sie die in Ihrem Unternehmen benötigten Kontoarten " -"exakt definieren." +"festlegen." #. module: account #: selection:account.account.type,report_type:0 @@ -6765,16 +6815,16 @@ msgstr "Status ist Entwurf" #. module: account #: view:account.move.line:0 -#: code:addons/account/account_move_line.py:1043 +#: code:addons/account/account_move_line.py:1058 #, python-format msgid "Total debit" msgstr "Gesamt Soll" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:824 #, python-format msgid "Entry \"%s\" is not valid !" -msgstr "Eintrag \"%s\" ist ungültig !" +msgstr "Eintrag \"%s\" ist ungültig!" #. module: account #: report:account.invoice:0 @@ -6788,7 +6838,7 @@ msgid "" "taxes and journals according to the selected template" msgstr "" "Automatische Konfiguration Ihres Kontenplans, Bankkontos, Steuern und " -"Journaldefinition resultierend aus der gewählten Vorlage," +"Journaldefinition gemäß der gewählten Vorlage," #. module: account #: help:res.partner,property_account_receivable:0 @@ -6827,12 +6877,12 @@ msgstr "" #. module: account #: view:account.fiscalyear.close:0 msgid "Create" -msgstr "Erstellen" +msgstr "Anlegen" #. module: account #: model:process.transition.action,name:account.process_transition_action_createentries0 msgid "Create entry" -msgstr "Erzeuge Buchung" +msgstr "Buchung anlegen" #. module: account #: selection:account.account.type,report_type:0 @@ -6845,49 +6895,50 @@ msgstr "Gewinn & Verlust ( Aufwandskonto )" #: code:addons/account/account.py:622 #: code:addons/account/account.py:624 #: code:addons/account/account.py:963 -#: code:addons/account/account.py:1052 -#: code:addons/account/account.py:1129 -#: code:addons/account/account.py:1344 -#: code:addons/account/account.py:1351 -#: code:addons/account/account.py:2280 -#: code:addons/account/account.py:2596 -#: code:addons/account/account_analytic_line.py:92 -#: code:addons/account/account_analytic_line.py:101 +#: code:addons/account/account.py:1057 +#: code:addons/account/account.py:1136 +#: code:addons/account/account.py:1352 +#: code:addons/account/account.py:1359 +#: code:addons/account/account.py:1361 +#: code:addons/account/account.py:2297 +#: code:addons/account/account.py:2613 +#: code:addons/account/account_analytic_line.py:90 +#: code:addons/account/account_analytic_line.py:99 #: code:addons/account/account_bank_statement.py:301 #: code:addons/account/account_bank_statement.py:314 #: code:addons/account/account_bank_statement.py:352 -#: code:addons/account/account_cash_statement.py:292 -#: code:addons/account/account_cash_statement.py:314 -#: code:addons/account/account_invoice.py:808 -#: code:addons/account/account_invoice.py:839 -#: code:addons/account/account_invoice.py:1030 -#: code:addons/account/account_move_line.py:1200 -#: code:addons/account/account_move_line.py:1216 -#: code:addons/account/account_move_line.py:1218 +#: code:addons/account/account_cash_statement.py:293 +#: code:addons/account/account_cash_statement.py:315 +#: code:addons/account/account_invoice.py:819 +#: code:addons/account/account_invoice.py:850 +#: code:addons/account/account_invoice.py:1042 +#: code:addons/account/account_move_line.py:1215 +#: code:addons/account/account_move_line.py:1231 +#: code:addons/account/account_move_line.py:1233 #: code:addons/account/wizard/account_invoice_refund.py:108 #: code:addons/account/wizard/account_invoice_refund.py:110 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" -msgstr "Fehler !" +msgstr "Fehler!" #. module: account #: field:account.financial.report,style_overwrite:0 msgid "Financial Report Style" -msgstr "Finanz Report Stiel" +msgstr "Stil des Finanzberichts" #. module: account #: selection:account.financial.report,sign:0 msgid "Preserve balance sign" -msgstr "Erhalte Saldo Vorzeichen" +msgstr "Erhalte Saldo-Vorzeichen" #. module: account #: view:account.vat.declaration:0 #: model:ir.actions.report.xml,name:account.account_vat_declaration #: model:ir.ui.menu,name:account.menu_account_vat_declaration msgid "Taxes Report" -msgstr "Umsatzsteuer" +msgstr "Umsatzsteuer-Anmeldung" #. module: account #: selection:account.journal.period,state:0 @@ -6895,16 +6946,16 @@ msgid "Printed" msgstr "Gedruckt" #. module: account -#: code:addons/account/account_move_line.py:584 -#: code:addons/account/account_move_line.py:591 +#: code:addons/account/account_move_line.py:575 +#: code:addons/account/account_move_line.py:582 #, python-format msgid "Error :" -msgstr "Fehler :" +msgstr "Fehler:" #. module: account #: view:account.analytic.line:0 msgid "Project line" -msgstr "Budget Projekt" +msgstr "Projektbudget" #. module: account #: field:account.invoice.tax,manual:0 @@ -6921,11 +6972,11 @@ msgid "" "the amounts correspond." msgstr "" "Damit Ihre Rechnung als bezahlt gekennzeichnet werden kann, müssen Sie einen " -"Ausgleich durch eine Gegenbuchung herbeiführen, welches üblicherweise eine " -"Zahlung ist. Durch die Funktion des automatisierten Ausgleichs offener " -"Posten, nutzen Sie die OpenERP Automatik für die Suche und den Ausgleich von " -"zusammengehörigen Rechnungen und Zahlungen über eine Prüfung " -"zuammenpassender Beträge." +"Ausgleich durch eine Gegenbuchung herbeiführen. Üblicherweise ist dies eine " +"Zahlung. Durch die Funktion des automatisierten Ausgleichs offener Posten, " +"nutzen Sie die Automatik von OpenERP den Ausgleich von zusammengehörigen " +"Rechnungen und Zahlungen über eine Suche zuammenpassender Beträge " +"durchzuführen." #. module: account #: view:account.move:0 @@ -6941,9 +6992,9 @@ msgid "" "row to display the amount of debit/credit/balance that precedes the filter " "you've set." msgstr "" -"Wenn ein Tages oder Periodenfilter gewählt wird, können sie mit diesem " -"Kennzeichen steuern, ob eine Zeile mit Soll/Haben/Saldo ausgegeben wird, die " -"die Buchungen davor summiert." +"Wenn ein Filter nach Datum oder Periode gewählt wird, können sie mit diesem " +"Kennzeichen steuern, ob eine Zeile mit Soll/Haben/Saldo der Ausgabe " +"vorangestellt wird." #. module: account #: view:account.bank.statement:0 @@ -6952,7 +7003,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form #: model:ir.ui.menu,name:account.menu_finance_entries msgid "Journal Entries" -msgstr "Buchungsbelege" +msgstr "Buchungen" #. module: account #: help:account.partner.ledger,page_split:0 @@ -6960,7 +7011,7 @@ msgid "Display Ledger Report with One partner per page" msgstr "Kontoauszug mit einem Partner pro Seite" #. module: account -#: code:addons/account/account_move_line.py:1218 +#: code:addons/account/account_move_line.py:1233 #, python-format msgid "" "You can not do this modification on a reconciled entry! You can just change " @@ -6987,9 +7038,9 @@ msgid "" "This report is an analysis done by a partner. It is a PDF report containing " "one line per partner representing the cumulative credit balance" msgstr "" -"Diese Auswertung analysiert die Salden auf Partnerskonten. Der Bericht " -"beinhaltet eine PDF Auswertung mit je einer zusammenfassenden " -"Auswertungszeile je Partner" +"Diese Auswertung analysiert die Salden auf Partnerskonten. Der PDF-Bericht " +"beinhaltet eine Auswertung mit je einer zusammenfassenden Auswertungszeile " +"je Partner" #. module: account #: code:addons/account/wizard/account_validate_account_move.py:61 @@ -7027,7 +7078,7 @@ msgid "" "Error: The default UOM and the purchase UOM must be in the same category." msgstr "" "Fehler: Die Standard Mengeneinheit (ME) sowie die Mengeneinheit (ME) bei der " -"Beschaffung muss in derselben Kategorie sein." +"Beschaffung müssen derselben Kategorie angehören." #. module: account #: view:account.journal.select:0 @@ -7045,12 +7096,12 @@ msgstr "Anfangssaldo" #. module: account #: model:ir.model,name:account.model_account_move_reconcile msgid "Account Reconciliation" -msgstr "Konto OP Ausgleich" +msgstr "Konto OP-Ausgleich" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax msgid "Taxes Fiscal Position" -msgstr "Steuern Zuordnung" +msgstr "Steuerzuordnung" #. module: account #: report:account.general.ledger:0 @@ -7066,7 +7117,7 @@ msgstr "Umsätze nach Konten und Perioden" #. module: account #: model:process.transition,note:account.process_transition_paymentorderbank0 msgid "The payment order is sent to the bank." -msgstr "Der Zahlungsauftrag wurde an Bank versendet." +msgstr "Die Zahlungsanweisung wurde der Bank zugesendet." #. module: account #: view:account.balance.report:0 @@ -7127,7 +7178,7 @@ msgid "Total:" msgstr "Summe:" #. module: account -#: code:addons/account/account.py:2229 +#: code:addons/account/account.py:2246 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -7142,11 +7193,11 @@ msgstr "" "Sie können Jahr, Monat und Datum für die Anwendung dieser Buchungsvorlage " "als Buchungstext durch folgende Platzhalter definieren:\n" "\n" -"%(year)s: Spezifikation für das Jahr \n" -"%(month)s: Spezifikation für den Monat \n" -"%(date)s: Spezifikation für das Datum\n" +"%(year)s: Festlegung des Jahres \n" +"%(month)s: Festlegung des Monats \n" +"%(date)s: Festlegung des heutigen Datums\n" "\n" -"z.B. Meine Buchungsvorlage am %(date)s" +"z. B. Meine Buchungsvorlage am %(date)s" #. module: account #: help:report.invoice.created,origin:0 @@ -7157,7 +7208,7 @@ msgstr "Belegreferenz für diese Rechnung" #: field:account.tax.code,child_ids:0 #: field:account.tax.code.template,child_ids:0 msgid "Child Codes" -msgstr "untergeordnete Codes" +msgstr "untergeordnete Schlüssel" #. module: account #: view:account.tax.template:0 @@ -7165,7 +7216,7 @@ msgid "Taxes used in Sales" msgstr "Steuern für Verkäufe" #. module: account -#: code:addons/account/account_invoice.py:495 +#: code:addons/account/account_invoice.py:504 #: code:addons/account/wizard/account_invoice_refund.py:145 #, python-format msgid "Data Insufficient !" @@ -7210,15 +7261,16 @@ msgid "" "automatically based on these data." msgstr "" "Konfigurieren Sie ie Bankkonten des Unternehmens und wählen Sie diejenigen, " -"die in den Report Fußzeilen erscheinen sollen.\r\n" +"die in Fußzeilen des Berichts erscheinen sollen.\r\n" "Sie können die Bankkonten in der Liste sortieren. Wenn Sie die Buchhaltung " -"von OpenERP einsetzen werden automatisch Journale und Konten generiert." +"von OpenERP einsetzen werden aus diesen Angaben automatisch Journale und " +"Konten generiert." #. module: account #: model:process.transition,note:account.process_transition_invoicemanually0 msgid "A statement with manual entries becomes a draft statement." msgstr "" -"Ein Bankauszug mit händischen Buchungen erhält zunächst den Status Entwurf." +"Ein Bankauszug mit händischen Buchungen erhält zunächst den Status 'Entwurf'." #. module: account #: view:account.aged.trial.balance:0 @@ -7234,21 +7286,21 @@ msgstr "" "Ihrer Debitoren aufgeteilt in zeitliche Intervalle. Wenn Sie diesen Bericht " "öffnen, fragt OpenERP nach dem Unternehmen, der Periode und dem " "Zeitintervall für die Auswertung (in Tagen). OpenERP berechnet dann eine " -"Tabelle mit Kundensalden nach Perioden. Wenn Sie eine Intervalle von 30 " -"Tagen eingeben, erzeugt OpenERP eine Auswertung der Salden für den letzten " -"Monat, vorletzten Monat usw. " +"Tabelle mit Kundensalden nach Perioden. Wenn Sie ein Intervalle von 30 Tagen " +"eingeben, erzeugt OpenERP eine Auswertung der Salden für den letzten Monat, " +"vorletzten Monat usw. " #. module: account #: field:account.invoice,origin:0 #: field:report.invoice.created,origin:0 msgid "Source Document" -msgstr "Herkunftsverweis" +msgstr "Herkunftsdokument" #. module: account -#: code:addons/account/account.py:1432 +#: code:addons/account/account.py:1449 #, python-format msgid "You can not delete a posted journal entry \"%s\"!" -msgstr "Sie können keine verbuchten Buchungen löschen \"%s\"!" +msgstr "Sie können keine quittierten Buchungen löschen \"%s\"!" #. module: account #: selection:account.partner.ledger,filter:0 @@ -7266,7 +7318,7 @@ msgstr "Bankauszug Abstimmung" #. module: account #: model:ir.model,name:account.model_accounting_report msgid "Accounting Report" -msgstr "Report Finanzen" +msgstr "Finanzbericht" #. module: account #: report:account.invoice:0 @@ -7277,8 +7329,8 @@ msgstr "Steuern:" #: help:account.tax,amount:0 msgid "For taxes of type percentage, enter % ratio between 0-1." msgstr "" -"Für Steuern mit dem Typ Prozent, geben Sie einen Wert zwischen 0 - 1 ein, " -"z.B. 0.19 für 19%" +"Für Steuern mit dem Typ Prozent, geben Sie einen Wert zwischen 0 - 1 ein, z. " +"B. 0.19 für 19%" #. module: account #: model:ir.actions.act_window,help:account.action_subscription_form @@ -7289,7 +7341,7 @@ msgid "" "you can create such entries to automate the postings in the system." msgstr "" "Eine wiederkehrende Buchung ist ein Geschäftsvorfall, der in regelmässigen " -"wiederkehrenden Zeitabständen zu buchen ist, z.B. die Buchungen aus " +"wiederkehrenden Zeitabständen zu buchen ist, z. B. die Buchungen aus " "bestimmten Verträgen mit Kunden oder Lieferanten, Mietaufwendungen oder " "Erträge aus Abonnements. Durch die Definition wiederkehrender Buchungen " "können Sie dafür sorgen, dass diese Geschäftsvorfälle automatisch gebucht " @@ -7298,7 +7350,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy msgid "Financial Reports Hierarchy" -msgstr "Hierarchische Finanz Reports" +msgstr "Hierarchie der Finanzberichte" #. module: account #: field:account.entries.report,product_uom_id:0 @@ -7329,8 +7381,8 @@ msgid "" "This date will be used as the invoice date for Refund Invoice and Period " "will be chosen accordingly!" msgstr "" -"Dieses Datum wird genutzt als Rechnungsdatum für eine Gutschrift. Die " -"Buchungsperiode wird dabei gleichlautend eingetragen." +"Dieses Datum wird als Belegdatum für eine Gutschrift. Die Buchungsperiode " +"wird dabei passend gewählt." #. module: account #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation @@ -7352,7 +7404,7 @@ msgstr "Positionen" #. module: account #: view:account.tax.template:0 msgid "Account Tax Template" -msgstr "Umsatzsteuer Vorlage" +msgstr "Umsatzsteuer-Vorlage" #. module: account #: view:account.journal.select:0 @@ -7365,8 +7417,8 @@ msgid "Are you sure you want to open this invoice ?" msgstr "Sind Sie sicher, daß Sie diese Rechnung öffnen wollen?" #. module: account -#: code:addons/account/account_invoice.py:528 -#: code:addons/account/account_invoice.py:543 +#: code:addons/account/account_invoice.py:537 +#: code:addons/account/account_invoice.py:552 #, python-format msgid "" "Can not find a chart of account, you should create one from the " @@ -7378,10 +7430,10 @@ msgstr "" #. module: account #: field:account.chart.template,property_account_expense_opening:0 msgid "Opening Entries Expense Account" -msgstr "Eröffnungsbilanz Buchungen Aufwandskonto" +msgstr "Eröffnungsbuchungen des Aufwandskontos" #. module: account -#: code:addons/account/account_move_line.py:999 +#: code:addons/account/account_move_line.py:1014 #, python-format msgid "Accounting Entries" msgstr "Buchungen" @@ -7389,7 +7441,7 @@ msgstr "Buchungen" #. module: account #: field:account.account.template,parent_id:0 msgid "Parent Account Template" -msgstr "Basiskonto Vorlage" +msgstr "Stammkonto Vorlage" #. module: account #: model:ir.actions.act_window,name:account.action_account_configuration_installer @@ -7421,7 +7473,7 @@ msgstr "" #. module: account #: view:account.entries.report:0 msgid "Posted entries" -msgstr "Verbuchte Buchungen" +msgstr "Quittierte Buchungen" #. module: account #: help:account.payment.term.line,value_amount:0 @@ -7444,7 +7496,7 @@ msgstr "Gruppiere nach Rechnungsjahr" #. module: account #: help:res.partner,credit:0 msgid "Total amount this customer owes you." -msgstr "Gesamtschulden eines Kunden" +msgstr "Gesamtschulden dieses Kunden" #. module: account #: model:ir.model,name:account.model_ir_sequence @@ -7465,7 +7517,7 @@ msgstr "OK" #. module: account #: field:account.chart.template,tax_code_root_id:0 msgid "Root Tax Code" -msgstr "Basis Steuerkonto" +msgstr "Basis Steuerschlüssel" #. module: account #: help:account.journal,centralisation:0 @@ -7485,17 +7537,17 @@ msgstr "Beendet am" #. module: account #: model:ir.model,name:account.model_account_bank_statement_line msgid "Bank Statement Line" -msgstr "Bankauszug Buchungen" +msgstr "Positionen auf Bankauszug" #. module: account #: field:account.automatic.reconcile,date2:0 msgid "Ending Date" -msgstr "Ende Datum" +msgstr "Enddatum" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 msgid "Default Purchase Tax" -msgstr "Standard Steuer Einkauf" +msgstr "Standard Erwerbssteuer" #. module: account #: field:account.chart.template,property_account_income_opening:0 @@ -7518,26 +7570,26 @@ msgstr "" "Steuerberechnung gebraucht wird." #. module: account -#: code:addons/account/account.py:1088 +#: code:addons/account/account.py:1095 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "" -"Sie sollten Perioden wählen, die für dieses Unternehmen vorhanden sind" +"Sie sollten Perioden wählen, die dem gleichen Unternehmen zugeordnet sind" #. module: account #: model:ir.actions.act_window,name:account.action_review_payment_terms_installer msgid "Review your Payment Terms" -msgstr "Überprüfen Sie Ihre Zahlungskonditionen" +msgstr "Überprüfen Sie Ihre Zahlungsbedingungen" #. module: account #: field:account.fiscalyear.close,report_name:0 msgid "Name of new entries" -msgstr "Buchungstext" +msgstr "Text neuer Buchungen" #. module: account #: view:account.use.model:0 msgid "Create Entries" -msgstr "Erstelle Buchungen" +msgstr "Buchungen anlegen" #. module: account #: view:res.partner:0 @@ -7550,8 +7602,8 @@ msgid "Reporting" msgstr "Berichtswesen" #. module: account -#: code:addons/account/account_move_line.py:759 -#: code:addons/account/account_move_line.py:842 +#: code:addons/account/account_move_line.py:775 +#: code:addons/account/account_move_line.py:856 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_state_open.py:37 @@ -7575,13 +7627,13 @@ msgstr "Kassenabschluss" #: view:account.journal:0 #: field:res.partner.bank,journal_id:0 msgid "Account Journal" -msgstr "Journal Konto" +msgstr "Konto-Journal" #. module: account #: model:process.node,name:account.process_node_paidinvoice0 #: model:process.node,name:account.process_node_supplierpaidinvoice0 msgid "Paid invoice" -msgstr "Rechnung Bezahlt" +msgstr "Beglichene Rechnung" #. module: account #: help:account.partner.reconcile.process,next_partner_id:0 @@ -7590,9 +7642,9 @@ msgid "" "the system to go through the reconciliation process, based on the latest day " "it have been reconciled." msgstr "" -"Dieses Feld zeigt den nächsten Partner an, der automatisch durch das System " -"im Rahmen des Ausgleichs offener Posten auf Basis des letztmaligen " -"Ausgleichs von offenen Posten vorgeschlagen wird." +"Dieses Feld zeigt automatisch den nächsten Partner an, der im Rahmen des " +"Ausgleichs offener Posten, auf Basis des letztmaligen Ausgleichs von offenen " +"Posten, vorgeschlagen wird." #. module: account #: field:account.move.line.reconcile.writeoff,comment:0 @@ -7608,13 +7660,13 @@ msgstr "Domain" #. module: account #: model:ir.model,name:account.model_account_use_model msgid "Use model" -msgstr "Benutze Buchungsvorlage" +msgstr "Benutze Modellvorlage" #. module: account #: code:addons/account/account.py:429 #, python-format msgid "Unable to adapt the initial balance (negative value)!" -msgstr "Kann die Anfangsbilanz nicht berechnen (negativer Wert)" +msgstr "Kann die Anfangsbilanz nicht berechnen (negativer Wert)!" #. module: account #: model:ir.actions.act_window,help:account.action_account_moves_purchase @@ -7645,21 +7697,23 @@ msgstr "Kunden und Lieferanten Gutschriften" #. module: account #: field:account.financial.report,sign:0 msgid "Sign on Reports" -msgstr "Sign On Reports" +msgstr "Vorzeichen in Berichten" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:73 +#: code:addons/account/wizard/account_fiscalyear_close.py:88 #, python-format msgid "The periods to generate opening entries were not found" -msgstr "Die Perioden für die Eröffnungsbilanz konnte nicht gefunden werden." +msgstr "" +"Die Perioden zur Erstellung der Eröffnungsbilanz konntennicht gefunden " +"werden." #. module: account #: model:account.account.type,name:account.data_account_type_view msgid "Root/View" -msgstr "Wurzel/Sicht" +msgstr "Stamm/Sicht" #. module: account -#: code:addons/account/account.py:3121 +#: code:addons/account/account.py:3138 #, python-format msgid "OPEJ" msgstr "EB" @@ -7668,7 +7722,7 @@ msgstr "EB" #: report:account.invoice:0 #: view:account.invoice:0 msgid "PRO-FORMA" -msgstr "PRO-FORMA" +msgstr "PROFORMA" #. module: account #: selection:account.entries.report,move_line_state:0 @@ -7694,13 +7748,14 @@ msgid "Optional Information" msgstr "Informationen (Optional)" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:84 +#: code:addons/account/wizard/account_fiscalyear_close.py:100 #, python-format msgid "The journal must have default credit and debit account" msgstr "Das Journal benötigt einen Standardwert für Debitor und Kreditor" #. module: account #: report:account.general.journal:0 +#: xsl:account.transfer:0 msgid ":" msgstr ":" @@ -7727,25 +7782,25 @@ msgstr "Multi-Währung" #. module: account #: field:account.model.line,date_maturity:0 msgid "Maturity Date" -msgstr "Datum Fällig" +msgstr "Fälligkeitsdatum" #. module: account -#: code:addons/account/account_move_line.py:1302 +#: code:addons/account/account_move_line.py:1317 #, python-format msgid "Bad account !" msgstr "Falsches Konto!" #. module: account -#: code:addons/account/account.py:3108 +#: code:addons/account/account.py:3125 #, python-format msgid "Sales Journal" -msgstr "Journal Verkauf" +msgstr "Verkaufs-Journal" #. module: account #: code:addons/account/wizard/account_move_journal.py:104 #, python-format msgid "Open Journal Items !" -msgstr "Öffne Journalbuchungen" +msgstr "Öffne Journalbuchungen!" #. module: account #: model:ir.model,name:account.model_account_invoice_tax @@ -7753,7 +7808,7 @@ msgid "Invoice Tax" msgstr "Umsatzsteuer" #. module: account -#: code:addons/account/account_move_line.py:1277 +#: code:addons/account/account_move_line.py:1292 #, python-format msgid "No piece number !" msgstr "Keine Stückzahl!" @@ -7762,7 +7817,7 @@ msgstr "Keine Stückzahl!" #: view:account.financial.report:0 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy msgid "Account Reports Hierarchy" -msgstr "Konten Report Hierarchie" +msgstr "Bericht der Konten-Hierarchie" #. module: account #: help:account.account.template,chart_template_id:0 @@ -7774,22 +7829,21 @@ msgid "" "common to both several times)." msgstr "" "Dieses wahlfreie Feld ermöglicht Ihnen eine Konten-Vorlage von einer " -"Kontenplan-Vorlage abzuleiten, wobei sich die Konten des vom Stamm-" -"Kontenplan unterscheiden können. So können Sie eine Kontenplan-Vorlage " -"festlegen, die eine Andere, ggf. auch nur geringfügig, erweitert. (Sie " -"brauchen also nicht die beiden gemeinsamen Strukturen mehrfach zu " -"definieren)." +"Kontenplan-Vorlage abzuleiten, wobei sich die Konten vom Stamm-Kontenplan " +"unterscheiden können. So können Sie eine Kontenplan-Vorlage festlegen, die " +"eine Andere, ggf. auch nur geringfügig, erweitert. (Sie brauchen also nicht " +"die beiden gemeinsamen Strukturen mehrfach zu definieren)." #. module: account #: view:account.move:0 msgid "Unposted Journal Entries" -msgstr "Nicht verbuchte Buchungen" +msgstr "Nicht Quittierte Buchungen" #. module: account #: view:product.product:0 #: view:product.template:0 msgid "Sales Properties" -msgstr "Verkauf Eigenschaften" +msgstr "Verkaufseinstellungen" #. module: account #: model:ir.ui.menu,name:account.menu_manual_reconcile @@ -7799,7 +7853,7 @@ msgstr "Manueller Kontenausgleich" #. module: account #: report:account.overdue:0 msgid "Total amount due:" -msgstr "Gesamtbetrag fällig:" +msgstr "Fälliger Gesamtbetrag:" #. module: account #: field:account.analytic.chart,to_date:0 @@ -7809,7 +7863,7 @@ msgstr "An" #. module: account #: selection:account.move.line,centralisation:0 -#: code:addons/account/account.py:1518 +#: code:addons/account/account.py:1535 #, python-format msgid "Currency Adjustment" msgstr "Währungsanpassung" @@ -7863,18 +7917,20 @@ msgstr "Mai" #: selection:account.common.partner.report,result_selection:0 #: selection:account.partner.balance,result_selection:0 #: selection:account.partner.ledger,result_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:374 #: code:addons/account/report/account_partner_balance.py:299 +#: code:addons/account/report/account_partner_ledger.py:396 #, python-format msgid "Payable Accounts" msgstr "Kreditorenkonten" #. module: account -#: code:addons/account/account_invoice.py:732 +#: code:addons/account/account_invoice.py:741 #, python-format msgid "Global taxes defined, but they are not in invoice lines !" msgstr "" -"Allgemeine Steuern wurden definiert, aber befinden sich nicht auf " -"Rechnungszeilenebene!" +"Allgemeine Steuern wurden definiert, aber in den Rechnungspositionensind " +"keine aufgeführt!" #. module: account #: model:ir.model,name:account.model_account_chart_template @@ -7897,17 +7953,17 @@ msgstr "Steuercode Nummer" #. module: account #: view:validate.account.move:0 msgid "Post Journal Entries of a Journal" -msgstr "Erzeuge Buchungen in Journal" +msgstr "Buchungen eines Journals quittieren" #. module: account #: view:product.product:0 msgid "Sale Taxes" -msgstr "Steuern Verkauf" +msgstr "Verkaufssteuern" #. module: account #: field:account.financial.report,name:0 msgid "Report Name" -msgstr "Report Bezeichnung" +msgstr "Berichtsbezeichnung" #. module: account #: model:account.account.type,name:account.data_account_type_cash @@ -7915,38 +7971,38 @@ msgstr "Report Bezeichnung" #: selection:account.bank.accounts.wizard,account_type:0 #: selection:account.entries.report,type:0 #: selection:account.journal,type:0 -#: code:addons/account/account.py:3003 +#: code:addons/account/account.py:3020 #, python-format msgid "Cash" -msgstr "Kasse" +msgstr "Barkasse" #. module: account #: field:account.fiscal.position.account,account_dest_id:0 #: field:account.fiscal.position.account.template,account_dest_id:0 msgid "Account Destination" -msgstr "Konto Zuordnung" +msgstr "Kontozuordnung" #. module: account -#: code:addons/account/account.py:1431 -#: code:addons/account/account.py:1460 -#: code:addons/account/account.py:1467 -#: code:addons/account/account_invoice.py:920 -#: code:addons/account/account_move_line.py:1104 -#: code:addons/account/wizard/account_automatic_reconcile.py:152 -#: code:addons/account/wizard/account_fiscalyear_close.py:73 -#: code:addons/account/wizard/account_fiscalyear_close.py:83 -#: code:addons/account/wizard/account_fiscalyear_close.py:86 +#: code:addons/account/account.py:1448 +#: code:addons/account/account.py:1477 +#: code:addons/account/account.py:1484 +#: code:addons/account/account_invoice.py:931 +#: code:addons/account/account_move_line.py:1119 +#: code:addons/account/wizard/account_automatic_reconcile.py:148 +#: code:addons/account/wizard/account_fiscalyear_close.py:88 +#: code:addons/account/wizard/account_fiscalyear_close.py:99 +#: code:addons/account/wizard/account_fiscalyear_close.py:102 #: code:addons/account/wizard/account_move_journal.py:165 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58 #, python-format msgid "UserError" -msgstr "BenutzerFehler" +msgstr "UserError" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 msgid "Payment of invoices" -msgstr "Zahlung von Eingangsrechnungen" +msgstr "Ausgleich von Eingangsrechnungen" #. module: account #: field:account.bank.statement.line,sequence:0 @@ -7976,7 +8032,7 @@ msgstr "Optionale Menge in Buchungen" #. module: account #: view:account.financial.report:0 msgid "Parent Report" -msgstr "Übergeordneter Report" +msgstr "Übergeordneter Bericht" #. module: account #: view:account.state.open:0 @@ -7991,7 +8047,7 @@ msgstr "Verkauf nach Kontotyp" #. module: account #: help:account.invoice,move_id:0 msgid "Link to the automatically generated Journal Items." -msgstr "Verlinke mit automatisch generierten Buchungen" +msgstr "Verweis auf automatisch generierte Buchungen" #. module: account #: selection:account.installer,period:0 @@ -8047,12 +8103,12 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Reports" -msgstr "Offizielle Auswertungen" +msgstr "Offizielle Finanzberichte" #. module: account #: field:account.tax.code,sum_period:0 msgid "Period Sum" -msgstr "Summe Periode" +msgstr "Periodensumme" #. module: account #: help:account.tax,sequence:0 @@ -8061,15 +8117,15 @@ msgid "" "to the higher ones. The order is important if you have a tax with several " "tax children. In this case, the evaluation order is important." msgstr "" -"Des Feld \"Reihenfolge\" wird benutzt, um die Steuerzeilen aufsteigend zu " -"sortieren. Die Reihenfolge ist dann von Bedeutung, wenn es eine Steuerart " -"mit mehreren Steuersätzen gibt. In diesem Fall ist die Reihenfolge für die " -"Auswahl entscheidend." +"Des Feld \"Reihenfolge\" (Sequenz) wird benutzt, um die Steuerzeilen " +"aufsteigend zu sortieren. Die Reihenfolge ist dann von Bedeutung, wenn es " +"eine Steuerart mit mehreren Steuersätzen gibt. In diesem Fall ist die " +"Reihenfolge für die Auswahl entscheidend." #. module: account #: model:ir.model,name:account.model_account_cashbox_line msgid "CashBox Line" -msgstr "Barkasse Buchungen" +msgstr "Barkassenbuchung" #. module: account #: view:account.partner.ledger:0 @@ -8084,7 +8140,7 @@ msgstr "Partner Kontoauszug" #. module: account #: selection:account.tax.template,type:0 msgid "Fixed" -msgstr "Fest" +msgstr "Fix" #. module: account #: code:addons/account/account.py:629 @@ -8092,32 +8148,33 @@ msgstr "Fest" #: code:addons/account/account.py:645 #: code:addons/account/account.py:664 #: code:addons/account/account.py:787 -#: code:addons/account/account.py:1077 -#: code:addons/account/account_invoice.py:732 -#: code:addons/account/account_invoice.py:735 -#: code:addons/account/account_invoice.py:738 +#: code:addons/account/account.py:1082 +#: code:addons/account/account_invoice.py:741 +#: code:addons/account/account_invoice.py:744 +#: code:addons/account/account_invoice.py:747 #: code:addons/account/account_move_line.py:97 -#: code:addons/account/account_move_line.py:750 -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:766 +#: code:addons/account/account_move_line.py:819 +#: code:addons/account/wizard/account_fiscalyear_close.py:62 #, python-format msgid "Warning !" -msgstr "Warnung" +msgstr "Warnung!" #. module: account #: field:account.entries.report,move_line_state:0 msgid "State of Move Line" -msgstr "Status Buchungszeile" +msgstr "Status der Buchung" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile msgid "Account move line reconcile" -msgstr "Storno Buchung" +msgstr "Ausgleich der Buchung" #. module: account #: view:account.subscription.generate:0 #: model:ir.model,name:account.model_account_subscription_generate msgid "Subscription Compute" -msgstr "Wiederkehrende Buchungen" +msgstr "Wiederkehrende Buchungen berechnen" #. module: account #: field:account.bank.statement.line,partner_id:0 @@ -8150,7 +8207,7 @@ msgid "Select a currency to apply on the invoice" msgstr "Wähle eine Währung für diese Rechnung" #. module: account -#: code:addons/account/account.py:3446 +#: code:addons/account/account.py:3463 #, python-format msgid "" "The bank account defined on the selected chart of accounts hasn't a code." @@ -8160,18 +8217,18 @@ msgstr "Das Bankkonto in der ausgewählten Vorlage hat keinen Code" #: code:addons/account/wizard/account_invoice_refund.py:108 #, python-format msgid "Can not %s draft/proforma/cancel invoice." -msgstr "Kann Entwurf/ProForma/Storno für Rechnung %s nicht durchführen" +msgstr "Kann Entwurf/Proforma/Storno für Rechnung %s nicht durchführen" #. module: account -#: code:addons/account/account_invoice.py:810 +#: code:addons/account/account_invoice.py:821 #, python-format msgid "No Invoice Lines !" -msgstr "Keine Rechnungszeilen !" +msgstr "Keine Rechnungspositionen!" #. module: account #: view:account.financial.report:0 msgid "Report Type" -msgstr "Report Type" +msgstr "Berichtsart" #. module: account #: view:account.analytic.account:0 @@ -8200,8 +8257,8 @@ msgid "" "Select Fiscal Year which you want to remove entries for its End of year " "entries journal" msgstr "" -"Wähle das abzuschliessende Geschäftsjahr für die Buchung in das definierte " -"Journal für den Jahresabschluss" +"Wähle das Geschäftsjahr aus dessen Jahres-Abschlussbericht und dessen " +"Abschluss-Salden entfernt werden sollen" #. module: account #: field:account.tax.template,type_tax_use:0 @@ -8248,10 +8305,10 @@ msgid "Deferral Method" msgstr "Abgrenzung Jahreswechsel" #. module: account -#: code:addons/account/account_invoice.py:379 +#: code:addons/account/account_invoice.py:388 #, python-format msgid "Invoice '%s' is paid." -msgstr "Rechnung '%s' wurde bezahlt." +msgstr "Rechnung '%s' wurde beglichen." #. module: account #: model:process.node,note:account.process_node_electronicfile0 @@ -8261,7 +8318,7 @@ msgstr "Automatische Buchung" #. module: account #: constraint:account.tax.code.template:0 msgid "Error ! You can not create recursive Tax Codes." -msgstr "Fehler! Sie können keine rekursiven Umsatzsteuern definieren" +msgstr "Fehler! Sie können keine rekursiven Steuern definieren" #. module: account #: help:account.journal,group_invoice_lines:0 @@ -8313,7 +8370,7 @@ msgid "Associated Partner" msgstr "Zugehöriger Partner" #. module: account -#: code:addons/account/account_invoice.py:1332 +#: code:addons/account/account_invoice.py:1345 #, python-format msgid "You must first select a partner !" msgstr "Sie müssen zuerst einen Partner wählen!" @@ -8370,13 +8427,13 @@ msgstr "" "zugeordneten Steuerschlüsseln für die Umsatzsteuererklärung in Ihrem Land." #. module: account -#: code:addons/account/account_invoice.py:428 +#: code:addons/account/account_invoice.py:437 #, python-format msgid "" "Can not find a chart of accounts for this company, you should create one." msgstr "" "Kann keinen Kontenplan für dieses Unternehmen finden. Sie müssen einen " -"anlagen!" +"anlegen!" #. module: account #: view:account.invoice:0 @@ -8394,16 +8451,16 @@ msgid "Choose Fiscal Year" msgstr "Wähle Geschäftsjahr" #. module: account -#: code:addons/account/account.py:3111 +#: code:addons/account/account.py:3128 #, python-format msgid "Purchase Refund Journal" -msgstr "Journal Gutschriften Eingangsrechnungen" +msgstr "Journal zu Gutschriften aus Eingangsrechnungen" #. module: account #: help:account.tax.template,amount:0 msgid "For Tax Type percent enter % ratio between 0-1." msgstr "" -"Für den Typ Prozent erfassen Sie einen Wert zwischen 0 und 1, z.B. 0.19 für " +"Für den Typ Prozent erfassen Sie einen Wert zwischen 0 und 1, z. B. 0.19 für " "19%" #. module: account @@ -8414,7 +8471,7 @@ msgstr "aktuelle Konten" #. module: account #: view:account.invoice.report:0 msgid "Group by Invoice Date" -msgstr "Gruppiert je Rechnungsdatum" +msgstr "Gruppiert nach Rechnungsdatum" #. module: account #: view:account.invoice.refund:0 @@ -8456,8 +8513,8 @@ msgid "" "Total amount (in Company currency) for transactions held in secondary " "currency for this account." msgstr "" -"Gesamtbetrag in Unternehmenswährung für Buchungen in der 2.Währung des " -"Kontos" +"Gesamtbetrag in Unternehmenswährung für Buchungen in der Alternativwährung " +"des Kontos" #. module: account #: report:account.invoice:0 @@ -8488,13 +8545,13 @@ msgid "Compute Code for Taxes Included Prices" msgstr "Berechnungsgrundlage (inkl. Steuer)" #. module: account -#: code:addons/account/account_invoice.py:1030 +#: code:addons/account/account_invoice.py:1042 #, python-format msgid "" "You can not cancel an invoice which is partially paid! You need to " "unreconcile related payment entries first!" msgstr "" -"Sie können eine teilbezahlte Rechnungen nicht stornieren! Sie müssen der OP-" +"Sie können eine angezahlte Rechnungen nicht stornieren! Sie müssen der OP-" "Ausgleich der Zahlung zuerst rückgängig machen." #. module: account @@ -8511,17 +8568,17 @@ msgstr "korrigierter Saldo" #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template msgid "Fiscal Position Templates" -msgstr "Steuerzuordnung Vorlage" +msgstr "Vorlage zum Finanzbericht" #. module: account #: view:account.entries.report:0 msgid "Int.Type" -msgstr "Int. Typ" +msgstr "Int. Art" #. module: account #: field:account.move.line,tax_amount:0 msgid "Tax/Base Amount" -msgstr "Betrag für Steuerberechnung" +msgstr "Grundbetrag für Steuerberechnung" #. module: account #: view:account.payment.term.line:0 @@ -8568,7 +8625,7 @@ msgstr "Tel.:" #. module: account #: field:account.account,company_currency_id:0 msgid "Company Currency" -msgstr "Betriebl. Währung" +msgstr "Unternehmenswährung" #. module: account #: field:account.aged.trial.balance,chart_account_id:0 @@ -8632,7 +8689,7 @@ msgid "current month" msgstr "laufender Monat" #. module: account -#: code:addons/account/account.py:1052 +#: code:addons/account/account.py:1057 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -8681,7 +8738,7 @@ msgstr " Betrag: NV" #: model:process.node,name:account.process_node_supplierreconciliation0 #, python-format msgid "Reconciliation" -msgstr "Ausgleichen Offene Posten" +msgstr "Ausgleichen offener Posten" #. module: account #: view:account.chart.template:0 @@ -8718,6 +8775,7 @@ msgstr "Journal Gutschriften" #. module: account #: report:account.account.balance:0 #: report:account.central.journal:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -8761,7 +8819,7 @@ msgid "The partner account used for this invoice." msgstr "Partner Finanzkonto dieser Rechnung." #. module: account -#: code:addons/account/account.py:3296 +#: code:addons/account/account.py:3313 #, python-format msgid "Tax %.2f%%" msgstr "Steuer %.2f%%" @@ -8784,16 +8842,15 @@ msgid "Payment Term Line" msgstr "Zahlungsbedingungen" #. module: account -#: code:addons/account/account.py:3109 +#: code:addons/account/account.py:3126 #, python-format msgid "Purchase Journal" -msgstr "Journal Einkauf" +msgstr "Einkaufs-Journal" #. module: account #: view:account.invoice.refund:0 msgid "Refund Invoice: Creates the refund invoice, ready for editing." -msgstr "" -"Gutschrift Rechnung: Generiert eine Gutschrift mit Bearbeitungsmöglichkeit" +msgstr "Rechnungsgutschrift: Legt eine Gutschrift zur Weiterbearbeitung an." #. module: account #: field:account.invoice.line,price_subtotal:0 @@ -8803,7 +8860,7 @@ msgstr "Zwischensumme" #. module: account #: view:account.vat.declaration:0 msgid "Print Tax Statement" -msgstr "Drucke Auswertung Umsatzsteuer" +msgstr "Drucke Umsatzsteueranmeldung" #. module: account #: view:account.model.line:0 @@ -8828,12 +8885,12 @@ msgstr "Lieferanten" #. module: account #: view:account.journal:0 msgid "Accounts Type Allowed (empty for no control)" -msgstr "zugelassene Kontotypen (leer = alle)" +msgstr "zugelassene Kontoarten (leer = alle)" #. module: account #: view:res.partner:0 msgid "Supplier Accounting Properties" -msgstr "Kreditoren Eigenschaften" +msgstr "Kreditoren-Eigenschaften" #. module: account #: help:account.move.line,amount_residual:0 @@ -8858,7 +8915,7 @@ msgstr "Von" #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close msgid "Fiscalyear Close" -msgstr "Geschäftsjahr beenden" +msgstr "Geschäftsjahr abschließen" #. module: account #: sql_constraint:account.account:0 @@ -8872,10 +8929,10 @@ msgid "Unpaid Invoices" msgstr "Offene Rechnungen" #. module: account -#: code:addons/account/account_invoice.py:495 +#: code:addons/account/account_invoice.py:504 #, python-format msgid "The payment term of supplier does not have a payment term line!" -msgstr "Die Zahlungskonditionen des Lieferanten haben keine Zeilen!" +msgstr "Die Zahlungsbedingungen des Lieferanten enthalten keine Positionen!" #. module: account #: field:account.move.line.reconcile,debit:0 @@ -8940,7 +8997,7 @@ msgstr "Journal Bezeichnung" #. module: account #: view:account.move.line:0 msgid "Next Partner Entries to reconcile" -msgstr "Op-Ausgleich des nächsten Partners" +msgstr "OP-Ausgleich des nächsten Partners" #. module: account #: selection:account.financial.report,style_overwrite:0 @@ -8958,7 +9015,7 @@ msgid "" "Unique number of the invoice, computed automatically when the invoice is " "created." msgstr "" -"Einheitliche Rechnungsnummer, automatisch ermittelt bei der Erzeugung der " +"Eindeutige Rechnungsnummer, automatisch ermittelt bei der Erzeugung der " "Rechnung." #. module: account @@ -8982,10 +9039,10 @@ msgid "Keep empty for all open fiscal years" msgstr "Frei lassen für alle offenen Geschäftsjahre" #. module: account -#: code:addons/account/account_move_line.py:1105 +#: code:addons/account/account_move_line.py:1120 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" -msgstr "Die Buchungszeile (%s)" +msgstr "Die Buchung (%s) wurde zur Sammlung/Zentralisierung genehmigt!" #. module: account #: help:account.move.line,amount_currency:0 @@ -8993,11 +9050,11 @@ msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." msgstr "" -"Der Betrag in Fremdwährung, wenn es sich um eine Mulit-Währungsbuchung " +"Der Betrag in Fremdwährung, wenn es sich um eine Fremd-Währungsbuchung " "handelt" #. module: account -#: code:addons/account/account.py:1307 +#: code:addons/account/account.py:1315 #, python-format msgid "" "You can not validate a non-balanced entry !\n" @@ -9047,7 +9104,7 @@ msgstr "Erzeugt Sequenz für Anzeige der Bankdetails bei Buchungen" #. module: account #: model:process.transition,note:account.process_transition_validentries0 msgid "Accountant validates the accounting entries coming from the invoice." -msgstr "Ein Buchhalter verbucht die Buchungssätze einer Rechnung" +msgstr "Ein Buchhalter quittiert die Buchungssätze einer Rechnung" #. module: account #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form @@ -9077,15 +9134,15 @@ msgstr "" #: view:account.entries.report:0 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open msgid "Reconciled entries" -msgstr "Auszugleichende Buchungsposten" +msgstr "Auszugleichende Buchungen" #. module: account #: field:account.invoice,address_contact_id:0 msgid "Contact Address" -msgstr "Kontakt Adresse" +msgstr "Kontaktadresse" #. module: account -#: code:addons/account/account.py:2256 +#: code:addons/account/account.py:2273 #, python-format msgid "Wrong model !" msgstr "Falsches Modell!" @@ -9098,7 +9155,7 @@ msgstr "Erzwinge Periode" #. module: account #: model:ir.model,name:account.model_account_partner_balance msgid "Print Account Partner Balance" -msgstr "Drucke Partner Saldenliste" +msgstr "Drucke Partner-Saldenliste" #. module: account #: help:account.financial.report,sign:0 @@ -9109,7 +9166,7 @@ msgid "" "accounts that are typically more credited than debited and that you would " "like to print as positive amounts in your reports; e.g.: Income account." msgstr "" -"Für Salden die mit umgekehrten Vorzeichen gedruckt werden sollen. zB " +"Für Salden die mit umgekehrten Vorzeichen gedruckt werden sollen. z. B. " "Aufwandskonten negativ, Ertragskonten positiv." #. module: account @@ -9122,12 +9179,14 @@ msgstr "Verträge" #: field:account.cashbox.line,starting_id:0 #: field:account.entries.report,reconcile_id:0 #: field:account.financial.report,balance:0 +#: field:account.financial.report,credit:0 +#: field:account.financial.report,debit:0 msgid "unknown" msgstr "unbekannt" #. module: account #: field:account.fiscalyear.close,journal_id:0 -#: code:addons/account/account.py:3113 +#: code:addons/account/account.py:3130 #, python-format msgid "Opening Entries Journal" msgstr "Start Buchungsjournal" @@ -9150,10 +9209,10 @@ msgstr "" "wird durch die Auswertung Gewinn & Verlust generiert." #. module: account -#: code:addons/account/account_invoice.py:808 +#: code:addons/account/account_invoice.py:819 #, python-format msgid "Please define sequence on the journal related to this invoice." -msgstr "BItte definieren Sie Sequenzen für das Journal dieser Rechnung." +msgstr "Bitte legen Sie Sequenzen für das Journal dieser Rechnung fest." #. module: account #: view:account.move:0 @@ -9180,8 +9239,8 @@ msgid "" "Set if the tax computation is based on the computation of child taxes rather " "than on the total amount." msgstr "" -"Aktivieren, wenn die Steuerberechnung auf die untergeordneten Steuern beruht " -"und nicht auf dem Gesamtbetrag" +"Aktivieren, wenn die Steuerberechnung auf untergeordneten Steuern beruht und " +"nicht auf dem Gesamtbetrag" #. module: account #: selection:account.tax,applicable_type:0 @@ -9241,7 +9300,7 @@ msgid "Period from" msgstr "Gültig ab" #. module: account -#: code:addons/account/account.py:3110 +#: code:addons/account/account.py:3127 #, python-format msgid "Sales Refund Journal" msgstr "Gutschriften Ausgangsrechnungen Journal" @@ -9288,10 +9347,10 @@ msgid "Purchase Tax(%)" msgstr "Steuer Einkauf (%)" #. module: account -#: code:addons/account/account_invoice.py:810 +#: code:addons/account/account_invoice.py:821 #, python-format msgid "Please create some invoice lines." -msgstr "Bitte erstellen Sie einige Rechnungspositionen" +msgstr "Bitte erstellen Sie Rechnungspositionen" #. module: account #: report:account.overdue:0 @@ -9304,7 +9363,7 @@ msgid "Display Detail" msgstr "Zeige Detail" #. module: account -#: code:addons/account/account.py:3118 +#: code:addons/account/account.py:3135 #, python-format msgid "SCNJ" msgstr "GSV" @@ -9343,8 +9402,6 @@ msgstr "Ende der Periode" #: field:account.account.template,financial_report_ids:0 #: model:ir.actions.act_window,name:account.action_account_financial_report_tree #: model:ir.actions.act_window,name:account.action_account_report -#: model:ir.actions.act_window,name:account.action_account_report_bs -#: model:ir.actions.act_window,name:account.action_account_report_pl #: model:ir.ui.menu,name:account.menu_account_reports msgid "Financial Reports" msgstr "Finanz Reports" @@ -9359,6 +9416,7 @@ msgstr "Finanz Reports" #: field:account.common.journal.report,period_from:0 #: field:account.common.partner.report,period_from:0 #: field:account.common.report,period_from:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: field:account.general.journal,period_from:0 #: report:account.general.ledger:0 @@ -9379,6 +9437,7 @@ msgstr "Start Periode" #. module: account #: field:account.aged.trial.balance,direction_selection:0 +#: report:account.aged_trial_balance:0 msgid "Analysis Direction" msgstr "Analysezeitraum" @@ -9398,7 +9457,7 @@ msgstr "Ansicht Journal" #. module: account #: view:account.move.line:0 -#: code:addons/account/account_move_line.py:1046 +#: code:addons/account/account_move_line.py:1061 #, python-format msgid "Total credit" msgstr "Gesamt Haben" @@ -9412,7 +9471,7 @@ msgstr "" #. module: account #: report:account.overdue:0 msgid "Best regards." -msgstr "Beste Grüsse." +msgstr "Mit freundlichen Grüssen." #. module: account #: view:account.invoice:0 @@ -9470,6 +9529,7 @@ msgstr "Bankauszüge" #: report:account.analytic.account.inverted.balance:0 #: report:account.central.journal:0 #: field:account.entries.report,balance:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -9552,7 +9612,7 @@ msgstr "" "Debitorenkonto." #. module: account -#: code:addons/account/wizard/account_automatic_reconcile.py:152 +#: code:addons/account/wizard/account_automatic_reconcile.py:148 #, python-format msgid "You must select accounts to reconcile" msgstr "Bitte Konten zum Ausgleich auswählen" @@ -9585,7 +9645,7 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "Filters By" -msgstr "Filter nch" +msgstr "Filter nach" #. module: account #: model:process.node,note:account.process_node_manually0 @@ -9604,10 +9664,10 @@ msgid "Move" msgstr "Buchung" #. module: account -#: code:addons/account/account_move_line.py:1153 +#: code:addons/account/account_move_line.py:1168 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" -msgstr "Die Steuer kann nicht verändert werden. Löschen und Neuerstellen." +msgstr "Die Steuer kann nicht verändert werden. Löschen und Neuerstellen!" #. module: account #: view:analytic.entries.report:0 @@ -9664,7 +9724,7 @@ msgid "Consolidated Children" msgstr "Konsolidierte Konten" #. module: account -#: code:addons/account/wizard/account_fiscalyear_close.py:87 +#: code:addons/account/wizard/account_fiscalyear_close.py:103 #, python-format msgid "" "The journal must have centralised counterpart without the Skipping draft " @@ -9729,6 +9789,7 @@ msgstr "" #: field:account.common.journal.report,period_to:0 #: field:account.common.partner.report,period_to:0 #: field:account.common.report,period_to:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: field:account.general.journal,period_to:0 #: report:account.general.ledger:0 @@ -9750,7 +9811,7 @@ msgstr "Ende der Periode" #. module: account #: field:account.move.line,date_maturity:0 msgid "Due date" -msgstr "Datum fällig" +msgstr "Fälligkeitsdatum" #. module: account #: view:account.move.journal:0 @@ -9771,7 +9832,7 @@ msgstr "" "\"Einkauf\" für Lieferantenrechnungsjournale\r\n" "\"Kassa\" oder \"Bank\" für Kunden und Lieferantenzahlungen\r\n" "\"Allgemein\" für alles andere.\r\n" -"\"Eröffnung/Schluss Buchungen\" für Buchungen des Jahresabschlusses" +"\"Eröffnungs-/Schluss-Buchungen\" für Buchungen des Jahresabschlusses" #. module: account #: model:ir.model,name:account.model_account_subscription @@ -9781,7 +9842,7 @@ msgstr "Konto Automatische Buchung" #. module: account #: report:account.overdue:0 msgid "Maturity date" -msgstr "Datum Fällig" +msgstr "Fälligkeitsdatum" #. module: account #: view:account.subscription:0 @@ -9791,6 +9852,7 @@ msgstr "Eingabe automat. Buchung" #. module: account #: report:account.account.balance:0 #: field:account.aged.trial.balance,date_from:0 +#: report:account.aged_trial_balance:0 #: field:account.balance.report,date_from:0 #: report:account.central.journal:0 #: field:account.central.journal,date_from:0 @@ -9798,6 +9860,7 @@ msgstr "Eingabe automat. Buchung" #: field:account.common.journal.report,date_from:0 #: field:account.common.partner.report,date_from:0 #: field:account.common.report,date_from:0 +#: report:account.financial.report:0 #: field:account.fiscalyear,date_start:0 #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 @@ -9816,7 +9879,7 @@ msgstr "Eingabe automat. Buchung" #: field:accounting.report,date_from:0 #: field:accounting.report,date_from_cmp:0 msgid "Start Date" -msgstr "Start Datum" +msgstr "Anfangsdatum" #. module: account #: help:account.invoice,reconciled:0 @@ -9832,17 +9895,17 @@ msgstr "" #: view:account.invoice.report:0 #: model:process.node,name:account.process_node_supplierdraftinvoices0 msgid "Draft Invoices" -msgstr "Entwurf Rechnungen" +msgstr "Rechnungsentwürfe" #. module: account #: selection:account.account.type,close_method:0 #: view:account.entries.report:0 #: view:account.move.line:0 msgid "Unreconciled" -msgstr "Offene Posten" +msgstr "Nicht beglichen" #. module: account -#: code:addons/account/account_invoice.py:828 +#: code:addons/account/account_invoice.py:839 #, python-format msgid "Bad total !" msgstr "Falsche Summe!" @@ -9850,7 +9913,7 @@ msgstr "Falsche Summe!" #. module: account #: field:account.journal,sequence_id:0 msgid "Entry Sequence" -msgstr "Eingabe Sequenz" +msgstr "Eingabereihenfolge" #. module: account #: model:ir.actions.act_window,help:account.action_account_period_tree @@ -9910,7 +9973,7 @@ msgid "Comparison" msgstr "Vergleich" #. module: account -#: code:addons/account/account_invoice.py:372 +#: code:addons/account/account_invoice.py:381 #, python-format msgid "Unknown Error" msgstr "Unbekannter Fehler" @@ -9927,7 +9990,7 @@ msgstr "" #. module: account #: field:account.period,special:0 msgid "Opening/Closing Period" -msgstr "Eröffnungs- / Abschlussperiode" +msgstr "Eröffnungs-/Abschlussperiode" #. module: account #: field:account.account,currency_id:0 @@ -9939,7 +10002,7 @@ msgstr "Alternative Währung" #. module: account #: model:ir.model,name:account.model_validate_account_move msgid "Validate Account Move" -msgstr "Buchen" +msgstr "Buchung quittieren" #. module: account #: field:account.account,credit:0 @@ -9949,6 +10012,7 @@ msgstr "Buchen" #: report:account.analytic.account.inverted.balance:0 #: report:account.central.journal:0 #: field:account.entries.report,credit:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -10056,16 +10120,18 @@ msgstr "Analytische Buchungen der letzten 30 Tage" #: view:accounting.report:0 #: selection:accounting.report,filter:0 #: selection:accounting.report,filter_cmp:0 +#: code:addons/account/report/common_report_header.py:99 #: model:ir.actions.act_window,name:account.action_account_period_form #: model:ir.ui.menu,name:account.menu_action_account_period_form #: model:ir.ui.menu,name:account.next_id_23 +#, python-format msgid "Periods" msgstr "Perioden" #. module: account #: field:account.invoice.report,currency_rate:0 msgid "Currency Rate" -msgstr "Wechsellkurs" +msgstr "Wechselkurs" #. module: account #: view:account.account:0 @@ -10191,14 +10257,14 @@ msgstr "Kontotyp" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_running msgid "Running Subscriptions" -msgstr "Entwurf" +msgstr "Laufende Abbonnements" #. module: account #: view:report.account.sales:0 #: view:report.account_type.sales:0 #: view:report.hr.timesheet.invoice.journal:0 msgid "This Month" -msgstr "Dieser Monat" +msgstr "Diesen Monat" #. module: account #: view:account.analytic.balance:0 @@ -10216,7 +10282,7 @@ msgstr "Periode auswählen" #: selection:account.move,state:0 #: view:account.move.line:0 msgid "Posted" -msgstr "Gebucht" +msgstr "Quittiert" #. module: account #: report:account.account.balance:0 @@ -10228,6 +10294,7 @@ msgstr "Gebucht" #: field:account.common.journal.report,date_to:0 #: field:account.common.partner.report,date_to:0 #: field:account.common.report,date_to:0 +#: report:account.financial.report:0 #: field:account.fiscalyear,date_stop:0 #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 @@ -10245,13 +10312,13 @@ msgstr "Gebucht" #: field:accounting.report,date_to:0 #: field:accounting.report,date_to_cmp:0 msgid "End Date" -msgstr "Ende Datum" +msgstr "Enddatum" #. module: account #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear msgid "Cancel Opening Entries" -msgstr "Abbrechen Buchen Jahreseröffnung" +msgstr "Buchen der Jahreseröffnung abbrechen" #. module: account #: field:account.payment.term.line,days2:0 @@ -10272,10 +10339,10 @@ msgstr "Geschäftsjahr Sequenz" #. module: account #: selection:account.financial.report,display_detail:0 msgid "No detail" -msgstr "Kein Detail" +msgstr "Keine Details" #. module: account -#: code:addons/account/account_analytic_line.py:102 +#: code:addons/account/account_analytic_line.py:100 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -10284,7 +10351,7 @@ msgstr "" #. module: account #: constraint:account.move.line:0 msgid "You can not create journal items on closed account." -msgstr "You can not create journal items on closed account." +msgstr "Sie können auf ein abgeschlossenes Konto nicht mehr buchen." #. module: account #: field:account.account,unrealized_gain_loss:0 @@ -10304,14 +10371,15 @@ msgstr "Status" #. module: account #: model:ir.actions.server,name:account.ir_actions_server_edi_invoice msgid "Auto-email confirmed invoices" -msgstr "automatischer EMail Versand der Rechnungen" +msgstr "automatischer E-Mail Versand der Rechnungen" #. module: account #: field:account.invoice,check_total:0 msgid "Verification Total" -msgstr "Gesamt Prüfsumme" +msgstr "Zu prüfende Gesamtsumme" #. module: account +#: report:account.aged_trial_balance:0 #: report:account.analytic.account.balance:0 #: report:account.analytic.account.inverted.balance:0 #: report:account.analytic.account.quantity_cost_ledger:0 @@ -10329,7 +10397,7 @@ msgstr "Bruttobetrag" #, python-format msgid "Journal: All" msgstr "" -"Journal: AlleErstelle und manage die Finanzjournale des Unternehmens über " +"Journal: Alle Erstelle und manage die Finanzjournale des Unternehmens über " "dieses Menü. Ein Journal ist eine lückenlose und chronologische Aufzeichnung " "aller Geschäftsvorfälle in einem Unternehmen in Form der doppelten " "Buchhaltung. In Abhängigkeit des Anwendungsumfangs der Buchhaltung sowie der " @@ -10339,6 +10407,7 @@ msgstr "" #. module: account #: field:account.account,company_id:0 +#: report:account.account.balance:0 #: field:account.aged.trial.balance,company_id:0 #: field:account.analytic.journal,company_id:0 #: field:account.balance.report,company_id:0 @@ -10353,7 +10422,9 @@ msgstr "" #: field:account.entries.report,company_id:0 #: field:account.fiscal.position,company_id:0 #: field:account.fiscalyear,company_id:0 +#: report:account.general.journal:0 #: field:account.general.journal,company_id:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,company_id:0 #: field:account.invoice,company_id:0 #: field:account.invoice.line,company_id:0 @@ -10363,6 +10434,8 @@ msgstr "" #: view:account.journal:0 #: field:account.journal,company_id:0 #: field:account.journal.period,company_id:0 +#: report:account.journal.period.print:0 +#: report:account.journal.period.print.sale.purchase:0 #: field:account.model,company_id:0 #: field:account.move,company_id:0 #: field:account.move.line,company_id:0 @@ -10380,7 +10453,7 @@ msgstr "" #: field:analytic.entries.report,company_id:0 #: field:wizard.multi.charts.accounts,company_id:0 msgid "Company" -msgstr "Firma" +msgstr "Unternehmen" #. module: account #: model:ir.ui.menu,name:account.menu_action_subscription_form @@ -10421,12 +10494,12 @@ msgstr "Vorzeichen f. überg. Steuer" #. module: account #: model:ir.model,name:account.model_account_balance_report msgid "Trial Balance Report" -msgstr "Test Auswertung Bilanz" +msgstr "Salden-Bilanz" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree msgid "Draft statements" -msgstr "Beleg Entwurf" +msgstr "Belegentwürfe" #. module: account #: model:process.transition,note:account.process_transition_statemententries0 @@ -10455,14 +10528,14 @@ msgstr "Rechnungspositionen" #. module: account #: field:account.chart,period_to:0 msgid "End period" -msgstr "Ende Periode" +msgstr "End-Periode" #. module: account #: sql_constraint:account.journal:0 msgid "The code of the journal must be unique per company !" msgstr "" -"Die Kurzbezeichnung des Journals sollte eindeutig sein je Unternehmen " -"(Mandant)." +"Die Kurzbezeichnung des Journals sollte je Unternehmen (Mandant)eindeutig " +"sein." #. module: account #: help:product.category,property_account_expense_categ:0 @@ -10510,7 +10583,7 @@ msgstr "Auswertung Verkauf nach Konto" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account msgid "Accounts Fiscal Position" -msgstr "Steuerzuordnung" +msgstr "Konten des Haushaltsberichts" #. module: account #: report:account.invoice:0 @@ -10530,6 +10603,7 @@ msgstr "Eingangsrechnungen" #: report:account.analytic.account.inverted.balance:0 #: report:account.central.journal:0 #: field:account.entries.report,debit:0 +#: report:account.financial.report:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 @@ -10559,10 +10633,12 @@ msgstr "Rechnungszeilen" #. module: account #: constraint:account.account.template:0 msgid "Error ! You can not create recursive account templates." -msgstr "Fehler ! Rekursive Finanzkontenvorlagen sind nicht erlaubt" +msgstr "Fehler! Rekursive Finanzkontenvorlagen sind nicht erlaubt." #. module: account #: selection:account.print.journal,sort_selection:0 +#: code:addons/account/report/account_journal.py:197 +#, python-format msgid "Journal Entry Number" msgstr "Belegnummer" @@ -10582,7 +10658,7 @@ msgstr "" "mit Buchungen geändert werden." #. module: account -#: code:addons/account/account_move_line.py:832 +#: code:addons/account/account_move_line.py:843 #, python-format msgid "Entry is already reconciled" msgstr "Buchung wurde bereits ausgeglichen" @@ -10624,8 +10700,10 @@ msgstr "" "geschlossen für nicht mehr verwendete" #. module: account +#: report:account.account.balance:0 #: selection:account.balance.report,display_account:0 #: selection:account.common.account.report,display_account:0 +#: report:account.general.ledger_landscape:0 #: selection:account.report.general.ledger,display_account:0 msgid "With movements" msgstr "Konten mit Buchungen" @@ -10679,7 +10757,7 @@ msgstr "Überfällige Forderungen" #. module: account #: field:account.tax,applicable_type:0 msgid "Applicability" -msgstr "Individualberechnung" +msgstr "Anwendbarkeit" #. module: account #: code:addons/account/wizard/account_move_journal.py:165 @@ -10741,16 +10819,16 @@ msgstr "Kontenplan Analysekonten" #. module: account #: help:account.invoice,residual:0 msgid "Remaining amount due." -msgstr "verbleibender Restwert nach Zahlung" +msgstr "Verbleibender, fälliger Restbetrag" #. module: account #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement msgid "Statistic Reports" -msgstr "Statistische Auswertungen" +msgstr "Statistische Berichte" #. module: account -#: code:addons/account/account_move_line.py:1155 -#: code:addons/account/account_move_line.py:1238 +#: code:addons/account/account_move_line.py:1170 +#: code:addons/account/account_move_line.py:1253 #, python-format msgid "Bad account!" msgstr "Falsches Konto!" @@ -10779,7 +10857,7 @@ msgid "Accounts Mapping" msgstr "Zuordnung Finanzkonten" #. module: account -#: code:addons/account/account_invoice.py:364 +#: code:addons/account/account_invoice.py:373 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "Rechnung '%s' wartet auf Buchungsfreigabe." @@ -10907,16 +10985,17 @@ msgstr "" "''}${object.address_invoice_id.name or ''},\n" "\n" "Eine neue Rechnung ist verfügbar: ${object.partner_id.name}:\n" -" | Invoice number: *${object.number}*\n" -" | Invoice total: *${object.amount_total} ${object.currency_id.name}*\n" -" | Invoice date: ${object.date_invoice}\n" +" | Rechnungsnummer: *${object.number}*\n" +" | Rechnungsbetrag: *${object.amount_total} " +"${object.currency_id.name}*\n" +" | Rechnungsdatum : ${object.date_invoice}\n" " % if object.origin:\n" " | Auftrag: ${object.origin}\n" " % endif\n" -" | Ihr Kontakt: ${object.user_id.name} ${object.user_id.user_email and " -"'<%s>'%(object.user_id.user_email) or ''}\n" +" | Ihr Ansprechpartner: ${object.user_id.name} " +"${object.user_id.user_email and '<%s>'%(object.user_id.user_email) or ''}\n" "\n" -"Sie können dieses Dokument ansehen, herunterladenund Online bezahlen, wenn " +"Sie können dieses Dokument ansehen, herunterladen und Online bezahlen, wenn " "Sie den folgenden Link verwenden:\n" " ${ctx.get('edi_web_url_view') or 'n/a'}\n" "\n" @@ -10941,9 +11020,9 @@ msgstr "" " ${paypal_url}\n" "% endif\n" "\n" -"Im Falle von Fragen wollen Sie uns bitte kontaktieren.\n" +"Im Falle von Fragen können Sie uns gerne kontaktieren.\n" "\n" -"Danke, dass Sie ${object.company_id.name} gewählt haben!\n" +"Danke, dass Sie ${object.company_id.name} Ihr vertrauen schenken!\n" "\n" "\n" "--\n" @@ -10964,7 +11043,7 @@ msgstr "" "or ''} ${object.company_id.country_id.name or ''}\n" "% endif\n" "% if object.company_id.phone:\n" -"Phone: ${object.company_id.phone}\n" +"Tel.: ${object.company_id.phone}\n" "% endif\n" "% if object.company_id.website:\n" "${object.company_id.website or ''}\n" @@ -10979,7 +11058,7 @@ msgstr "Bankkonten" #. module: account #: field:res.partner,credit:0 msgid "Total Receivable" -msgstr "Gesamt Forderungen" +msgstr "Forderungsgesamtsumme" #. module: account #: view:account.account:0 @@ -11039,6 +11118,7 @@ msgstr "account.addtmpl.wizard" #. module: account #: field:account.aged.trial.balance,result_selection:0 +#: report:account.aged_trial_balance:0 #: field:account.common.partner.report,result_selection:0 #: report:account.partner.balance:0 #: field:account.partner.balance,result_selection:0 @@ -11113,17 +11193,19 @@ msgstr "Zentrales Journal" #. module: account #: report:account.overdue:0 msgid "Maturity" -msgstr "überfälllig" +msgstr "Überfällig" #. module: account #: selection:account.aged.trial.balance,direction_selection:0 +#: code:addons/account/report/account_aged_partner_balance.py:383 +#, python-format msgid "Future" msgstr "Zukunft" #. module: account #: view:account.move.line:0 msgid "Search Journal Items" -msgstr "Suche Journaleinträge" +msgstr "Durchsuche Buchungen" #. module: account #: help:account.tax,base_sign:0 @@ -11862,9 +11944,6 @@ msgstr "" #~ msgid "3 Months" #~ msgstr "3 Monate" -#~ msgid "Standard entries" -#~ msgstr "Standard Buchung" - #~ msgid "" #~ "Check this box if you want to print all entries when printing the General " #~ "Ledger, otherwise it will only print its balance." @@ -12637,9 +12716,6 @@ msgstr "" #~ msgid "Calculated Balance" #~ msgstr "Berechneter Saldo" -#~ msgid "Open For Unreconciliation" -#~ msgstr "Öffne Storno Ausgleich" - #, python-format #~ msgid "CashBox Balance is not matching with Calculated Balance !" #~ msgstr "Kassenbestand passt nicht zu Kontensaldo" @@ -13204,9 +13280,6 @@ msgstr "" #~ msgid "Receivable Accounts" #~ msgstr "Debitorenkonten" -#~ msgid "Tax codes" -#~ msgstr "Umsatzsteuererklärung" - #~ msgid "" #~ "Streamlines invoice payment and creates hooks to plug automated payment " #~ "systems in." @@ -13231,9 +13304,6 @@ msgstr "" #~ msgid " day of the month= -1" #~ msgstr " Tag des Monats= -1" -#~ msgid "Reconciliation result" -#~ msgstr "Ergebnis Kontoabstimmung" - #~ msgid "" #~ "You cannot create entries on different periods/journals in the same move" #~ msgstr "" @@ -13366,3 +13436,15 @@ msgstr "" #~ msgid "Description On Invoices" #~ msgstr "Beschreibung auf Rechnungen" + +#~ msgid "Open For Unreconciliation" +#~ msgstr "Öffne zur Stornierung des OP-Ausgleichs" + +#~ msgid "Tax codes" +#~ msgstr "Steuerschlüssel" + +#~ msgid "Reconciliation result" +#~ msgstr "Ergebnis Kontoausgleich" + +#~ msgid "Standard entries" +#~ msgstr "Standard-Buchungen" diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml index 5f417825032..4d64af3e154 100644 --- a/addons/account/product_view.xml +++ b/addons/account/product_view.xml @@ -14,8 +14,8 @@ - - + + diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml index 0c488eac400..1754988f7d6 100644 --- a/addons/account/project/report/analytic_balance.rml +++ b/addons/account/project/report/analytic_balance.rml @@ -163,7 +163,7 @@ [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] - [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]] + [[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]] [[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'quantity')) ]] @@ -187,7 +187,7 @@ [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] - [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]] + [[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]] [[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'quantity')) ]] @@ -211,7 +211,7 @@ [[ formatLang(move_g['credit']) ]] - [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]] + [[ formatLang(move_g['balance'], currency_obj = company.currency_id) ]] [[ formatLang(move_g['quantity']) ]] diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml index 7500b655ab3..1099a8b8b4e 100644 --- a/addons/account/project/report/cost_ledger.rml +++ b/addons/account/project/report/cost_ledger.rml @@ -224,7 +224,7 @@ [[ formatLang (sum_credit(objects,data['form']['date1'],data['form']['date2'])) ]] - [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol ]] + [[ formatLang (sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]] @@ -245,7 +245,7 @@ [[ formatLang (account_sum_credit(account,data['form']['date1'],data['form']['date2'])) ]] - [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol ]] + [[ formatLang (account_sum_balance(account,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id) ]] @@ -266,7 +266,7 @@ [[ formatLang( move_g['credit']) ]] - [[ formatLang( move_g['balance']) ]] [[ company.currency_id.symbol ]] + [[ formatLang( move_g['balance'], currency_obj = company.currency_id) ]] @@ -290,7 +290,7 @@ [[ formatLang( move_a['credit']) ]] - [[ formatLang( move_a['balance']) ]] [[ company.currency_id.symbol]] + [[ formatLang( move_a['balance'], currency_obj = company.currency_id)]] diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml index f112ec8fbd3..54b6878c407 100644 --- a/addons/account/project/report/inverted_analytic_balance.rml +++ b/addons/account/project/report/inverted_analytic_balance.rml @@ -164,7 +164,7 @@ [[ formatLang(sum_credit(objects,data['form']['date1'],data['form']['date2']))]] - [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']))]] [[ company.currency_id.symbol]] + [[ formatLang(sum_balance(objects,data['form']['date1'],data['form']['date2']), currency_obj = company.currency_id)]] [[ formatLang(sum_quantity(objects,data['form']['date1'],data['form']['date2'])) ]] @@ -188,7 +188,7 @@ [[formatLang(move_g['credit'])]] - [[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol]] + [[ formatLang(move_g['balance'], currency_obj = company.currency_id)]] [[formatLang(move_g['quantity']) ]] @@ -212,7 +212,7 @@ [[ formatLang(move_a['credit']) ]] - [[ formatLang(move_a['balance']) ]] [[ company.currency_id.symbol]] + [[ formatLang(move_a['balance'], currency_obj = company.currency_id)]] [[ formatLang(move_a['quantity']) ]] diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py index 8148a016927..3d6bf0f5447 100644 --- a/addons/account/project/wizard/account_analytic_journal_report.py +++ b/addons/account/project/wizard/account_analytic_journal_report.py @@ -63,8 +63,12 @@ class account_analytic_journal_report(osv.osv_memory): if context is None: context = {} res = super(account_analytic_journal_report, self).default_get(cr, uid, fields, context=context) + if not context.has_key('active_ids'): + journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [], context=context) + else: + journal_ids = context.get('active_ids') if 'analytic_account_journal_id' in fields: - res.update({'analytic_account_journal_id': context.get('active_ids',[])}) + res.update({'analytic_account_journal_id': journal_ids}) return res account_analytic_journal_report() diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 8963ba97376..8a421e3cb36 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -5,7 +5,7 @@ analytic.entries.report.tree analytic.entries.report - + diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 667c61ab78f..551265252cc 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -5,7 +5,7 @@ account.entries.report.tree account.entries.report - + diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index c22d5d55f45..13a137e53df 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -5,7 +5,7 @@ account.invoice.report.tree account.invoice.report - + diff --git a/addons/account/report/account_print_overdue.py b/addons/account/report/account_print_overdue.py index 1b617e9afa4..4ddedc102f5 100644 --- a/addons/account/report/account_print_overdue.py +++ b/addons/account/report/account_print_overdue.py @@ -29,34 +29,11 @@ class Overdue(report_sxw.rml_parse): super(Overdue, self).__init__(cr, uid, name, context=context) self.localcontext.update( { 'time': time, - 'adr_get': self._adr_get, 'getLines': self._lines_get, 'tel_get': self._tel_get, 'message': self._message, }) self.context = context - def _adr_get(self, partner, type): - res = [] - res_partner = pooler.get_pool(self.cr.dbname).get('res.partner') - addresses = res_partner.address_get(self.cr, self.uid, [partner.id], [type]) - adr_id = addresses and addresses[type] or False - result = { - 'name': False, - 'street': False, - 'street2': False, - 'city': False, - 'zip': False, - 'state_id':False, - 'country_id': False, - } - if adr_id: - result = res_partner.read(self.cr, self.uid, [adr_id], context=self.context.copy()) - result[0]['country_id'] = result[0]['country_id'] and result[0]['country_id'][1] or False - result[0]['state_id'] = result[0]['state_id'] and result[0]['state_id'][1] or False - return result - - res.append(result) - return res def _tel_get(self,partner): if not partner: diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml index 2d4238823da..577cb9142a2 100644 --- a/addons/account/report/account_print_overdue.rml +++ b/addons/account/report/account_print_overdue.rml @@ -126,15 +126,10 @@ - [[ repeatIn(adr_get(o, 'invoice'),'addr') ]] [[ o.title.name or '' ]] [[ o.name ]] - [[ addr['street'] ]] - [[ addr['street2'] or removeParentNode('para') ]] - [[ addr['zip'] ]] [[ addr['city'] ]] - [[ addr['state_id'] or removeParentNode('para')]] - [[ addr['country_id'] ]] + [[ display_address(o.partner_id)] ]] @@ -216,7 +211,7 @@ [[ (line['account_id']['type'] == 'receivable' and formatLang(line['credit']) or 0) or (line['account_id']['type'] == 'payable' and formatLang(line['debit'] * -1) or 0) ]] - [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit']) ]] [[ company.currency_id.symbol ]] + [[ time.strftime('%Y-%m-%d') > formatLang((line['date_maturity'])) and formatLang(line['debit'] - line['credit'], currency_obj = company.currency_id) ]] [[ line['blocked'] and 'X' or '' ]] @@ -241,7 +236,7 @@ [[ formatLang((reduce(lambda x, y: x + ((y['account_id']['type'] == 'receivable' and y['credit'] or 0) or (y['account_id']['type'] == 'payable' and y['debit'] * -1 or 0)), getLines(o), 0))) ]] - [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0))) ]] [[ company.currency_id.symbol ]] + [[ formatLang((reduce(lambda x, y: x + (y['debit'] - y['credit']), filter(lambda x: x['date_maturity'] < time.strftime('%Y-%m-%d'), getLines(o)), 0)), currency_obj=company.currency_id) ]] @@ -261,7 +256,7 @@ Balance : - [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0))) ]] [[ company.currency_id.symbol ]] + [[ formatLang((reduce(lambda x, y: x +(y['debit'] - y['credit']), getLines(o), 0)), currency_obj = company.currency_id) ]] diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml index ee21b9e5ec6..be6ae0dfdc9 100644 --- a/addons/account/report/account_treasury_report_view.xml +++ b/addons/account/report/account_treasury_report_view.xml @@ -5,7 +5,7 @@ account.treasury.report.tree account.treasury.report - + diff --git a/addons/account/static/src/xml/account_move_reconciliation.xml b/addons/account/static/src/xml/account_move_reconciliation.xml index c266e819198..d7b5301238d 100644 --- a/addons/account/static/src/xml/account_move_reconciliation.xml +++ b/addons/account/static/src/xml/account_move_reconciliation.xml @@ -3,10 +3,17 @@ + +
+

+ Good job! +

+ There is nothing to reconcile. All invoices and payments + have been reconciled, your partner balance is clean. +

+
+
diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 5f6463508b6..59196c4da87 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -1,47 +1,201 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2012-today OpenERP SA () +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see +# +############################################################################## +import random +import time +import urllib +import urlparse + import openerp -from openerp.osv import osv +from openerp.osv import osv, fields from openerp import SUPERUSER_ID +from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT +from openerp.tools.safe_eval import safe_eval + +def random_token(): + # the token has an entropy of about 120 bits (6 bits/char * 20 chars) + chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789' + return ''.join(random.choice(chars) for i in xrange(20)) + +def now(): + return time.strftime(DEFAULT_SERVER_DATETIME_FORMAT) + +class res_partner(osv.Model): + _inherit = 'res.partner' + + def _get_signup_valid(self, cr, uid, ids, name, arg, context=None): + dt = now() + res = {} + for partner in self.browse(cr, uid, ids, context): + res[partner.id] = bool(partner.signup_token) and \ + (not partner.signup_expiration or dt <= partner.signup_expiration) + return res + + def _get_signup_url(self, cr, uid, ids, name, arg, context=None): + """ determine a signup url for a given partner """ + base_url = self.pool.get('ir.config_parameter').get_param(cr, uid, 'web.base.url') + + # if required, make sure that every partner without user has a valid signup token + if context and context.get('signup_valid'): + unsigned_ids = [p.id for p in self.browse(cr, uid, ids, context) if not p.user_ids] + self.signup_prepare(cr, uid, unsigned_ids, context=context) + + res = dict.fromkeys(ids, False) + for partner in self.browse(cr, uid, ids, context): + if partner.signup_token: + params = (urllib.quote(cr.dbname), urllib.quote(partner.signup_token)) + res[partner.id] = urlparse.urljoin(base_url, "#action=login&db=%s&token=%s" % params) + elif partner.user_ids: + user = partner.user_ids[0] + params = (urllib.quote(cr.dbname), urllib.quote(user.login)) + res[partner.id] = urlparse.urljoin(base_url, "#action=login&db=%s&login=%s" % params) + return res + + _columns = { + 'signup_token': fields.char(size=24, string='Signup Token'), + 'signup_expiration': fields.datetime(string='Signup Expiration'), + 'signup_valid': fields.function(_get_signup_valid, type='boolean', string='Signup Token is Valid'), + 'signup_url': fields.function(_get_signup_url, type='char', string='Signup URL'), + } + + def action_signup_prepare(self, cr, uid, ids, context=None): + return self.signup_prepare(cr, uid, ids, context=context) + + def signup_prepare(self, cr, uid, ids, expiration=False, context=None): + """ generate a new token for the partners with the given validity, if necessary + :param expiration: the expiration datetime of the token (string, optional) + """ + for partner in self.browse(cr, uid, ids, context): + if expiration or not partner.signup_valid: + token = random_token() + while self._signup_retrieve_partner(cr, uid, token, context=context): + token = random_token() + partner.write({'signup_token': token, 'signup_expiration': expiration}) + return True + + def _signup_retrieve_partner(self, cr, uid, token, + check_validity=False, raise_exception=False, context=None): + """ find the partner corresponding to a token, and possibly check its validity + :param token: the token to resolve + :param check_validity: if True, also check validity + :param raise_exception: if True, raise exception instead of returning False + :return: partner (browse record) or False (if raise_exception is False) + """ + partner_ids = self.search(cr, uid, [('signup_token', '=', token)], context=context) + if not partner_ids: + if raise_exception: + raise Exception("Signup token '%s' is not valid" % token) + return False + partner = self.browse(cr, uid, partner_ids[0], context) + if check_validity and not partner.signup_valid: + if raise_exception: + raise Exception("Signup token '%s' is no longer valid" % token) + return False + return partner + + def signup_retrieve_info(self, cr, uid, token, context=None): + """ retrieve the user info about the token + :return: a dictionary with the user information: + - 'db': the name of the database + - 'token': the token, if token is valid + - 'name': the name of the partner, if token is valid + - 'login': the user login, if the user already exists + - 'email': the partner email, if the user does not exist + """ + partner = self._signup_retrieve_partner(cr, uid, token, raise_exception=True, context=None) + res = {'db': cr.dbname} + if partner.signup_valid: + res['token'] = token + res['name'] = partner.name + if partner.user_ids: + res['login'] = partner.user_ids[0].login + else: + res['email'] = partner.email or '' + return res class res_users(osv.Model): _inherit = 'res.users' - def auth_signup_create(self, cr, uid, new_user, context=None): - # new_user: - # login - # email - # name (optional) - # partner_id (optional) - # groups (optional) - # sign (for partner_id and groups) - # - user_template_id = self.pool.get('ir.config_parameter').get_param(cr, uid, 'auth.signup_template_user_id', 0) - if user_template_id: - self.pool.get('res.users').copy(cr, SUPERUSER_ID, user_template_id, new_user, context=context) - else: - self.pool.get('res.users').create(cr, SUPERUSER_ID, new_user, context=context) + def _get_state(self, cr, uid, ids, name, arg, context=None): + return dict((user.id, 'new' if not user.login_date else 'reset' if user.signup_token else 'active') + for user in self.browse(cr, uid, ids, context)) - def auth_signup(self, cr, uid, name, login, password, context=None): - r = (cr.dbname, login, password) - res = self.search(cr, uid, [("login", "=", login)]) - if res: - # Existing user - user_id = res[0] - try: - self.check(cr.dbname, user_id, password) - # Same password - except openerp.exceptions.AccessDenied: - # Different password - raise - else: - # New user - new_user = { - 'name': name, - 'login': login, - 'user_email': login, - 'password': password, - 'active': True, - } - self.auth_signup_create(cr, uid, new_user) - return r + _columns = { + 'state': fields.function(_get_state, string='State', type='selection', + selection=[('new', 'New'), ('active', 'Active'), ('reset', 'Resetting Password')]), + } -# + def signup(self, cr, uid, values, token=None, context=None): + """ signup a user, to either: + - create a new user (no token), or + - create a user for a partner (with token, but no user for partner), or + - change the password of a user (with token, and existing user). + :param values: a dictionary with field values + :param token: signup token (optional) + :return: (dbname, login, password) for the signed up user + """ + assert values.get('login') and values.get('password') + result = (cr.dbname, values['login'], values['password']) + + if token: + # signup with a token: find the corresponding partner id + res_partner = self.pool.get('res.partner') + partner = res_partner._signup_retrieve_partner(cr, uid, token, + check_validity=True, raise_exception=True, context=None) + # invalidate signup token + partner.write({'signup_token': False, 'signup_expiration': False}) + if partner.user_ids: + # user exists, modify its password + partner.user_ids[0].write({'password': values['password']}) + else: + # user does not exist: sign up invited user + self._signup_create_user(cr, uid, { + 'name': partner.name, + 'login': values['login'], + 'password': values['password'], + 'email': values['login'], + 'partner_id': partner.id, + }, context=context) + return result + + # sign up an external user + assert values.get('name'), 'Signup: no name given for new user' + self._signup_create_user(cr, uid, { + 'name': values['name'], + 'login': values['login'], + 'password': values['password'], + 'email': values['login'], + }, context=context) + return result + + def _signup_create_user(self, cr, uid, values, context=None): + """ create a new user from the template user """ + ir_config_parameter = self.pool.get('ir.config_parameter') + template_user_id = safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.template_user_id', 'False')) + assert template_user_id and self.exists(cr, uid, template_user_id, context=context), 'Signup: invalid template user' + + # check that uninvited users may sign up + if 'partner_id' not in values: + if not safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')): + raise Exception('Signup is not allowed for uninvited users') + + # create a copy of the template user (attached to a specific partner_id if given) + values['active'] = True + return self.copy(cr, uid, template_user_id, values, context=context) diff --git a/addons/auth_signup/res_users_view.xml b/addons/auth_signup/res_users_view.xml new file mode 100644 index 00000000000..c42e1ab5f41 --- /dev/null +++ b/addons/auth_signup/res_users_view.xml @@ -0,0 +1,19 @@ + + + + + + user.form.state + res.users + + + +
+ +
+ + + + + + diff --git a/addons/auth_signup/static/src/css/Makefile b/addons/auth_signup/static/src/css/Makefile new file mode 100644 index 00000000000..d6b4f4b2fc8 --- /dev/null +++ b/addons/auth_signup/static/src/css/Makefile @@ -0,0 +1,3 @@ +base.css: base.sass + sass --trace -t expanded base.sass base.css + diff --git a/addons/auth_signup/static/src/css/base.css b/addons/auth_signup/static/src/css/base.css new file mode 100644 index 00000000000..3f97e7a9301 --- /dev/null +++ b/addons/auth_signup/static/src/css/base.css @@ -0,0 +1,10 @@ +@charset "utf-8"; +.openerp .oe_login .oe_signup_show { + display: none; +} +.openerp .oe_login_signup .oe_signup_show { + display: block !important; +} +.openerp .oe_login_signup .oe_signup_hide { + display: none; +} diff --git a/addons/auth_signup/static/src/css/base.sass b/addons/auth_signup/static/src/css/base.sass new file mode 100644 index 00000000000..f97665d192c --- /dev/null +++ b/addons/auth_signup/static/src/css/base.sass @@ -0,0 +1,13 @@ +@charset "utf-8" + +.openerp + // Regular login form + .oe_login + .oe_signup_show + display: none + // Signup form + .oe_login_signup + .oe_signup_show + display: block !important + .oe_signup_hide + display: none diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 2ab13aa7598..0974b73292d 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -5,56 +5,100 @@ openerp.auth_signup = function(instance) { instance.web.Login.include({ start: function() { var self = this; - this.$('a.oe_signup').click(function() { - var dbname = self.$("form [name=db]").val(); - self.do_action({ - type: 'ir.actions.client', - tag: 'auth_signup.signup', - params: {'dbname': dbname}, - target: 'new', - name: 'Sign up' - }); - return true; + var d = this._super(); + + // to switch between the signup and regular login form + this.$('a.oe_signup_signup').click(function() { + self.$el.addClass("oe_login_signup"); + }); + this.$('a.oe_signup_back').click(function() { + self.$el.removeClass("oe_login_signup"); + delete self.params.token; }); - return this._super(); - }, - }); + // if there is an error message in params, show it then forget it + if (self.params.error_message) { + this.show_error(self.params.error_message); + delete self.params.error_message; + } - instance.auth_signup.Signup = instance.web.Widget.extend({ - template: 'auth_signup.signup', - init: function(parent, params) { - this.params = params; - return this._super(); + // in case of a signup, retrieve the user information from the token + if (self.params.db && self.params.token) { + d = self.rpc("/auth_signup/retrieve", {dbname: self.params.db, token: self.params.token}) + .done(self.on_token_loaded) + .fail(self.on_token_failed); + } + return d; }, - start: function() { - var self = this; - this.$('input[name=password_confirmation]').keyup(function() { - var v = $(this).val(); - var $b = self.$('button'); - if (_.isEmpty(v) || self.$('input[name=password]').val() === v) { - $b.removeAttr('disabled'); + on_token_loaded: function(result) { + // select the right the database + this.selected_db = result.db; + this.on_db_loaded({db_list: [result.db]}); + if (result.token) { + // switch to signup mode, set user name and login + this.$el.addClass("oe_login_signup"); + this.$("form input[name=name]").val(result.name).attr("readonly", "readonly"); + if (result.login) { + this.$("form input[name=login]").val(result.login).attr("readonly", "readonly"); } else { - $b.attr('disabled', 'disabled'); + this.$("form input[name=login]").val(result.email); } - }); - - this.$('form').submit(function(ev) { - if(ev) { - ev.preventDefault(); + } else { + // remain in login mode, set login if present + delete this.params.token; + this.$("form input[name=login]").val(result.login || ""); + } + }, + on_token_failed: function(result, ev) { + if (ev) { + ev.preventDefault(); + } + this.show_error("Invalid signup token"); + delete this.params.db; + delete this.params.token; + }, + on_submit: function(ev) { + if (ev) { + ev.preventDefault(); + } + if (this.$el.hasClass("oe_login_signup")) { + // signup user (or reset password) + var db = this.$("form [name=db]").val(); + var name = this.$("form input[name=name]").val(); + var login = this.$("form input[name=login]").val(); + var password = this.$("form input[name=password]").val(); + var confirm_password = this.$("form input[name=confirm_password]").val(); + if (!db) { + this.do_warn("Login", "No database selected !"); + return false; + } else if (!name) { + this.do_warn("Login", "Please enter a name.") + return false; + } else if (!login) { + this.do_warn("Login", "Please enter a username.") + return false; + } else if (!password || !confirm_password) { + this.do_warn("Login", "Please enter a password and confirm it.") + return false; + } else if (password !== confirm_password) { + this.do_warn("Login", "Passwords do not match; please retype them.") + return false; } var params = { - dbname : self.params.dbname, - name: self.$('input[name=name]').val(), - login: self.$('input[name=email]').val(), - password: self.$('input[name=password]').val(), + dbname : db, + token: this.params.token || "", + name: name, + login: login, + password: password, + state: $.param(this.params) }; var url = "/auth_signup/signup?" + $.param(params); window.location = url; - }); - return this._super(); - } + } else { + // regular login + this._super(ev); + } + }, }); - instance.web.client_actions.add("auth_signup.signup", "instance.auth_signup.Signup"); }; diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml index c2eec846d15..e63bd5863b0 100644 --- a/addons/auth_signup/static/src/xml/auth_signup.xml +++ b/addons/auth_signup/static/src/xml/auth_signup.xml @@ -1,28 +1,28 @@ - + - - -
  • - -
    • + + + + + + + + + + + + + + + + + + +
    • +
    • +     -     - - -
    -
    - Name =
    - Email =
    - Password =
    - Confirmation =
    - -
    -
    -     - -     diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 5b8c41787d4..f5fb3dbd051 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -39,11 +39,11 @@ months = { def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None): """ - Get recurrent dates based on Rule string considering exdate and start date - @param rrulestring: Rulestring - @param exdate: List of exception dates for rrule - @param startdate: Startdate for computing recurrent dates - @return: List of Recurrent dates + Get recurrent dates based on Rule string considering exdate and start date. + @param rrulestring: rulestring + @param exdate: list of exception dates for rrule + @param startdate: startdate for computing recurrent dates + @return: list of Recurrent dates """ def todate(date): val = parser.parse(''.join((re.compile('\d')).findall(date))) @@ -67,11 +67,12 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None): def base_calendar_id2real_id(base_calendar_id=None, with_date=False): """ - This function converts virtual event id into real id of actual event - @param base_calendar_id: Id of calendar - @param with_date: If value passed to this param it will return dates based on value of withdate + base_calendar_id + Convert a "virtual/recurring event id" (type string) into a real event id (type int). + E.g. virtual/recurring event id is 4-20091201100000, so it will return 4. + @param base_calendar_id: id of calendar + @param with_date: if a value is passed to this param it will return dates based on value of withdate + base_calendar_id + @return: real event id """ - if base_calendar_id and isinstance(base_calendar_id, (str, unicode)): res = base_calendar_id.split('-') @@ -89,12 +90,13 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False): def real_id2base_calendar_id(real_id, recurrent_date): """ - Convert real id of record into virtual id using recurrent_date - e.g. real id is 1 and recurrent_date is 01-12-2009 10:00:00 then it will return - 1-20091201100000 - @return: real id with recurrent date. + Convert a real event id (type int) into a "virtual/recurring event id" (type string). + E.g. real event id is 1 and recurrent_date is set to 01-12-2009 10:00:00, so + it will return 1-20091201100000. + @param real_id: real event id + @param recurrent_date: real event recurrent date + @return: string containing the real id and the recurrent date """ - if real_id and recurrent_date: recurrent_date = time.strftime("%Y%m%d%H%M%S", \ time.strptime(recurrent_date, "%Y-%m-%d %H:%M:%S")) @@ -104,10 +106,10 @@ def real_id2base_calendar_id(real_id, recurrent_date): def _links_get(self, cr, uid, context=None): """ Get request link. - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param context: A standard dictionary for contextual values - @return: list of dictionary which contain object and name and id. + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param context: a standard dictionary for contextual values + @return: list of dictionary which contain object and name and id """ obj = self.pool.get('res.request.link') ids = obj.search(cr, uid, []) @@ -216,9 +218,9 @@ class calendar_attendee(osv.osv): def _get_address(self, name=None, email=None): """ - Gives email information in ical CAL-ADDRESS type format - @param name: Name for CAL-ADDRESS value - @param email: Email address for CAL-ADDRESS value + Gives email information in ical CAL-ADDRESS type format. + @param name: name for CAL-ADDRESS value + @param email: email address for CAL-ADDRESS value """ if name and email: name += ':' @@ -226,13 +228,13 @@ class calendar_attendee(osv.osv): def _compute_data(self, cr, uid, ids, name, arg, context=None): """ - Compute data on function fields for attendee values . - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of calendar attendee’s IDs. - @param name: name of field. - @param context: A standard dictionary for contextual values - @return: Dictionary of form {id: {'field Name': value'}}. + Compute data on function fields for attendee values. + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param ids: list of calendar attendee's IDs + @param name: name of field + @param context: a standard dictionary for contextual values + @return: dictionary of form {id: {'field Name': value'}} """ name = name[0] result = {} @@ -297,10 +299,10 @@ class calendar_attendee(osv.osv): def _links_get(self, cr, uid, context=None): """ Get request link for ref field in calendar attendee. - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param cr: the current row, from the database cursor + @param uid: the current user's id for security checks @param context: A standard dictionary for contextual values - @return: list of dictionary which contain object and name and id. + @return: list of dictionary which contain object and name and id """ obj = self.pool.get('res.request.link') ids = obj.search(cr, uid, []) @@ -310,10 +312,10 @@ class calendar_attendee(osv.osv): def _lang_get(self, cr, uid, context=None): """ Get language for language selection field. - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param context: A standard dictionary for contextual values - @return: list of dictionary which contain code and name and id. + @param cr: the current row, from the database cursor + @param uid: the current user's id for security checks + @param context: a standard dictionary for contextual values + @return: list of dictionary which contain code and name and id """ obj = self.pool.get('res.lang') ids = obj.search(cr, uid, []) @@ -375,7 +377,6 @@ property or property parameter."), 'ref': fields.reference('Event Ref', selection=_links_get, size=128), 'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"), } - _defaults = { 'state': 'needs-action', 'role': 'req-participant', @@ -388,12 +389,12 @@ property or property parameter."), def get_ics_file(self, cr, uid, event_obj, context=None): """ - Returns iCalendar file for the event invitation - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param event_obj: Event object (browse record) - @param context: A standard dictionary for contextual values + Returns iCalendar file for the event invitation. + @param self: the object pointer + @param cr: the current row, from the database cursor + @param uid: the current user's id for security checks + @param event_obj: event object (browse record) + @param context: a standard dictionary for contextual values @return: .ics file content """ res = None @@ -471,7 +472,7 @@ property or property parameter."), def _send_mail(self, cr, uid, ids, mail_to, email_from=tools.config.get('email_from', False), context=None): """ Send mail for event invitation to event attendees. - @param email_from: Email address for user sending the mail + @param email_from: email address for user sending the mail @return: True """ company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name @@ -517,11 +518,11 @@ property or property parameter."), def onchange_user_id(self, cr, uid, ids, user_id, *args, **argv): """ Make entry on email and availbility on change of user_id field. - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of calendar attendee’s IDs. - @param user_id: Changed value of User id - @return: dictionary of value. which put value in email and availability fields. + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param ids: list of calendar attendee's IDs + @param user_id: changed value of User id + @return: dictionary of values which put value in email and availability fields """ if not user_id: @@ -531,24 +532,25 @@ property or property parameter."), return {'value': {'email': user.email, 'availability':user.availability}} def do_tentative(self, cr, uid, ids, context=None, *args): - """ Makes event invitation as Tentative - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of calendar attendee’s IDs - @param *args: Get Tupple value - @param context: A standard dictionary for contextual values + """ + Makes event invitation as Tentative. + @param self: the object pointer + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param ids: list of calendar attendee's IDs + @param *args: get Tupple value + @param context: a standard dictionary for contextual values """ return self.write(cr, uid, ids, {'state': 'tentative'}, context) def do_accept(self, cr, uid, ids, context=None, *args): """ - Update state of invitation as Accepted and - if the invited user is other then event user it will make a copy of this event for invited user - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of calendar attendee’s IDs. - @param context: A standard dictionary for contextual values + Update state of invitation as Accepted and if the invited user is other + then event user it will make a copy of this event for invited user. + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param ids: list of calendar attendee's IDs + @param context: a standard dictionary for contextual values @return: True """ if context is None: @@ -564,25 +566,28 @@ property or property parameter."), return True def do_decline(self, cr, uid, ids, context=None, *args): - """ Marks event invitation as Declined - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of calendar attendee’s IDs - @param *args: Get Tupple value - @param context: A standard dictionary for contextual values """ + """ + Marks event invitation as Declined. + @param self: the object pointer + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param ids: list of calendar attendee's IDs + @param *args: get Tupple value + @param context: a standard dictionary for contextual values + """ if context is None: context = {} return self.write(cr, uid, ids, {'state': 'declined'}, context) def create(self, cr, uid, vals, context=None): - """ Overrides orm create method. + """ + Overrides orm create method. @param self: The object pointer - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param vals: Get Values - @param context: A standard dictionary for contextual values """ - + @param cr: the current row, from the database cursor + @param uid: the current user's ID for security checks + @param vals: get Values + @param context: a standard dictionary for contextual values + """ if context is None: context = {} if not vals.get("email") and vals.get("cn"): @@ -592,6 +597,7 @@ property or property parameter."), vals['cn'] = vals.get("cn") res = super(calendar_attendee, self).create(cr, uid, vals, context) return res + calendar_attendee() class res_alarm(osv.osv): @@ -630,8 +636,8 @@ true, it will allow you to hide the event alarm information without removing it. """ Create Alarm for event. @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of res alarm’s IDs. + @param uid: the current user's ID for security checks, + @param ids: List of res alarm's IDs. @param model: Model name. @param date: Event date @param context: A standard dictionary for contextual values @@ -704,8 +710,8 @@ true, it will allow you to hide the event alarm information without removing it. """ Delete alarm specified in ids @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of res alarm’s IDs. + @param uid: the current user's ID for security checks, + @param ids: List of res alarm's IDs. @param model: Model name for which alarm is to be cleared. @return: True """ @@ -715,12 +721,12 @@ true, it will allow you to hide the event alarm information without removing it. ir_obj = self.pool.get('ir.model') model_id = ir_obj.search(cr, uid, [('model', '=', model)])[0] model_obj = self.pool.get(model) - for datas in model_obj.browse(cr, uid, ids, context=context): - alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', datas.id)]) + for data in model_obj.browse(cr, uid, ids, context=context): + alarm_ids = alarm_obj.search(cr, uid, [('model_id', '=', model_id), ('res_id', '=', data.id)]) if alarm_ids: alarm_obj.unlink(cr, uid, alarm_ids) cr.execute('Update %s set base_calendar_alarm_id=NULL, alarm_id=NULL\ - where id=%%s' % model_obj._table,(datas.id,)) + where id=%%s' % model_obj._table,(data.id,)) return True res_alarm() @@ -773,7 +779,7 @@ class calendar_alarm(osv.osv): Overrides orm create method. @param self: The object pointer @param cr: the current row, from the database cursor, - @param vals: dictionary of fields value.{‘name_of_the_field’: value, ...} + @param vals: dictionary of fields value.{'name_of_the_field': value, ...} @param context: A standard dictionary for contextual values @return: new record id for calendar_alarm. """ @@ -798,8 +804,8 @@ class calendar_alarm(osv.osv): """Scheduler for event reminder @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of calendar alarm’s IDs. + @param uid: the current user's ID for security checks, + @param ids: List of calendar alarm's IDs. @param use_new_cursor: False or the dbname @param context: A standard dictionary for contextual values """ @@ -891,8 +897,8 @@ class calendar_event(osv.osv): """Returns duration and/or end date based on values passed @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of calendar event’s IDs. + @param uid: the current user's ID for security checks, + @param ids: List of calendar event's IDs. @param start_date: Starting date @param duration: Duration between start date and end date @param end_date: Ending Datee @@ -967,14 +973,14 @@ class calendar_event(osv.osv): if not isinstance(ids, list): ids = [ids] - for datas in self.read(cr, uid, ids, ['id','byday','recurrency', 'month_list','end_date', 'rrule_type', 'select1', 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'su', 'exrule', 'day', 'week_list' ], context=context): - event = datas['id'] - if datas.get('interval', 0) < 0: + for data in self.read(cr, uid, ids, ['id','byday','recurrency', 'month_list','end_date', 'rrule_type', 'select1', 'interval', 'count', 'end_type', 'mo', 'tu', 'we', 'th', 'fr', 'sa', 'su', 'exrule', 'day', 'week_list' ], context=context): + event = data['id'] + if data.get('interval', 0) < 0: raise osv.except_osv(_('Warning!'), _('Interval cannot be negative.')) - if datas.get('count', 0) <= 0: + if data.get('count', 0) <= 0: raise osv.except_osv(_('Warning!'), _('Count cannot be negative or 0.')) - if datas['recurrency']: - result[event] = self.compute_rule_string(datas) + if data['recurrency']: + result[event] = self.compute_rule_string(data) else: result[event] = "" return result @@ -990,7 +996,6 @@ class calendar_event(osv.osv): super(calendar_event, obj).write(cr, uid, ids, data, context=context) return True - _columns = { 'id': fields.integer('ID', readonly=True), 'sequence': fields.integer('Sequence'), @@ -1006,21 +1011,24 @@ class calendar_event(osv.osv): 'show_as': fields.selection([('free', 'Free'), ('busy', 'Busy')], \ 'Show Time as', states={'done': [('readonly', True)]}), 'base_calendar_url': fields.char('Caldav URL', size=264), - 'state': fields.selection([('tentative', 'Tentative'), - ('cancelled', 'Cancelled'), - ('confirmed', 'Confirmed'), - ], 'Status', readonly=True), + 'state': fields.selection([ + ('tentative', 'Tentative'), + ('cancelled', 'Cancelled'), + ('confirmed', 'Confirmed'), + ], 'Status', readonly=True), 'exdate': fields.text('Exception Date/Times', help="This property \ defines the list of date/time exceptions for a recurring calendar component."), 'exrule': fields.char('Exception Rule', size=352, help="Defines a \ rule or repeating pattern of time to exclude from the recurring rule."), 'rrule': fields.function(_get_rulestring, type='char', size=124, \ fnct_inv=_rrule_write, store=True, string='Recurrent Rule'), - 'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \ - ('weekly', 'Weekly'), ('monthly', 'Monthly'), \ - ('yearly', 'Yearly'),], - 'Recurrency', states={'done': [('readonly', True)]}, - help="Let the event automatically repeat at that interval"), + 'rrule_type': fields.selection([ + ('daily', 'Daily'), + ('weekly', 'Weekly'), + ('monthly', 'Monthly'), + ('yearly', 'Yearly') + ], 'Recurrency', states={'done': [('readonly', True)]}, + help="Let the event automatically repeat at that interval"), 'alarm_id': fields.many2one('res.alarm', 'Reminder', states={'done': [('readonly', True)]}, help="Set an alarm at this time, before the event occurs" ), 'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'), @@ -1028,7 +1036,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'recurrent_id': fields.datetime('Recurrent ID date'), 'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'), 'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}), - 'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with Organizer Attribure of VEvent. + 'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent. 'organizer_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}), 'end_type' : fields.selection([('count', 'Number of repetitions'), ('end_date','End date')], 'Recurrence Termination'), 'interval': fields.integer('Repeat Every', help="Repeat every (Days/Week/Month/Year)"), @@ -1043,13 +1051,21 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'select1': fields.selection([('date', 'Date of month'), ('day', 'Day of month')], 'Option'), 'day': fields.integer('Date of month'), - 'week_list': fields.selection([('MO', 'Monday'), ('TU', 'Tuesday'), \ - ('WE', 'Wednesday'), ('TH', 'Thursday'), \ - ('FR', 'Friday'), ('SA', 'Saturday'), \ - ('SU', 'Sunday')], 'Weekday'), - 'byday': fields.selection([('1', 'First'), ('2', 'Second'), \ - ('3', 'Third'), ('4', 'Fourth'), \ - ('5', 'Fifth'), ('-1', 'Last')], 'By day'), + 'week_list': fields.selection([ + ('MO', 'Monday'), + ('TU', 'Tuesday'), + ('WE', 'Wednesday'), + ('TH', 'Thursday'), + ('FR', 'Friday'), + ('SA', 'Saturday'), + ('SU', 'Sunday')], 'Weekday'), + 'byday': fields.selection([ + ('1', 'First'), + ('2', 'Second'), + ('3', 'Third'), + ('4', 'Fourth'), + ('5', 'Fifth'), + ('-1', 'Last')], 'By day'), 'month_list': fields.selection(months.items(), 'Month'), 'end_date': fields.date('Repeat Until'), 'attendee_ids': fields.many2many('calendar.attendee', 'event_attendee_rel', \ @@ -1101,9 +1117,9 @@ rule or repeating pattern of time to exclude from the recurring rule."), return res _defaults = { - 'end_type' : 'count', - 'count' : 1, - 'rrule_type' : 'none', + 'end_type': 'count', + 'count': 1, + 'rrule_type': False, 'state': 'tentative', 'class': 'public', 'show_as': 'busy', @@ -1113,7 +1129,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'user_id': lambda self, cr, uid, ctx: uid, 'organizer': default_organizer, } - + def _check_closing_date(self, cr, uid, ids, context=None): for event in self.browse(cr, uid, ids, context=context): if event.date_deadline < event.date: @@ -1129,7 +1145,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), This method gives ids of dates that comes between start date and end date of calendar views @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param limit: The Number of Results to Return """ if not context: context = {} @@ -1140,7 +1156,8 @@ rule or repeating pattern of time to exclude from the recurring rule."), result.append(data['id']) continue event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S") -# To check: If the start date is replace by event date .. the event date will be changed by that of calendar code + + # TOCHECK: the start date should be replaced by event date; the event date will be changed by that of calendar code if not data['rrule']: continue @@ -1186,45 +1203,46 @@ rule or repeating pattern of time to exclude from the recurring rule."), ids = list(set(result)) return ids - def compute_rule_string(self, datas): + def compute_rule_string(self, data): """ Compute rule string according to value type RECUR of iCalendar from the values given. @param self: the object pointer - @param datas: dictionary of freq and interval value. + @param data: dictionary of freq and interval value + @return: string containing recurring rule (empty if no rule) """ - def get_week_string(freq, datas): + def get_week_string(freq, data): weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su'] if freq == 'weekly': - byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas)) + byday = map(lambda x: x.upper(), filter(lambda x: data.get(x) and x in weekdays, data)) if byday: return ';BYDAY=' + ','.join(byday) return '' - def get_month_string(freq, datas): + def get_month_string(freq, data): if freq == 'monthly': - if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31): + if data.get('select1')=='date' and (data.get('day') < 1 or data.get('day') > 31): raise osv.except_osv(_('Error!'), ("Please select a proper day of the month.")) - if datas.get('select1')=='day': - return ';BYDAY=' + datas.get('byday') + datas.get('week_list') - elif datas.get('select1')=='date': - return ';BYMONTHDAY=' + str(datas.get('day')) + if data.get('select1')=='day': + return ';BYDAY=' + data.get('byday') + data.get('week_list') + elif data.get('select1')=='date': + return ';BYMONTHDAY=' + str(data.get('day')) return '' - def get_end_date(datas): - if datas.get('end_date'): - datas['end_date_new'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z' + def get_end_date(data): + if data.get('end_date'): + data['end_date_new'] = ''.join((re.compile('\d')).findall(data.get('end_date'))) + 'T235959Z' - return (datas.get('end_type') == 'count' and (';COUNT=' + str(datas.get('count'))) or '') +\ - ((datas.get('end_date_new') and datas.get('end_type') == 'end_date' and (';UNTIL=' + datas.get('end_date_new'))) or '') + return (data.get('end_type') == 'count' and (';COUNT=' + str(data.get('count'))) or '') +\ + ((data.get('end_date_new') and data.get('end_type') == 'end_date' and (';UNTIL=' + data.get('end_date_new'))) or '') - freq=datas.get('rrule_type') - if freq == 'none': - return '' + freq = data.get('rrule_type', False) + res = '' + if freq: + interval_srting = data.get('interval') and (';INTERVAL=' + str(data.get('interval'))) or '' + res = 'FREQ=' + freq.upper() + get_week_string(freq, data) + interval_srting + get_end_date(data) + get_month_string(freq, data) - interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or '' - - return 'FREQ=' + freq.upper() + get_week_string(freq, datas) + interval_srting + get_end_date(datas) + get_month_string(freq, datas) + return res def _get_empty_rrule_data(self): return { @@ -1248,19 +1266,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), 'week_list' : False } - #def _write_rrule(self, cr, uid, ids, field_value, rule_date=False, context=None): - # data = self._get_empty_rrule_data() - # - # if field_value: - # data['recurrency'] = True - # for event in self.browse(cr, uid, ids, context=context): - # rdate = rule_date or event.date - # update_data = self._parse_rrule(field_value, dict(data), rdate) - # data.update(update_data) - # #parse_rrule - # self.write(cr, uid, event.id, data, context=context) - - def _parse_rrule(self, rule, data, date_start): day_list = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su'] rrule_type = ['yearly', 'monthly', 'weekly', 'daily'] @@ -1278,7 +1283,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), if i in r._byweekday: data[day_list[i]] = True data['rrule_type'] = 'weekly' - #repeat monthly bynweekday ((weekday, weeknumber), ) + #repeat monthly by nweekday ((weekday, weeknumber), ) if r._bynweekday: data['week_list'] = day_list[r._bynweekday[0][0]].upper() data['byday'] = r._bynweekday[0][1] @@ -1290,7 +1295,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), data['select1'] = 'date' data['rrule_type'] = 'monthly' - #yearly but for openerp it's monthly, take same information as monthly but interval is 12 times + #repeat yearly but for openerp it's monthly, take same information as monthly but interval is 12 times if r._bymonth: data['interval'] = data['interval'] * 12 @@ -1363,7 +1368,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), except Exception: return True - def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True): context = context or {} if isinstance(ids, (str, int, long)): @@ -1384,14 +1388,14 @@ rule or repeating pattern of time to exclude from the recurring rule."), data = self.read(cr, uid, event_id, ['date', 'date_deadline', \ 'rrule', 'duration', 'exdate']) if data.get('rrule'): - data.update(vals) - data.update({ - 'recurrent_uid': real_event_id, - 'recurrent_id': data.get('date'), - 'rrule_type': 'none', - 'rrule': '', - 'recurrency' : False, - }) + data.update( + vals, + recurrent_uid=real_event_id, + recurrent_id=data.get('date'), + rrule_type=False, + rrule='', + recurrency=False, + ) new_id = self.copy(cr, uid, real_event_id, default=data, context=context) @@ -1435,7 +1439,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), return res def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'): - # FIXME This whole id mangling has to go! if context is None: context = {} fields2 = fields and fields[:] or None @@ -1445,10 +1448,12 @@ rule or repeating pattern of time to exclude from the recurring rule."), if fields and (f not in fields): fields2.append(f) + # FIXME This whole id mangling has to go! if isinstance(ids, (str, int, long)): select = [ids] else: select = ids + select = map(lambda x: (x, base_calendar_id2real_id(x)), select) result = [] @@ -1477,7 +1482,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), if f not in ('id','date','date_deadline','duration','user_id','state'): if isinstance(r[f], list): r[f] = [] - else: + else: r[f] = False if f=='name': r[f] = _('Busy') @@ -1525,7 +1530,6 @@ rule or repeating pattern of time to exclude from the recurring rule."), self.unlink_events(cr, uid, ids, context=context) return res - def create(self, cr, uid, vals, context=None): if context is None: context = {} @@ -1543,7 +1547,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), """ Makes event invitation as Tentative @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param ids: List of Event IDs @param *args: Get Tupple value @param context: A standard dictionary for contextual values @@ -1554,7 +1558,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), """ Makes event invitation as Tentative @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param ids: List of Event IDs @param *args: Get Tupple value @param context: A standard dictionary for contextual values @@ -1565,7 +1569,7 @@ rule or repeating pattern of time to exclude from the recurring rule."), """ Makes event invitation as Tentative @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param ids: List of Event IDs @param *args: Get Tupple value @param context: A standard dictionary for contextual values @@ -1586,9 +1590,9 @@ class calendar_todo(osv.osv): Get Date @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param ids: List of calendar todo's IDs. - @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. + @param args: list of tuples of form [(‘name_of_the_field', ‘operator', value), ...]. @param context: A standard dictionary for contextual values """ @@ -1602,10 +1606,10 @@ class calendar_todo(osv.osv): Set Date @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param id: calendar's ID. @param value: Get Value - @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. + @param args: list of tuples of form [('name_of_the_field', 'operator', value), ...]. @param context: A standard dictionary for contextual values """ @@ -1633,7 +1637,7 @@ class ir_values(osv.osv): Set IR Values @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param model: Get The Model """ @@ -1652,7 +1656,7 @@ class ir_values(osv.osv): Get IR Values @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param model: Get The Model """ if context is None: @@ -1678,8 +1682,8 @@ class ir_model(osv.osv): Overrides orm read method. @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of IR Model’s IDs. + @param uid: the current user's ID for security checks, + @param ids: List of IR Model's IDs. @param context: A standard dictionary for contextual values """ new_ids = isinstance(ids, (str, int, long)) and [ids] or ids @@ -1696,24 +1700,24 @@ ir_model() class virtual_report_spool(web_services.report_spool): - def exp_report(self, db, uid, object, ids, datas=None, context=None): + def exp_report(self, db, uid, object, ids, data=None, context=None): """ Export Report @param self: The object pointer @param db: get the current database, - @param uid: the current user’s ID for security checks, + @param uid: the current user's ID for security checks, @param context: A standard dictionary for contextual values """ if object == 'printscreen.list': return super(virtual_report_spool, self).exp_report(db, uid, \ - object, ids, datas, context) + object, ids, data, context) new_ids = [] for id in ids: new_ids.append(base_calendar_id2real_id(id)) - if datas.get('id', False): - datas['id'] = base_calendar_id2real_id(datas['id']) - return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, datas, context) + if data.get('id', False): + data['id'] = base_calendar_id2real_id(data['id']) + return super(virtual_report_spool, self).exp_report(db, uid, object, new_ids, data, context) virtual_report_spool() @@ -1725,8 +1729,8 @@ class res_users(osv.osv): Get User Availability @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of res user’s IDs. + @param uid: the current user's ID for security checks, + @param ids: List of res user's IDs. @param context: A standard dictionary for contextual values """ @@ -1755,8 +1759,8 @@ class res_users(osv.osv): Get User Availability Function @param self: The object pointer @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param ids: List of res user’s IDs. + @param uid: the current user's ID for security checks, + @param ids: List of res user's IDs. @param context: A standard dictionary for contextual values """ @@ -1770,5 +1774,4 @@ class res_users(osv.osv): res_users() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index fe292a489ab..d5dc75df873 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -1,8 +1,7 @@ - - + calendar.attendee.form calendar.attendee @@ -55,8 +54,7 @@     - - + calendar.attendee.tree calendar.attendee @@ -73,8 +71,7 @@     - - + calendar.attendee.search calendar.attendee @@ -110,18 +107,16 @@ {'default_sent_by_uid': uid} - + - - - + res.alarm.form res.alarm @@ -140,8 +135,7 @@     - - + res.alarm.tree res.alarm @@ -171,15 +165,13 @@     - - + - - + Event Form calendar.event @@ -334,8 +326,7 @@     - - + Event Tree calendar.event @@ -352,8 +343,7 @@     - - + Events Calendar calendar.event @@ -367,8 +357,7 @@     - - + Calendar Events Search calendar.event @@ -393,8 +382,7 @@ - - + Events ir.actions.act_window @@ -404,8 +392,7 @@ - - + diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index b87114f3a66..9ceaea671ca 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -43,14 +43,14 @@ class crm_meeting(base_state, osv.Model): _name = 'crm.meeting' _description = "Meeting" _order = "id desc" - _inherit = ["calendar.event", "mail.thread", 'ir.needaction_mixin'] + _inherit = ["calendar.event", "mail.thread", "ir.needaction_mixin"] _columns = { # base_state required fields 'create_date': fields.datetime('Creation Date', readonly=True), 'write_date': fields.datetime('Write Date', readonly=True), 'date_open': fields.datetime('Confirmed', readonly=True), 'date_closed': fields.datetime('Closed', readonly=True), - 'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id','partner_id', + 'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id', 'partner_id', string='Attendees', states={'done': [('readonly', True)]}), 'state': fields.selection( [('draft', 'Unconfirmed'), ('open', 'Confirmed')], @@ -115,5 +115,3 @@ class crm_meeting(base_state, osv.Model): def case_close_send_note(self, cr, uid, ids, context=None): return self.message_post(cr, uid, ids, body=_("Meeting completed."), context=context) - - diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml index adcfc23a520..4df0a8a22b2 100644 --- a/addons/base_calendar/crm_meeting_view.xml +++ b/addons/base_calendar/crm_meeting_view.xml @@ -15,9 +15,9 @@ action_crm_meeting_read - + action - + crm.meeting client_action_multi @@ -33,9 +33,9 @@ action_crm_meeting_unread - + action - + crm.meeting client_action_multi @@ -73,7 +73,7 @@
    -

    @@ -116,9 +116,49 @@ - - + + + + + + @@ -128,44 +168,6 @@ - - + + +

    +

    +

    Map your data to OpenERP

    @@ -27,18 +55,6 @@
    - - File Format Options… -
    -

    - - - -

    -

    Frequently Asked Questions

    @@ -81,17 +97,37 @@ -

    Import preview failed due to:

    +

    Import preview failed due to: . The issue is + usually an incorrect file encoding.

    Here is the start of the file we could not import:
      -
    • - - +
    • + + + + + + + +
        +
      • + + + +
        • +
    + + + + + + + this.attr('t-if', 'widget.options.import_enabled'); diff --git a/addons/board/controllers.py b/addons/board/controllers.py index 53845c96095..81557f64fa3 100644 --- a/addons/board/controllers.py +++ b/addons/board/controllers.py @@ -1,19 +1,14 @@ # -*- coding: utf-8 -*- from xml.etree import ElementTree -try: - import openerp.addons.web.common.http as openerpweb - from openerp.addons.web.common import nonliterals - from openerp.addons.web.controllers.main import load_actions_from_ir_values -except ImportError: - import web.common.http as openerpweb # noqa - from web.common import nonliterals # noqa - from web.controllers.main import load_actions_from_ir_values # noqa +import openerp +from openerp.addons.web import nonliterals +from openerp.addons.web.controllers.main import load_actions_from_ir_values -class Board(openerpweb.Controller): +class Board(openerp.addons.web.http.Controller): _cp_path = '/board' - @openerpweb.jsonrequest + @openerp.addons.web.http.jsonrequest def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''): # FIXME move this method to board.board model to_eval = nonliterals.CompoundContext(context_to_save) diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 43d7ca76d39..2dbd9f5c9cc 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -25,9 +25,9 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ }).bind('sortstop', self.do_save_dashboard); var old_title = this.__parentedParent.get('title'); - this.__parentedParent.on_record_loaded.add_last(function(){ - self.__parentedParent.set({ 'title' : old_title}); - }); + this.__parentedParent.on('load_record', self, function(){ + self.__parentedParent.set({ 'title': old_title}); + }) // Events this.$el.find('.oe_dashboard_link_reset').click(this.on_reset); this.$el.find('.oe_dashboard_link_change_layout').click(this.on_change_layout); @@ -173,7 +173,7 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ }, on_load_action: function(result, index, action_attrs) { var self = this, - action = result.result, + action = result, view_mode = action_attrs.view_mode; if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) { diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 7e33f397e8a..fbe47c08dca 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -26,6 +26,7 @@ from osv import fields, osv import time import tools from tools.translate import _ +from tools import html2plaintext from base.res.res_partner import format_address @@ -776,7 +777,6 @@ class crm_lead(base_stage, format_address, osv.osv): 'default_user_id': uid, 'default_section_id': opportunity.section_id and opportunity.section_id.id or False, 'default_email_from': opportunity.email_from, - 'default_state': 'open', 'default_name': opportunity.name, } return res @@ -812,9 +812,11 @@ class crm_lead(base_stage, format_address, osv.osv): This override updates the document according to the email. """ if custom_values is None: custom_values = {} + + desc = html2plaintext(msg.get('body')) if msg.get('body') else '' custom_values.update({ 'name': msg.get('subject') or _("No Subject"), - 'description': msg.get('body'), + 'description': desc, 'email_from': msg.get('from'), 'email_cc': msg.get('cc'), 'user_id': False, diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index f91a8756598..cee80eb0836 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -160,17 +160,17 @@
    - +
    - + @@ -488,7 +488,7 @@     - @@ -327,7 +337,7 @@ - + @@ -452,7 +462,7 @@
    @@ -277,7 +277,7 @@ Total: diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 1cd1e10c5ed..9f94c264c5e 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -6,7 +6,7 @@ hr.expense.report.treehr.expense.report - + diff --git a/addons/hr_expense/security/ir.model.access.csv b/addons/hr_expense/security/ir.model.access.csv index 0455302319e..092424ef7e6 100644 --- a/addons/hr_expense/security/ir.model.access.csv +++ b/addons/hr_expense/security/ir.model.access.csv @@ -9,6 +9,7 @@ access_product_template_hr_expense_user,product.template.hr.expense.user,product access_product_uom_hr_expense_user,product.uom.hr.expense.user,product.model_product_uom,base.group_hr_user,1,1,1,1 access_product_price_type_user,product.price.type.user,product.model_product_price_type,base.group_hr_user,1,1,1,1 access_account_journal_user,account.journal.user,account.model_account_journal,base.group_hr_user,1,1,1,1 +access_account_journal_employee,account.journal.employee,account.model_account_journal,base.group_user,1,0,0,0 access_account_invoice_user,account.invoice.user,account.model_account_invoice,base.group_hr_user,1,1,1,1 access_account_invoice_line_user,account.invoice.line.user,account.model_account_invoice_line,base.group_hr_user,1,1,1,1 access_account_analytic_journal_user,account.ianalytic.journal.user,account.model_account_analytic_journal,base.group_hr_user,1,1,1,1 diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 306e5201829..b48f0786704 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -212,13 +212,6 @@ class hr_holidays(osv.osv): } return result - def onchange_status_id(self, cr, uid, ids, status_id, context=None): - double_validation = False - if status_id: - holiday_status = self.pool.get('hr.holidays.status').browse(cr, uid, status_id, context=context) - double_validation = holiday_status.double_validation - return {'value': {'double_validation': double_validation}} - def set_to_draft(self, cr, uid, ids, context=None): self.write(cr, uid, ids, { 'state': 'draft', diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 347e2b17ca5..6e3c9b2d083 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -100,7 +100,7 @@ - + @@ -222,7 +222,7 @@ Total: diff --git a/addons/hr_payroll/report/report_payslip.rml b/addons/hr_payroll/report/report_payslip.rml index 4d96e4b5ef7..990419ee5f1 100644 --- a/addons/hr_payroll/report/report_payslip.rml +++ b/addons/hr_payroll/report/report_payslip.rml @@ -197,7 +197,8 @@ @@ -293,7 +294,7 @@ [[ formatLang(p.amount) ]] diff --git a/addons/hr_payroll/report/report_payslip_details.rml b/addons/hr_payroll/report/report_payslip_details.rml index fe6a10dd1f5..4ace0ad2f82 100644 --- a/addons/hr_payroll/report/report_payslip_details.rml +++ b/addons/hr_payroll/report/report_payslip_details.rml @@ -234,7 +234,8 @@ @@ -334,7 +335,7 @@ [[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]] @@ -391,7 +392,7 @@ [[ formatLang(r['amount']) ]] diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py index 184f9a06867..94df47f6e44 100644 --- a/addons/hr_payroll_account/hr_payroll_account.py +++ b/addons/hr_payroll_account/hr_payroll_account.py @@ -36,7 +36,7 @@ class hr_payslip(osv.osv): _columns = { 'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."), - 'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True), + 'journal_id': fields.many2one('account.journal', 'Salary Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True), 'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True), } @@ -215,7 +215,7 @@ class hr_payslip_run(osv.osv): _inherit = 'hr.payslip.run' _description = 'Payslip Run' _columns = { - 'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True), + 'journal_id': fields.many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True), } def _get_default_journal(self, cr, uid, context=None): diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index 31959d7e9c7..56c517620e0 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -26,6 +26,7 @@ from base_status.base_stage import base_stage from datetime import datetime from osv import fields, osv from tools.translate import _ +from tools import html2plaintext AVAILABLE_STATES = [ ('draft', 'New'), @@ -296,7 +297,6 @@ class hr_applicant(base_stage, osv.Model): res['context'] = { 'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False, 'default_user_id': uid, - 'default_state': 'open', 'default_name': applicant.name, 'default_categ_ids': category and [category.id] or False, } @@ -327,9 +327,10 @@ class hr_applicant(base_stage, osv.Model): This override updates the document according to the email. """ if custom_values is None: custom_values = {} + desc = html2plaintext(msg.get('body')) if msg.get('body') else '' custom_values.update({ 'name': msg.get('subject') or _("No Subject"), - 'description': msg.get('body'), + 'description': desc, 'email_from': msg.get('from'), 'email_cc': msg.get('cc'), 'user_id': False, diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 08e5f31a2d2..d6d04c1b969 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -208,7 +208,7 @@ - + @@ -289,7 +289,8 @@
    -
    +
    +

    Mobile:

    @@ -342,8 +343,8 @@ attrs="{'invisible':[('survey_id','=',False)]}"/>
    - -
    + +
    - [[ formatLang(line.total_amount) ]] [[ o.currency_id.symbol ]] + [[ formatLang(line.total_amount, currency_obj=o.currency_id) ]]
    - [[ formatLang(o.amount) ]] [[ o.currency_id.symbol ]] + [[ formatLang(o.amount, currency_obj=o.currency_id) ]]
    - [[ formatLang(r['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]]
    - [[ formatLang(sum_total()) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(sum_total(), currency_obj = o.company_id and o.company_id.currency_id)]]
    - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]] + [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
    - [[ formatLang(p.total) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] + [[ formatLang(p.total, currency_obj = o.company_id and o.company_id.currency_id)]]
    - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]] + [[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]]
    - [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] + [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]]
    - [[ formatLang(r['total']) ]] [[ o.company_id and o.company_id.currency_id.symbol or '']][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]] + [[ formatLang(r['total'], currency_obj = o.company_id and o.company_id.currency_id)]][[ r.get('register_name', False) and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font')]]
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +     		TOTAL
    + + + +
    +
    +
    +
    TOTAL
    +
    +     		+ + + +
    +
    + + \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml index 070079a4b80..71776af61ba 100644 --- a/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml +++ b/addons/hr_timesheet_sheet/test/test_hr_timesheet_sheet.yml @@ -16,7 +16,6 @@ I create a timesheet for employee "Quentin Paolinon". - !record {model: hr_timesheet_sheet.sheet, id: hr_timesheet_sheet_sheet_deddk0}: - date_current: !eval time.strftime('%Y-%m-%d') date_from: !eval time.strftime('%Y-%m-01') name: Quentin Paolinon state: new @@ -34,30 +33,6 @@ - !assert {model: hr.employee, id: hr.employee_qdp}: - state == 'present' -- - I want to check attendance and work of yesterday. I click on <- button. -- - !python {model: hr_timesheet_sheet.sheet}: | - date_prev = self.date_previous(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) - assert date_prev == True, "I See Previous Date Timesheet" -- - Then I click on "Today" button to fill today's timesheet. -- - !python {model: hr_timesheet_sheet.sheet}: | - date_to = self.date_today(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) - assert date_to == True, "I See Today Date Timesheet" -- - I can also move to next day by clicking on -> button. -- - !python {model: hr_timesheet_sheet.sheet}: | - date_next = self.date_next(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) - assert date_next == True, "I See Next Date Timesheet" -- - I want to go to a particular date and see attendance then I select the date and click on "Go to:" button. -- - !python {model: hr_timesheet_sheet.sheet}: | - button_dumy = self.button_dummy(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], None) - assert button_dumy == True, "I See Particular Date Attendance" - At the time of logout, I create attendance and perform "Sign Out". - diff --git a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py index a6974fc2ccf..2af8792472e 100644 --- a/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py +++ b/addons/hr_timesheet_sheet/wizard/hr_timesheet_current.py @@ -35,14 +35,13 @@ class hr_timesheet_current_open(osv.osv_memory): user_ids = self.pool.get('hr.employee').search(cr, uid, [('user_id','=',uid)], context=context) if not len(user_ids): - raise osv.except_osv(_('Error!'), _('Please define employee for your user!')) + raise osv.except_osv(_('Error!'), _('Please create an employee and associate it with this user.')) ids = ts.search(cr, uid, [('user_id','=',uid),('state','=','draft'),('date_from','<=',time.strftime('%Y-%m-%d')), ('date_to','>=',time.strftime('%Y-%m-%d'))], context=context) if len(ids) > 1: view_type = 'tree,form' domain = "[('id','in',["+','.join(map(str, ids))+"]),('user_id', '=', uid)]" elif len(ids)==1: - ts.write(cr, uid, ids, {'date_current': time.strftime('%Y-%m-%d')}, context=context) domain = "[('user_id', '=', uid)]" else: domain = "[('user_id', '=', uid)]" diff --git a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml index 415f3a08f1f..ff1a2c2064d 100644 --- a/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml +++ b/addons/l10n_be/wizard/l10n_be_vat_intra_print.rml @@ -108,7 +108,7 @@ [[ l['code'] (l['intra_code']) ]] - [[ l['amount'] or O.OO ]] [[ company.currency_id.symbol ]] + [[ formatLang(l['amount'], currency_obj=company.currency_id) ]] @@ -129,7 +129,7 @@ Total: - [[ data['form']['amountsum'] or 0.00 ]] [[ company.currency_id.symbol ]] + [[ formatLang(data['form']['amountsum'], currency_obj=company.currency_id) ]] diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml index 5221b00c462..76c6eb9dedf 100644 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml @@ -290,9 +290,7 @@ [[o.employee_id.name or '_']] - [[o.employee_id.address_home_id.street or '_' ]] - [[o.employee_id.address_home_id.street2 or '' ]] - [[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]] + [[display_address(o.employee_id.address_home_id) or '_' ]] diff --git a/addons/l10n_in_hr_payroll/i18n/bn.po b/addons/l10n_in_hr_payroll/i18n/bn.po index ea9fcfd7bb3..0fd88c3813e 100644 --- a/addons/l10n_in_hr_payroll/i18n/bn.po +++ b/addons/l10n_in_hr_payroll/i18n/bn.po @@ -6,928 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 06:46+0000\n" -"PO-Revision-Date: 2012-08-17 06:46+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2012-09-10 09:14+0000\n" +"PO-Revision-Date: 2012-10-10 12:31+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: Bengali \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n" +"X-Generator: Launchpad (build 16118)\n" -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "E-mail Address" -msgstr "" -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,employee_bank_no:0 -msgid "Employee Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in draft state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Title" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Payment Advice from" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail -msgid "Hr Salary Employee By Category Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employees Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Allowances with Basic:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Department" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Deductions:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "A/C no." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,driver_salay:0 -msgid "Driver Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail -msgid "Yearly Salary by Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list -msgid "Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "March" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "(" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,company_id:0 -#: field:hr.payroll.advice.line,company_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,company_id:0 -msgid "Company" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "The Manager" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Letter Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "," -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Set to Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,number_of_year:0 -msgid "Total years of work experience" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "to" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Total :" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payslip.run,available_advice:0 -msgid "Made Payment Advice?" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Advices which are paid using NEFT transfer" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,tds:0 -msgid "Amount for Tax Deduction at Source" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip -msgid "Pay Slip" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,day:0 -msgid "Day" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Month of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.payslip:0 -msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,batch_id:0 -msgid "Batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Other Information" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Cancelled" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "For" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Details by Salary Rule Category:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,voluntary_provident_fund:0 -msgid "VPF computed as percentage(%)" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,number:0 -#: report:paylip.details.in:0 -msgid "Reference" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Group By..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,medical_insurance:0 -msgid "Medical Insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Identification No" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Confirmed" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,bysal:0 -#: field:payment.advice.report,bysal:0 -#: report:payroll.advice:0 -msgid "By Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Confirm" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,chaque_nos:0 -#: field:payment.advice.report,cheque_nos:0 -msgid "Cheque Numbers" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month -msgid "Yearly Salary by Head" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#, python-format -msgid "You can not confirm Payment advice without advice lines." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,state:0 -#: field:payment.advice.report,state:0 -msgid "State" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Yours Sincerely" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,medical_insurance:0 -msgid "Deduction towards company provided medical insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line -msgid "Bank Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Email" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payslip.run,available_advice:0 -msgid "If this box is checked which means that Payment Advice exists for current batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Error !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Print" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run -msgid "Payslip Batches" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,debit_credit:0 -#: report:payroll.advice:0 -msgid "C/D" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.employee.bymonth:0 -msgid "Yearly Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice -msgid "Print Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,line_ids:0 -msgid "Employee Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "July" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Configuration" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree -#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice -msgid "Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice -#: view:payment.advice.report:0 -msgid "Advices Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc:0 -msgid "IFSC" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,tds:0 -msgid "TDS" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,join_date:0 -msgid "Join Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.contract:0 -msgid "Error! Contract start-date must be less than contract end-date." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:res.company,dearness_allowance:0 -msgid "Dearness Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "August" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Deduction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Search Payment advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "SI. No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in confirm state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "December" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Sheet" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,month:0 -msgid "Month" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Non Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "or" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month -msgid "Hr Salary Employee By Month Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,category_id:0 -msgid "Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#, python-format -msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "To Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,number_of_year:0 -msgid "No. of Years of Service" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Note" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Salary Rule Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: selection:hr.payroll.advice,state:0 -#: view:payment.advice.report:0 -#: selection:payment.advice.report,state:0 -msgid "Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,voluntary_provident_fund:0 -msgid "Voluntary Provident Fund" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report -msgid "Payment Advice Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Status" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,city_type:0 -msgid "Type of City" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:res.company,dearness_allowance:0 -msgid "Check this box if your company provide Dearness Allowance to employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc_code:0 -#: field:payment.advice.report,ifsc_code:0 -#: report:payroll.advice:0 -msgid "IFSC Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "June" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,nbr:0 -msgid "# Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report -msgid "PaySlip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,date:0 -#: field:payment.advice.report,date:0 -msgid "Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "November" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Extended Filters..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all -msgid "This report performs analysis on Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "October" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Designation" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "January" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "Pay Head Employee Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_res_company -msgid "Companies" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:payroll.advice:0 -msgid "Authorized Signature" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract -msgid "Contract" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice.line:0 -msgid "Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "To," -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,driver_salay:0 -msgid "Check this box if you provide allowance for driver" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice.line,advice_id:0 -#: field:hr.payslip,advice_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice -msgid "Bank Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Other No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Draft Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,neft:0 -msgid "Check this box if your company use online transfer for salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,number:0 -msgid "Number" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "September" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Cancel" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Day of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "This wizard will print report which display a pay head employee breakup for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Payslip Batches ready to be Adviced" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Pay Slip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Total Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,employee_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee -#: view:payment.advice.report:0 -#: field:payment.advice.report,employee_id:0 -msgid "Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Compute Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,join_date:0 -msgid "Joining date of employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Dear Sir/Madam," -msgstr "Dear Sir/Madam," - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,note:0 -msgid "Description" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid ")" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Payroll" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "NEFT" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Address" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,bank_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,bank_id:0 -#: report:payroll.advice:0 -#: report:salary.detail.byyear:0 -msgid "Bank" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,end_date:0 -#: field:yearly.salary.detail,date_to:0 -msgid "End Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "February" -msgstr "" - -#. module: l10n_in_hr_payroll -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,name:0 -#: report:paylip.details.in:0 -#: field:payment.advice.report,name:0 -#: report:salary.employee.bymonth:0 -msgid "Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: field:hr.salary.employee.month,employee_ids:0 -#: view:yearly.salary.detail:0 -#: field:yearly.salary.detail,employee_ids:0 -msgid "Employees" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "April" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Name of the Employe" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Please define bank account for the %s employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,start_date:0 -#: field:yearly.salary.detail,date_from:0 -msgid "Start Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,bank_id:0 -msgid "Select the Bank from which the salary is going to be paid" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "Employee Pay Head Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Phone No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Credit" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,name:0 -#: report:payroll.advice:0 -msgid "Bank Account No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,date:0 -msgid "Advice Date is used to search Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "May" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Create Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,year:0 -msgid "Year" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,neft:0 -#: field:payment.advice.report,neft:0 -msgid "NEFT Transaction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "Total" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "form period" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Year of Payment Advices" -msgstr "" \ No newline at end of file diff --git a/addons/l10n_in_hr_payroll/i18n/gu.po b/addons/l10n_in_hr_payroll/i18n/gu.po index 2c321b13191..844c492e28b 100644 --- a/addons/l10n_in_hr_payroll/i18n/gu.po +++ b/addons/l10n_in_hr_payroll/i18n/gu.po @@ -6,928 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 06:46+0000\n" -"PO-Revision-Date: 2012-08-17 06:46+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2012-09-10 09:14+0000\n" +"PO-Revision-Date: 2012-10-10 12:31+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: Gujarati \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n" +"X-Generator: Launchpad (build 16118)\n" -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "E-mail Address" -msgstr "" -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,employee_bank_no:0 -msgid "Employee Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in draft state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Title" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Payment Advice from" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail -msgid "Hr Salary Employee By Category Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employees Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Allowances with Basic:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Department" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Deductions:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "A/C no." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,driver_salay:0 -msgid "Driver Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail -msgid "Yearly Salary by Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list -msgid "Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "March" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "(" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,company_id:0 -#: field:hr.payroll.advice.line,company_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,company_id:0 -msgid "Company" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "The Manager" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Letter Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "," -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Set to Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,number_of_year:0 -msgid "Total years of work experience" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "to" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Total :" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payslip.run,available_advice:0 -msgid "Made Payment Advice?" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Advices which are paid using NEFT transfer" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,tds:0 -msgid "Amount for Tax Deduction at Source" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip -msgid "Pay Slip" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,day:0 -msgid "Day" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Month of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.payslip:0 -msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,batch_id:0 -msgid "Batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Other Information" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Cancelled" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "For" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Details by Salary Rule Category:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,voluntary_provident_fund:0 -msgid "VPF computed as percentage(%)" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,number:0 -#: report:paylip.details.in:0 -msgid "Reference" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Group By..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,medical_insurance:0 -msgid "Medical Insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Identification No" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Confirmed" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,bysal:0 -#: field:payment.advice.report,bysal:0 -#: report:payroll.advice:0 -msgid "By Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Confirm" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,chaque_nos:0 -#: field:payment.advice.report,cheque_nos:0 -msgid "Cheque Numbers" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month -msgid "Yearly Salary by Head" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#, python-format -msgid "You can not confirm Payment advice without advice lines." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,state:0 -#: field:payment.advice.report,state:0 -msgid "State" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Yours Sincerely" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,medical_insurance:0 -msgid "Deduction towards company provided medical insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line -msgid "Bank Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Email" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payslip.run,available_advice:0 -msgid "If this box is checked which means that Payment Advice exists for current batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Error !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Print" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run -msgid "Payslip Batches" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,debit_credit:0 -#: report:payroll.advice:0 -msgid "C/D" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.employee.bymonth:0 -msgid "Yearly Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice -msgid "Print Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,line_ids:0 -msgid "Employee Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "July" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Configuration" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree -#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice -msgid "Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice -#: view:payment.advice.report:0 -msgid "Advices Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc:0 -msgid "IFSC" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,tds:0 -msgid "TDS" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,join_date:0 -msgid "Join Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.contract:0 -msgid "Error! Contract start-date must be less than contract end-date." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:res.company,dearness_allowance:0 -msgid "Dearness Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "August" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Deduction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Search Payment advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "SI. No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in confirm state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "December" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Sheet" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,month:0 -msgid "Month" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Non Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "or" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month -msgid "Hr Salary Employee By Month Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,category_id:0 -msgid "Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#, python-format -msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "To Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,number_of_year:0 -msgid "No. of Years of Service" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Note" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Salary Rule Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: selection:hr.payroll.advice,state:0 -#: view:payment.advice.report:0 -#: selection:payment.advice.report,state:0 -msgid "Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,voluntary_provident_fund:0 -msgid "Voluntary Provident Fund" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report -msgid "Payment Advice Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Status" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,city_type:0 -msgid "Type of City" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:res.company,dearness_allowance:0 -msgid "Check this box if your company provide Dearness Allowance to employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc_code:0 -#: field:payment.advice.report,ifsc_code:0 -#: report:payroll.advice:0 -msgid "IFSC Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "June" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,nbr:0 -msgid "# Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report -msgid "PaySlip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,date:0 -#: field:payment.advice.report,date:0 -msgid "Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "November" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Extended Filters..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all -msgid "This report performs analysis on Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "October" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Designation" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "January" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "Pay Head Employee Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_res_company -msgid "Companies" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:payroll.advice:0 -msgid "Authorized Signature" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract -msgid "Contract" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice.line:0 -msgid "Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "To," -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,driver_salay:0 -msgid "Check this box if you provide allowance for driver" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice.line,advice_id:0 -#: field:hr.payslip,advice_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice -msgid "Bank Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Other No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Draft Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,neft:0 -msgid "Check this box if your company use online transfer for salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,number:0 -msgid "Number" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "September" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Cancel" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Day of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "This wizard will print report which display a pay head employee breakup for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Payslip Batches ready to be Adviced" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Pay Slip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Total Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,employee_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee -#: view:payment.advice.report:0 -#: field:payment.advice.report,employee_id:0 -msgid "Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Compute Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,join_date:0 -msgid "Joining date of employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Dear Sir/Madam," -msgstr "Dear Sir/Madam," - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,note:0 -msgid "Description" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid ")" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Payroll" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "NEFT" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Address" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,bank_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,bank_id:0 -#: report:payroll.advice:0 -#: report:salary.detail.byyear:0 -msgid "Bank" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,end_date:0 -#: field:yearly.salary.detail,date_to:0 -msgid "End Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "February" -msgstr "" - -#. module: l10n_in_hr_payroll -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,name:0 -#: report:paylip.details.in:0 -#: field:payment.advice.report,name:0 -#: report:salary.employee.bymonth:0 -msgid "Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: field:hr.salary.employee.month,employee_ids:0 -#: view:yearly.salary.detail:0 -#: field:yearly.salary.detail,employee_ids:0 -msgid "Employees" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "April" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Name of the Employe" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Please define bank account for the %s employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,start_date:0 -#: field:yearly.salary.detail,date_from:0 -msgid "Start Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,bank_id:0 -msgid "Select the Bank from which the salary is going to be paid" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "Employee Pay Head Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Phone No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Credit" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,name:0 -#: report:payroll.advice:0 -msgid "Bank Account No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,date:0 -msgid "Advice Date is used to search Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "May" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Create Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,year:0 -msgid "Year" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,neft:0 -#: field:payment.advice.report,neft:0 -msgid "NEFT Transaction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "Total" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "form period" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Year of Payment Advices" -msgstr "" \ No newline at end of file diff --git a/addons/l10n_in_hr_payroll/i18n/hi.po b/addons/l10n_in_hr_payroll/i18n/hi.po index d7cc9dc1519..b13e24e05f9 100644 --- a/addons/l10n_in_hr_payroll/i18n/hi.po +++ b/addons/l10n_in_hr_payroll/i18n/hi.po @@ -6,928 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 06:46+0000\n" -"PO-Revision-Date: 2012-08-17 06:46+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2012-09-10 09:14+0000\n" +"PO-Revision-Date: 2012-10-10 12:31+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: Hindi \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n" +"X-Generator: Launchpad (build 16118)\n" -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "E-mail Address" -msgstr "" -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,employee_bank_no:0 -msgid "Employee Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in draft state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Title" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Payment Advice from" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail -msgid "Hr Salary Employee By Category Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employees Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Allowances with Basic:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Department" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Deductions:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "A/C no." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,driver_salay:0 -msgid "Driver Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail -msgid "Yearly Salary by Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list -msgid "Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "March" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "(" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,company_id:0 -#: field:hr.payroll.advice.line,company_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,company_id:0 -msgid "Company" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "The Manager" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Letter Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "," -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Set to Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,number_of_year:0 -msgid "Total years of work experience" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "to" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Total :" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payslip.run,available_advice:0 -msgid "Made Payment Advice?" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Advices which are paid using NEFT transfer" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,tds:0 -msgid "Amount for Tax Deduction at Source" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip -msgid "Pay Slip" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,day:0 -msgid "Day" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Month of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.payslip:0 -msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,batch_id:0 -msgid "Batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Other Information" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Cancelled" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "For" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Details by Salary Rule Category:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,voluntary_provident_fund:0 -msgid "VPF computed as percentage(%)" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,number:0 -#: report:paylip.details.in:0 -msgid "Reference" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Group By..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,medical_insurance:0 -msgid "Medical Insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Identification No" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Confirmed" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,bysal:0 -#: field:payment.advice.report,bysal:0 -#: report:payroll.advice:0 -msgid "By Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Confirm" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,chaque_nos:0 -#: field:payment.advice.report,cheque_nos:0 -msgid "Cheque Numbers" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month -msgid "Yearly Salary by Head" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#, python-format -msgid "You can not confirm Payment advice without advice lines." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,state:0 -#: field:payment.advice.report,state:0 -msgid "State" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Yours Sincerely" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,medical_insurance:0 -msgid "Deduction towards company provided medical insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line -msgid "Bank Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Email" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payslip.run,available_advice:0 -msgid "If this box is checked which means that Payment Advice exists for current batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Error !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Print" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run -msgid "Payslip Batches" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,debit_credit:0 -#: report:payroll.advice:0 -msgid "C/D" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.employee.bymonth:0 -msgid "Yearly Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice -msgid "Print Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,line_ids:0 -msgid "Employee Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "July" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Configuration" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree -#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice -msgid "Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice -#: view:payment.advice.report:0 -msgid "Advices Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc:0 -msgid "IFSC" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,tds:0 -msgid "TDS" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,join_date:0 -msgid "Join Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.contract:0 -msgid "Error! Contract start-date must be less than contract end-date." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:res.company,dearness_allowance:0 -msgid "Dearness Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "August" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Deduction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Search Payment advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "SI. No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in confirm state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "December" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Sheet" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,month:0 -msgid "Month" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Non Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "or" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month -msgid "Hr Salary Employee By Month Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,category_id:0 -msgid "Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#, python-format -msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "To Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,number_of_year:0 -msgid "No. of Years of Service" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Note" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Salary Rule Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: selection:hr.payroll.advice,state:0 -#: view:payment.advice.report:0 -#: selection:payment.advice.report,state:0 -msgid "Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,voluntary_provident_fund:0 -msgid "Voluntary Provident Fund" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report -msgid "Payment Advice Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Status" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,city_type:0 -msgid "Type of City" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:res.company,dearness_allowance:0 -msgid "Check this box if your company provide Dearness Allowance to employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc_code:0 -#: field:payment.advice.report,ifsc_code:0 -#: report:payroll.advice:0 -msgid "IFSC Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "June" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,nbr:0 -msgid "# Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report -msgid "PaySlip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,date:0 -#: field:payment.advice.report,date:0 -msgid "Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "November" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Extended Filters..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all -msgid "This report performs analysis on Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "October" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Designation" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "January" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "Pay Head Employee Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_res_company -msgid "Companies" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:payroll.advice:0 -msgid "Authorized Signature" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract -msgid "Contract" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice.line:0 -msgid "Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "To," -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,driver_salay:0 -msgid "Check this box if you provide allowance for driver" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice.line,advice_id:0 -#: field:hr.payslip,advice_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice -msgid "Bank Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Other No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Draft Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,neft:0 -msgid "Check this box if your company use online transfer for salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,number:0 -msgid "Number" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "September" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Cancel" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Day of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "This wizard will print report which display a pay head employee breakup for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Payslip Batches ready to be Adviced" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Pay Slip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Total Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,employee_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee -#: view:payment.advice.report:0 -#: field:payment.advice.report,employee_id:0 -msgid "Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Compute Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,join_date:0 -msgid "Joining date of employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Dear Sir/Madam," -msgstr "Dear Sir/Madam," - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,note:0 -msgid "Description" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid ")" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Payroll" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "NEFT" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Address" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,bank_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,bank_id:0 -#: report:payroll.advice:0 -#: report:salary.detail.byyear:0 -msgid "Bank" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,end_date:0 -#: field:yearly.salary.detail,date_to:0 -msgid "End Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "February" -msgstr "" - -#. module: l10n_in_hr_payroll -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,name:0 -#: report:paylip.details.in:0 -#: field:payment.advice.report,name:0 -#: report:salary.employee.bymonth:0 -msgid "Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: field:hr.salary.employee.month,employee_ids:0 -#: view:yearly.salary.detail:0 -#: field:yearly.salary.detail,employee_ids:0 -msgid "Employees" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "April" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Name of the Employe" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Please define bank account for the %s employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,start_date:0 -#: field:yearly.salary.detail,date_from:0 -msgid "Start Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,bank_id:0 -msgid "Select the Bank from which the salary is going to be paid" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "Employee Pay Head Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Phone No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Credit" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,name:0 -#: report:payroll.advice:0 -msgid "Bank Account No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,date:0 -msgid "Advice Date is used to search Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "May" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Create Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,year:0 -msgid "Year" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,neft:0 -#: field:payment.advice.report,neft:0 -msgid "NEFT Transaction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "Total" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "form period" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Year of Payment Advices" -msgstr "" \ No newline at end of file diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po index 98d00c76a33..dbe0e244bee 100644 --- a/addons/l10n_in_hr_payroll/i18n/ta.po +++ b/addons/l10n_in_hr_payroll/i18n/ta.po @@ -6,928 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 06:46+0000\n" -"PO-Revision-Date: 2012-08-17 06:46+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2012-09-10 09:14+0000\n" +"PO-Revision-Date: 2012-10-10 12:31+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: Tamil \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n" +"X-Generator: Launchpad (build 16118)\n" -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "E-mail Address" -msgstr "" -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,employee_bank_no:0 -msgid "Employee Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in draft state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Title" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Payment Advice from" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail -msgid "Hr Salary Employee By Category Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employees Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Allowances with Basic:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Department" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Deductions:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "A/C no." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,driver_salay:0 -msgid "Driver Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail -msgid "Yearly Salary by Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list -msgid "Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "March" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "(" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,company_id:0 -#: field:hr.payroll.advice.line,company_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,company_id:0 -msgid "Company" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "The Manager" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Letter Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "," -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Set to Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,number_of_year:0 -msgid "Total years of work experience" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "to" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Total :" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payslip.run,available_advice:0 -msgid "Made Payment Advice?" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Advices which are paid using NEFT transfer" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,tds:0 -msgid "Amount for Tax Deduction at Source" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip -msgid "Pay Slip" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,day:0 -msgid "Day" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Month of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.payslip:0 -msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,batch_id:0 -msgid "Batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Other Information" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Cancelled" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "For" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Details by Salary Rule Category:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,voluntary_provident_fund:0 -msgid "VPF computed as percentage(%)" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,number:0 -#: report:paylip.details.in:0 -msgid "Reference" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Group By..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,medical_insurance:0 -msgid "Medical Insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Identification No" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Confirmed" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,bysal:0 -#: field:payment.advice.report,bysal:0 -#: report:payroll.advice:0 -msgid "By Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Confirm" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,chaque_nos:0 -#: field:payment.advice.report,cheque_nos:0 -msgid "Cheque Numbers" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month -msgid "Yearly Salary by Head" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#, python-format -msgid "You can not confirm Payment advice without advice lines." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,state:0 -#: field:payment.advice.report,state:0 -msgid "State" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Yours Sincerely" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,medical_insurance:0 -msgid "Deduction towards company provided medical insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line -msgid "Bank Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Email" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payslip.run,available_advice:0 -msgid "If this box is checked which means that Payment Advice exists for current batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Error !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Print" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run -msgid "Payslip Batches" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,debit_credit:0 -#: report:payroll.advice:0 -msgid "C/D" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.employee.bymonth:0 -msgid "Yearly Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice -msgid "Print Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,line_ids:0 -msgid "Employee Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "July" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Configuration" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree -#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice -msgid "Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice -#: view:payment.advice.report:0 -msgid "Advices Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc:0 -msgid "IFSC" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,tds:0 -msgid "TDS" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,join_date:0 -msgid "Join Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.contract:0 -msgid "Error! Contract start-date must be less than contract end-date." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:res.company,dearness_allowance:0 -msgid "Dearness Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "August" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Deduction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Search Payment advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "SI. No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in confirm state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "December" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Sheet" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,month:0 -msgid "Month" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Non Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "or" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month -msgid "Hr Salary Employee By Month Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,category_id:0 -msgid "Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#, python-format -msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "To Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,number_of_year:0 -msgid "No. of Years of Service" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Note" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Salary Rule Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: selection:hr.payroll.advice,state:0 -#: view:payment.advice.report:0 -#: selection:payment.advice.report,state:0 -msgid "Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,voluntary_provident_fund:0 -msgid "Voluntary Provident Fund" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report -msgid "Payment Advice Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Status" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,city_type:0 -msgid "Type of City" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:res.company,dearness_allowance:0 -msgid "Check this box if your company provide Dearness Allowance to employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc_code:0 -#: field:payment.advice.report,ifsc_code:0 -#: report:payroll.advice:0 -msgid "IFSC Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "June" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,nbr:0 -msgid "# Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report -msgid "PaySlip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,date:0 -#: field:payment.advice.report,date:0 -msgid "Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "November" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Extended Filters..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all -msgid "This report performs analysis on Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "October" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Designation" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "January" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "Pay Head Employee Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_res_company -msgid "Companies" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:payroll.advice:0 -msgid "Authorized Signature" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract -msgid "Contract" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice.line:0 -msgid "Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "To," -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,driver_salay:0 -msgid "Check this box if you provide allowance for driver" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice.line,advice_id:0 -#: field:hr.payslip,advice_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice -msgid "Bank Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Other No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Draft Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,neft:0 -msgid "Check this box if your company use online transfer for salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,number:0 -msgid "Number" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "September" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Cancel" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Day of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "This wizard will print report which display a pay head employee breakup for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Payslip Batches ready to be Adviced" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Pay Slip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Total Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,employee_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee -#: view:payment.advice.report:0 -#: field:payment.advice.report,employee_id:0 -msgid "Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Compute Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,join_date:0 -msgid "Joining date of employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Dear Sir/Madam," -msgstr "Dear Sir/Madam," - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,note:0 -msgid "Description" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid ")" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Payroll" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "NEFT" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Address" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,bank_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,bank_id:0 -#: report:payroll.advice:0 -#: report:salary.detail.byyear:0 -msgid "Bank" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,end_date:0 -#: field:yearly.salary.detail,date_to:0 -msgid "End Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "February" -msgstr "" - -#. module: l10n_in_hr_payroll -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,name:0 -#: report:paylip.details.in:0 -#: field:payment.advice.report,name:0 -#: report:salary.employee.bymonth:0 -msgid "Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: field:hr.salary.employee.month,employee_ids:0 -#: view:yearly.salary.detail:0 -#: field:yearly.salary.detail,employee_ids:0 -msgid "Employees" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "April" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Name of the Employe" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Please define bank account for the %s employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,start_date:0 -#: field:yearly.salary.detail,date_from:0 -msgid "Start Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,bank_id:0 -msgid "Select the Bank from which the salary is going to be paid" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "Employee Pay Head Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Phone No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Credit" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,name:0 -#: report:payroll.advice:0 -msgid "Bank Account No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,date:0 -msgid "Advice Date is used to search Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "May" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Create Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,year:0 -msgid "Year" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,neft:0 -#: field:payment.advice.report,neft:0 -msgid "NEFT Transaction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "Total" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "form period" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Year of Payment Advices" -msgstr "" \ No newline at end of file diff --git a/addons/l10n_in_hr_payroll/i18n/te.po b/addons/l10n_in_hr_payroll/i18n/te.po index 0c6f6127c4d..47ea35552f8 100644 --- a/addons/l10n_in_hr_payroll/i18n/te.po +++ b/addons/l10n_in_hr_payroll/i18n/te.po @@ -6,928 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: OpenERP Server 7.0alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 06:46+0000\n" -"PO-Revision-Date: 2012-08-17 06:46+0000\n" -"Last-Translator: <>\n" +"POT-Creation-Date: 2012-09-10 09:14+0000\n" +"PO-Revision-Date: 2012-10-10 12:31+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: Telugu \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" -"Plural-Forms: \n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2012-10-11 05:00+0000\n" +"X-Generator: Launchpad (build 16118)\n" -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "E-mail Address" -msgstr "" -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,employee_bank_no:0 -msgid "Employee Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in draft state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Title" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Payment Advice from" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_yearly_salary_detail -msgid "Hr Salary Employee By Category Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employees Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Allowances with Basic:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Department" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Deductions:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "A/C no." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,driver_salay:0 -msgid "Driver Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_yearly_salary_detail -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.yearly_salary -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_yearly_salary_detail -msgid "Yearly Salary by Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.act_hr_emp_payslip_list -msgid "Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "March" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "(" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,company_id:0 -#: field:hr.payroll.advice.line,company_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,company_id:0 -msgid "Company" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "The Manager" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Letter Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "," -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Set to Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,number_of_year:0 -msgid "Total years of work experience" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "to" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Total :" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payslip.run,available_advice:0 -msgid "Made Payment Advice?" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Advices which are paid using NEFT transfer" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,tds:0 -msgid "Amount for Tax Deduction at Source" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip -msgid "Pay Slip" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,day:0 -msgid "Day" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Month of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.payslip:0 -msgid "Payslip 'Date From' must be before 'Date To'." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,batch_id:0 -msgid "Batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Other Information" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Cancelled" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "For" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Details by Salary Rule Category:" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,voluntary_provident_fund:0 -msgid "VPF computed as percentage(%)" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,number:0 -#: report:paylip.details.in:0 -msgid "Reference" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Group By..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,medical_insurance:0 -msgid "Medical Insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Identification No" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.payroll.advice,state:0 -#: selection:payment.advice.report,state:0 -msgid "Confirmed" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,bysal:0 -#: field:payment.advice.report,bysal:0 -#: report:payroll.advice:0 -msgid "By Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Confirm" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,chaque_nos:0 -#: field:payment.advice.report,cheque_nos:0 -msgid "Cheque Numbers" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:res.company:0 -msgid "Error! You can not create recursive companies." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_salary_employee_month -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.hr_salary_employee_bymonth -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_salary_employee_month -msgid "Yearly Salary by Head" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#, python-format -msgid "You can not confirm Payment advice without advice lines." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,state:0 -#: field:payment.advice.report,state:0 -msgid "State" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Yours Sincerely" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,medical_insurance:0 -msgid "Deduction towards company provided medical insurance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice_line -msgid "Bank Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Email" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payslip.run,available_advice:0 -msgid "If this box is checked which means that Payment Advice exists for current batch" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:184 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Error !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Print" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payslip_run -msgid "Payslip Batches" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,debit_credit:0 -#: report:payroll.advice:0 -msgid "C/D" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.employee.bymonth:0 -msgid "Yearly Salary Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payroll_advice -msgid "Print Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,line_ids:0 -msgid "Employee Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "July" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Configuration" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_view_hr_bank_advice_tree -#: model:ir.ui.menu,name:l10n_in_hr_payroll.hr_menu_payment_advice -msgid "Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,name:l10n_in_hr_payroll.action_payment_advice_report_all -#: model:ir.ui.menu,name:l10n_in_hr_payroll.menu_reporting_payment_advice -#: view:payment.advice.report:0 -msgid "Advices Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "This wizard will print report which displays employees break-up of Net Head for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc:0 -msgid "IFSC" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,tds:0 -msgid "TDS" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,join_date:0 -msgid "Join Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.contract:0 -msgid "Error! Contract start-date must be less than contract end-date." -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:res.company,dearness_allowance:0 -msgid "Dearness Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "August" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Deduction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Search Payment advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "SI. No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Payment Advices which are in confirm state" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "December" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Confirm Sheet" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,month:0 -msgid "Month" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Non Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "or" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_salary_employee_month -msgid "Hr Salary Employee By Month Report" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,category_id:0 -msgid "Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:240 -#, python-format -msgid "Payment advice already exists for %s, 'Set to Draft' to create a new advice." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "To Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.employee,number_of_year:0 -msgid "No. of Years of Service" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Note" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Salary Rule Category" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: selection:hr.payroll.advice,state:0 -#: view:payment.advice.report:0 -#: selection:payment.advice.report,state:0 -msgid "Draft" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Date From" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,voluntary_provident_fund:0 -msgid "Voluntary Provident Fund" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Employee Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_payment_advice_report -msgid "Payment Advice Analysis" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:payment.advice.report:0 -msgid "Status" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.contract,city_type:0 -msgid "Type of City" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:res.company,dearness_allowance:0 -msgid "Check this box if your company provide Dearness Allowance to employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,ifsc_code:0 -#: field:payment.advice.report,ifsc_code:0 -#: report:payroll.advice:0 -msgid "IFSC Code" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "June" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,nbr:0 -msgid "# Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.report.xml,name:l10n_in_hr_payroll.payslip_details_report -msgid "PaySlip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Payment Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,date:0 -#: field:payment.advice.report,date:0 -msgid "Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "November" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Extended Filters..." -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.actions.act_window,help:l10n_in_hr_payroll.action_payment_advice_report_all -msgid "This report performs analysis on Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "October" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Designation" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "January" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "Pay Head Employee Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_res_company -msgid "Companies" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:payroll.advice:0 -msgid "Authorized Signature" -msgstr "" - -#. module: l10n_in_hr_payroll -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_contract -msgid "Contract" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice.line:0 -msgid "Advice Lines" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "To," -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.contract,driver_salay:0 -msgid "Check this box if you provide allowance for driver" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice.line,advice_id:0 -#: field:hr.payslip,advice_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice -msgid "Bank Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Other No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Draft Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,neft:0 -msgid "Check this box if your company use online transfer for salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "To" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:payment.advice.report,number:0 -msgid "Number" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "September" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: view:hr.salary.employee.month:0 -#: view:yearly.salary.detail:0 -msgid "Cancel" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Day of Payment Advices" -msgstr "" - -#. module: l10n_in_hr_payroll -#: constraint:hr.employee:0 -msgid "Error! You cannot create recursive hierarchy of Employee(s)." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:yearly.salary.detail:0 -msgid "This wizard will print report which display a pay head employee breakup for a specified dates." -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Payslip Batches ready to be Adviced" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Pay Slip Details" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Total Salary" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,employee_id:0 -#: model:ir.model,name:l10n_in_hr_payroll.model_hr_employee -#: view:payment.advice.report:0 -#: field:payment.advice.report,employee_id:0 -msgid "Employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -msgid "Compute Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.employee,join_date:0 -msgid "Joining date of employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Dear Sir/Madam," -msgstr "Dear Sir/Madam," - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,note:0 -msgid "Description" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid ")" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:res.company:0 -msgid "Payroll" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "NEFT" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -msgid "Address" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,bank_id:0 -#: view:payment.advice.report:0 -#: field:payment.advice.report,bank_id:0 -#: report:payroll.advice:0 -#: report:salary.detail.byyear:0 -msgid "Bank" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,end_date:0 -#: field:yearly.salary.detail,date_to:0 -msgid "End Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "February" -msgstr "" - -#. module: l10n_in_hr_payroll -#: sql_constraint:res.company:0 -msgid "The company name must be unique !" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payroll.advice:0 -#: field:hr.payroll.advice,name:0 -#: report:paylip.details.in:0 -#: field:payment.advice.report,name:0 -#: report:salary.employee.bymonth:0 -msgid "Name" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:hr.contract,city_type:0 -msgid "Metro" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -#: field:hr.salary.employee.month,employee_ids:0 -#: view:yearly.salary.detail:0 -#: field:yearly.salary.detail,employee_ids:0 -msgid "Employees" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Bank Account" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "April" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "Name of the Employe" -msgstr "" - -#. module: l10n_in_hr_payroll -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:158 -#: code:addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py:257 -#, python-format -msgid "Please define bank account for the %s employee" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.salary.employee.month,start_date:0 -#: field:yearly.salary.detail,date_from:0 -msgid "Start Date" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.contract:0 -msgid "Allowance" -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,bank_id:0 -msgid "Select the Bank from which the salary is going to be paid" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.salary.employee.month:0 -msgid "Employee Pay Head Breakup" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:salary.detail.byyear:0 -msgid "Phone No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -msgid "Credit" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice.line,name:0 -#: report:payroll.advice:0 -msgid "Bank Account No." -msgstr "" - -#. module: l10n_in_hr_payroll -#: help:hr.payroll.advice,date:0 -msgid "Advice Date is used to search Payslips" -msgstr "" - -#. module: l10n_in_hr_payroll -#: selection:payment.advice.report,month:0 -msgid "May" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:hr.payslip.run:0 -msgid "Create Advice" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -#: field:payment.advice.report,year:0 -msgid "Year" -msgstr "" - -#. module: l10n_in_hr_payroll -#: field:hr.payroll.advice,neft:0 -#: field:payment.advice.report,neft:0 -msgid "NEFT Transaction" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:paylip.details.in:0 -#: report:salary.detail.byyear:0 -#: report:salary.employee.bymonth:0 -msgid "Total" -msgstr "" - -#. module: l10n_in_hr_payroll -#: report:payroll.advice:0 -msgid "form period" -msgstr "" - -#. module: l10n_in_hr_payroll -#: view:payment.advice.report:0 -msgid "Year of Payment Advices" -msgstr "" \ No newline at end of file diff --git a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml index 4d7dbe91ee1..38f1272718b 100644 --- a/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml +++ b/addons/l10n_in_hr_payroll/report/payment_advice_report_view.xml @@ -6,7 +6,7 @@ payment.advice.report.tree payment.advice.report - + diff --git a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml index 92eaf3ec4a9..d71cb283336 100644 --- a/addons/l10n_in_hr_payroll/report/payslip_report_view.xml +++ b/addons/l10n_in_hr_payroll/report/payslip_report_view.xml @@ -6,7 +6,7 @@ payslip.report.tree payslip.report - + diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml index 8f2a57d2018..6368a644f4b 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml @@ -234,7 +234,7 @@ - [[ formatLang(e[13]) ]] [[company.currency_id.symbol]] + [[ formatLang(e[13],currency_obj= company.currency_id)]] @@ -248,43 +248,43 @@ Total - [[ formatLang(t[1]) or removeParentNode('para') ]] [[company.currency_id.symbol]] + [[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]] - [[ formatLang(t[2]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[3]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[4]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[5]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[6]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[7]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ] - [[ formatLang(t[8]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[9]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[10]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[11]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(t[12]) or removeParentNode('para')]] [[company.currency_id.symbol]] + [[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]] - [[ formatLang(get_total()) ]] [[company.currency_id.symbol]] + [[ formatLang(get_total(), currency_obj = company.currency_id)]] diff --git a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml index 7fa127b0bd3..502eaa7b0ff 100644 --- a/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml +++ b/addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml @@ -478,7 +478,7 @@ - [[ formatLang(e1[13]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e1[13],currency_obj= company.currency_id) ]] @@ -571,7 +571,7 @@ - [[ formatLang(e2[13]) ]] [[ company.currency_id.symbol ]] + [[ formatLang(e2[13],currency_obj= company.currency_id) ]] diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml index 8ca1bae5ba5..879314a24d9 100644 --- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml +++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml @@ -247,7 +247,7 @@ [[ line['acc_no'] ]] - [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[formatLang(line['bysal'], currency_obj = company.currency_id) ]] [[ line['debit_credit'] ]] @@ -296,7 +296,7 @@ [[ line['ifsc_code'] ]] - [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[formatLang(line['bysal'], currency_obj = company.currency_id) ]] [[ line['debit_credit'] ]] @@ -321,7 +321,7 @@ - [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]] @@ -347,7 +347,7 @@ - [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total(), currency_obj = company.currency_id) ]] diff --git a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml index a7ab3db3185..c4ce55bfa41 100644 --- a/addons/l10n_in_hr_payroll/report/report_payslip_details.rml +++ b/addons/l10n_in_hr_payroll/report/report_payslip_details.rml @@ -234,7 +234,7 @@ - [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.street2 or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.zip or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.city or '' ]],[[o.employee_id.address_home_id and o.employee_id.address_home_id.state_id and o.employee_id.address_home_id.state_id.name or '' ]] [[o.employee_id.address_home_id and o.employee_id.address_home_id.country_id and o.employee_id.address_home_id.country_id.name or '' ]] + [[o.employee_id.address_home_id and o.employee_id.address_home_id.name or '' ]],[[o.employee_id.address_home_id and display_address(o.employee_id.address_home_id)]] @@ -334,7 +334,7 @@ [[ '..'*h['level'] ]][[ h['rule_category'] ]][[ h['level']!=0 and ( setTag('para','para',{'style':'terp_default_8'})) or removeParentNode('font') ]] - [[ formatLang(h['total']) ]] [[o.company_id and o.company_id.currency_id.symbol or '']] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] + [[ formatLang(h['total'], currency_obj = o.company_id and o.company_id.currency_id)]] [[ h['level']==0 and ( setTag('para','para',{'style':'terp_default_10'})) or removeParentNode('font') ]] diff --git a/addons/l10n_uk/data/account.account.type.csv b/addons/l10n_uk/data/account.account.type.csv index 0827975b22f..379656ece39 100644 --- a/addons/l10n_uk/data/account.account.type.csv +++ b/addons/l10n_uk/data/account.account.type.csv @@ -10,4 +10,4 @@ "account_type_output_tax","Output Tax","Output Tax","liability","Unreconciled" "account_type_input_tax","Input Tax","Input Tax","asset","Unreconciled" "account_type_profit_and_loss","Profit and Loss","Profit and Loss","none","None" -"account_type_view","View","view",,"None" +"account_type_view","View","view","none","None" diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml index b09b59bb96b..0a13beb622c 100644 --- a/addons/lunch/report/order.rml +++ b/addons/lunch/report/order.rml @@ -137,7 +137,7 @@ - [[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]] + [[ formatLang(get_total(o,objects), currency_obj = o.company_id and o.company_id.currency_id) ]] @@ -155,7 +155,7 @@ [[ lines.descript]] - [[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]] + [[ formatLang(lines.price , currency_obj = o.company_id and o.company_id.currency_id) ]] @@ -172,7 +172,7 @@ Total : - [[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]] + [[ formatLang(get_nettotal(), currency_obj = o.company_id and o.company_id.currency_id) ]] diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py index 92e882ae6d8..abf714ad534 100644 --- a/addons/mail/__init__.py +++ b/addons/mail/__init__.py @@ -33,6 +33,7 @@ import report import wizard import res_config import mail_group_menu +import update # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 5fe1ee45b1d..522cbe8c7a7 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -13,6 +13,20 @@ + + Update Notification + + + 1 + weeks + -1 + + + + + 1000 + + comment diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml index 1350fd33547..7bda32c002b 100644 --- a/addons/mail/data/mail_demo.xml +++ b/addons/mail/data/mail_demo.xml @@ -42,10 +42,5 @@ This month you also get 250 EUR of eco-vouchers if you have been in the company comment - - mail.catchall.domain - demo.openerp.com - - diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index e9a569a8192..741184ef7a3 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -63,10 +63,12 @@ class mail_mail(osv.Model): } def _get_default_from(self, cr, uid, context=None): - cur = self.pool.get('res.users').browse(cr, uid, uid, context=context) - if not cur.alias_domain: - raise osv.except_osv(_('Invalid Action!'), _('Unable to send email, set an alias domain in your server settings.')) - return cur.alias_name + '@' + cur.alias_domain + this = self.pool.get('res.users').browse(cr, uid, uid, context=context) + if this.alias_domain: + return '%s@%s' % (this.alias_name, this.alias_domain) + elif this.email: + return this.email + raise osv.except_osv(_('Invalid Action!'), _("Unable to send email, please configure the sender's email address or alias.")) _defaults = { 'state': 'outgoing', diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index bbf68509277..9631918050a 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -134,6 +134,7 @@ class mail_message(osv.Model): 'subtype_id': fields.many2one('mail.message.subtype', 'Subtype'), 'vote_user_ids': fields.many2many('res.users', 'mail_vote', 'message_id', 'user_id', string='Votes', help='Users that voted for this message'), + 'is_private': fields.boolean('Private message'), } def _needaction_domain_get(self, cr, uid, context=None): @@ -150,6 +151,7 @@ class mail_message(osv.Model): 'date': lambda *a: fields.datetime.now(), 'author_id': lambda self, cr, uid, ctx={}: self._get_default_author(cr, uid, ctx), 'body': '', + 'is_private': True, } #------------------------------------------------------ @@ -180,7 +182,6 @@ class mail_message(osv.Model): fields allow to have the foreign record name without having to check external access rights). """ - child_nbr = len(msg.child_ids) has_voted = False vote_ids = self.pool.get('res.users').name_get(cr, SUPERUSER_ID, [user.id for user in msg.vote_user_ids], context=context) for vote in vote_ids: @@ -194,7 +195,7 @@ class mail_message(osv.Model): try: author_id = self.pool.get('res.partner').name_get(cr, uid, [msg.author_id.id], context=context)[0] is_author = uid == msg.author_id.user_ids[0].id - except (orm.except_orm, osv.except_osv): + except Exception: author_id = False is_author = False try: @@ -221,127 +222,12 @@ class mail_message(osv.Model): 'unread': msg.unread and msg.unread['unread'] or False } - def message_read_tree_get_expandable(self, cr, uid, parent_message, last_message, domain=[], current_level=0, level=0, context=None): - """ . """ - base_domain = [('id', '<', last_message['id'])] - if parent_message and current_level < level: - base_domain += [('parent_id', '=', parent_message['id'])] - elif parent_message: - base_domain += [('id', 'child_of', parent_message['id']), ('id', '!=', parent_message['id'])] - if domain: - base_domain += domain - extension = { 'type': 'expandable', - 'domain': base_domain, - 'thread_level': current_level, - 'context': context, - 'id': -1, - } - return extension - - def message_read_tree_flatten(self, cr, uid, parent_message, messages, domain=[], level=0, current_level=0, context=None, limit=None, add_expandable=True): - """ Given a tree with several roots of following structure : - [ {'id': 1, 'child_ids': [ - {'id': 11, 'child_ids': [...] },], - {...} ] - Flatten it to have a maximum number of levels, 0 being flat and - sort messages in a level according to a key of the messages. - Perform the flattening at leafs if above the maximum depth, then get - back in the tree. - :param context: ``sort_key``: key for sorting (id by default) - :param context: ``sort_reverse``: reverser order for sorting (True by default) + def _message_read_expandable(self, cr, uid, tree, result, message_loaded, domain, context, parent_id, limit): """ - def _flatten(msg_dict): - """ from {'id': x, 'child_ids': [{child1}, {child2}]} - get [{'id': x, 'child_ids': []}, {child1}, {child2}] - """ - child_ids = msg_dict.pop('child_ids', []) - msg_dict['child_ids'] = [] - return [msg_dict] + child_ids - - context = context or {} - limit = limit or self._message_read_limit - - # Depth-first flattening - for message in messages: - if message.get('type') == 'expandable': - continue - message['child_ids'] = self.message_read_tree_flatten(cr, uid, message, message['child_ids'], domain, level, current_level + 1, context=context, limit=limit) - for child in message['child_ids']: - if child.get('type') == 'expandable': - continue - message['child_nbr'] += child['child_nbr'] - # Flatten if above maximum depth - if current_level < level: - return_list = messages - else: - return_list = [flat_message for message in messages for flat_message in _flatten(message)] - - # Add expandable - return_list = sorted(return_list, key=itemgetter(context.get('sort_key', 'id')), reverse=context.get('sort_reverse', True)) - if return_list and current_level == 0 and add_expandable: - expandable = self.message_read_tree_get_expandable(cr, uid, parent_message, return_list and return_list[-1] or parent_message, domain, current_level, level, context=context) - return_list.append(expandable) - elif return_list and current_level <= level and add_expandable: - expandable = self.message_read_tree_get_expandable(cr, uid, parent_message, return_list and return_list[-1] or parent_message, domain, current_level, level, context=context) - return_list.append(expandable) - return return_list - - def message_read(self, cr, uid, ids=False, domain=[], level=0, context=None, parent_id=False, limit=None): - """ Read messages from mail.message, and get back a structured tree - of messages to be displayed as discussion threads. If IDs is set, - fetch these records. Otherwise use the domain to fetch messages. - After having fetch messages, their parents will be added to obtain - well formed threads. - - :param domain: optional domain for searching ids - :param level: level of threads to display, 0 being flat - :param limit: number of messages to fetch - :param parent_id: if parent_id reached, stop searching for - further parents - :return list: list of trees of messages + create the expandable message for all parent message read + this function is used by message_read """ - message_loaded = context and context.get('message_loaded') or [0] - - # don't read the message display by .js, in context message_loaded list - if context and context.get('message_loaded'): - domain += [ ['id','not in',message_loaded] ]; - - limit = limit or self._message_read_limit - context = context or {} - - tree = [] - result = [] - record = None - - # select ids - if ids: - for msg in self.browse(cr, uid, ids, context=context): - result.append(self._message_dict_get(cr, uid, msg, context=context)) - return result - - # key: ID, value: record - ids = self.search(cr, SUPERUSER_ID, domain, context=context, limit=limit) - for msg in self.browse(cr, uid, ids, context=context): - # if not in record and not in message_loded list - if msg.id not in tree and msg.id not in message_loaded : - record = self._message_dict_get(cr, uid, msg, context=context) - tree.append(msg.id) - result.append(record) - - while msg.parent_id and msg.parent_id.id != parent_id: - parent_id = msg.parent_id.id - if msg.parent_id.id not in tree: - msg = msg.parent_id - tree.append(msg.id) - # if not in record and not in message_loded list - if msg.id not in message_loaded : - record = self._message_dict_get(cr, uid, msg, context=context) - result.append(record) - - result = sorted(result, key=lambda k: k['id']) - - tree_not = [] # expandable for not show message for id_msg in tree: @@ -368,10 +254,12 @@ class mail_message(osv.Model): 'parent_id': id_msg, 'id': id_min }) + id_min=None + id_max=None nb=0 if nb>0: result.append({ - 'domain': [['id','>=',id_min],['parent_id','=',id_msg]], + 'domain': [['id','>=',id_min],['id','<=',id_max],['parent_id','=',id_msg]], 'nb_messages': nb, 'type': 'expandable', 'parent_id': id_msg, @@ -396,6 +284,73 @@ class mail_message(osv.Model): return result + def message_read(self, cr, uid, ids=False, domain=[], level=0, context=None, parent_id=False, limit=None): + """ Read messages from mail.message, and get back a structured tree + of messages to be displayed as discussion threads. If IDs is set, + fetch these records. Otherwise use the domain to fetch messages. + After having fetch messages, their parents will be added to obtain + well formed threads. + + :param domain: optional domain for searching ids + :param limit: number of messages to fetch + :param parent_id: if parent_id reached, stop searching for + further parents + :return list: list of trees of messages + """ + message_loaded = context and context.get('message_loaded') or [0] + + # don't read the message display by .js, in context message_loaded list + if context and context.get('message_loaded'): + domain += [ ['id','not in',message_loaded] ]; + + limit = limit or self._message_read_limit + context = context or {} + + tree = [] + result = [] + record = None + + # select ids + if ids and ids!=[None]: + for msg in self.browse(cr, uid, ids, context=context): + result.append(self._message_dict_get(cr, uid, msg, context=context)) + return result + + # key: ID, value: record + ids = self.search(cr, SUPERUSER_ID, domain, context=context, limit=limit) + for msg in self.browse(cr, uid, ids, context=context): + # if not in record and not in message_loded list + if msg.id not in tree and msg.id not in message_loaded : + record = self._message_dict_get(cr, uid, msg, context=context) + tree.append(msg.id) + result.append(record) + + while msg.parent_id and msg.parent_id.id != parent_id: + parent_id = msg.parent_id.id + if msg.parent_id.id not in tree: + msg = msg.parent_id + tree.append(msg.id) + # if not in record and not in message_loded list + if msg.id not in message_loaded : + record = self._message_dict_get(cr, uid, msg, context=context) + result.append(record) + + result = sorted(result, key=lambda k: k['id']) + + result = self._message_read_expandable(cr, uid, tree, result, message_loaded, domain, context, parent_id, limit) + + return result + + def user_free_attachment(self, cr, uid, context=None): + attachment_list = [] + + attachment = self.pool.get('ir.attachment') + attachment_ids = attachment.search(cr, uid, [('res_model','=',''),('create_uid','=',uid)]) + if len(attachment_ids): + attachment_list = [{'id': attach.id, 'name': attach.name, 'date': attach.create_date} for attach in attachment.browse(cr, uid, attachment_ids, context=context)] + + return attachment_list + #------------------------------------------------------ # Email api #------------------------------------------------------ @@ -502,9 +457,9 @@ class mail_message(osv.Model): def create(self, cr, uid, values, context=None): if not values.get('message_id') and values.get('res_id') and values.get('model'): - values['message_id'] = tools.generate_tracking_message_id('%(model)s-%(res_id)s' % values) + values['message_id'] = tools.generate_tracking_message_id('%(res_id)s-%(model)s' % values) newid = super(mail_message, self).create(cr, uid, values, context) - self._notify(cr, 1, newid, context=context) + self._notify(cr, SUPERUSER_ID, newid, context=context) return newid def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'): @@ -526,11 +481,9 @@ class mail_message(osv.Model): self.pool.get('ir.attachment').unlink(cr, uid, attachments_to_delete, context=context) return super(mail_message, self).unlink(cr, uid, ids, context=context) - def _notify(self, cr, uid, newid, context=None): + def _notify_followers(self, cr, uid, newid, message, context=None): """ Add the related record followers to the destination partner_ids. - Call mail_notification.notify to manage the email sending """ - message = self.browse(cr, uid, newid, context=context) partners_to_notify = set([]) # message has no subtype_id: pure log message -> no partners, no one notified if not message.subtype_id: @@ -551,6 +504,14 @@ class mail_message(osv.Model): self.write(cr, SUPERUSER_ID, [newid], {'partner_ids': [(4, p_id) for p_id in missing_notified]}, context=context) partners_to_notify |= extra_notified + def _notify(self, cr, uid, newid, context=None): + """ Add the related record followers to the destination partner_ids if is not a private message. + Call mail_notification.notify to manage the email sending + """ + message = self.browse(cr, uid, newid, context=context) + if message and (message.is_private!=False and message.is_private!=None): + self._notify_followers(cr, uid, newid, message, context=context) + # add myself if I wrote on my wall, # unless remove myself author if ((message.model=="res.partner" and message.res_id==message.author_id.id)): diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index cc0419352af..0c572384bb4 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -88,21 +88,21 @@ Inbox mail.wall + 'context': {'default_model': 'res.partner'} }""/> Archives mail.wall + 'context': {'default_model': 'res.partner'} }""/> Sent mail.wall + 'context': {'default_model': 'res.partner'} }""/> diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 9f53b4c08b1..e5b93ac4000 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -39,63 +39,6 @@ _logger = logging.getLogger(__name__) def decode_header(message, header, separator=' '): return separator.join(map(decode, message.get_all(header, []))) -class many2many_reference(fields.many2many): - """ many2many_reference manages many2many fields where one id is found - by a reference-like key (a char column in addition to the foreign id). - The reference_column attribute on the many2many fields is used; - if not defined, ``res_model`` is used. """ - - def _get_query_and_where_params(self, cr, model, ids, values, where_params): - """ Add in where condition like mail_followers.res_model = 'crm.lead' """ - reference_column = self.reference_column if self.reference_column else 'res_model' - values.update(reference_column=reference_column, reference_value=model._name) - query = 'SELECT %(rel)s.%(id2)s, %(rel)s.%(id1)s \ - FROM %(rel)s, %(from_c)s \ - WHERE %(rel)s.%(id1)s IN %%s \ - AND %(rel)s.%(id2)s = %(tbl)s.id \ - AND %(rel)s.%(reference_column)s = \'%(reference_value)s\' \ - %(where_c)s \ - %(order_by)s \ - %(limit)s \ - OFFSET %(offset)d' \ - % values - return query, where_params - - def set(self, cr, model, id, name, values, user=None, context=None): - """ Override to add the reference field in queries. """ - if not values: return - rel, id1, id2 = self._sql_names(model) - obj = model.pool.get(self._obj) - # reference column name: given by attribute or res_model - reference_column = self.reference_column if self.reference_column else 'res_model' - for act in values: - if not (isinstance(act, list) or isinstance(act, tuple)) or not act: - continue - if act[0] == 0: - idnew = obj.create(cr, user, act[2], context=context) - cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, idnew, model._name)) - elif act[0] == 3: - cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+reference_column+'=%s', (id, act[1], model._name)) - elif act[0] == 4: - # following queries are in the same transaction - so should be relatively safe - cr.execute('SELECT 1 FROM '+rel+' WHERE '+id1+'=%s AND '+id2+'=%s AND '+reference_column+'=%s', (id, act[1], model._name)) - if not cr.fetchone(): - cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, act[1], model._name)) - elif act[0] == 5: - cr.execute('delete from '+rel+' where '+id1+' = %s AND '+reference_column+'=%s', (id, model._name)) - elif act[0] == 6: - d1, d2,tables = obj.pool.get('ir.rule').domain_get(cr, user, obj._name, context=context) - if d1: - d1 = ' and ' + ' and '.join(d1) - else: - d1 = '' - cr.execute('DELETE FROM '+rel+' WHERE '+id1+'=%s AND '+reference_column+'=%s AND '+id2+' IN (SELECT '+rel+'.'+id2+' FROM '+rel+', '+','.join(tables)+' WHERE '+rel+'.'+id1+'=%s AND '+rel+'.'+id2+' = '+obj._table+'.id '+ d1 +')', [id, model._name, id]+d2) - for act_nbr in act[2]: - cr.execute('INSERT INTO '+rel+' ('+id1+','+id2+','+reference_column+') VALUES (%s,%s,%s)', (id, act_nbr, model._name)) - # cases 1, 2: performs write and unlink -> default implementation is ok - else: - return super(many2many_reference, self).set(cr, model, id, name, values, user, context) - class mail_thread(osv.AbstractModel): ''' mail_thread model is meant to be inherited by any model that needs to @@ -186,6 +129,64 @@ class mail_thread(osv.AbstractModel): res[notif.message_id.res_id] = True return [('id', 'in', res.keys())] + def _get_followers(self, cr, uid, ids, name, arg, context=None): + fol_obj = self.pool.get('mail.followers') + fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', 'in', ids)]) + res = dict((res_id, []) for res_id in ids) + for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids): + res[fol.res_id].append(fol.partner_id.id) + return res + + def _set_followers(self, cr, uid, id, name, value, arg, context=None): + if not value: + return + partner_obj = self.pool.get('res.partner') + fol_obj = self.pool.get('mail.followers') + + # read the old set of followers, and determine the new set of followers + fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('res_id', '=', id)]) + old = set(fol.partner_id.id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids)) + new = set(old) + + for command in value: + if isinstance(command, (int, long)): + new.add(command) + elif command[0] == 0: + new.add(partner_obj.create(cr, uid, command[2], context=context)) + elif command[0] == 1: + partner_obj.write(cr, uid, [command[1]], command[2], context=context) + new.add(command[1]) + elif command[0] == 2: + partner_obj.unlink(cr, uid, [command[1]], context=context) + new.discard(command[1]) + elif command[0] == 3: + new.discard(command[1]) + elif command[0] == 4: + new.add(command[1]) + elif command[0] == 5: + new.clear() + elif command[0] == 6: + new = set(command[2]) + + # remove partners that are no longer followers + fol_ids = fol_obj.search(cr, SUPERUSER_ID, + [('res_model', '=', self._name), ('res_id', '=', id), ('partner_id', 'not in', list(new))]) + fol_obj.unlink(cr, SUPERUSER_ID, fol_ids) + + # add new followers + for partner_id in new - old: + fol_obj.create(cr, SUPERUSER_ID, {'res_model': self._name, 'res_id': id, 'partner_id': partner_id}) + + def _search_followers(self, cr, uid, obj, name, args, context): + fol_obj = self.pool.get('mail.followers') + res = [] + for field, operator, value in args: + assert field == name + fol_ids = fol_obj.search(cr, SUPERUSER_ID, [('res_model', '=', self._name), ('partner_id', operator, value)]) + res_ids = [fol.res_id for fol in fol_obj.browse(cr, SUPERUSER_ID, fol_ids)] + res.append(('id', 'in', res_ids)) + return res + _columns = { 'message_is_follower': fields.function(_get_subscription_data, type='boolean', string='Is a Follower', multi='_get_subscription_data,'), @@ -194,9 +195,8 @@ class mail_thread(osv.AbstractModel): help="Holds data about the subtypes. The content of this field "\ "is a structure holding the current model subtypes, and the "\ "current document followed subtypes."), - 'message_follower_ids': many2many_reference('res.partner', - 'mail_followers', 'res_id', 'partner_id', - reference_column='res_model', string='Followers'), + 'message_follower_ids': fields.function(_get_followers, fnct_inv=_set_followers, + fnct_search=_search_followers, type='many2many', obj='res.partner', string='Followers'), 'message_comment_ids': fields.one2many('mail.message', 'res_id', domain=lambda self: [('model', '=', self._name), ('type', 'in', ('comment', 'email'))], string='Comments and emails', @@ -422,12 +422,12 @@ class mail_thread(osv.AbstractModel): model_pool = self.pool.get(model) assert thread_id and hasattr(model_pool, 'message_update') or hasattr(model_pool, 'message_new'), \ "Undeliverable mail with Message-Id %s, model %s does not accept incoming emails" % \ - (msg['message-id'], model) + (msg['message_id'], model) if thread_id and hasattr(model_pool, 'message_update'): model_pool.message_update(cr, user_id, [thread_id], msg, context=context) else: thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context) - self.message_post(cr, uid, [thread_id], context=context, **msg) + model_pool.message_post(cr, uid, [thread_id], context=context, **msg) return thread_id def message_new(self, cr, uid, msg_dict, custom_values=None, context=None): @@ -538,7 +538,7 @@ class mail_thread(osv.AbstractModel): field may not be present if missing in original message:: - { 'message-id': msg_id, + { 'message_id': msg_id, 'subject': subject, 'from': from, 'to': to, @@ -623,11 +623,10 @@ class mail_thread(osv.AbstractModel): :param str subject: optional subject :param str type: mail_message.type :param int parent_id: optional ID of parent message in this thread - :param tuple(str,str) attachments: list of attachment tuples in the form + :param tuple(str,str) attachments or list id: list of attachment tuples in the form ``(name,content)``, where content is NOT base64 encoded :return: ID of newly created mail.message """ - context = context or {} attachments = attachments or [] assert (not thread_id) or isinstance(thread_id, (int, long)) or \ @@ -635,7 +634,7 @@ class mail_thread(osv.AbstractModel): if isinstance(thread_id, (list, tuple)): thread_id = thread_id and thread_id[0] - attachment_ids = [] + attachment_ids=[] for name, content in attachments: if isinstance(content, unicode): content = content.encode('utf-8') @@ -679,6 +678,13 @@ class mail_thread(osv.AbstractModel): 'attachment_ids': attachment_ids, 'subtype_id': subtype_id, }) + + # if the parent is private, the message must be private + if parent_id: + msg = messages.browse(cr, uid, parent_id, context=context) + if msg.is_private: + values["is_private"] = msg.is_private + # Avoid warnings about non-existing fields for x in ('from', 'to', 'cc'): values.pop(x, None) @@ -691,10 +697,23 @@ class mail_thread(osv.AbstractModel): def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification', subtype=None, parent_id=False, attachments=None, context=None, **kwargs): - added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type, - subtype=subtype, parent_id=parent_id, attachments=attachments, context=context) - added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id]) + # if the user write on his wall + if self._name=='res.partner' and not thread_id: + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + thread_id = user.partner_id.id + added_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type, + subtype=subtype, parent_id=parent_id, context=context) + + attachment_ids=[] + if attachments: + ir_attachment = self.pool.get('ir.attachment') + attachment_ids = ir_attachment.search(cr, 1, [('res_model', '=', ""), ('res_id', '=', ""), ('user_id', '=', uid), ('id', 'in', attachments)], context=context) + if attachment_ids: + self.pool.get('ir.attachment').write(cr, 1, attachment_ids, { 'res_model': self._name, 'res_id': thread_id }, context=context) + self.pool.get('mail.message').write(cr, 1, [added_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]} ) + + added_message = self.pool.get('mail.message').message_read(cr, uid, [added_message_id]) return added_message def get_message_subtypes(self, cr, uid, ids, context=None): diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index 3507e7c449f..696edde0e15 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -20,13 +20,13 @@ Archives - + Sent - + diff --git a/addons/mail/res_config.py b/addons/mail/res_config.py index ce2f75687ba..91606e1c720 100644 --- a/addons/mail/res_config.py +++ b/addons/mail/res_config.py @@ -19,6 +19,8 @@ # ############################################################################## +import urlparse + from openerp.osv import osv, fields class project_configuration(osv.TransientModel): @@ -31,9 +33,16 @@ class project_configuration(osv.TransientModel): } def get_default_alias_domain(self, cr, uid, ids, context=None): - return {'alias_domain': self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context)} + alias_domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "mail.catchall.domain", context=context) + if not alias_domain: + domain = self.pool.get("ir.config_parameter").get_param(cr, uid, "web.base.url", context=context) + try: + alias_domain = urlparse.urlsplit(domain).netloc.split(':')[0] + except Exception: + pass + return {'alias_domain': alias_domain} def set_alias_domain(self, cr, uid, ids, context=None): config_parameters = self.pool.get("ir.config_parameter") for record in self.browse(cr, uid, ids, context=context): - config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context) \ No newline at end of file + config_parameters.set_param(cr, uid, "mail.catchall.domain", record.alias_domain or '', context=context) diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index 545198f4c7f..f870604b03a 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -110,9 +110,19 @@ class res_users(osv.Model): alias_pool.unlink(cr, uid, alias_ids, context=context) return res - def message_post(self, cr, uid, thread_id, **kwargs): - partner_id = self.pool.get('res.users').browse(cr, uid, thread_id)[0].partner_id.id - return self.pool.get('res.partner').message_post(cr, uid, partner_id, **kwargs) + def message_post(self, cr, uid, thread_id, context=None, **kwargs): + assert thread_id, "res.users does not support posting global messages" + if context and 'thread_model' in context: + context['thread_model'] = 'res.partner' + if isinstance(thread_id, (list, tuple)): + thread_id = thread_id[0] + partner_id = self.pool.get('res.users').browse(cr, uid, thread_id).partner_id.id + return self.pool.get('res.partner').message_post(cr, uid, partner_id, context=context, **kwargs) + + def message_update(self, cr, uid, ids, msg_dict, update_vals=None, context=None): + partner_id = self.pool.get('res.users').browse(cr, uid, ids)[0].partner_id.id + return self.pool.get('res.partner').message_update(cr, uid, [partner_id], msg_dict, + update_vals=update_vals, context=context) class res_users_mail_group(osv.Model): """ Update of res.users class diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml index b503565bd11..be3bb667628 100644 --- a/addons/mail/security/mail_security.xml +++ b/addons/mail/security/mail_security.xml @@ -7,7 +7,7 @@ Mail.group: access only public and joined groups - ['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.id]), '&', ('public','=','groups'), ('group_public_id','in', [x.id for x in user.groups_id])] + ['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.partner_id.id]), '&', ('public','=','groups'), ('group_public_id','in', [g.id for g in user.groups_id])] + +
    + User img +
    + + +
    + + X +
    +