diff --git a/addons/account/account.py b/addons/account/account.py index d0e9c501bb9..aced4041f13 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -368,16 +368,16 @@ class account_account(osv.osv): 'parent_id': fields.many2one('account.account', 'Parent', ondelete='cascade', domain=[('type','=','view')]), 'child_parent_ids': fields.one2many('account.account','parent_id','Children'), 'child_consol_ids': fields.many2many('account.account', 'account_account_consol_rel', 'child_id', 'parent_id', 'Consolidated Children'), - 'child_id': fields.function(_get_child_ids, method=True, type='many2many', relation="account.account", string="Child Accounts"), - 'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Balance', multi='balance'), - 'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Credit', multi='balance'), - 'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), method=True, string='Debit', multi='balance'), + 'child_id': fields.function(_get_child_ids, type='many2many', relation="account.account", string="Child Accounts"), + 'balance': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Balance', multi='balance'), + 'credit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Credit', multi='balance'), + 'debit': fields.function(__compute, digits_compute=dp.get_precision('Account'), string='Debit', multi='balance'), 'reconcile': fields.boolean('Reconcile', help="Check this if the user is allowed to reconcile entries in this account."), 'shortcut': fields.char('Shortcut', size=12), 'tax_ids': fields.many2many('account.tax', 'account_account_tax_default_rel', 'account_id', 'tax_id', 'Default Taxes'), 'note': fields.text('Note'), - 'company_currency_id': fields.function(_get_company_currency, method=True, type='many2one', relation='res.currency', string='Company Currency'), + 'company_currency_id': fields.function(_get_company_currency, type='many2one', relation='res.currency', string='Company Currency'), 'company_id': fields.many2one('res.company', 'Company', required=True), 'active': fields.boolean('Active', select=2, help="If the active field is set to False, it will allow you to hide the account without removing it."), @@ -390,7 +390,7 @@ class account_account(osv.osv): 'manage this. So if you import from another software system you may have to use the rate at date. ' \ 'Incoming transactions always use the rate at date.', \ required=True), - 'level': fields.function(_get_level, string='Level', method=True, store=True, type='integer'), + 'level': fields.function(_get_level, string='Level', store=True, type='integer'), } _defaults = { @@ -587,7 +587,7 @@ class account_journal_column(osv.osv): _description = "Journal Column" _columns = { 'name': fields.char('Column Name', size=64, required=True), - 'field': fields.selection(_col_get, 'Field Name', method=True, required=True, size=32), + 'field': fields.selection(_col_get, 'Field Name', required=True, size=32), 'view_id': fields.many2one('account.journal.view', 'Journal View', select=True), 'sequence': fields.integer('Sequence', help="Gives the sequence order to journal column.", readonly=True), 'required': fields.boolean('Required'), @@ -985,7 +985,7 @@ class account_journal_period(osv.osv): 'name': fields.char('Journal-Period Name', size=64, required=True), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, ondelete="cascade"), 'period_id': fields.many2one('account.period', 'Period', required=True, ondelete="cascade"), - 'icon': fields.function(_icon_get, method=True, string='Icon', type='char', size=32), + 'icon': fields.function(_icon_get, string='Icon', type='char', size=32), 'active': fields.boolean('Active', required=True, help="If the active field is set to False, it will allow you to hide the journal period without removing it."), 'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True, help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'), @@ -1139,7 +1139,7 @@ class account_move(osv.osv): 'line_id': fields.one2many('account.move.line', 'move_id', 'Entries', states={'posted':[('readonly',True)]}), 'to_check': fields.boolean('To Review', help='Check this box if you are unsure of that journal entry and if you want to note it as \'to be reviewed\' by an accounting expert.'), 'partner_id': fields.related('line_id', 'partner_id', type="many2one", relation="res.partner", string="Partner", store=True), - 'amount': fields.function(_amount_compute, method=True, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount), + 'amount': fields.function(_amount_compute, string='Amount', digits_compute=dp.get_precision('Account'), type='float', fnct_search=_search_amount), 'date': fields.date('Date', required=True, states={'posted':[('readonly',True)]}, select=True), 'narration':fields.text('Narration'), 'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company', store=True, readonly=True), @@ -1646,8 +1646,8 @@ class account_tax_code(osv.osv): 'name': fields.char('Tax Case Name', size=64, required=True, translate=True), 'code': fields.char('Case Code', size=64), 'info': fields.text('Description'), - 'sum': fields.function(_sum_year, method=True, string="Year Sum"), - 'sum_period': fields.function(_sum_period, method=True, string="Period Sum"), + 'sum': fields.function(_sum_year, string="Year Sum"), + 'sum_period': fields.function(_sum_period, string="Period Sum"), 'parent_id': fields.many2one('account.tax.code', 'Parent Code', select=True), 'child_ids': fields.one2many('account.tax.code', 'parent_id', 'Child Codes'), 'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'), @@ -2502,7 +2502,7 @@ class account_tax_template(osv.osv): 'name': fields.char('Tax Name', size=64, required=True), 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."), 'amount': fields.float('Amount', required=True, digits=(14,4), help="For Tax Type percent enter % ratio between 0-1."), - 'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code')], 'Tax Type', required=True), + 'type': fields.selection( [('percent','Percent'), ('fixed','Fixed'), ('none','None'), ('code','Python Code'), ('balance','Balance')], 'Tax Type', required=True), 'applicable_type': fields.selection( [('true','True'), ('code','Python Code')], 'Applicable Type', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."), 'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."), 'account_collected_id':fields.many2one('account.account.template', 'Invoice Tax Account'), diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 54776e5c7e6..f712cc9ab0c 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -137,7 +137,7 @@ class account_bank_statement(osv.osv): states={'confirm':[('readonly',True)]}), 'balance_end_real': fields.float('Ending Balance', digits_compute=dp.get_precision('Account'), states={'confirm':[('readonly', True)]}), - 'balance_end': fields.function(_end_balance, method=True, string='Balance'), + 'balance_end': fields.function(_end_balance, string='Balance'), 'company_id': fields.related('journal_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), 'line_ids': fields.one2many('account.bank.statement.line', 'statement_id', 'Statement lines', @@ -149,7 +149,7 @@ class account_bank_statement(osv.osv): states={'confirm': [('readonly', True)]}, readonly="1", help='When new statement is created the state will be \'Draft\'. \ \n* And after getting confirmation from the bank it will be in \'Confirmed\' state.'), - 'currency': fields.function(_currency, method=True, string='Currency', + 'currency': fields.function(_currency, string='Currency', type='many2one', relation='res.currency'), 'account_id': fields.related('journal_id', 'default_debit_account_id', type='many2one', relation='account.account', string='Account used in this journal', readonly=True, help='used in statement reconciliation domain, but shouldn\'t be used elswhere.'), } diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 04e780ade30..982383ea2a7 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -58,7 +58,7 @@ class account_cashbox_line(osv.osv): _columns = { 'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')), 'number': fields.integer('Number'), - 'subtotal': fields.function(_sub_total, method=True, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')), + 'subtotal': fields.function(_sub_total, string='Sub Total', type='float', digits_compute=dp.get_precision('Account')), 'starting_id': fields.many2one('account.bank.statement', ondelete='cascade'), 'ending_id': fields.many2one('account.bank.statement', ondelete='cascade'), } @@ -223,10 +223,10 @@ class account_cash_statement(osv.osv): [('draft', 'Draft'), ('confirm', 'Closed'), ('open','Open')], 'State', required=True, states={'confirm': [('readonly', True)]}, readonly="1"), - 'total_entry_encoding': fields.function(_get_sum_entry_encoding, method=True, store=True, string="Cash Transaction", help="Total cash transactions"), + 'total_entry_encoding': fields.function(_get_sum_entry_encoding, store=True, string="Cash Transaction", help="Total cash transactions"), 'closing_date': fields.datetime("Closed On"), - 'balance_end': fields.function(_end_balance, method=True, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"), - 'balance_end_cash': fields.function(_balance_end_cash, method=True, store=True, string='Balance', help="Closing balance based on cashBox"), + 'balance_end': fields.function(_end_balance, store=True, string='Balance', help="Closing balance based on Starting Balance and Cash Transactions"), + 'balance_end_cash': fields.function(_balance_end_cash, store=True, string='Balance', help="Closing balance based on cashBox"), 'starting_details_ids': fields.one2many('account.cashbox.line', 'starting_id', string='Opening Cashbox'), 'ending_details_ids': fields.one2many('account.cashbox.line', 'ending_id', string='Closing Cashbox'), 'name': fields.char('Name', size=64, required=True, states={'draft': [('readonly', False)]}, readonly=True, help='if you give the Name other then /, its created Accounting Entries Move will be with same name as statement name. This allows the statement entries to have the same references than the statement itself'), diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 2117d7fc40e..2733ecbd189 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -489,8 +489,8 @@ class account_move_line(osv.osv): 'reconcile_id': fields.many2one('account.move.reconcile', 'Reconcile', readonly=True, ondelete='set null', select=2), 'reconcile_partial_id': fields.many2one('account.move.reconcile', 'Partial Reconcile', readonly=True, ondelete='set null', select=2), 'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency if it is a multi-currency entry.", digits_compute=dp.get_precision('Account')), - 'amount_residual_currency': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."), - 'amount_residual': fields.function(_amount_residual, method=True, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."), + 'amount_residual_currency': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)."), + 'amount_residual': fields.function(_amount_residual, string='Residual Amount', multi="residual", help="The residual amount on a receivable or payable of a journal entry expressed in the company currency."), 'currency_id': fields.many2one('res.currency', 'Currency', help="The optional other currency if it is a multi-currency entry."), 'period_id': fields.many2one('account.period', 'Period', required=True, select=2), 'journal_id': fields.many2one('account.journal', 'Journal', required=True, select=1), @@ -504,13 +504,13 @@ class account_move_line(osv.osv): 'date_created': fields.date('Creation date', select=True), 'analytic_lines': fields.one2many('account.analytic.line', 'move_id', 'Analytic lines'), 'centralisation': fields.selection([('normal','Normal'),('credit','Credit Centralisation'),('debit','Debit Centralisation'),('currency','Currency Adjustment')], 'Centralisation', size=8), - 'balance': fields.function(_balance, fnct_search=_balance_search, method=True, string='Balance'), + 'balance': fields.function(_balance, fnct_search=_balance_search, string='Balance'), 'state': fields.selection([('draft','Unbalanced'), ('valid','Valid')], 'State', readonly=True, help='When new move line is created the state will be \'Draft\'.\n* When all the payments are done it will be in \'Valid\' state.'), 'tax_code_id': fields.many2one('account.tax.code', 'Tax Account', help="The Account can either be a base tax code or a tax code account."), 'tax_amount': fields.float('Tax/Base Amount', digits_compute=dp.get_precision('Account'), select=True, help="If the Tax account is a tax code account, this field will contain the taxed amount.If the tax account is base tax code, "\ "this field will contain the basic amount(without tax)."), - 'invoice': fields.function(_invoice, method=True, string='Invoice', + 'invoice': fields.function(_invoice, string='Invoice', type='many2one', relation='account.invoice', fnct_search=_invoice_search), 'account_tax_id':fields.many2one('account.tax', 'Tax'), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index e0a355c35bf..d3d54a51918 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -897,6 +897,7 @@ + @@ -909,6 +910,7 @@ + diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 14a60c5bc7f..3d6a63f1bd9 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: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-21 05:36+0000\n" +"PO-Revision-Date: 2011-07-02 08:42+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: 2011-04-29 05:06+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-07-03 04:46+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -34,7 +34,7 @@ msgstr "" "Es ist kein Journal für den Jahresabschluss des Geschäftsjahres definiert" #. module: account -#: code:addons/account/account.py:506 +#: code:addons/account/account.py:516 #, python-format msgid "" "You cannot remove/deactivate an account which is set as a property to any " @@ -68,7 +68,7 @@ msgid "Residual" msgstr "Restwert" #. module: account -#: code:addons/account/invoice.py:785 +#: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" msgstr "Bitte definieren Sie den Sequenzer für das Rechnungsjournal." @@ -138,7 +138,7 @@ msgid "Accounting Entries-" msgstr "Buchungssätze-" #. module: account -#: code:addons/account/account.py:1291 +#: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" msgstr "Sie können keine gebuchten Vorgänge löschen: \"%s\"!" @@ -184,7 +184,7 @@ msgstr "" "angezeigt." #. module: account -#: code:addons/account/invoice.py:1421 +#: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" msgstr "Achtung!" @@ -240,7 +240,7 @@ msgid "account.tax" msgstr "account.tax" #. module: account -#: code:addons/account/account.py:901 +#: code:addons/account/account.py:915 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -272,7 +272,7 @@ msgstr "" "Rechnung erscheinen sollen" #. module: account -#: code:addons/account/invoice.py:1210 +#: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "" @@ -290,7 +290,7 @@ msgid "Belgian Reports" msgstr "Auswertungen für Belgien" #. module: account -#: code:addons/account/account_move_line.py:1176 +#: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "" @@ -330,7 +330,7 @@ msgid "St." msgstr "Beleg" #. module: account -#: code:addons/account/invoice.py:529 +#: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" @@ -594,7 +594,7 @@ msgid "Not reconciled transactions" msgstr "Nicht ausgeglichene Posten" #. module: account -#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" msgstr "Kassenbestand passt nicht zu Kontensaldo" @@ -679,7 +679,7 @@ msgid "Tax Code Amount" msgstr "Steuerbetrag" #. module: account -#: code:addons/account/account.py:2779 +#: code:addons/account/account.py:2823 #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" @@ -712,8 +712,8 @@ msgid "Journal Period" msgstr "Journal Periode" #. module: account -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -776,7 +776,7 @@ msgid "Analytic Entries by line" msgstr "Analytische Buchungsbelege" #. module: account -#: code:addons/account/wizard/account_change_currency.py:39 +#: 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" @@ -880,7 +880,7 @@ msgid "Next Partner to reconcile" msgstr "Weiterer Partner für automat. Ausgleich" #. module: account -#: code:addons/account/account_move_line.py:1191 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "" "You can not do this modification on a confirmed entry ! Please note that you " @@ -1009,11 +1009,11 @@ msgid "Code" msgstr "Kurzbezeichnung" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 +#: code:addons/account/account_move_line.py:169 #: code:addons/account/invoice.py:73 -#: code:addons/account/invoice.py:670 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" @@ -1095,7 +1095,6 @@ msgstr "GuV (Aufwendungen)" #. module: account #: report:account.analytic.account.journal:0 -#: report:account.move.voucher:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "-" @@ -1186,6 +1185,7 @@ msgstr "# Transaktionen" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1193,7 +1193,7 @@ msgid "Entry Label" msgstr "Buchungstext" #. module: account -#: code:addons/account/account.py:976 +#: code:addons/account/account.py:990 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "" @@ -1333,7 +1333,6 @@ msgid "Journal Items Analysis" msgstr "Analyse der Journaleinträge" #. module: account -#: model:ir.actions.act_window,name:account.action_partner_all #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "Partner" @@ -1363,7 +1362,7 @@ msgid "Central Journal" msgstr "Zentrales Journal" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "You can not use this general account in this journal !" msgstr "Sie können dieses Sachkonto nicht in diesem Journal einsetzen." @@ -1460,7 +1459,7 @@ msgid "" msgstr "Beispiel: 14 Tage 2% Skonto, 30 Tage Netto" #. module: account -#: code:addons/account/invoice.py:815 +#: code:addons/account/invoice.py:823 #, python-format msgid "" "Cannot create the invoice !\n" @@ -1631,7 +1630,6 @@ msgid "Separated Journal Sequences" msgstr "Unterschiedliche Journal Sequenzer" #. module: account -#: field:account.bank.statement,user_id:0 #: view:account.invoice:0 msgid "Responsible" msgstr "Mitarbeiter" @@ -1705,7 +1703,7 @@ msgid "Error! You cannot define overlapping fiscal years" msgstr "Fehler ! Sie können keine Überschneidungen bei Geschäftsjahren haben" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:799 #, python-format msgid "The account is not defined to be reconciled !" msgstr "" @@ -1742,7 +1740,7 @@ msgid "Receivables & Payables" msgstr "Debitoren & Kreditoren" #. module: account -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:806 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "Sie müssen ein Konto für die Forderungsabschreibung hinterlegen!" @@ -1778,7 +1776,7 @@ msgid "Customer Ref:" msgstr "Kundenreferenz:" #. module: account -#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:329 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "Benutzer %s hat keinen Zugriff auf das %s Journal!" @@ -1799,7 +1797,7 @@ msgid "Tax Declaration: Credit Notes" msgstr "Steuermeldung: Ausweis von Gutschriften" #. module: account -#: code:addons/account/account.py:499 +#: code:addons/account/account.py:509 #, python-format msgid "You cannot deactivate an account that contains account moves." msgstr "Sie können kein Konto mit vorhandenen Buchungen deaktivieren." @@ -1816,7 +1814,7 @@ msgstr "" "Sie können keine Buchung auf einem bereits abgeschlossenen Konto vornehmen." #. module: account -#: code:addons/account/account.py:519 +#: code:addons/account/account.py:529 #, python-format msgid "" "You cannot change the type of account from 'Closed' to any other type which " @@ -2101,7 +2099,7 @@ msgid " Journal" msgstr " Journal" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 #, python-format msgid "" "There is no default default debit account defined \n" @@ -2164,7 +2162,7 @@ msgid "Description" msgstr "Buchungstext" #. module: account -#: code:addons/account/account.py:2844 +#: code:addons/account/account.py:2888 #: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" @@ -2184,7 +2182,7 @@ msgid "Income Account" msgstr "Erlöskonto" #. module: account -#: code:addons/account/invoice.py:352 +#: code:addons/account/invoice.py:351 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "" @@ -2197,6 +2195,7 @@ msgid "Accounting Properties" msgstr "Finanzbuchhaltung Eigenschaften" #. module: account +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted By" @@ -2225,6 +2224,7 @@ msgstr "Vorlage f. Produkte" #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2333,7 +2333,7 @@ msgid "Account Tax Code" msgstr "Umsatzsteuer" #. module: account -#: code:addons/account/invoice.py:545 +#: code:addons/account/invoice.py:552 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" @@ -2415,7 +2415,7 @@ msgid "Account Model Entries" msgstr "Buchungsvorlage" #. module: account -#: code:addons/account/account.py:2796 +#: code:addons/account/account.py:2840 #: code:addons/account/installer.py:454 #, python-format msgid "EXJ" @@ -2507,7 +2507,7 @@ msgid "Accounts" msgstr "Finanzkonten" #. module: account -#: code:addons/account/invoice.py:351 +#: code:addons/account/invoice.py:350 #, python-format msgid "Configuration Error!" msgstr "Konfigurationsfehler !" @@ -2519,13 +2519,12 @@ msgid "Average Price" msgstr "Durchschnittspreis" #. module: account -#: report:account.move.voucher:0 #: report:account.overdue:0 msgid "Date:" msgstr "Datum:" #. module: account -#: code:addons/account/account.py:640 +#: code:addons/account/account.py:654 #, python-format msgid "" "You cannot modify company of this journal as its related record exist in " @@ -2563,6 +2562,7 @@ msgstr "Rabatt (%)" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2679,16 +2679,16 @@ msgid "This wizard will create recurring accounting entries" msgstr "Diese Assistent erzeugt wiederkehrende Buchungen." #. module: account -#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1195 #, python-format msgid "No sequence defined on the journal !" msgstr "Kein Sequenzer für dieses Journal definiert !" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 -#: code:addons/account/invoice.py:670 +#: code:addons/account/account_move_line.py:169 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2862,7 +2862,7 @@ msgid "Analytic Entries" msgstr "Analytische Buchungen" #. module: account -#: code:addons/account/account.py:822 +#: code:addons/account/account.py:836 #, python-format msgid "" "No fiscal year defined for this date !\n" @@ -2994,7 +2994,7 @@ msgid "BNK%s" msgstr "BNK%s" #. module: account -#: code:addons/account/account.py:2906 +#: code:addons/account/account.py:2950 #: code:addons/account/installer.py:296 #, python-format msgid "BNK" @@ -3119,6 +3119,7 @@ msgstr "Leer lassen um Aufwandskonto zu verwenden" #: field:account.common.report,journal_ids:0 #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 +#: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 #: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 @@ -3179,7 +3180,7 @@ msgid "Starting Balance" msgstr "Anfangssaldo" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "No Partner Defined !" msgstr "Kein Partner definiert!" @@ -3223,7 +3224,6 @@ msgstr "Journal:" #: view:account.invoice.report:0 #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 -#: report:account.move.voucher:0 #: view:account.subscription:0 #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 @@ -3277,7 +3277,7 @@ msgstr "" "bedeutet, dass Sie Ihre einzelnen Buchungen nicht ändern können." #. module: account -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "Kann offene oder bezahlte Rechnungen nicht löschen" @@ -3340,7 +3340,7 @@ msgstr "" "'Abgebrochen' oder 'Erledigt' Status ist." #. module: account -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 #, python-format msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " @@ -3351,6 +3351,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "Gegenbuchung" @@ -3455,6 +3456,7 @@ msgstr "(Wenn kein Geschäftsjahr ausgewählt wird, werden alle genommen)" #: field:account.entries.report,date:0 #: selection:account.general.journal,filter:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice.report,date:0 #: report:account.journal.period.print:0 #: view:account.move:0 @@ -3498,7 +3500,7 @@ msgid "Chart of Accounts Template" msgstr "Vorlage Kontenplan" #. module: account -#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2109 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " @@ -3510,13 +3512,13 @@ msgstr "" "Bitte ordnen Sie dem Partner eine Zahlungsbedingungen zu." #. module: account -#: code:addons/account/account_move_line.py:810 +#: code:addons/account/account_move_line.py:801 #, python-format msgid "Some entries are already reconciled !" msgstr "Einige Einträge wurden bereits ausgeglichen!" #. module: account -#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1218 #, python-format msgid "" "You cannot validate a Journal Entry unless all journal items are in same " @@ -3644,7 +3646,7 @@ msgid "Analytic Items" msgstr "Analytische Buchungen" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "Unable to change tax !" msgstr "Die Steuer kann nicht geändert werden!" @@ -3655,7 +3657,7 @@ msgid "#Entries" msgstr "# Buchungen" #. module: account -#: code:addons/account/invoice.py:1422 +#: code:addons/account/invoice.py:1437 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." @@ -3663,7 +3665,7 @@ msgstr "" "Sie haben eine Mengeneinheit gewählt, die nicht kompatibel zum Produkt ist." #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #, python-format msgid "" "The Payment Term of Supplier does not have Payment Term Lines(Computation) " @@ -3977,7 +3979,7 @@ msgid "Acc.Type" msgstr "Kontotyp" #. module: account -#: code:addons/account/invoice.py:714 +#: code:addons/account/invoice.py:722 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "" @@ -4042,7 +4044,7 @@ msgstr "" "Status unmittelbar 'Gebucht' ist." #. module: account -#: code:addons/account/account_analytic_line.py:91 +#: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -4224,7 +4226,7 @@ msgid "Credit Notes" msgstr "Gutschrift" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" @@ -4297,11 +4299,11 @@ msgid "Change" msgstr "Ändere Währung" #. module: account -#: code:addons/account/account.py:1290 -#: code:addons/account/account.py:1318 -#: code:addons/account/account.py:1325 -#: code:addons/account/account_move_line.py:1055 -#: code:addons/account/invoice.py:896 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1332 +#: code:addons/account/account.py:1339 +#: code:addons/account/account_move_line.py:1061 +#: code:addons/account/invoice.py:904 #: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_fiscalyear_close.py:78 #: code:addons/account/wizard/account_fiscalyear_close.py:81 @@ -4408,7 +4410,7 @@ msgid "You must define an analytic journal of type '%s' !" msgstr "Ein Analytisches Journal vom Typ '%s' muss definiert werden" #. module: account -#: code:addons/account/account.py:1397 +#: code:addons/account/account.py:1411 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " @@ -4480,7 +4482,7 @@ msgid "Invoices" msgstr "Rechnung" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "" "Please verify the price of the invoice !\n" @@ -4594,25 +4596,24 @@ msgid "Third Party (Country)" msgstr "Drittwelt (Land)" #. module: account -#: code:addons/account/account.py:938 -#: code:addons/account/account.py:940 -#: code:addons/account/account.py:1181 -#: code:addons/account/account.py:1393 -#: code:addons/account/account.py:1397 -#: code:addons/account/account_cash_statement.py:249 -#: code:addons/account/account_move_line.py:780 -#: code:addons/account/account_move_line.py:803 -#: code:addons/account/account_move_line.py:805 -#: code:addons/account/account_move_line.py:808 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account.py:952 +#: code:addons/account/account.py:954 +#: code:addons/account/account.py:1195 +#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1411 +#: code:addons/account/account_cash_statement.py:250 +#: code:addons/account/account_move_line.py:771 +#: code:addons/account/account_move_line.py:794 +#: code:addons/account/account_move_line.py:796 +#: code:addons/account/account_move_line.py:799 +#: code:addons/account/account_move_line.py:801 +#: code:addons/account/account_move_line.py:1123 #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_change_currency.py:39 -#: code:addons/account/wizard/account_change_currency.py:60 -#: code:addons/account/wizard/account_change_currency.py:65 -#: code:addons/account/wizard/account_change_currency.py:71 +#: 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_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_report_common.py:120 #: code:addons/account/wizard/account_report_common.py:126 #, python-format @@ -4634,7 +4635,7 @@ msgid "Bank Details" msgstr "Bankkonto Details" #. module: account -#: code:addons/account/invoice.py:720 +#: code:addons/account/invoice.py:728 #, python-format msgid "Taxes missing !" msgstr "Steuerkonfiguration fehlt!" @@ -4694,7 +4695,7 @@ msgid "Check Date not in the Period" msgstr "Prüfe auf ein Datum nicht in Periode" #. module: account -#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:1224 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -4716,7 +4717,7 @@ msgid "Child Tax Accounts" msgstr "untergeordnete Steuerkonten" #. module: account -#: code:addons/account/account.py:940 +#: code:addons/account/account.py:954 #, python-format msgid "Start period should be smaller then End period" msgstr "Beginn der Periode sollte kleiner sein als Ende der Periode" @@ -4746,6 +4747,7 @@ msgstr "Saldo (Anal.)" #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 @@ -4830,7 +4832,7 @@ msgid "Line 1:" msgstr "Zeile 1:" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "Integrity Error !" msgstr "Integritätsfehler!" @@ -4980,7 +4982,7 @@ msgstr "" "einen vorher vorhandenen Partner erstellen." #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" @@ -5057,7 +5059,7 @@ msgstr "" "->> Fälligkeitstag = 28.2" #. module: account -#: code:addons/account/account.py:2896 +#: code:addons/account/account.py:2940 #: code:addons/account/installer.py:283 #: code:addons/account/installer.py:295 #, python-format @@ -5085,7 +5087,7 @@ msgid "Start of period" msgstr "Start Periode" #. module: account -#: code:addons/account/account_move_line.py:1193 +#: code:addons/account/account_move_line.py:1199 #, python-format msgid "" "You can not do this modification on a reconciled entry ! Please note that " @@ -5144,12 +5146,12 @@ msgstr "Journal Eröffnungsbuchungen" #. module: account #: code:addons/account/account_bank_statement.py:331 -#: code:addons/account/invoice.py:405 -#: code:addons/account/invoice.py:505 -#: code:addons/account/invoice.py:520 -#: code:addons/account/invoice.py:528 -#: code:addons/account/invoice.py:545 -#: code:addons/account/invoice.py:1347 +#: code:addons/account/invoice.py:408 +#: code:addons/account/invoice.py:508 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:531 +#: code:addons/account/invoice.py:552 +#: code:addons/account/invoice.py:1361 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -5230,7 +5232,7 @@ msgid "Sort By" msgstr "Sortiert nach" #. module: account -#: code:addons/account/account.py:1326 +#: code:addons/account/account.py:1340 #, python-format msgid "" "There is no default default credit account defined \n" @@ -5391,7 +5393,7 @@ msgid "Generate Opening Entries" msgstr "Erstelle Vortragsbuchungen" #. module: account -#: code:addons/account/account_move_line.py:738 +#: code:addons/account/account_move_line.py:729 #, python-format msgid "Already Reconciled!" msgstr "Bereits ausgeglichen" @@ -5430,7 +5432,7 @@ msgstr "untergeordnete Konten" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:821 #, python-format msgid "Write-Off" msgstr "Abschreibung" @@ -5585,7 +5587,7 @@ msgid "# of Lines" msgstr "# Positionen" #. module: account -#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not confirured properly !" msgstr "Neue Währung wurde nicht vollständig konfiguriert !" @@ -5610,14 +5612,14 @@ msgid "Filter by" msgstr "Filter durch" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not use an inactive account!" msgstr "Sie können kein inaktives Konto verwenden!" #. module: account -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:794 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "" @@ -5654,7 +5656,7 @@ msgstr "7" #. module: account #: code:addons/account/account_bank_statement.py:391 -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Invalid action !" msgstr "Fehlerhafte Aktion" @@ -5876,7 +5878,7 @@ msgid "Companies" msgstr "Unternehmen" #. module: account -#: code:addons/account/account.py:532 +#: code:addons/account/account.py:546 #, python-format msgid "" "You cannot modify Company of account as its related record exist in Entry " @@ -6157,9 +6159,9 @@ msgid "Optional create" msgstr "Erzeuge optional" #. module: account -#: code:addons/account/invoice.py:406 -#: code:addons/account/invoice.py:506 -#: code:addons/account/invoice.py:1348 +#: code:addons/account/invoice.py:409 +#: code:addons/account/invoice.py:509 +#: code:addons/account/invoice.py:1362 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "" @@ -6312,8 +6314,8 @@ msgid "Analytic Entries Statistics" msgstr "Auswertung analytische Buchungen" #. module: account -#: code:addons/account/account_analytic_line.py:143 -#: code:addons/account/account_move_line.py:905 +#: code:addons/account/account_analytic_line.py:141 +#: code:addons/account/account_move_line.py:897 #, python-format msgid "Entries: " msgstr "Buchungen: " @@ -6324,7 +6326,7 @@ msgid "Create manual recurring entries in a chosen journal." msgstr "Händisch wiederkehrende Buchungen in ein bestimmtes Journal buchen." #. module: account -#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1407 #, python-format msgid "Couldn't create move between different companies" msgstr "Konnte keine überbetriebliche Buchung erzeugen" @@ -6373,7 +6375,7 @@ msgid "Total debit" msgstr "Gesamt Soll" #. module: account -#: code:addons/account/account_move_line.py:781 +#: code:addons/account/account_move_line.py:772 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "Eintrag \"%s\" ist ungültig !" @@ -6443,30 +6445,31 @@ msgid " valuation: percent" msgstr " Wertansatz: Prozent" #. module: account -#: code:addons/account/account.py:499 -#: code:addons/account/account.py:501 -#: code:addons/account/account.py:822 -#: code:addons/account/account.py:901 -#: code:addons/account/account.py:976 -#: code:addons/account/account.py:1204 -#: code:addons/account/account.py:1210 -#: code:addons/account/account.py:2095 -#: code:addons/account/account.py:2333 -#: code:addons/account/account_analytic_line.py:90 -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account.py:509 +#: code:addons/account/account.py:511 +#: code:addons/account/account.py:836 +#: code:addons/account/account.py:915 +#: code:addons/account/account.py:990 +#: code:addons/account/account.py:1218 +#: code:addons/account/account.py:1224 +#: code:addons/account/account.py:2109 +#: code:addons/account/account.py:2357 +#: code:addons/account/account_analytic_line.py:89 +#: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:292 #: code:addons/account/account_bank_statement.py:305 #: code:addons/account/account_bank_statement.py:345 -#: code:addons/account/account_cash_statement.py:328 -#: code:addons/account/account_cash_statement.py:348 -#: code:addons/account/account_move_line.py:1176 -#: code:addons/account/account_move_line.py:1191 -#: code:addons/account/account_move_line.py:1193 -#: code:addons/account/invoice.py:785 -#: code:addons/account/invoice.py:815 -#: code:addons/account/invoice.py:1008 +#: code:addons/account/account_cash_statement.py:329 +#: code:addons/account/account_cash_statement.py:349 +#: code:addons/account/account_move_line.py:1182 +#: code:addons/account/account_move_line.py:1197 +#: code:addons/account/account_move_line.py:1199 +#: code:addons/account/invoice.py:793 +#: code:addons/account/invoice.py:823 +#: code:addons/account/invoice.py:1014 #: code:addons/account/wizard/account_invoice_refund.py:100 #: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" @@ -6587,7 +6590,7 @@ msgid "Journal Select" msgstr "Wähle Journal" #. module: account -#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:64 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "Die aktuelle Währung ist nicht korrekt konfiguriert !" @@ -6604,9 +6607,11 @@ msgstr "Steuern Zuordnung" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger +#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" msgstr "Umsätze nach Konten und Perioden" @@ -6667,7 +6672,7 @@ msgid "Total:" msgstr "Summe:" #. module: account -#: code:addons/account/account.py:2050 +#: code:addons/account/account.py:2064 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -6705,7 +6710,7 @@ msgid "Child Codes" msgstr "untergeordnete Codes" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" @@ -6896,7 +6901,7 @@ msgid "Lines" msgstr "Positionen" #. module: account -#: code:addons/account/invoice.py:521 +#: code:addons/account/invoice.py:524 #, python-format msgid "" "Can not find account chart for this company in invoice line account, Please " @@ -7095,7 +7100,7 @@ msgstr "" "Steuerberechnung gebraucht wird." #. module: account -#: code:addons/account/account.py:938 +#: code:addons/account/account.py:952 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "" @@ -7214,7 +7219,7 @@ msgid "Sign on Reports" msgstr "Sign On Reports" #. module: account -#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_cash_statement.py:250 #, python-format msgid "You can not have two open register for the same journal" msgstr "" @@ -7251,7 +7256,6 @@ msgstr "" #. module: account #: report:account.invoice:0 #: view:account.invoice:0 -#: report:account.move.voucher:0 msgid "PRO-FORMA" msgstr "PRO-FORMA" @@ -7284,6 +7288,7 @@ msgstr "Informationen (Optional)" #. module: account #: view:account.analytic.line:0 +#: field:account.bank.statement,user_id:0 #: view:account.journal:0 #: field:account.journal,user_id:0 #: view:analytic.entries.report:0 @@ -7312,13 +7317,13 @@ msgstr "" "bezahlt werden soll." #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "Bad account !" msgstr "Falsches Konto!" #. module: account -#: code:addons/account/account.py:2777 +#: code:addons/account/account.py:2821 #: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" @@ -7336,7 +7341,7 @@ msgid "Invoice Tax" msgstr "Umsatzsteuer" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "No piece number !" msgstr "Keine Stückzahl!" @@ -7582,17 +7587,17 @@ msgid "Fixed" msgstr "Fest" #. module: account -#: code:addons/account/account.py:506 -#: code:addons/account/account.py:519 -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:516 +#: code:addons/account/account.py:529 #: code:addons/account/account.py:532 -#: code:addons/account/account.py:640 -#: code:addons/account/account.py:927 -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 -#: code:addons/account/invoice.py:714 -#: code:addons/account/invoice.py:717 -#: code:addons/account/invoice.py:720 +#: code:addons/account/account.py:546 +#: code:addons/account/account.py:654 +#: code:addons/account/account.py:941 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/invoice.py:722 +#: code:addons/account/invoice.py:725 +#: code:addons/account/invoice.py:728 #, python-format msgid "Warning !" msgstr "Warnung" @@ -7624,6 +7629,7 @@ msgstr "Betrag (in Worten)" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7654,7 +7660,7 @@ msgid "Can not %s draft/proforma/cancel invoice." msgstr "Kann Entwurf/ProForma/Storno für Rechnung %s nicht durchführen" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "No Invoice Lines !" msgstr "Keine Rechnungszeilen !" @@ -7705,7 +7711,7 @@ msgid "Deferral Method" msgstr "Abgrenzung Jahreswechsel" #. module: account -#: code:addons/account/invoice.py:359 +#: code:addons/account/invoice.py:360 #, python-format msgid "Invoice '%s' is paid." msgstr "Rechnung '%s' wurde bezahlt." @@ -7769,7 +7775,7 @@ msgid "Associated Partner" msgstr "Zugehöriger Partner" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "You must first select a partner !" msgstr "Sie müssen zuerst einen Partner wählen!" @@ -7837,7 +7843,7 @@ msgid "Choose Fiscal Year" msgstr "Wähle Geschäftsjahr" #. module: account -#: code:addons/account/account.py:2841 +#: code:addons/account/account.py:2885 #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" @@ -7876,6 +7882,7 @@ msgstr "Finanzbuchhaltung" #: view:account.entries.report:0 #: field:account.entries.report,period_id:0 #: view:account.fiscalyear:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.journal.period,period_id:0 @@ -8057,7 +8064,7 @@ msgid "Account Types" msgstr "Kontoartkonfiguration" #. module: account -#: code:addons/account/invoice.py:897 +#: code:addons/account/invoice.py:905 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "Kann keine Rechnungsbuchungen in zentralisiertem Journal durchführen" @@ -8107,6 +8114,7 @@ msgstr "Journal Gutschriften" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 +#: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" msgstr "Filter nach" @@ -8150,7 +8158,7 @@ msgid "Payment Term Line" msgstr "Zahlungsbedingungen" #. module: account -#: code:addons/account/account.py:2794 +#: code:addons/account/account.py:2838 #: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" @@ -8326,8 +8334,8 @@ msgstr "" "Bankauszug übereinstimmen." #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "Bad account!" msgstr "Falsches Konto!" @@ -8338,7 +8346,7 @@ 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:1056 +#: code:addons/account/account_move_line.py:1062 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "Die Buchungszeile (%s)" @@ -8361,6 +8369,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -8564,14 +8573,14 @@ msgid "Period from" msgstr "Gültig ab" #. module: account -#: code:addons/account/account.py:2817 +#: code:addons/account/account.py:2861 #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "Gutschriften Ausgangsrechnungen Journal" #. module: account -#: code:addons/account/account.py:927 +#: code:addons/account/account.py:941 #, python-format msgid "" "You cannot modify company of this period as its related record exist in " @@ -8621,7 +8630,7 @@ msgid "Purchase Tax(%)" msgstr "Steuer Einkauf (%)" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "Please create some invoice lines." msgstr "Bitte erstellen Sie einige Rechnungspositionen" @@ -8637,7 +8646,7 @@ msgid "Configure Your Accounting Application" msgstr "Konfigurieren Sie die Anwendungen für die Finanzbuchhaltung" #. module: account -#: code:addons/account/account.py:2820 +#: code:addons/account/account.py:2864 #: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" @@ -8682,6 +8691,7 @@ msgstr "Überwachung von Zahlungseingängen" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8691,7 +8701,7 @@ msgid "Start Period" msgstr "Start Periode" #. module: account -#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2357 #, python-format msgid "Cannot locate parent code for template account!" msgstr "Kann keine Buchung auf einem Oberkonto vonehmen." @@ -8729,7 +8739,7 @@ msgstr "" "Buchhalter verbucht und validiert die Buchungszeilen einer Rechnung. " #. module: account -#: code:addons/account/invoice.py:1008 +#: code:addons/account/invoice.py:1014 #, python-format msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " @@ -8759,7 +8769,7 @@ msgid "You can not create move line on view account." msgstr "Sie können keine Buchungen auf Konten des Typs Ansicht erstellen." #. module: account -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not confirured properly !" msgstr "Aktuelle Währung ist nicht korrekt definiert" @@ -8814,6 +8824,7 @@ msgstr "Leer lassen um das Erlöskonto zu nutzen" #: field:account.entries.report,balance:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8832,6 +8843,7 @@ msgstr "Händisch oder automatisch im System erfasst." #. module: account #: report:account.account.balance:0 +#: report:account.general.ledger_landscape:0 msgid "Display Account" msgstr "Anzeige Konten" @@ -8963,6 +8975,7 @@ msgstr "Händische Buchung" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 @@ -8970,7 +8983,7 @@ msgid "Move" msgstr "Buchung" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, 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." @@ -9070,6 +9083,7 @@ msgstr "Saldo Analytisches Konto" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -9113,7 +9127,7 @@ msgid "Account Subscription" msgstr "Konto Automatische Buchung" #. module: account -#: code:addons/account/invoice.py:717 +#: code:addons/account/invoice.py:725 #, python-format msgid "" "Tax base different !\n" @@ -9142,6 +9156,7 @@ msgstr "Eingabe automat. Buchung" #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_start:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -9170,7 +9185,7 @@ msgid "Unreconciled" msgstr "Offene Posten" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "Bad total !" msgstr "Falsche Summe!" @@ -9237,13 +9252,13 @@ msgid "Active" msgstr "Aktiv" #. module: account -#: code:addons/account/invoice.py:354 +#: code:addons/account/invoice.py:353 #, python-format msgid "Unknown Error" msgstr "Unbekannter Fehler" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "" "You cannot validate a non-balanced entry !\n" @@ -9294,10 +9309,10 @@ msgstr "Buchen" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9546,7 +9561,6 @@ msgstr "Periode auswählen" #: view:account.move:0 #: selection:account.move,state:0 #: view:account.move.line:0 -#: report:account.move.voucher:0 msgid "Posted" msgstr "Gebucht" @@ -9565,6 +9579,7 @@ msgstr "Gebucht" #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_stop:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -9618,7 +9633,7 @@ msgid "This is a model for recurring accounting entries" msgstr "Dieses ist ein Modell für wiederkehrende Buchungen." #. module: account -#: code:addons/account/account_analytic_line.py:100 +#: code:addons/account/account_analytic_line.py:99 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -9781,8 +9796,8 @@ msgid "End period" msgstr "Ende Periode" #. module: account -#: code:addons/account/account_move_line.py:738 -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:729 +#: code:addons/account/account_move_line.py:806 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_report_balance_sheet.py:70 @@ -9850,10 +9865,10 @@ msgstr "Eingangsrechnungen" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9890,7 +9905,7 @@ msgid "Recurring" msgstr "Wiederkehrend" #. module: account -#: code:addons/account/account_move_line.py:805 +#: code:addons/account/account_move_line.py:796 #, python-format msgid "Entry is already reconciled" msgstr "Buchung wurde bereits ausgeglichen" @@ -9911,7 +9926,7 @@ msgid "Range" msgstr "Bereich" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "" "Can not create an automatic sequence for this piece !\n" @@ -10052,7 +10067,7 @@ msgid "Accounts Mapping" msgstr "Zuordnung Finanzkonten" #. module: account -#: code:addons/account/invoice.py:346 +#: code:addons/account/invoice.py:345 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "Rechnung '%s' wartet auf Buchungsfreigabe." @@ -10077,7 +10092,7 @@ msgid "The income or expense account related to the selected product." msgstr "Aufwand- und Erlöskonto des Produktes" #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1123 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "" @@ -10241,7 +10256,7 @@ msgstr "Zentrales Journal" #. module: account #: report:account.overdue:0 msgid "Maturity" -msgstr "Fällig am" +msgstr "überfälllig" #. module: account #: selection:account.aged.trial.balance,direction_selection:0 @@ -10287,7 +10302,7 @@ msgid "You must enter a period length that cannot be 0 or below !" msgstr "Die Länge der Periode muss größer als 0 sein" #. module: account -#: code:addons/account/account.py:501 +#: code:addons/account/account.py:511 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "" @@ -10355,9 +10370,6 @@ msgstr "" #~ msgid "Unreconciled entries" #~ msgstr "Offene Posten" -#~ msgid "Print Taxes Report" -#~ msgstr "Druck Report Steuer" - #, python-format #~ msgid "Account move line \"%s\" is not valid" #~ msgstr "Buchungsposition \"%s\" ist ungültig" @@ -10365,9 +10377,6 @@ msgstr "" #~ msgid "Unreconcile entries" #~ msgstr "Storno Ausgleich" -#~ msgid "Confirm draft invoices" -#~ msgstr "Bestätige Entwurf Rechnung" - #~ msgid "Charts of Account" #~ msgstr "Kontenplan Finanzkonten" @@ -11825,16 +11834,6 @@ msgstr "" #~ msgid "Account Reporting - Reporting" #~ msgstr "Finanz Reporting" -#~ msgid "" -#~ "Gives the view used when writing or browsing entries in this journal. The " -#~ "view tell Open ERP which fields should be visible, required or readonly and " -#~ "in which order. You can create your own view for a faster encoding in each " -#~ "journal." -#~ msgstr "" -#~ "Definiert Felder (sichtbar, zwingend, nur lesen) für die Sicht für dieses " -#~ "Journal. Für jedes Journal können eingene Sichten erzeugt wrden um scheller " -#~ "erfassen zu können" - #~ msgid "wizard.company.setup" #~ msgstr "wizard.company.setup" @@ -12289,3 +12288,26 @@ msgstr "" #~ "dem Geschäftsjahr verwendet (Bei vorläufigem Gewinn: Betrag wird " #~ "gutgeschrieben, bei vorläufigem Verlust: Betrag wird belastet.) Der Betrag " #~ "wird durch die Auswertung Gewinn & Verlust generiert." + +#~ msgid "" +#~ "Gives the view used when writing or browsing entries in this journal. The " +#~ "view tell Open ERP which fields should be visible, required or readonly and " +#~ "in which order. You can create your own view for a faster encoding in each " +#~ "journal." +#~ msgstr "" +#~ "Zeigt an, welche Sicht genutzt wird, wenn Sie dieses Journal durchblättern " +#~ "oder etwas schreiben. Die Sichten geben Open ERP an, welche Felder sichtbar " +#~ "sein sollen, zwingend benötigt werden, ob nur lesend auf sie zugegriffen " +#~ "werden darf und in welcher Reihenfolge Sie erscheinen sollen. Sie können " +#~ "Ihre eigene Sicht erstellen, um jedes Journal schneller erfassen zu können." + +#~ msgid "Print Taxes Report" +#~ msgstr "Steuerbericht drucken" + +#, python-format +#~ msgid "" +#~ "No period defined for this date !\n" +#~ "Please create a fiscal year." +#~ msgstr "" +#~ "Kein Zeitraum für dieses Datum definiert!\n" +#~ "Bitte erzeugen Sie ein neues Geschäftsjahr." diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index e3c4f508e2f..12a1b35a98a 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-04 03:16+0000\n" -"Last-Translator: Emerson \n" +"PO-Revision-Date: 2011-07-02 18:53+0000\n" +"Last-Translator: Nédio Batista Marques \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: 2011-05-05 04:40+0000\n" -"X-Generator: Launchpad (build 12959)\n" +"X-Launchpad-Export-Date: 2011-07-03 04:46+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year" msgstr "Nenhum Livro de Encerramento definido para o Ano Fiscal." #. module: account -#: code:addons/account/account.py:506 +#: code:addons/account/account.py:516 #, python-format msgid "" "You cannot remove/deactivate an account which is set as a property to any " @@ -67,7 +67,7 @@ msgid "Residual" msgstr "Residual" #. module: account -#: code:addons/account/invoice.py:785 +#: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" msgstr "Defina uma sequencia para o diário" @@ -136,7 +136,7 @@ msgid "Accounting Entries-" msgstr "Lançamentos contábeis-" #. module: account -#: code:addons/account/account.py:1291 +#: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" msgstr "Você não pode excluir o movimento postado: \"%s\"!" @@ -182,7 +182,7 @@ msgstr "" "pagamento sem as remover." #. module: account -#: code:addons/account/invoice.py:1421 +#: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" msgstr "Aviso!" @@ -237,7 +237,7 @@ msgid "account.tax" msgstr "account.tax" #. module: account -#: code:addons/account/account.py:901 +#: code:addons/account/account.py:915 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -270,7 +270,7 @@ msgstr "" "(IVA) relativos a este código de imposto apareçam nas faturas" #. module: account -#: code:addons/account/invoice.py:1210 +#: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "Fatura '%s' é parcialmente paga: %s%s of %s%s (%s%s restantes)" @@ -286,7 +286,7 @@ msgid "Belgian Reports" msgstr "Relatórios belgas" #. module: account -#: code:addons/account/account_move_line.py:1176 +#: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "Você não pode incluir/modificar as lançamentos em um diário fechado." @@ -324,12 +324,11 @@ msgid "St." msgstr "St." #. module: account -#: code:addons/account/invoice.py:529 +#: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" -"A companhia da conta da linha da fatura, não corresponde à companhia da " -"fatura." +"A empresa da conta da linha da fatura, não corresponde à empresa da fatura." #. module: account #: field:account.journal.column,field:0 @@ -586,7 +585,7 @@ msgid "Not reconciled transactions" msgstr "Transação não conciliada" #. module: account -#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" msgstr "Balanço de Caixa não confere com Balanço Calculado" @@ -671,7 +670,7 @@ msgid "Tax Code Amount" msgstr "Valor do Código do Imposto" #. module: account -#: code:addons/account/account.py:2779 +#: code:addons/account/account.py:2823 #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" @@ -704,8 +703,8 @@ msgid "Journal Period" msgstr "Período do Diário" #. module: account -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -768,7 +767,7 @@ msgid "Analytic Entries by line" msgstr "Entradas analíticas por linha" #. module: account -#: code:addons/account/wizard/account_change_currency.py:39 +#: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice !" msgstr "É permitido alterar a moeda apenas para Fatura Rascunho" @@ -872,7 +871,7 @@ msgid "Next Partner to reconcile" msgstr "Próximo Parceiro a reconciliar" #. module: account -#: code:addons/account/account_move_line.py:1191 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "" "You can not do this modification on a confirmed entry ! Please note that you " @@ -999,11 +998,11 @@ msgid "Code" msgstr "Código" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 +#: code:addons/account/account_move_line.py:169 #: code:addons/account/invoice.py:73 -#: code:addons/account/invoice.py:670 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" @@ -1084,7 +1083,6 @@ msgstr "Lucros e Perdas (Conta de Despesas)" #. module: account #: report:account.analytic.account.journal:0 -#: report:account.move.voucher:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "-" @@ -1175,6 +1173,7 @@ msgstr "# de transações" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1182,7 +1181,7 @@ msgid "Entry Label" msgstr "Aba de lançamento" #. module: account -#: code:addons/account/account.py:976 +#: code:addons/account/account.py:990 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "" @@ -1321,7 +1320,6 @@ msgid "Journal Items Analysis" msgstr "Análise de Itens de Diário" #. module: account -#: model:ir.actions.act_window,name:account.action_partner_all #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "Parceiros" @@ -1351,7 +1349,7 @@ msgid "Central Journal" msgstr "Diário Central" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "You can not use this general account in this journal !" msgstr "Voce não pode usar esta conta geral neste diário !" @@ -1448,7 +1446,7 @@ msgid "" msgstr "Exemplo: 2% em 14 dias, restante em 30 dias no fim do mês." #. module: account -#: code:addons/account/invoice.py:815 +#: code:addons/account/invoice.py:823 #, python-format msgid "" "Cannot create the invoice !\n" @@ -1618,7 +1616,6 @@ msgid "Separated Journal Sequences" msgstr "Sequências de diário separadas" #. module: account -#: field:account.bank.statement,user_id:0 #: view:account.invoice:0 msgid "Responsible" msgstr "Responsável" @@ -1690,7 +1687,7 @@ msgid "Error! You cannot define overlapping fiscal years" msgstr "Erro! Você não pode definir anos fiscais que se sobreponham." #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:799 #, python-format msgid "The account is not defined to be reconciled !" msgstr "A conta não está definida para ser reconciliada !" @@ -1725,7 +1722,7 @@ msgid "Receivables & Payables" msgstr "Recebíveis & Pagáveis" #. module: account -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:806 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "Você tem que fornecer uma conta para o lançamento da baixa !" @@ -1761,7 +1758,7 @@ msgid "Customer Ref:" msgstr "Ref.Cliente:" #. module: account -#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:329 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "Usuário %s não possui permissões para acessar o diário %s !" @@ -1782,7 +1779,7 @@ msgid "Tax Declaration: Credit Notes" msgstr "Declaração de Impostos: Observações de Crédito" #. module: account -#: code:addons/account/account.py:499 +#: code:addons/account/account.py:509 #, python-format msgid "You cannot deactivate an account that contains account moves." msgstr "" @@ -1799,7 +1796,7 @@ msgid "You can not create move line on closed account." msgstr "Você não pode criar linhas de movimento em uma conta fechada." #. module: account -#: code:addons/account/account.py:519 +#: code:addons/account/account.py:529 #, python-format msgid "" "You cannot change the type of account from 'Closed' to any other type which " @@ -2082,7 +2079,7 @@ msgid " Journal" msgstr " Diário" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 #, python-format msgid "" "There is no default default debit account defined \n" @@ -2144,7 +2141,7 @@ msgid "Description" msgstr "Descrição" #. module: account -#: code:addons/account/account.py:2844 +#: code:addons/account/account.py:2888 #: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" @@ -2164,7 +2161,7 @@ msgid "Income Account" msgstr "Conta de Receita" #. module: account -#: code:addons/account/invoice.py:352 +#: code:addons/account/invoice.py:351 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "Não existe Diário Contábil do tipo Compra/Venda definido!" @@ -2175,6 +2172,7 @@ msgid "Accounting Properties" msgstr "Propriedades da Conta" #. module: account +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted By" @@ -2203,6 +2201,7 @@ msgstr "Modelo de produto" #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2312,7 +2311,7 @@ msgid "Account Tax Code" msgstr "Código da conta de impostos" #. module: account -#: code:addons/account/invoice.py:545 +#: code:addons/account/invoice.py:552 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" @@ -2393,7 +2392,7 @@ msgid "Account Model Entries" msgstr "Modelo de entrada de contas" #. module: account -#: code:addons/account/account.py:2796 +#: code:addons/account/account.py:2840 #: code:addons/account/installer.py:454 #, python-format msgid "EXJ" @@ -2484,7 +2483,7 @@ msgid "Accounts" msgstr "Contas" #. module: account -#: code:addons/account/invoice.py:351 +#: code:addons/account/invoice.py:350 #, python-format msgid "Configuration Error!" msgstr "Erro de Configuração!" @@ -2496,13 +2495,12 @@ msgid "Average Price" msgstr "Preço médio" #. module: account -#: report:account.move.voucher:0 #: report:account.overdue:0 msgid "Date:" msgstr "Data:" #. module: account -#: code:addons/account/account.py:640 +#: code:addons/account/account.py:654 #, python-format msgid "" "You cannot modify company of this journal as its related record exist in " @@ -2540,6 +2538,7 @@ msgstr "Desc.(%)" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2656,16 +2655,16 @@ msgid "This wizard will create recurring accounting entries" msgstr "Este assistente irá criar lançamentos contábeis periódicos" #. module: account -#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1195 #, python-format msgid "No sequence defined on the journal !" msgstr "Nenhuma seqüência definida no diário !" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 -#: code:addons/account/invoice.py:670 +#: code:addons/account/account_move_line.py:169 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2837,7 +2836,7 @@ msgid "Analytic Entries" msgstr "Lançamentos analíticos" #. module: account -#: code:addons/account/account.py:822 +#: code:addons/account/account.py:836 #, python-format msgid "" "No fiscal year defined for this date !\n" @@ -2969,7 +2968,7 @@ msgid "BNK%s" msgstr "BCO%s" #. module: account -#: code:addons/account/account.py:2906 +#: code:addons/account/account.py:2950 #: code:addons/account/installer.py:296 #, python-format msgid "BNK" @@ -3091,6 +3090,7 @@ msgstr "Deixe vazio para usar a conta de despesas" #: field:account.common.report,journal_ids:0 #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 +#: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 #: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 @@ -3151,7 +3151,7 @@ msgid "Starting Balance" msgstr "Saldo Inicial" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "No Partner Defined !" msgstr "Número do parceiro definido !" @@ -3195,7 +3195,6 @@ msgstr "Diário" #: view:account.invoice.report:0 #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 -#: report:account.move.voucher:0 #: view:account.subscription:0 #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 @@ -3249,7 +3248,7 @@ msgstr "" "que você não poderá mais alterar seus campos." #. module: account -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "Impossível excluir fatura(s) que já foram abertas ou pagas!" @@ -3312,7 +3311,7 @@ msgstr "" "'Cancelado' ou 'Concluído'!" #. module: account -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 #, python-format msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " @@ -3323,6 +3322,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "Contra-parte" @@ -3428,6 +3428,7 @@ msgstr "" #: field:account.entries.report,date:0 #: selection:account.general.journal,filter:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice.report,date:0 #: report:account.journal.period.print:0 #: view:account.move:0 @@ -3471,7 +3472,7 @@ msgid "Chart of Accounts Template" msgstr "Modelo de plano de contas" #. module: account -#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2109 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " @@ -3483,13 +3484,13 @@ msgstr "" "Por favor, defina o parceiro sobre ela!" #. module: account -#: code:addons/account/account_move_line.py:810 +#: code:addons/account/account_move_line.py:801 #, python-format msgid "Some entries are already reconciled !" msgstr "Alguns lançamentos já estão conciliados !" #. module: account -#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1218 #, python-format msgid "" "You cannot validate a Journal Entry unless all journal items are in same " @@ -3617,7 +3618,7 @@ msgid "Analytic Items" msgstr "Itens Analíticos" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "Unable to change tax !" msgstr "Não foi possível alterar o imposto!" @@ -3628,14 +3629,14 @@ msgid "#Entries" msgstr "#Entradas" #. module: account -#: code:addons/account/invoice.py:1422 +#: code:addons/account/invoice.py:1437 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." msgstr "Você selecionou uma unidade que não é compatível com o produto." #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #, python-format msgid "" "The Payment Term of Supplier does not have Payment Term Lines(Computation) " @@ -3949,7 +3950,7 @@ msgid "Acc.Type" msgstr "Tipo de Conta" #. module: account -#: code:addons/account/invoice.py:714 +#: code:addons/account/invoice.py:722 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "" @@ -4014,7 +4015,7 @@ msgstr "" "...) os quais já são gerados com status 'Postado'." #. module: account -#: code:addons/account/account_analytic_line.py:91 +#: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -4193,7 +4194,7 @@ msgid "Credit Notes" msgstr "Notas de crédito" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" @@ -4247,7 +4248,7 @@ msgstr "Taxa incluida no preço" #. module: account #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report msgid "Account Analytic Cost Ledger For Journal Report" -msgstr "" +msgstr "Livro-razão Conta Custo Analítico para o Relatório de Diários" #. module: account #: model:ir.actions.act_window,name:account.action_model_form @@ -4266,11 +4267,11 @@ msgid "Change" msgstr "Alterar" #. module: account -#: code:addons/account/account.py:1290 -#: code:addons/account/account.py:1318 -#: code:addons/account/account.py:1325 -#: code:addons/account/account_move_line.py:1055 -#: code:addons/account/invoice.py:896 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1332 +#: code:addons/account/account.py:1339 +#: code:addons/account/account_move_line.py:1061 +#: code:addons/account/invoice.py:904 #: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_fiscalyear_close.py:78 #: code:addons/account/wizard/account_fiscalyear_close.py:81 @@ -4376,7 +4377,7 @@ msgid "You must define an analytic journal of type '%s' !" msgstr "Você tem que definir um diário analítico '%s' !" #. module: account -#: code:addons/account/account.py:1397 +#: code:addons/account/account.py:1411 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " @@ -4448,7 +4449,7 @@ msgid "Invoices" msgstr "Faturas" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "" "Please verify the price of the invoice !\n" @@ -4562,25 +4563,24 @@ msgid "Third Party (Country)" msgstr "Terceiro (País)" #. module: account -#: code:addons/account/account.py:938 -#: code:addons/account/account.py:940 -#: code:addons/account/account.py:1181 -#: code:addons/account/account.py:1393 -#: code:addons/account/account.py:1397 -#: code:addons/account/account_cash_statement.py:249 -#: code:addons/account/account_move_line.py:780 -#: code:addons/account/account_move_line.py:803 -#: code:addons/account/account_move_line.py:805 -#: code:addons/account/account_move_line.py:808 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account.py:952 +#: code:addons/account/account.py:954 +#: code:addons/account/account.py:1195 +#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1411 +#: code:addons/account/account_cash_statement.py:250 +#: code:addons/account/account_move_line.py:771 +#: code:addons/account/account_move_line.py:794 +#: code:addons/account/account_move_line.py:796 +#: code:addons/account/account_move_line.py:799 +#: code:addons/account/account_move_line.py:801 +#: code:addons/account/account_move_line.py:1123 #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_change_currency.py:39 -#: code:addons/account/wizard/account_change_currency.py:60 -#: code:addons/account/wizard/account_change_currency.py:65 -#: code:addons/account/wizard/account_change_currency.py:71 +#: 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_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_report_common.py:120 #: code:addons/account/wizard/account_report_common.py:126 #, python-format @@ -4602,7 +4602,7 @@ msgid "Bank Details" msgstr "Detalhes bancários" #. module: account -#: code:addons/account/invoice.py:720 +#: code:addons/account/invoice.py:728 #, python-format msgid "Taxes missing !" msgstr "Impostos faltando!" @@ -4661,7 +4661,7 @@ msgid "Check Date not in the Period" msgstr "Verificar Data fora do Período" #. module: account -#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:1224 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -4683,7 +4683,7 @@ msgid "Child Tax Accounts" msgstr "Contas de impostos derivados (subcontas)" #. module: account -#: code:addons/account/account.py:940 +#: code:addons/account/account.py:954 #, python-format msgid "Start period should be smaller then End period" msgstr "Período Inicial deve ser anterior ao Período Final" @@ -4713,6 +4713,7 @@ msgstr "Balanço analítico -" #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 @@ -4795,7 +4796,7 @@ msgid "Line 1:" msgstr "Linha 1:" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "Integrity Error !" msgstr "Erro de integridade !" @@ -4945,7 +4946,7 @@ msgstr "" "um parceiro" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" @@ -5020,7 +5021,7 @@ msgstr "" "28/02." #. module: account -#: code:addons/account/account.py:2896 +#: code:addons/account/account.py:2940 #: code:addons/account/installer.py:283 #: code:addons/account/installer.py:295 #, python-format @@ -5048,7 +5049,7 @@ msgid "Start of period" msgstr "Início do período" #. module: account -#: code:addons/account/account_move_line.py:1193 +#: code:addons/account/account_move_line.py:1199 #, python-format msgid "" "You can not do this modification on a reconciled entry ! Please note that " @@ -5060,7 +5061,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_common_account_report msgid "Account Common Account Report" -msgstr "" +msgstr "Relatório de Contas da Contabilidade Geral" #. module: account #: field:account.bank.statement.line,name:0 @@ -5106,12 +5107,12 @@ msgstr "Diário de lançamentos do fim do ano" #. module: account #: code:addons/account/account_bank_statement.py:331 -#: code:addons/account/invoice.py:405 -#: code:addons/account/invoice.py:505 -#: code:addons/account/invoice.py:520 -#: code:addons/account/invoice.py:528 -#: code:addons/account/invoice.py:545 -#: code:addons/account/invoice.py:1347 +#: code:addons/account/invoice.py:408 +#: code:addons/account/invoice.py:508 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:531 +#: code:addons/account/invoice.py:552 +#: code:addons/account/invoice.py:1361 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -5191,7 +5192,7 @@ msgid "Sort By" msgstr "Ordenar Por" #. module: account -#: code:addons/account/account.py:1326 +#: code:addons/account/account.py:1340 #, python-format msgid "" "There is no default default credit account defined \n" @@ -5346,7 +5347,7 @@ msgid "Generate Opening Entries" msgstr "Gerar Lançamentos de Abertura" #. module: account -#: code:addons/account/account_move_line.py:738 +#: code:addons/account/account_move_line.py:729 #, python-format msgid "Already Reconciled!" msgstr "Já Reconciliado" @@ -5384,7 +5385,7 @@ msgstr "Sub-contas" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:821 #, python-format msgid "Write-Off" msgstr "Baixa ou exclusão" @@ -5433,6 +5434,8 @@ msgid "" "Streamlines invoice payment and creates hooks to plug automated payment " "systems in." msgstr "" +"Simplifica o pagamento de faturas e cria ligações com o sistema de pagamento " +"automático." #. module: account #: field:account.payment.term.line,value:0 @@ -5534,7 +5537,7 @@ msgid "# of Lines" msgstr "# de Linhas" #. module: account -#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not confirured properly !" msgstr "A nova moeda não está configurada corretamente !" @@ -5559,14 +5562,14 @@ msgid "Filter by" msgstr "Filtrar por" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not use an inactive account!" msgstr "Voce não pode usar uma conta inativa!" #. module: account -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:794 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "Lançamentos não são das mesmas contas ou já estão conciliados ! " @@ -5601,7 +5604,7 @@ msgstr "7" #. module: account #: code:addons/account/account_bank_statement.py:391 -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Invalid action !" msgstr "Ação invalida !" @@ -5821,7 +5824,7 @@ msgid "Companies" msgstr "Empresas" #. module: account -#: code:addons/account/account.py:532 +#: code:addons/account/account.py:546 #, python-format msgid "" "You cannot modify Company of account as its related record exist in Entry " @@ -6102,9 +6105,9 @@ msgid "Optional create" msgstr "Criação opcional" #. module: account -#: code:addons/account/invoice.py:406 -#: code:addons/account/invoice.py:506 -#: code:addons/account/invoice.py:1348 +#: code:addons/account/invoice.py:409 +#: code:addons/account/invoice.py:509 +#: code:addons/account/invoice.py:1362 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "" @@ -6257,8 +6260,8 @@ msgid "Analytic Entries Statistics" msgstr "Estatísticas de Lançamentos Analíticos" #. module: account -#: code:addons/account/account_analytic_line.py:143 -#: code:addons/account/account_move_line.py:905 +#: code:addons/account/account_analytic_line.py:141 +#: code:addons/account/account_move_line.py:897 #, python-format msgid "Entries: " msgstr "Lancamentos: " @@ -6269,7 +6272,7 @@ msgid "Create manual recurring entries in a chosen journal." msgstr "Criar lançamentos recorrentes manuais no diário escolhido." #. module: account -#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1407 #, python-format msgid "Couldn't create move between different companies" msgstr "Não foi possível criar movimentação entre empresas diferentes" @@ -6316,7 +6319,7 @@ msgid "Total debit" msgstr "Débito Total" #. module: account -#: code:addons/account/account_move_line.py:781 +#: code:addons/account/account_move_line.py:772 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "Lançamento \"%s\" não é válido" @@ -6386,30 +6389,31 @@ msgid " valuation: percent" msgstr " valorização: porcentagem" #. module: account -#: code:addons/account/account.py:499 -#: code:addons/account/account.py:501 -#: code:addons/account/account.py:822 -#: code:addons/account/account.py:901 -#: code:addons/account/account.py:976 -#: code:addons/account/account.py:1204 -#: code:addons/account/account.py:1210 -#: code:addons/account/account.py:2095 -#: code:addons/account/account.py:2333 -#: code:addons/account/account_analytic_line.py:90 -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account.py:509 +#: code:addons/account/account.py:511 +#: code:addons/account/account.py:836 +#: code:addons/account/account.py:915 +#: code:addons/account/account.py:990 +#: code:addons/account/account.py:1218 +#: code:addons/account/account.py:1224 +#: code:addons/account/account.py:2109 +#: code:addons/account/account.py:2357 +#: code:addons/account/account_analytic_line.py:89 +#: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:292 #: code:addons/account/account_bank_statement.py:305 #: code:addons/account/account_bank_statement.py:345 -#: code:addons/account/account_cash_statement.py:328 -#: code:addons/account/account_cash_statement.py:348 -#: code:addons/account/account_move_line.py:1176 -#: code:addons/account/account_move_line.py:1191 -#: code:addons/account/account_move_line.py:1193 -#: code:addons/account/invoice.py:785 -#: code:addons/account/invoice.py:815 -#: code:addons/account/invoice.py:1008 +#: code:addons/account/account_cash_statement.py:329 +#: code:addons/account/account_cash_statement.py:349 +#: code:addons/account/account_move_line.py:1182 +#: code:addons/account/account_move_line.py:1197 +#: code:addons/account/account_move_line.py:1199 +#: code:addons/account/invoice.py:793 +#: code:addons/account/invoice.py:823 +#: code:addons/account/invoice.py:1014 #: code:addons/account/wizard/account_invoice_refund.py:100 #: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" @@ -6529,7 +6533,7 @@ msgid "Journal Select" msgstr "Selecionar Diário" #. module: account -#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:64 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "A moeda atual não está configurada corretamente !" @@ -6546,9 +6550,11 @@ msgstr "Posição Fiscal dos Impostos" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger +#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" msgstr "Livro Razão" @@ -6609,7 +6615,7 @@ msgid "Total:" msgstr "Total:" #. module: account -#: code:addons/account/account.py:2050 +#: code:addons/account/account.py:2064 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -6646,7 +6652,7 @@ msgid "Child Codes" msgstr "Códigos derivados (sub-contas)" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" @@ -6830,7 +6836,7 @@ msgid "Lines" msgstr "Linhas" #. module: account -#: code:addons/account/invoice.py:521 +#: code:addons/account/invoice.py:524 #, python-format msgid "" "Can not find account chart for this company in invoice line account, Please " @@ -7031,7 +7037,7 @@ msgstr "" "personalizado." #. module: account -#: code:addons/account/account.py:938 +#: code:addons/account/account.py:952 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "Você deveria ter escolhido períodos que pertencem a mesma empresa" @@ -7145,7 +7151,7 @@ msgid "Sign on Reports" msgstr "Assinar relatórios" #. module: account -#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_cash_statement.py:250 #, python-format msgid "You can not have two open register for the same journal" msgstr "Você não pode ter dois registradores abertos para o mesmo diário" @@ -7180,7 +7186,6 @@ msgstr "" #. module: account #: report:account.invoice:0 #: view:account.invoice:0 -#: report:account.move.voucher:0 msgid "PRO-FORMA" msgstr "Pro-forma" @@ -7212,6 +7217,7 @@ msgstr "Informação Opcional" #. module: account #: view:account.analytic.line:0 +#: field:account.bank.statement,user_id:0 #: view:account.journal:0 #: field:account.journal,user_id:0 #: view:analytic.entries.report:0 @@ -7239,13 +7245,13 @@ msgstr "" "Você pode colocar data limite para o pagamento desta linha." #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "Bad account !" msgstr "Conta errada!" #. module: account -#: code:addons/account/account.py:2777 +#: code:addons/account/account.py:2821 #: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" @@ -7263,7 +7269,7 @@ msgid "Invoice Tax" msgstr "Taxa de fatura" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "No piece number !" msgstr "Nenhum número da parte!" @@ -7510,17 +7516,17 @@ msgid "Fixed" msgstr "Fixo" #. module: account -#: code:addons/account/account.py:506 -#: code:addons/account/account.py:519 -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:516 +#: code:addons/account/account.py:529 #: code:addons/account/account.py:532 -#: code:addons/account/account.py:640 -#: code:addons/account/account.py:927 -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 -#: code:addons/account/invoice.py:714 -#: code:addons/account/invoice.py:717 -#: code:addons/account/invoice.py:720 +#: code:addons/account/account.py:546 +#: code:addons/account/account.py:654 +#: code:addons/account/account.py:941 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/invoice.py:722 +#: code:addons/account/invoice.py:725 +#: code:addons/account/invoice.py:728 #, python-format msgid "Warning !" msgstr "Atenção !" @@ -7552,6 +7558,7 @@ msgstr "Valor (por extenso) :" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7582,7 +7589,7 @@ msgid "Can not %s draft/proforma/cancel invoice." msgstr "Não pode %s provisório/proforma/cancelar fatura." #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "No Invoice Lines !" msgstr "Sem Linhas na Fatura !" @@ -7631,7 +7638,7 @@ msgid "Deferral Method" msgstr "Método para deferimento" #. module: account -#: code:addons/account/invoice.py:359 +#: code:addons/account/invoice.py:360 #, python-format msgid "Invoice '%s' is paid." msgstr "A Fatura '%s' está paga." @@ -7696,7 +7703,7 @@ msgid "Associated Partner" msgstr "Parceiro Associado" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "You must first select a partner !" msgstr "Voce precisa selecionar um parceiro primeiro !" @@ -7766,7 +7773,7 @@ msgid "Choose Fiscal Year" msgstr "Escolha o Ano Fiscal" #. module: account -#: code:addons/account/account.py:2841 +#: code:addons/account/account.py:2885 #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" @@ -7804,6 +7811,7 @@ msgstr "Gestão Financeira e Contábil" #: view:account.entries.report:0 #: field:account.entries.report,period_id:0 #: view:account.fiscalyear:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.journal.period,period_id:0 @@ -7983,7 +7991,7 @@ msgid "Account Types" msgstr "Tipos de Conta" #. module: account -#: code:addons/account/invoice.py:897 +#: code:addons/account/invoice.py:905 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "Não é possível criar um movimento de fatura no diário centralizado" @@ -8033,6 +8041,7 @@ msgstr "Diário de Devolução" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 +#: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" msgstr "Filtrar Por" @@ -8075,7 +8084,7 @@ msgid "Payment Term Line" msgstr "Linha da forma de pagamento" #. module: account -#: code:addons/account/account.py:2794 +#: code:addons/account/account.py:2838 #: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" @@ -8247,8 +8256,8 @@ msgstr "" "O valor do recibo deve ser o mesmo valor da linha equivalente no extrato" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "Bad account!" msgstr "Conta inválida!" @@ -8259,7 +8268,7 @@ msgid "Keep empty for all open fiscal years" msgstr "Deixe vazio para todos os anos fiscais abertos" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1062 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "O movimento de conta (%s) para centralização foi confirmado!" @@ -8282,6 +8291,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -8479,14 +8489,14 @@ msgid "Period from" msgstr "Período de" #. module: account -#: code:addons/account/account.py:2817 +#: code:addons/account/account.py:2861 #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "Diário de Devolução de Vendas" #. module: account -#: code:addons/account/account.py:927 +#: code:addons/account/account.py:941 #, python-format msgid "" "You cannot modify company of this period as its related record exist in " @@ -8537,7 +8547,7 @@ msgid "Purchase Tax(%)" msgstr "Imposto de Compra(%)" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "Please create some invoice lines." msgstr "Por favor, crie algumas linhas da fatura." @@ -8553,7 +8563,7 @@ msgid "Configure Your Accounting Application" msgstr "Configure sua Aplicação Contábil" #. module: account -#: code:addons/account/account.py:2820 +#: code:addons/account/account.py:2864 #: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" @@ -8597,6 +8607,7 @@ msgstr "Gestão de Acompanhamentos" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8606,7 +8617,7 @@ msgid "Start Period" msgstr "Período Inicial" #. module: account -#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2357 #, python-format msgid "Cannot locate parent code for template account!" msgstr "Impossível localizar o código da conta pai para o modelo de conta!" @@ -8643,7 +8654,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "O Contador valida os lançamentos contábeis vindos da fatura. " #. module: account -#: code:addons/account/invoice.py:1008 +#: code:addons/account/invoice.py:1014 #, python-format msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " @@ -8673,7 +8684,7 @@ msgid "You can not create move line on view account." msgstr "Você não pode criar linhas de movimento em uma conta de exibição." #. module: account -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not confirured properly !" msgstr "A moeda atual não está configurada corretamente !" @@ -8726,6 +8737,7 @@ msgstr "Manter vazio para usar a conta de receita" #: field:account.entries.report,balance:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8744,6 +8756,7 @@ msgstr "Entrada manual ou automática no sistema" #. module: account #: report:account.account.balance:0 +#: report:account.general.ledger_landscape:0 msgid "Display Account" msgstr "Mostrar Conta" @@ -8870,6 +8883,7 @@ msgstr "Lançamento manual" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 @@ -8877,7 +8891,7 @@ msgid "Move" msgstr "Movimento" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "" @@ -8976,6 +8990,7 @@ msgstr "Balanço de Conta Analítica" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -9019,7 +9034,7 @@ msgid "Account Subscription" msgstr "Inscriçãoda conta" #. module: account -#: code:addons/account/invoice.py:717 +#: code:addons/account/invoice.py:725 #, python-format msgid "" "Tax base different !\n" @@ -9048,6 +9063,7 @@ msgstr "Inscrição de Lançamento" #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_start:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -9076,7 +9092,7 @@ msgid "Unreconciled" msgstr "Não conciliado" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "Bad total !" msgstr "Total inválido!" @@ -9134,13 +9150,13 @@ msgid "Active" msgstr "Ativo" #. module: account -#: code:addons/account/invoice.py:354 +#: code:addons/account/invoice.py:353 #, python-format msgid "Unknown Error" msgstr "Erro Desconhecido" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "" "You cannot validate a non-balanced entry !\n" @@ -9188,10 +9204,10 @@ msgstr "Validar Movimento de Conta" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9441,7 +9457,6 @@ msgstr "Selecione o período" #: view:account.move:0 #: selection:account.move,state:0 #: view:account.move.line:0 -#: report:account.move.voucher:0 msgid "Posted" msgstr "Postado" @@ -9460,6 +9475,7 @@ msgstr "Postado" #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_stop:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -9513,7 +9529,7 @@ msgid "This is a model for recurring accounting entries" msgstr "Este é um modelo para lançamentos recorrentes de contabilização" #. module: account -#: code:addons/account/account_analytic_line.py:100 +#: code:addons/account/account_analytic_line.py:99 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "Não há conta de entrada definida para este produto:\"%s\" (id:%d)" @@ -9668,8 +9684,8 @@ msgid "End period" msgstr "Período final" #. module: account -#: code:addons/account/account_move_line.py:738 -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:729 +#: code:addons/account/account_move_line.py:806 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_report_balance_sheet.py:70 @@ -9735,10 +9751,10 @@ msgstr "Fatura do fornecedor" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9775,7 +9791,7 @@ msgid "Recurring" msgstr "Recorrente" #. module: account -#: code:addons/account/account_move_line.py:805 +#: code:addons/account/account_move_line.py:796 #, python-format msgid "Entry is already reconciled" msgstr "Este lançamento já está conciliado" @@ -9796,7 +9812,7 @@ msgid "Range" msgstr "Intervalo" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "" "Can not create an automatic sequence for this piece !\n" @@ -9936,7 +9952,7 @@ msgid "Accounts Mapping" msgstr "Mapeando contas" #. module: account -#: code:addons/account/invoice.py:346 +#: code:addons/account/invoice.py:345 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "A fatura '%s' está aguardando validação." @@ -9961,7 +9977,7 @@ msgid "The income or expense account related to the selected product." msgstr "A conta de receita ou despesa relacionada ao produto selecionado." #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1123 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "A data do seu Lançamento de Diário não está no período definido!" @@ -10168,7 +10184,7 @@ msgid "You must enter a period length that cannot be 0 or below !" msgstr "Você deve digitar um período que não seja 0 ou menor !" #. module: account -#: code:addons/account/account.py:501 +#: code:addons/account/account.py:511 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "Você não pode remover uma conta que contém lançamentos! " @@ -10253,6 +10269,14 @@ msgstr "" #~ msgid "x Checks Journal" #~ msgstr "x Conferências diárias" +#, python-format +#~ msgid "" +#~ "No period defined for this date !\n" +#~ "Please create a fiscal year." +#~ msgstr "" +#~ "Nenhum período definido para esta data !\n" +#~ "Por favor crie um ano fiscal." + #~ msgid "Account No." #~ msgstr "Conta nro." @@ -10412,6 +10436,26 @@ msgstr "" #~ "Indica se o imposto deve ser incluído na base de cálculo para calcular os " #~ "próximos impostos." +#, python-format +#~ msgid "" +#~ "You can specify year, month and date in the name of the model using the " +#~ "following labels:\n" +#~ "\n" +#~ "%(year)s : To Specify Year \n" +#~ "%(month)s : To Specify Month \n" +#~ "%(date)s : Current Date\n" +#~ "\n" +#~ "e.g. My model on %(date)s" +#~ msgstr "" +#~ "Você pode especificar o ano, mês e data no nome do modelo usando as " +#~ "seguintes expressões:\n" +#~ "\n" +#~ "%(year)s : Para especificar o Ano \n" +#~ "%(month)s : Para especificar o Mês \n" +#~ "%(date)s : Data corrente\n" +#~ "\n" +#~ "ex: Meu modelo em %(date)s" + #~ msgid "Journal - Period" #~ msgstr "Dario - Período" @@ -11744,3 +11788,7 @@ msgstr "" #, python-format #~ msgid "is validated." #~ msgstr "está validada." + +#, python-format +#~ msgid "Date not in a defined fiscal year" +#~ msgstr "A data não está em um ano fiscal definido" diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index f16c1a81618..16b60927980 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-15 19:34+0000\n" -"Last-Translator: Chertykov Denis \n" +"PO-Revision-Date: 2011-06-27 05:16+0000\n" +"Last-Translator: Andrew Yashchuk \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: 2011-04-29 05:09+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year" msgstr "Не определен журнал конца года для финансового года" #. module: account -#: code:addons/account/account.py:506 +#: code:addons/account/account.py:516 #, python-format msgid "" "You cannot remove/deactivate an account which is set as a property to any " @@ -67,10 +67,10 @@ msgid "Residual" msgstr "Остаток" #. module: account -#: code:addons/account/invoice.py:785 +#: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" -msgstr "Пожалуйста, определите последовательность в журнале счетов" +msgstr "Пожалуйста, определите нумерацию в журнале счетов" #. module: account #: constraint:account.period:0 @@ -85,12 +85,12 @@ msgstr "Валюта счета" #. module: account #: view:account.tax:0 msgid "Children Definition" -msgstr "" +msgstr "Определение наследников" #. module: account #: model:ir.model,name:account.model_report_aged_receivable msgid "Aged Receivable Till Today" -msgstr "" +msgstr "Просроченная задолженность на сегодня" #. module: account #: field:account.partner.ledger,reconcil:0 @@ -127,6 +127,8 @@ 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 "" +"Если вы отмените сверку транзакций, то вы должны проверить все действия, " +"связанные с этими транзакциями так, как они не будут отключены" #. module: account #: report:account.tax.code.entries:0 @@ -134,10 +136,10 @@ msgid "Accounting Entries-" msgstr "Бухгалтерские проводки-" #. module: account -#: code:addons/account/account.py:1291 +#: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" -msgstr "Нельзя удалить проведенное перемещение: \"%s\"!" +msgstr "Нельзя удалить проведенную операцию: \"%s\"!" #. module: account #: report:account.invoice:0 @@ -176,11 +178,11 @@ msgid "" "If the active field is set to False, it will allow you to hide the payment " "term without removing it." msgstr "" -"Если поле 'Активно' имеет значение Ложь, вы сможете скрыть срок оплаты, не " -"удаляя его." +"Если поле \"Активно\" имеет значение Ложь, вы сможете скрыть условие оплаты, " +"не удаляя его." #. module: account -#: code:addons/account/invoice.py:1421 +#: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" msgstr "Предупреждение!" @@ -219,6 +221,8 @@ msgid "" "invoice) to create analytic entries, OpenERP will look for a matching " "journal of the same type." msgstr "" +"Дает тип журнала аналитики. Когда для документа (для счета) надо создать " +"проводки аналитики, OpenERP будет искать подходящий журнал такого типа." #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form @@ -232,7 +236,7 @@ msgid "account.tax" msgstr "account.tax" #. module: account -#: code:addons/account/account.py:901 +#: code:addons/account/account.py:915 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -244,7 +248,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_select msgid "Move line reconcile select" -msgstr "Выбор сверки действия" +msgstr "Выбор сверки операций" #. module: account #: help:account.model.line,sequence:0 @@ -252,8 +256,7 @@ msgid "" "The sequence field is used to order the resources from lower sequences to " "higher ones" msgstr "" -"Поле \"последовательность\" используется для сортировки. От младшего к " -"старшему." +"Поле \"нумерация\" используется для сортировки. От младшего к старшему." #. module: account #: help:account.tax.code,notprintable:0 @@ -266,7 +269,7 @@ msgstr "" "налога появился в счетах-фактурах" #. module: account -#: code:addons/account/invoice.py:1210 +#: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" msgstr "Счет '%s' оплачивается частично: %s%s из %s%s (%s%s остаток)" @@ -282,7 +285,7 @@ msgid "Belgian Reports" msgstr "Бельгийские отчеты" #. module: account -#: code:addons/account/account_move_line.py:1176 +#: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "В не можете добавить/исправить проводки в закрытом журнале" @@ -320,7 +323,7 @@ msgid "St." msgstr "ул." #. module: account -#: code:addons/account/invoice.py:529 +#: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "" @@ -336,8 +339,8 @@ msgid "" "Installs localized accounting charts to match as closely as possible the " "accounting needs of your company based on your country." msgstr "" -"Устанавливает локализованный план счетов, чтобы соответствовать как можно " -"ближе потребностям учета вашей компании на основе учета в вашей стране." +"Устанавливает локализованный план счетов для наибольшего соответствия " +"потребностям учёта в вашей организации для вашей страны." #. module: account #: code:addons/account/wizard/account_move_journal.py:63 @@ -348,6 +351,10 @@ msgid "" "You can create one in the menu: \n" "Configuration/Financial Accounting/Accounts/Journals." msgstr "" +"Не найден журнал счета типа %s для этой компании.\n" +"\n" +"Вы можете создать его в меню:\n" +"Настройки/Финансы и бухгалтерия/Журналы" #. module: account #: model:ir.model,name:account.model_account_unreconcile @@ -524,7 +531,7 @@ msgstr "Подтвердить выбранные счета" #. module: account #: field:account.addtmpl.wizard,cparent_id:0 msgid "Parent target" -msgstr "" +msgstr "Родительская цель" #. module: account #: field:account.bank.statement,account_id:0 @@ -571,7 +578,7 @@ msgid "Not reconciled transactions" msgstr "Не сверенные транзакции" #. module: account -#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" msgstr "Баланс кассы не совпадает с рассчитанным балансом !" @@ -647,7 +654,7 @@ msgstr "Централизованный журнал" #. module: account #: sql_constraint:account.sequence.fiscalyear:0 msgid "Main Sequence must be different from current !" -msgstr "" +msgstr "Основная нумерация должна отличаться от текущей!" #. module: account #: field:account.invoice.tax,tax_amount:0 @@ -655,7 +662,7 @@ msgid "Tax Code Amount" msgstr "" #. module: account -#: code:addons/account/account.py:2779 +#: code:addons/account/account.py:2823 #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" @@ -688,11 +695,12 @@ msgid "Journal Period" msgstr "Период журнала" #. module: account -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" -msgstr "Для сверки проводок компания должна быть одна во всех проводках." +msgstr "" +"Для проведения сверки, организация в проводках не должна различаться." #. module: account #: view:account.account:0 @@ -729,7 +737,7 @@ msgstr "Проверка" #. module: account #: field:account.partner.reconcile.process,today_reconciled:0 msgid "Partners Reconciled Today" -msgstr "Партнеры сверенные сегодня" +msgstr "Контрагенты сверенные сегодня" #. module: account #: selection:account.payment.term.line,value:0 @@ -750,7 +758,7 @@ msgid "Analytic Entries by line" msgstr "Аналитические проводки по строкам" #. module: account -#: code:addons/account/wizard/account_change_currency.py:39 +#: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice !" msgstr "Вы можете изменить валюту только в черновике счета !" @@ -805,7 +813,7 @@ msgstr "Вычисление срока" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 msgid "J.C./Move name" -msgstr "" +msgstr "Код журн./Операция" #. module: account #: selection:account.entries.report,month:0 @@ -834,6 +842,8 @@ msgid "" "Can not %s invoice which is already reconciled, invoice should be " "unreconciled first. You can only Refund this invoice" msgstr "" +"Нельзя \"%s\" счет, который уже сверен, сначала надо отменить сверку. Вы " +"можете только вернуть счет." #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -848,10 +858,10 @@ msgstr "Вычисления" #. module: account #: view:account.move.line:0 msgid "Next Partner to reconcile" -msgstr "Следующий партнер для сверки" +msgstr "Следующий контрагент для сверки" #. module: account -#: code:addons/account/account_move_line.py:1191 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "" "You can not do this modification on a confirmed entry ! Please note that you " @@ -937,7 +947,7 @@ msgstr "Выписка банка" #. module: account #: field:account.analytic.line,move_id:0 msgid "Move Line" -msgstr "Действие" +msgstr "Операция" #. module: account #: help:account.move.line,tax_amount:0 @@ -975,11 +985,11 @@ msgid "Code" msgstr "Код" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 +#: code:addons/account/account_move_line.py:169 #: code:addons/account/invoice.py:73 -#: code:addons/account/invoice.py:670 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" @@ -1003,7 +1013,7 @@ msgstr "Название счета." #: 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 "" +msgstr "Счет резервов и прибылей/убытков" #. module: account #: field:report.account.receivable,name:0 @@ -1040,7 +1050,7 @@ msgstr "" #. module: account #: view:account.tax:0 msgid "Applicability Options" -msgstr "" +msgstr "Опции применимости" #. module: account #: report:account.partner.balance:0 @@ -1060,7 +1070,6 @@ msgstr "Прибыль и убыток (счета расходов)" #. module: account #: report:account.analytic.account.journal:0 -#: report:account.move.voucher:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "-" @@ -1095,7 +1104,7 @@ msgstr "Подтвердить документ" #: field:account.fiscal.position.tax,tax_dest_id:0 #: field:account.fiscal.position.tax.template,tax_dest_id:0 msgid "Replacement Tax" -msgstr "" +msgstr "Замещающий налог" #. module: account #: selection:account.move.line,centralisation:0 @@ -1110,6 +1119,11 @@ msgid "" "purchase orders or receipts. This way, you can control the invoice from your " "supplier according to what you purchased or received." msgstr "" +"\"Счета поставщиков\" позволяют вам управлять счетами выставленными вашими " +"поставщиками. OpenERP может генерировать черновики счетов автоматически из " +"заказов на закупку или прихода товара. В таком случае вы можете " +"контролировать соответствие счета, полученного от поставщика, закупленному " +"или полученному." #. module: account #: view:account.invoice.cancel:0 @@ -1132,12 +1146,12 @@ msgstr "Код налога" #. module: account #: field:account.account,currency_mode:0 msgid "Outgoing Currencies Rate" -msgstr "" +msgstr "Исходящий курс валют" #. module: account #: help:account.move.line,move_id:0 msgid "The move of this entry line." -msgstr "Перемещение этой проводки." +msgstr "Операция этой проводки" #. module: account #: field:account.move.line.reconcile,trans_nbr:0 @@ -1146,6 +1160,7 @@ msgstr "# транзакции" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1153,7 +1168,7 @@ msgid "Entry Label" msgstr "Метка проводки" #. module: account -#: code:addons/account/account.py:976 +#: code:addons/account/account.py:990 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "Вы не можете изменить/удалить журнал с записями за этот период !" @@ -1291,7 +1306,6 @@ msgid "Journal Items Analysis" msgstr "Анализ элементов журнала" #. module: account -#: model:ir.actions.act_window,name:account.action_partner_all #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" msgstr "Контрагенты" @@ -1321,7 +1335,7 @@ msgid "Central Journal" msgstr "Центральный журнал" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "You can not use this general account in this journal !" msgstr "Вы не можете использовать этот общий счет в этом журнале!" @@ -1416,15 +1430,18 @@ msgstr "Возвраты поставщику" msgid "" "Example: at 14 net days 2 percents, remaining amount at 30 days end of month." msgstr "" +"Пример: 2 процента через 14 дней, остаток через 30 дней после конца месяца." #. module: account -#: code:addons/account/invoice.py:815 +#: code:addons/account/invoice.py:823 #, python-format msgid "" "Cannot create the invoice !\n" "The payment term defined gives a computed amount greater than the total " "invoiced amount." msgstr "" +"Невозможно создать счет!\n" +"Сумма, рассчитанная по условию оплаты больше чем итоговая сумма счета." #. module: account #: field:account.installer.modules,account_anglo_saxon:0 @@ -1440,7 +1457,7 @@ msgstr "Англосаксонский бухгалтерский учет" #: selection:account.fiscalyear,state:0 #: selection:account.period,state:0 msgid "Closed" -msgstr "Закрыто" +msgstr "Закрыт" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries @@ -1455,7 +1472,7 @@ msgstr "Шаблон для системы налогообложения" #. module: account #: model:account.tax.code,name:account.account_tax_code_0 msgid "Tax Code Test" -msgstr "" +msgstr "Проверка налогового кода" #. module: account #: field:account.automatic.reconcile,reconciled:0 @@ -1534,6 +1551,11 @@ msgid "" "the Payment column of a line, you can press F1 to open the reconciliation " "form." msgstr "" +"Банковская выписка является отражением всех финансовых операций, прошедших в " +"течение определенного периода по банковскому счету, кредитной карте или " +"любому другому виду финансового счета. Начальный баланс будет предложен " +"автоматически, а конечное сальдо должно быть в выписке. Когда вы находитесь " +"в столбце Оплата, вы можете нажать F1, чтобы открыть форму сверки." #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -1576,10 +1598,9 @@ msgstr "Последовательность финансовых лет" #. module: account #: field:wizard.multi.charts.accounts,seq_journal:0 msgid "Separated Journal Sequences" -msgstr "Отдельные последовательности журнала" +msgstr "Раздельные нумерации журнала" #. module: account -#: field:account.bank.statement,user_id:0 #: view:account.invoice:0 msgid "Responsible" msgstr "Ответственный" @@ -1627,7 +1648,7 @@ msgstr "Годовая сумма" #. module: account #: model:ir.actions.report.xml,name:account.report_account_voucher_new msgid "Print Voucher" -msgstr "" +msgstr "Печать ваучера" #. module: account #: view:account.change.currency:0 @@ -1641,7 +1662,7 @@ msgid "" "Have a complete tree view of all journal items per account code by clicking " "on an account." msgstr "" -"Отображение плана счетов вашей компании на финансовый год с фильтром по " +"Отображение плана счетов вашей организации на финансовый год с фильтром по " "периодам. Отображается как древовидная структура всех элементов журнала по " "коду счета при нажатии на счет." @@ -1651,7 +1672,7 @@ msgid "Error! You cannot define overlapping fiscal years" msgstr "Ошибка! Вы не можете определить перекрывающиеся отчетные года" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:799 #, python-format msgid "The account is not defined to be reconciled !" msgstr "Счет не определен для сверки !" @@ -1678,7 +1699,7 @@ msgstr "Дебет по поставщику" #. module: account #: help:account.model.line,quantity:0 msgid "The optional quantity on entries" -msgstr "" +msgstr "Необязательное количество проводок" #. module: account #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all @@ -1686,7 +1707,7 @@ msgid "Receivables & Payables" msgstr "Дебиторы и кредиторы" #. module: account -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:806 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "Вы должны указать счет для проводки списания!" @@ -1722,7 +1743,7 @@ msgid "Customer Ref:" msgstr "Ссылка на клиента:" #. module: account -#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:329 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "Пользователь %s не имеет прав доступа к журналу %s !" @@ -1743,10 +1764,10 @@ msgid "Tax Declaration: Credit Notes" msgstr "" #. module: account -#: code:addons/account/account.py:499 +#: code:addons/account/account.py:509 #, python-format msgid "You cannot deactivate an account that contains account moves." -msgstr "Вы не можете отключить счет, по которому есть движение." +msgstr "Вы не можете отключить счет, по которому есть операции." #. module: account #: field:account.move.line.reconcile,credit:0 @@ -1756,10 +1777,10 @@ msgstr "Сумма кредита" #. module: account #: constraint:account.move.line:0 msgid "You can not create move line on closed account." -msgstr "Нельзя сделать действие по закрытому счету." +msgstr "Нельзя сделать операцию по закрытому счету." #. module: account -#: code:addons/account/account.py:519 +#: code:addons/account/account.py:529 #, python-format msgid "" "You cannot change the type of account from 'Closed' to any other type which " @@ -1771,7 +1792,7 @@ msgstr "" #. module: account #: view:res.company:0 msgid "Reserve And Profit/Loss Account" -msgstr "" +msgstr "Счет резервов и прибылей/убытков" #. module: account #: sql_constraint:account.move.line:0 @@ -1788,7 +1809,7 @@ msgstr "Анализ счетов" #. module: account #: model:ir.model,name:account.model_account_period_close msgid "period close" -msgstr "" +msgstr "закрытие периода" #. module: account #: view:account.installer:0 @@ -1829,7 +1850,7 @@ msgstr "Финансовый анализ" #. module: account #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "Ошибка! Вы не можете создавать рекурсивные компании." +msgstr "Ошибка ! Нельзя создать организации рекурсивно." #. module: account #: view:account.analytic.account:0 @@ -1902,7 +1923,8 @@ msgid "" "It adds the currency column if the currency is different then the company " "currency" msgstr "" -"Добавляет столбец валюты , если валюта отличается, от валюты компании." +"Добавляет столбец валюты. Если валюта отличается — указывается валюта " +"организации" #. module: account #: help:account.journal,allow_date:0 @@ -1952,6 +1974,9 @@ msgid "" "be with same name as statement name. This allows the statement entries to " "have the same references than the statement itself" msgstr "" +"Если вы вводите название отличное от \"/\", то созданные операции проводок " +"будут иметь названия как у документа. Это позволяет проводкам в документе " +"иметь названия как и у самого документа" #. module: account #: model:ir.actions.act_window,name:account.action_account_unreconcile @@ -2039,7 +2064,7 @@ msgid " Journal" msgstr " журнал" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 #, python-format msgid "" "There is no default default debit account defined \n" @@ -2059,6 +2084,10 @@ msgid "" "partners accounts (for debit/credit computations), closed for depreciated " "accounts." msgstr "" +"Этот тип используется, чтобы различать типы со специальными эффектами в " +"OpenERP: вид - не может иметь проводок, объединение - счета которые могут " +"иметь субсчета для консолидации нескольких компаний, кредитовые/дебетовые - " +"для контрагентов (вычисление задолженностей), закрыт - для ненужных счетов." #. module: account #: view:account.chart.template:0 @@ -2096,7 +2125,7 @@ msgid "Description" msgstr "Описание" #. module: account -#: code:addons/account/account.py:2844 +#: code:addons/account/account.py:2888 #: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" @@ -2116,7 +2145,7 @@ msgid "Income Account" msgstr "Cчёт доходов и расходов" #. module: account -#: code:addons/account/invoice.py:352 +#: code:addons/account/invoice.py:351 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "Не определен журнал покупок / продаж." @@ -2127,6 +2156,7 @@ msgid "Accounting Properties" msgstr "Установки бухгалтерии" #. module: account +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted By" @@ -2155,6 +2185,7 @@ msgstr "Шаблон продукта" #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2206,7 +2237,7 @@ msgstr "Основная Последовательность" #: model:ir.model,name:account.model_account_payment_term #: field:res.partner,property_payment_term:0 msgid "Payment Term" -msgstr "Условия оплаты" +msgstr "Условие оплаты" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form @@ -2264,7 +2295,7 @@ msgid "Account Tax Code" msgstr "Код налогового счёта" #. module: account -#: code:addons/account/invoice.py:545 +#: code:addons/account/invoice.py:552 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" @@ -2272,6 +2303,10 @@ msgid "" "You can create one in the menu: \n" "Configuration\\Financial Accounting\\Accounts\\Journals." msgstr "" +"Для этой компании не найден журнал типа %s.\n" +"\n" +"Вы можете создать его в меню:\n" +"Настройка\\Финансы и бухгалтерия\\Счета\\Журналы." #. module: account #: field:account.invoice.tax,base_code_id:0 @@ -2326,7 +2361,7 @@ msgstr "День" #. module: account #: model:ir.actions.act_window,name:account.act_account_renew_view msgid "Accounts to Renew" -msgstr "" +msgstr "Счета для обновления" #. module: account #: model:ir.model,name:account.model_account_model_line @@ -2334,11 +2369,11 @@ msgid "Account Model Entries" msgstr "Проводки модели счета" #. module: account -#: code:addons/account/account.py:2796 +#: code:addons/account/account.py:2840 #: code:addons/account/installer.py:454 #, python-format msgid "EXJ" -msgstr "" +msgstr "ЖР" #. module: account #: field:product.template,supplier_taxes_id:0 @@ -2354,11 +2389,10 @@ msgid "" "date empty, it means direct payment. The payment term may compute several " "due dates, for example 50% now, 50% in one month." msgstr "" -"При использовании условий платежа, дата валютирования будет сгенерирована " -"автоматически при создании проводок. Если вы оставляете условия платежа и " -"дату валютирования незаполненными - это будет подразумевать прямой платеж. " -"Условия платежа могут включать в себя несколько дат валютирования, например " -"50% сегодня, 50% в следующем месяце." +"При использовании условий оплаты, срок будет вычислен автоматически при " +"создании проводок. Если вы оставляете условие оплаты и срок незаполненными - " +"это будет подразумевать прямой платеж. Условие оплаты может включать в себя " +"несколько сроков, например 50% сразу, 50% в этом месяце." #. module: account #: view:account.analytic.cost.ledger.journal.report:0 @@ -2373,7 +2407,7 @@ msgstr "Выписки" #. module: account #: report:account.analytic.account.journal:0 msgid "Move Name" -msgstr "Имя перемещения" +msgstr "Название операции" #. module: account #: help:res.partner,property_account_position:0 @@ -2425,7 +2459,7 @@ msgid "Accounts" msgstr "Счета" #. module: account -#: code:addons/account/invoice.py:351 +#: code:addons/account/invoice.py:350 #, python-format msgid "Configuration Error!" msgstr "Ошибка конфигурации!" @@ -2437,20 +2471,19 @@ msgid "Average Price" msgstr "Средняя цена" #. module: account -#: report:account.move.voucher:0 #: report:account.overdue:0 msgid "Date:" msgstr "Дата:" #. module: account -#: code:addons/account/account.py:640 +#: code:addons/account/account.py:654 #, python-format msgid "" "You cannot modify company of this journal as its related record exist in " "Entry Lines" msgstr "" -"Вы не можете изменить компанию этого журнала, так как существуют связанные с " -"ним проводки." +"Вы не можете изменять организацию, связанную с этим журналом, так как " +"существуют связанные с ним проводки." #. module: account #: report:account.journal.period.print:0 @@ -2477,10 +2510,11 @@ msgstr "Сверка банковской выписки" #. module: account #: report:account.invoice:0 msgid "Disc.(%)" -msgstr "Скид.(%)" +msgstr "Скидка (%)" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2549,7 +2583,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_aged_balance_view #: model:ir.ui.menu,name:account.menu_aged_trial_balance msgid "Aged Partner Balance" -msgstr "" +msgstr "Баланс партнера по периодам" #. module: account #: model:process.transition,name:account.process_transition_entriesreconcile0 @@ -2580,7 +2614,7 @@ msgstr "" #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble msgid "New Company Financial Setting" -msgstr "Финансовые настройки новой компании" +msgstr "Финансовые настройки новой организации" #. module: account #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all @@ -2595,16 +2629,16 @@ msgid "This wizard will create recurring accounting entries" msgstr "Этот мастер создаст повторяющиеся бухгалтерские проводки" #. module: account -#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1195 #, python-format msgid "No sequence defined on the journal !" msgstr "Нумерация в журнале не определена !" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 -#: code:addons/account/invoice.py:670 +#: code:addons/account/account_move_line.py:169 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2677,11 +2711,14 @@ msgid "" "The optional quantity expressed by this line, eg: number of product sold. " "The quantity is not a legal requirement but is very useful for some reports." msgstr "" +"Необязательное количество отраженное в этой строке, например, количество " +"проданных товаров. Количество не является обязательным, но оно очень полезно " +"для некоторых отчетов." #. module: account #: view:account.payment.term.line:0 msgid "Line 2:" -msgstr "" +msgstr "Строка 2:" #. module: account #: field:account.journal.column,required:0 @@ -2710,7 +2747,7 @@ msgstr "" #. module: account #: field:account.invoice.tax,base_amount:0 msgid "Base Code Amount" -msgstr "" +msgstr "Сумма по основному коду" #. module: account #: field:wizard.multi.charts.accounts,sale_tax:0 @@ -2724,6 +2761,8 @@ msgid "" "between the creation date or the creation date of the entries plus the " "partner payment terms." msgstr "" +"Дата проведения созданных проводок для этой модели. Вы можете выбрать между " +"датой создания и датой создания проводок плюс условия оплаты партнера." #. module: account #: model:ir.ui.menu,name:account.menu_finance_accounting @@ -2757,6 +2796,8 @@ msgid "" "It adds initial balance row on report which display previous sum amount of " "debit/credit/balance" msgstr "" +"Добавляет колонку начального баланса к отчету который выводит предыдущую " +"сумму дебета/кредита/баланса." #. module: account #: view:account.analytic.line:0 @@ -2765,7 +2806,7 @@ msgid "Analytic Entries" msgstr "Проводки аналитического учета" #. module: account -#: code:addons/account/account.py:822 +#: code:addons/account/account.py:836 #, python-format msgid "" "No fiscal year defined for this date !\n" @@ -2897,7 +2938,7 @@ msgid "BNK%s" msgstr "БНК%s" #. module: account -#: code:addons/account/account.py:2906 +#: code:addons/account/account.py:2950 #: code:addons/account/installer.py:296 #, python-format msgid "BNK" @@ -2921,12 +2962,12 @@ msgstr "Кредит контрагенту" #. module: account #: model:ir.model,name:account.model_account_tax_code_template msgid "Tax Code Template" -msgstr "" +msgstr "Шаблон налогового кода" #. module: account #: view:account.subscription:0 msgid "Starts on" -msgstr "" +msgstr "Начинается с" #. module: account #: model:ir.model,name:account.model_account_partner_ledger @@ -2948,7 +2989,7 @@ msgstr "Налоговая декларация" #: help:account.account.template,currency_id:0 #: help:account.bank.accounts.wizard,currency_id:0 msgid "Forces all moves for this account to have this secondary currency." -msgstr "" +msgstr "Все операции по этому счету принудительно будут иметь вторую валюту." #. module: account #: model:ir.actions.act_window,help:account.action_validate_account_move_line @@ -2956,6 +2997,8 @@ msgid "" "This wizard will validate all journal entries of a particular journal and " "period. Once journal entries are validated, you can not update them anymore." msgstr "" +"Этот мастер утверждает все проводки журнала для конкретного журнала и " +"периода. После утверждения проводок вы не сможете их изменить." #. module: account #: model:ir.actions.act_window,name:account.action_account_chart_template_form @@ -3006,6 +3049,7 @@ msgstr "Оставьте пустым для использования счет #: field:account.common.report,journal_ids:0 #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 +#: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 #: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 @@ -3066,7 +3110,7 @@ msgid "Starting Balance" msgstr "Начальный баланс" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "No Partner Defined !" msgstr "Партнер не определен!" @@ -3094,6 +3138,7 @@ msgid "" "The amount expressed in the related account currency if not equal to the " "company one." msgstr "" +"Сумма выражена в валюте связанного счета, если не равна валюте компании." #. module: account #: report:account.move.voucher:0 @@ -3108,7 +3153,6 @@ msgstr "Журнал:" #: view:account.invoice.report:0 #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 -#: report:account.move.voucher:0 #: view:account.subscription:0 #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 @@ -3162,7 +3206,7 @@ msgstr "" "больше не сможете изменять их бухгалтерские поля." #. module: account -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "Нельзя удалить открытый или оплаченный счет !" @@ -3180,7 +3224,7 @@ msgstr "Переводы" #. module: account #: view:account.payment.term.line:0 msgid " value amount: n.a" -msgstr "" +msgstr " значение суммы: неопределено" #. module: account #: view:account.chart:0 @@ -3200,7 +3244,7 @@ msgstr "Ваши банковские и денежные счета" #. module: account #: view:account.move:0 msgid "Search Move" -msgstr "Искать проводку" +msgstr "Искать операцию" #. module: account #: field:account.tax.code,name:0 @@ -3225,7 +3269,7 @@ msgstr "" "состоянии \"Отменено\" или \"Сделано\" !" #. module: account -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 #, python-format msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " @@ -3235,6 +3279,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "Корреспондирующая сторона" @@ -3340,6 +3385,7 @@ msgstr "" #: field:account.entries.report,date:0 #: selection:account.general.journal,filter:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice.report,date:0 #: report:account.journal.period.print:0 #: view:account.move:0 @@ -3383,22 +3429,24 @@ msgid "Chart of Accounts Template" msgstr "Шаблон плана счетов" #. module: account -#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2109 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " "based on partner payment term!\n" "Please define partner on it!" msgstr "" +"Дата исполнения проводки созданной строкой \"%s\" модели \"%s\" основана на " +"условии оплаты контрагента." #. module: account -#: code:addons/account/account_move_line.py:810 +#: code:addons/account/account_move_line.py:801 #, python-format msgid "Some entries are already reconciled !" msgstr "Некоторые записи уже сверены!" #. module: account -#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1218 #, python-format msgid "" "You cannot validate a Journal Entry unless all journal items are in same " @@ -3479,7 +3527,7 @@ msgstr "Судебный спор" #. module: account #: view:account.analytic.line:0 msgid "Search Analytic Lines" -msgstr "" +msgstr "Искать проводки аналитики" #. module: account #: field:res.partner,property_account_payable:0 @@ -3491,8 +3539,8 @@ msgstr "Счета к оплате" msgid "" "You cannot create entries on different periods/journals in the same move" msgstr "" -"Вы не можете создавать проводки по разным периодам / журналам в одном " -"действии." +"Вы не можете создавать проводки по разным периодам / журналам в одной " +"операции." #. module: account #: model:process.node,name:account.process_node_supplierpaymentorder0 @@ -3523,7 +3571,7 @@ msgid "Analytic Items" msgstr "Элементы аналитики" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "Unable to change tax !" msgstr "Невозможно изменить налог !" @@ -3534,19 +3582,20 @@ msgid "#Entries" msgstr "#Проводок" #. module: account -#: code:addons/account/invoice.py:1422 +#: code:addons/account/invoice.py:1437 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." msgstr "Вы выбрали единицу измерения не совместимую с ТМЦ." #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #, python-format msgid "" "The Payment Term of Supplier does not have Payment Term Lines(Computation) " "defined !" msgstr "" +"Условие оплаты поставщика не содержит строк условий оплаты(расчетов)!" #. module: account #: view:account.state.open:0 @@ -3584,7 +3633,7 @@ msgstr "" #. module: account #: field:account.move.line,date:0 msgid "Effective date" -msgstr "Действительно до" +msgstr "Дата вступления в силу" #. module: account #: code:addons/account/wizard/account_move_bank_reconcile.py:53 @@ -3605,7 +3654,7 @@ msgstr "Журнал аналитических проводок" #: view:product.template:0 #: view:res.partner:0 msgid "Accounting" -msgstr "Бухгалтерия" +msgstr "Учёт" #. module: account #: help:account.central.journal,amount_currency:0 @@ -3616,6 +3665,7 @@ msgid "" "Print Report with the currency column if the currency is different then the " "company currency" msgstr "" +"Печать отчета с колонкой валюты, если валюта отличается от валюты компании" #. module: account #: view:account.analytic.line:0 @@ -3669,6 +3719,8 @@ msgstr "Утвердить" #: sql_constraint:account.model.line:0 msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!" msgstr "" +"В модели указано неверное значение прихода или расхода (Приход или Расход " +"должен быть равен \"0\")!" #. module: account #: model:ir.actions.act_window,help:account.action_account_invoice_report_all @@ -3807,6 +3859,8 @@ msgid "" "This account will be used to value outgoing stock for the current product " "category using sale price" msgstr "" +"Этот счет будет использоваться для стоимости исходящих ТМЦ для текущей " +"категории ТМЦ продажной цене" #. module: account #: selection:account.automatic.reconcile,power:0 @@ -3819,6 +3873,8 @@ msgid "" "Analytic costs (timesheets, some purchased products, ...) come from analytic " "accounts. These generate draft supplier invoices." msgstr "" +"Анализ себестоимости (учет времени, некоторой закупаемой продукции, ...) " +"берется из счетов аналитики. Генерирует черновик счетов поставщика." #. module: account #: view:account.bank.statement:0 @@ -3837,7 +3893,7 @@ msgid "Acc.Type" msgstr "Тип счета" #. module: account -#: code:addons/account/invoice.py:714 +#: code:addons/account/invoice.py:722 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "" @@ -3883,7 +3939,7 @@ msgstr "Позиции налога" #. module: account #: field:account.tax,base_code_id:0 msgid "Account Base Code" -msgstr "" +msgstr "Основной код счёта" #. module: account #: help:account.move,state:0 @@ -3894,9 +3950,14 @@ msgid "" "the system on document validation (invoices, bank statements...) and will be " "created in 'Posted' state." msgstr "" +"Все созданные вручную новые проводки в журнале обычно в состоянии \"Не " +"проведено\", но вы можете установить опцию для пропуска этого состояния в " +"журнале. Проводки в этом случае, как и создаваемые системой при обработке " +"документов (счетов, банковских выписок, ...), будут создаваться со статусом " +"\"Проведено\"." #. module: account -#: code:addons/account/account_analytic_line.py:91 +#: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "Счет расходов не определен для этого товара: \"%s\" (id:%d)" @@ -3949,7 +4010,7 @@ msgstr "Ошибка ! Неверная продолжительность фи #. module: account #: field:report.aged.receivable,name:0 msgid "Month Range" -msgstr "" +msgstr "Месячный период" #. module: account #: help:account.analytic.balance,empty_acc:0 @@ -3983,7 +4044,7 @@ 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 "" -"Когда новое перемещение создается, его состояние 'Черновик'.\n" +"Когда новая операция создается, ее состояние 'Черновик'.\n" "* Когда все платежи произведены состояние будет 'Проведено'." #. module: account @@ -3994,7 +4055,7 @@ msgstr "Режим вывода" #. module: account #: model:process.node,note:account.process_node_importinvoice0 msgid "Statement from invoice or payment" -msgstr "" +msgstr "Документ из счета или платежа" #. module: account #: view:account.payment.term.line:0 @@ -4032,7 +4093,7 @@ msgstr "Банковские выписки введены в систему." #: code:addons/account/wizard/account_reconcile.py:133 #, python-format msgid "Reconcile Writeoff" -msgstr "" +msgstr "Сверить списание" #. module: account #: field:account.model.line,date_maturity:0 @@ -4070,10 +4131,10 @@ msgstr "Печать счета" #. module: account #: view:account.tax.template:0 msgid "Credit Notes" -msgstr "" +msgstr "Кредит-ноты" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" @@ -4146,11 +4207,11 @@ msgid "Change" msgstr "Изменить" #. module: account -#: code:addons/account/account.py:1290 -#: code:addons/account/account.py:1318 -#: code:addons/account/account.py:1325 -#: code:addons/account/account_move_line.py:1055 -#: code:addons/account/invoice.py:896 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1332 +#: code:addons/account/account.py:1339 +#: code:addons/account/account_move_line.py:1061 +#: code:addons/account/invoice.py:904 #: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_fiscalyear_close.py:78 #: code:addons/account/wizard/account_fiscalyear_close.py:81 @@ -4164,7 +4225,7 @@ msgstr "UserError" #. module: account #: field:account.journal,type_control_ids:0 msgid "Type Controls" -msgstr "" +msgstr "Контроль типа" #. module: account #: help:account.journal,default_credit_account_id:0 @@ -4221,14 +4282,14 @@ msgstr "Генерировать проводки" #. module: account #: help:account.vat.declaration,chart_tax_id:0 msgid "Select Charts of Taxes" -msgstr "" +msgstr "Выбрать налоговые планы счетов" #. module: account #: view:account.fiscal.position:0 #: field:account.fiscal.position,account_ids:0 #: field:account.fiscal.position.template,account_ids:0 msgid "Account Mapping" -msgstr "" +msgstr "Отображение счета" #. module: account #: selection:account.bank.statement.line,type:0 @@ -4256,13 +4317,16 @@ msgid "You must define an analytic journal of type '%s' !" msgstr "Вы должны определить журнал аналитики типа '%s' !" #. module: account -#: code:addons/account/account.py:1397 +#: code:addons/account/account.py:1411 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " "the account \"%s - %s\". Clear the secondary currency field of the account " "definition if you want to accept all currencies." msgstr "" +"Нельзя сделать операцию по счету с валютой отличной от второй валюты счета " +"\"%s - %s\". Очистите поле ввода второй валюты в форме ввода счета, если " +"желаете использовать все валюты." #. module: account #: field:account.invoice.refund,date:0 @@ -4323,7 +4387,7 @@ msgid "Invoices" msgstr "Счета" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "" "Please verify the price of the invoice !\n" @@ -4434,28 +4498,27 @@ msgstr "Баланс (счета активов)" #. module: account #: report:account.tax.code.entries:0 msgid "Third Party (Country)" -msgstr "" +msgstr "Третье лицо (Страна)" #. module: account -#: code:addons/account/account.py:938 -#: code:addons/account/account.py:940 -#: code:addons/account/account.py:1181 -#: code:addons/account/account.py:1393 -#: code:addons/account/account.py:1397 -#: code:addons/account/account_cash_statement.py:249 -#: code:addons/account/account_move_line.py:780 -#: code:addons/account/account_move_line.py:803 -#: code:addons/account/account_move_line.py:805 -#: code:addons/account/account_move_line.py:808 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account.py:952 +#: code:addons/account/account.py:954 +#: code:addons/account/account.py:1195 +#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1411 +#: code:addons/account/account_cash_statement.py:250 +#: code:addons/account/account_move_line.py:771 +#: code:addons/account/account_move_line.py:794 +#: code:addons/account/account_move_line.py:796 +#: code:addons/account/account_move_line.py:799 +#: code:addons/account/account_move_line.py:801 +#: code:addons/account/account_move_line.py:1123 #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_change_currency.py:39 -#: code:addons/account/wizard/account_change_currency.py:60 -#: code:addons/account/wizard/account_change_currency.py:65 -#: code:addons/account/wizard/account_change_currency.py:71 +#: 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_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_report_common.py:120 #: code:addons/account/wizard/account_report_common.py:126 #, python-format @@ -4477,7 +4540,7 @@ msgid "Bank Details" msgstr "Банковская информация" #. module: account -#: code:addons/account/invoice.py:720 +#: code:addons/account/invoice.py:728 #, python-format msgid "Taxes missing !" msgstr "Налоги отсутствуют !" @@ -4513,13 +4576,13 @@ msgstr "Закрыть" #. module: account #: field:account.bank.statement.line,move_ids:0 msgid "Moves" -msgstr "Проводки" +msgstr "Операции" #. module: account #: 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 "" +msgstr "Декларация НДС счета" #. module: account #: view:account.period:0 @@ -4529,10 +4592,10 @@ msgstr "Закрыть" #. module: account #: field:account.journal,allow_date:0 msgid "Check Date not in the Period" -msgstr "" +msgstr "Дата проверки не входит в период" #. module: account -#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:1224 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -4554,7 +4617,7 @@ msgid "Child Tax Accounts" msgstr "" #. module: account -#: code:addons/account/account.py:940 +#: code:addons/account/account.py:954 #, python-format msgid "Start period should be smaller then End period" msgstr "Начало периода должно быть меньше, чем конец периода" @@ -4584,6 +4647,7 @@ msgstr "Остаток по аналитике" #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 @@ -4597,7 +4661,7 @@ msgstr "Остаток по аналитике" #: report:account.third_party_ledger_other:0 #: field:account.vat.declaration,target_move:0 msgid "Target Moves" -msgstr "Цель перемещений" +msgstr "Цель операции" #. module: account #: field:account.subscription,period_type:0 @@ -4625,7 +4689,7 @@ msgstr "Проводка" #: field:account.tax,python_compute_inv:0 #: field:account.tax.template,python_compute_inv:0 msgid "Python Code (reverse)" -msgstr "" +msgstr "Код на Python (реверс)" #. module: account #: model:ir.actions.act_window,name:account.action_payment_term_form @@ -4642,7 +4706,7 @@ msgstr "Название столбца" #: view:account.general.journal:0 msgid "" "This report gives you an overview of the situation of your general journals" -msgstr "" +msgstr "Этот доклад дает вам обзор ситуации по общим журналам" #. module: account #: field:account.entries.report,year:0 @@ -4663,10 +4727,10 @@ msgstr "Открытие кассы" #. module: account #: view:account.payment.term.line:0 msgid "Line 1:" -msgstr "" +msgstr "Строка 1:" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "Integrity Error !" msgstr "Ошибка целостности!" @@ -4695,7 +4759,7 @@ msgstr "Описание счетов" #. module: account #: field:account.partner.reconcile.process,next_partner_id:0 msgid "Next Partner to Reconcile" -msgstr "Следующий партнер для сверки" +msgstr "Следующий контрагент для сверки" #. module: account #: field:account.invoice.tax,account_id:0 @@ -4811,10 +4875,11 @@ msgstr "Налог на детей" #: constraint:account.move.line:0 msgid "" "You can not create move line on receivable/payable account without partner" -msgstr "Нельзя сделать действие по дебетовому/кредитовому счету без партнера" +msgstr "" +"Нельзя сделать действие по дебетовому/кредитовому счету без контрагента" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" @@ -4884,9 +4949,11 @@ 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 "" +"Количество дней для добавления перед вычислением дня месяца. Если " +"дата=15/01, количество дней=22, день месяца=-1, то срок 28/02." #. module: account -#: code:addons/account/account.py:2896 +#: code:addons/account/account.py:2940 #: code:addons/account/installer.py:283 #: code:addons/account/installer.py:295 #, python-format @@ -4914,7 +4981,7 @@ msgid "Start of period" msgstr "Начало периода" #. module: account -#: code:addons/account/account_move_line.py:1193 +#: code:addons/account/account_move_line.py:1199 #, python-format msgid "" "You can not do this modification on a reconciled entry ! Please note that " @@ -4972,12 +5039,12 @@ msgstr "Журнал проводок конца года" #. module: account #: code:addons/account/account_bank_statement.py:331 -#: code:addons/account/invoice.py:405 -#: code:addons/account/invoice.py:505 -#: code:addons/account/invoice.py:520 -#: code:addons/account/invoice.py:528 -#: code:addons/account/invoice.py:545 -#: code:addons/account/invoice.py:1347 +#: code:addons/account/invoice.py:408 +#: code:addons/account/invoice.py:508 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:531 +#: code:addons/account/invoice.py:552 +#: code:addons/account/invoice.py:1361 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -5054,7 +5121,7 @@ msgid "Sort By" msgstr "Сортировать по" #. module: account -#: code:addons/account/account.py:1326 +#: code:addons/account/account.py:1340 #, python-format msgid "" "There is no default default credit account defined \n" @@ -5066,7 +5133,7 @@ msgstr "" #: field:account.model.line,amount_currency:0 #: field:account.move.line,amount_currency:0 msgid "Amount Currency" -msgstr "Валюта суммы" +msgstr "Сумма в валюте" #. module: account #: code:addons/account/wizard/account_validate_account_move.py:39 @@ -5100,7 +5167,7 @@ msgstr "Количество" #. module: account #: view:account.move.line:0 msgid "Number (Move)" -msgstr "Номер (перемещение)" +msgstr "Операция" #. module: account #: view:account.invoice.refund:0 @@ -5120,8 +5187,8 @@ msgid "" "The sequence field is used to order the payment term lines from the lowest " "sequences to the higher ones" msgstr "" -"Поле \"последовательность\" используется для упорядочения строк в платежном " -"документе от наименьшего номера к наибольшему" +"Поле \"последовательность\" используется для упорядочения строк в условии " +"оплаты от наименьшего номера к наибольшему" #. module: account #: view:account.fiscal.position.template:0 @@ -5195,7 +5262,7 @@ msgstr "Элемент журнала" #. module: account #: model:ir.model,name:account.model_account_move_journal msgid "Move journal" -msgstr "" +msgstr "Журнал операций" #. module: account #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close @@ -5204,7 +5271,7 @@ msgid "Generate Opening Entries" msgstr "Генерировать открывающие проводки" #. module: account -#: code:addons/account/account_move_line.py:738 +#: code:addons/account/account_move_line.py:729 #, python-format msgid "Already Reconciled!" msgstr "Уже сверено !" @@ -5240,7 +5307,7 @@ msgstr "Подчиненный счет" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:821 #, python-format msgid "Write-Off" msgstr "Списание" @@ -5314,7 +5381,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_state_open #: model:ir.model,name:account.model_account_state_open msgid "Account State Open" -msgstr "" +msgstr "Состояние счета открытый" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 @@ -5338,6 +5405,8 @@ msgid "" "document shows your debit and credit taking in consideration some criteria " "you can choose by using the search tool." msgstr "" +"Этот вид предназначен для анализа различных финансовых счетов. Документ " +"показывает дебет и кредит в соответствии с выбранными критериями поиска." #. module: account #: model:ir.actions.act_window,help:account.action_tax_code_list @@ -5353,6 +5422,9 @@ msgid "" "Shows you the progress made today on the reconciliation process. Given by \n" "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)" msgstr "" +"Показывает прогресс, достигнутый сегодня по сверке. Определяется как\n" +"Контрагенты сверенные сегодня / (Оставшиеся контрагенты + Контрагенты " +"сверенные сегодня)" #. module: account #: help:account.payment.term.line,value:0 @@ -5361,6 +5433,9 @@ msgid "" "that you should have your last line with the type 'Balance' to ensure that " "the whole amount will be threated." msgstr "" +"Выберите вид расчета относящийся к этой строке условия оплаты. Отметим, что " +"последняя строка должна быть с типом \"Баланс\" для проверки обработки всей " +"суммы." #. module: account #: field:account.invoice,period_id:0 @@ -5377,7 +5452,7 @@ msgid "# of Lines" msgstr "# строк" #. module: account -#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not confirured properly !" msgstr "Новая валюта неправильно настроена !" @@ -5402,14 +5477,14 @@ msgid "Filter by" msgstr "Фильтровать по" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not use an inactive account!" msgstr "Нельзя использовать неактивный счет !" #. module: account -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:794 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "Проводки не по одному счету и тому же счету или уже сверены! " @@ -5444,7 +5519,7 @@ msgstr "7" #. module: account #: code:addons/account/account_bank_statement.py:391 -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Invalid action !" msgstr "Invalid action !" @@ -5513,7 +5588,7 @@ msgstr "не реализовано" #. module: account #: help:account.journal,company_id:0 msgid "Company related to this journal" -msgstr "Компания связанная с этим журналом" +msgstr "Организация, связанная с этим журналом" #. module: account #: code:addons/account/wizard/account_invoice_state.py:44 @@ -5561,6 +5636,10 @@ msgid "" "line of the expense account. OpenERP will propose to you automatically the " "Tax related to this account and the counterpart \"Account Payable\"." msgstr "" +"Здесь можно быстро вводить бухгалтерские проводки. Если вы хотите отразить " +"счет-фактуру поставщика, начните с записи движения по счету расходов. " +"OpenERP автоматически предложит вам налог, относящийся к этому счету и " +"корреспондирующий счет \"Кредиторская задолженность\"." #. module: account #: field:account.entries.report,date_created:0 @@ -5578,6 +5657,7 @@ msgid "" "The code will be used to generate the numbers of the journal entries of this " "journal." msgstr "" +"Код будет использоваться для генерации номеров записей этого журнала." #. module: account #: view:account.invoice:0 @@ -5613,7 +5693,7 @@ msgstr "Дата последней сверки" #. module: account #: model:ir.model,name:account.model_account_analytic_line msgid "Analytic Line" -msgstr "" +msgstr "Позиция аналитики" #. module: account #: field:product.template,taxes_id:0 @@ -5634,7 +5714,7 @@ msgstr "Настройка отчетов" #. module: account #: constraint:account.move.line:0 msgid "Company must be same for its related account and period." -msgstr "Для счета и периода должна быть одна компания." +msgstr "Для счета и периода должна быть одна организация." #. module: account #: field:account.tax,type:0 @@ -5646,25 +5726,27 @@ msgstr "Тип налога" #: 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 "Счет: Шаблоны" +msgstr "Шаблоны счетов" #. module: account #: report:account.vat.declaration:0 msgid "Tax Statement" -msgstr "" +msgstr "Налоговая декларация" #. module: account #: model:ir.model,name:account.model_res_company msgid "Companies" -msgstr "Компании" +msgstr "Организации" #. module: account -#: code:addons/account/account.py:532 +#: code:addons/account/account.py:546 #, python-format msgid "" "You cannot modify Company of account as its related record exist in Entry " "Lines" msgstr "" +"Нельзя изменить компанию счета так, как связанные с ней записи существуют в " +"проводках" #. module: account #: help:account.fiscalyear.close.state,fy_id:0 @@ -5789,7 +5871,7 @@ msgstr " количество дней: 30" #. module: account #: help:account.analytic.line,currency_id:0 msgid "The related account currency if not equal to the company one." -msgstr "" +msgstr "Валюта связанного счета, если не одинакова с валютой компании." #. module: account #: view:account.analytic.account:0 @@ -5819,7 +5901,7 @@ msgstr "Мощность" #. module: account #: field:account.invoice.refund,filter_refund:0 msgid "Refund Type" -msgstr "" +msgstr "Тип возмещения" #. module: account #: report:account.invoice:0 @@ -5878,6 +5960,9 @@ 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 "" +"Поле \"последовательность\" используется для упорядочивания позиций налогов " +"от меньшего к большему. Последовательность важна при наличии субналогов . В " +"таком случае важна последовательность вычислений." #. module: account #: selection:account.account,type:0 @@ -5899,6 +5984,10 @@ msgid "" "year. Note that you can run this wizard many times for the same fiscal year: " "it will simply replace the old opening entries with the new ones." msgstr "" +"Этот мастер генерирует проводки конца года в журнале для выбранного " +"финансового года. Заметим, что вы можете запустить этот мастер много раз для " +"того же финансового года: старые проводки открытия просто будут заменены на " +"новые." #. module: account #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash @@ -5913,25 +6002,29 @@ msgid "" "the tool search to analyse information about analytic entries generated in " "the system." msgstr "" +"Этот вид позволяет анализировать проводки аналитики в соответствии со счетом " +"аналитики, который вы создали исходя из особенностей вашего бизнеса. " +"Используйте поиск для анализа информации о проводках аналитики созданных в " +"системе." #. module: account #: sql_constraint:account.journal:0 msgid "The name of the journal must be unique per company !" -msgstr "Название журнала должно быть уникальным по компании !" +msgstr "Название журнала должно быть уникальным внутри организации!" #. module: account #: field:account.account.template,nocreate:0 msgid "Optional create" -msgstr "" +msgstr "Создать дополнительно" #. module: account -#: code:addons/account/invoice.py:406 -#: code:addons/account/invoice.py:506 -#: code:addons/account/invoice.py:1348 +#: code:addons/account/invoice.py:409 +#: code:addons/account/invoice.py:509 +#: code:addons/account/invoice.py:1362 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "" -"Не удалось найти план счетов для компании. Пожалуйста, создайте счет." +"Не удалось найти план счетов для организации. Пожалуйста, создайте счет." #. module: account #: code:addons/account/wizard/account_report_aged_partner_balance.py:57 @@ -6010,6 +6103,8 @@ msgid "" "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for " "2% " msgstr "" +"Проценты для позиции условий оплаты должен быть между 0 и 1, например: 0,02 " +"для 2% " #. module: account #: model:ir.model,name:account.model_account_sequence_fiscalyear @@ -6077,8 +6172,8 @@ msgid "Analytic Entries Statistics" msgstr "Статистика аналитических проводок" #. module: account -#: code:addons/account/account_analytic_line.py:143 -#: code:addons/account/account_move_line.py:905 +#: code:addons/account/account_analytic_line.py:141 +#: code:addons/account/account_move_line.py:897 #, python-format msgid "Entries: " msgstr "Проводки: " @@ -6089,10 +6184,10 @@ msgid "Create manual recurring entries in a chosen journal." msgstr "Создать вручную повторяющиеся проводки в выбранном журнале" #. module: account -#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1407 #, python-format msgid "Couldn't create move between different companies" -msgstr "" +msgstr "Нельзя создать перемещение между разными организациями" #. module: account #: model:ir.actions.act_window,help:account.action_account_type_form @@ -6129,7 +6224,7 @@ msgid "Total debit" msgstr "Всего по дебету" #. module: account -#: code:addons/account/account_move_line.py:781 +#: code:addons/account/account_move_line.py:772 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "Проводка \"%s\" не верна !" @@ -6171,6 +6266,8 @@ msgstr "Код на Python" msgid "" "Please define the Reserve and Profit/Loss account for current user company !" msgstr "" +"Пожалуйста, определите счет резервов и прибылей/убытков для компании " +"пользователя !" #. module: account #: help:account.journal,update_posted:0 @@ -6178,6 +6275,8 @@ msgid "" "Check this box if you want to allow the cancellation the entries related to " "this journal or of the invoice related to this journal" msgstr "" +"Отметьте, если вы хотите позволить отменять проводки связанные с этим " +"журналом или счетом связанным с этим журналом" #. module: account #: view:account.fiscalyear.close:0 @@ -6195,30 +6294,31 @@ msgid " valuation: percent" msgstr " оценка: процент" #. module: account -#: code:addons/account/account.py:499 -#: code:addons/account/account.py:501 -#: code:addons/account/account.py:822 -#: code:addons/account/account.py:901 -#: code:addons/account/account.py:976 -#: code:addons/account/account.py:1204 -#: code:addons/account/account.py:1210 -#: code:addons/account/account.py:2095 -#: code:addons/account/account.py:2333 -#: code:addons/account/account_analytic_line.py:90 -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account.py:509 +#: code:addons/account/account.py:511 +#: code:addons/account/account.py:836 +#: code:addons/account/account.py:915 +#: code:addons/account/account.py:990 +#: code:addons/account/account.py:1218 +#: code:addons/account/account.py:1224 +#: code:addons/account/account.py:2109 +#: code:addons/account/account.py:2357 +#: code:addons/account/account_analytic_line.py:89 +#: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:292 #: code:addons/account/account_bank_statement.py:305 #: code:addons/account/account_bank_statement.py:345 -#: code:addons/account/account_cash_statement.py:328 -#: code:addons/account/account_cash_statement.py:348 -#: code:addons/account/account_move_line.py:1176 -#: code:addons/account/account_move_line.py:1191 -#: code:addons/account/account_move_line.py:1193 -#: code:addons/account/invoice.py:785 -#: code:addons/account/invoice.py:815 -#: code:addons/account/invoice.py:1008 +#: code:addons/account/account_cash_statement.py:329 +#: code:addons/account/account_cash_statement.py:349 +#: code:addons/account/account_move_line.py:1182 +#: code:addons/account/account_move_line.py:1197 +#: code:addons/account/account_move_line.py:1199 +#: code:addons/account/invoice.py:793 +#: code:addons/account/invoice.py:823 +#: code:addons/account/invoice.py:1014 #: code:addons/account/wizard/account_invoice_refund.py:100 #: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" @@ -6255,6 +6355,10 @@ msgid "" "reconcile in a series of accounts. It finds entries for each partner where " "the amounts correspond." msgstr "" +"Для счета, который считается оплаченным, проводки на основе этого счета " +"должны сверяться с их корреспондирующими частями, обычно платежами. В " +"процессе автоматической сверки, OpenERP ищет проводки в ряде счетов. Система " +"ищет проводки с соответствующей суммой для каждого контрагента." #. module: account #: view:account.move:0 @@ -6292,6 +6396,7 @@ msgstr "" msgid "" "Selected Entry Lines does not have any account move enties in draft state" msgstr "" +"Выбранные проводки не содержат ни одной операции в состоянии \"Черновик\"." #. module: account #: selection:account.aged.trial.balance,target_move:0 @@ -6332,7 +6437,7 @@ msgid "Journal Select" msgstr "Выбор журнала" #. module: account -#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:64 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "Текущая валюта неправильно настроена !" @@ -6349,9 +6454,11 @@ msgstr "Налоги системы налогообложения" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger +#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" msgstr "Главная книга" @@ -6394,7 +6501,7 @@ msgstr "Параметры" #. module: account #: model:ir.model,name:account.model_account_tax_chart msgid "Account tax chart" -msgstr "" +msgstr "План налоговых счетов" #. module: account #: report:account.analytic.account.cost_ledger:0 @@ -6407,7 +6514,7 @@ msgid "Total:" msgstr "Всего:" #. module: account -#: code:addons/account/account.py:2050 +#: code:addons/account/account.py:2064 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -6436,16 +6543,16 @@ msgstr "Счета доходов" #. module: account #: help:report.invoice.created,origin:0 msgid "Reference of the document that generated this invoice report." -msgstr "" +msgstr "Ссылка на документ, создавший этот отчет о счете." #. module: account #: field:account.tax.code,child_ids:0 #: field:account.tax.code.template,child_ids:0 msgid "Child Codes" -msgstr "" +msgstr "Субкоды" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" @@ -6529,7 +6636,7 @@ msgstr "Налоги" #. module: account #: help:account.tax,amount:0 msgid "For taxes of type percentage, enter % ratio between 0-1." -msgstr "" +msgstr "Для процентных налогов, введите % как число от 0 до 1." #. module: account #: model:ir.actions.act_window,help:account.action_subscription_form @@ -6594,6 +6701,11 @@ msgid "" "Most of the OpenERP operations (invoices, timesheets, expenses, etc) " "generate analytic entries on the related account." msgstr "" +"Обычный план счетов имеет структуру определяемую правовыми требованиями " +"страны. Структура аналитического плана счетов должна отражать требования " +"вашего бизнеса. Обычно он структурирован по контрактам, проектам, ТМЦ или " +"отделам. Большинство операций в OpenERP (счета, бюллетени, затраты и т.д.) " +"создают проводки аналитики в соответствующих счетах." #. module: account #: field:account.analytic.journal,line_ids:0 @@ -6602,14 +6714,14 @@ msgid "Lines" msgstr "Строк" #. module: account -#: code:addons/account/invoice.py:521 +#: code:addons/account/invoice.py:524 #, python-format msgid "" "Can not find account chart for this company in invoice line account, Please " "Create account." msgstr "" -"Не могу найти план счетов для этой компании в позиции счета, пожалуйста " -"создайте бух. счет." +"Невозможно найти план счетов для этой организации в позиции счёта. " +"Пожалуйста, создайте счёт." #. module: account #: view:account.tax.template:0 @@ -6730,6 +6842,9 @@ msgid "" "new counterpart but will share the same counterpart. This is used in fiscal " "year closing." msgstr "" +"Отметьте, для определения того, что каждая проводка в этом журнале не " +"создает новой корреспондирующей части, а использует одну и ту же. Это " +"используется при закрытии финансового года." #. module: account #: field:account.bank.statement,closing_date:0 @@ -6775,10 +6890,10 @@ msgstr "" "домена." #. module: account -#: code:addons/account/account.py:938 +#: code:addons/account/account.py:952 #, python-format msgid "You should have chosen periods that belongs to the same company" -msgstr "" +msgstr "Вы должны выбрать периоды принадлежащие одной компании." #. module: account #: field:account.fiscalyear.close,report_name:0 @@ -6798,7 +6913,7 @@ msgstr "Отчетность" #. module: account #: sql_constraint:account.journal:0 msgid "The code of the journal must be unique per company !" -msgstr "Код журнала должен быть уникальным для компании !" +msgstr "Код журнала должен быть уникальным внутри организации!" #. module: account #: field:account.bank.statement,ending_details_ids:0 @@ -6823,6 +6938,8 @@ msgid "" "the system to go through the reconciliation process, based on the latest day " "it have been reconciled." msgstr "" +"Это поле показывает вам следующего контрагента, который автоматически выбран " +"системой для сверки. Выбор основан на дате последней сверки." #. module: account #: field:account.move.line.reconcile.writeoff,comment:0 @@ -6879,7 +6996,7 @@ msgid "Sign on Reports" msgstr "Знак в отчётах" #. module: account -#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_cash_statement.py:250 #, python-format msgid "You can not have two open register for the same journal" msgstr "Вы не можете иметь два открытых регистра для одного журнала" @@ -6908,7 +7025,6 @@ msgstr "" #. module: account #: report:account.invoice:0 #: view:account.invoice:0 -#: report:account.move.voucher:0 msgid "PRO-FORMA" msgstr "Проформа" @@ -6940,6 +7056,7 @@ msgstr "Доп. информация" #. module: account #: view:account.analytic.line:0 +#: field:account.bank.statement,user_id:0 #: view:account.journal:0 #: field:account.journal,user_id:0 #: view:analytic.entries.report:0 @@ -6965,13 +7082,13 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "Bad account !" msgstr "Неверный счет !" #. module: account -#: code:addons/account/account.py:2777 +#: code:addons/account/account.py:2821 #: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" @@ -6989,10 +7106,10 @@ msgid "Invoice Tax" msgstr "Налог по счету" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "No piece number !" -msgstr "" +msgstr "Нет номера части !" #. module: account #: view:product.product:0 @@ -7100,7 +7217,7 @@ msgstr "Оплата счетов" #: field:account.tax,sequence:0 #: field:account.tax.template,sequence:0 msgid "Sequence" -msgstr "Последовательность" +msgstr "Нумерация" #. module: account #: model:ir.model,name:account.model_account_bs_report @@ -7188,7 +7305,7 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement msgid "Legal Reports" -msgstr "" +msgstr "Официальные отчеты" #. module: account #: field:account.tax.code,sum_period:0 @@ -7202,6 +7319,9 @@ 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 "" +"Поле \"последовательность\" используется для упорядочивания позиций налогов " +"от меньшего к большему. Последовательность важна при наличии субналогов . В " +"таком случае важна последовательность вычислений." #. module: account #: model:ir.model,name:account.model_account_cashbox_line @@ -7229,17 +7349,17 @@ msgid "Fixed" msgstr "Фиксированный" #. module: account -#: code:addons/account/account.py:506 -#: code:addons/account/account.py:519 -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:516 +#: code:addons/account/account.py:529 #: code:addons/account/account.py:532 -#: code:addons/account/account.py:640 -#: code:addons/account/account.py:927 -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 -#: code:addons/account/invoice.py:714 -#: code:addons/account/invoice.py:717 -#: code:addons/account/invoice.py:720 +#: code:addons/account/account.py:546 +#: code:addons/account/account.py:654 +#: code:addons/account/account.py:941 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/invoice.py:722 +#: code:addons/account/invoice.py:725 +#: code:addons/account/invoice.py:728 #, python-format msgid "Warning !" msgstr "Warning !" @@ -7247,13 +7367,13 @@ msgstr "Warning !" #. module: account #: field:account.entries.report,move_line_state:0 msgid "State of Move Line" -msgstr "Состояние действия" +msgstr "Состояние операции" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff msgid "Account move line reconcile" -msgstr "Сверка действия по счету" +msgstr "Сверка операции по счету" #. module: account #: view:account.subscription.generate:0 @@ -7271,6 +7391,7 @@ msgstr "Величина (прописью):" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7298,10 +7419,10 @@ msgstr "Выбрать валюту применяемую в счете" #: code:addons/account/wizard/account_invoice_refund.py:100 #, python-format msgid "Can not %s draft/proforma/cancel invoice." -msgstr "" +msgstr "Нельзя %s черновик/проформу/отмененный счет." #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "No Invoice Lines !" msgstr "Нет позиций в счете !" @@ -7332,6 +7453,7 @@ msgid "" "Select Fiscal Year which you want to remove entries for its End of year " "entries journal" msgstr "" +"Выберите финансовый год для удаления проводок из журнала \"Конец года\"" #. module: account #: field:account.tax.template,type_tax_use:0 @@ -7350,7 +7472,7 @@ msgid "Deferral Method" msgstr "Метод отсрочки" #. module: account -#: code:addons/account/invoice.py:359 +#: code:addons/account/invoice.py:360 #, python-format msgid "Invoice '%s' is paid." msgstr "Счет '%s' оплачен." @@ -7415,7 +7537,7 @@ msgid "Associated Partner" msgstr "Связанный контрагент" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "You must first select a partner !" msgstr "Сначала вы должны выбрать партнера !" @@ -7472,7 +7594,7 @@ msgstr "Проформа" #. module: account #: report:account.analytic.account.cost_ledger:0 msgid "J.C. /Move name" -msgstr "" +msgstr "Код журн./Операция" #. module: account #: model:ir.model,name:account.model_account_open_closed_fiscalyear @@ -7480,7 +7602,7 @@ msgid "Choose Fiscal Year" msgstr "Закрыть отчетный год" #. module: account -#: code:addons/account/account.py:2841 +#: code:addons/account/account.py:2885 #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" @@ -7489,7 +7611,7 @@ msgstr "Журнал возврата покупок" #. module: account #: help:account.tax.template,amount:0 msgid "For Tax Type percent enter % ratio between 0-1." -msgstr "" +msgstr "Для налога типа \"процент\" введите %, как число от 0 до 1." #. module: account #: selection:account.automatic.reconcile,power:0 @@ -7517,6 +7639,7 @@ msgstr "Бухучет и управление финансами" #: view:account.entries.report:0 #: field:account.entries.report,period_id:0 #: view:account.fiscalyear:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.journal.period,period_id:0 @@ -7610,7 +7733,7 @@ msgstr "Тел. :" #. module: account #: field:account.account,company_currency_id:0 msgid "Company Currency" -msgstr "Валюта компании" +msgstr "Валюта организации" #. module: account #: report:account.general.ledger:0 @@ -7673,7 +7796,7 @@ msgstr "Виды журналов" #. module: account #: model:ir.model,name:account.model_account_move_bank_reconcile msgid "Move bank reconcile" -msgstr "Сверка проводки по банку" +msgstr "Сверка операции по банку" #. module: account #: model:ir.actions.act_window,name:account.action_account_type_form @@ -7682,7 +7805,7 @@ msgid "Account Types" msgstr "Типы счетов" #. module: account -#: code:addons/account/invoice.py:897 +#: code:addons/account/invoice.py:905 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "" @@ -7732,6 +7855,7 @@ msgstr "Журнал возвратов" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 +#: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" msgstr "Фильтровать по" @@ -7744,13 +7868,17 @@ msgid "" "sales orders or deliveries. You should only confirm them before sending them " "to your customers." msgstr "" +"Вы можете создавать счета заказчикам и управлять счетами выставленными вашим " +"клиентам. OpenERP может создавать черновики счетов автоматически по заказам " +"на продажу и доставку. Вы должны только подтвердить их пред выставлением " +"заказчикам." #. module: account #: view:account.entries.report:0 #: view:board.board:0 #: model:ir.actions.act_window,name:account.action_company_analysis_tree msgid "Company Analysis" -msgstr "Анализ компании" +msgstr "Анализ организации" #. module: account #: help:account.invoice,account_id:0 @@ -7770,7 +7898,7 @@ msgid "Payment Term Line" msgstr "Позиция условий оплаты" #. module: account -#: code:addons/account/account.py:2794 +#: code:addons/account/account.py:2838 #: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" @@ -7839,7 +7967,7 @@ msgstr "" #. module: account #: view:account.payment.term.line:0 msgid " valuation: balance" -msgstr "" +msgstr " расчет: баланс" #. module: account #: view:account.tax.code:0 @@ -7860,7 +7988,7 @@ msgstr "Закрыть финансовый год" #. module: account #: sql_constraint:account.account:0 msgid "The code of the account must be unique per company !" -msgstr "Код счета должен быть уникальным для компании !" +msgstr "Код счета должен быть уникальным внутри организации!" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened @@ -7939,8 +8067,8 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "Bad account!" msgstr "Плохой счет!" @@ -7951,7 +8079,7 @@ msgid "Keep empty for all open fiscal years" msgstr "Оставьте пустым для всех открытых финансовых лет" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1062 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "" @@ -7962,6 +8090,7 @@ msgid "" "The amount expressed in an optional other currency if it is a multi-currency " "entry." msgstr "" +"Сумма выражается в дополнительный валюте, если эта проводка мульти-валютная." #. module: account #: view:account.account:0 @@ -7972,6 +8101,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -8062,7 +8192,7 @@ msgstr "неизвестен" #. module: account #: field:account.fiscalyear.close,journal_id:0 msgid "Opening Entries Journal" -msgstr "Открытие журнала проводок" +msgstr "Журнал проводок открытия" #. module: account #: model:process.transition,note:account.process_transition_customerinvoice0 @@ -8145,14 +8275,14 @@ msgid "Period from" msgstr "Период с" #. module: account -#: code:addons/account/account.py:2817 +#: code:addons/account/account.py:2861 #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "Журнал возврата продаж" #. module: account -#: code:addons/account/account.py:927 +#: code:addons/account/account.py:941 #, python-format msgid "" "You cannot modify company of this period as its related record exist in " @@ -8201,7 +8331,7 @@ msgid "Purchase Tax(%)" msgstr "Налог на покупку(%)" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "Please create some invoice lines." msgstr "Пожалуйста, создайте позиции счета" @@ -8217,7 +8347,7 @@ msgid "Configure Your Accounting Application" msgstr "Настройка модуля бухучета" #. module: account -#: code:addons/account/account.py:2820 +#: code:addons/account/account.py:2864 #: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" @@ -8255,6 +8385,7 @@ msgstr "Управление напоминаниями" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8264,7 +8395,7 @@ msgid "Start Period" msgstr "Начало периода" #. module: account -#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2357 #, python-format msgid "Cannot locate parent code for template account!" msgstr "Не удается найти родительский код для шаблона счета!" @@ -8277,7 +8408,7 @@ msgstr "Направление анализа" #. module: account #: field:res.partner,ref_companies:0 msgid "Companies that refers to partner" -msgstr "Ссылающиеся на партнера компании" +msgstr "Связанные с партнёром организации" #. module: account #: view:account.journal:0 @@ -8301,7 +8432,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "Бухгалтер утверждает проводки созданные по счет-фактуре. " #. module: account -#: code:addons/account/invoice.py:1008 +#: code:addons/account/invoice.py:1014 #, python-format msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " @@ -8328,10 +8459,10 @@ msgstr "Документ: выписка клиенту со счета" #. module: account #: constraint:account.move.line:0 msgid "You can not create move line on view account." -msgstr "Нельзя создать действие по счету с типом Вид." +msgstr "Нельзя создать операцию по счету с типом Вид." #. module: account -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not confirured properly !" msgstr "Текущая валюта неправильно настроена !" @@ -8380,6 +8511,7 @@ msgstr "Оставьте пустым для использования дохо #: field:account.entries.report,balance:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8398,6 +8530,7 @@ msgstr "Вручную или автоматически введенные в #. module: account #: report:account.account.balance:0 +#: report:account.general.ledger_landscape:0 msgid "Display Account" msgstr "Вывод счета" @@ -8512,14 +8645,15 @@ msgstr "Проводка вручную" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 msgid "Move" -msgstr "Перемещение" +msgstr "Операция" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "" @@ -8528,7 +8662,7 @@ msgstr "" #. module: account #: report:account.central.journal:0 msgid "A/C No." -msgstr "" +msgstr "Счет №" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement @@ -8616,6 +8750,7 @@ msgstr "Аналитический баланс" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8646,7 +8781,7 @@ msgstr "План счетов" #. module: account #: field:account.move.line,date_maturity:0 msgid "Due date" -msgstr "Срок" +msgstr "Срок оплаты" #. module: account #: view:account.move.journal:0 @@ -8659,7 +8794,7 @@ msgid "Account Subscription" msgstr "Счет подписки" #. module: account -#: code:addons/account/invoice.py:717 +#: code:addons/account/invoice.py:725 #, python-format msgid "" "Tax base different !\n" @@ -8686,6 +8821,7 @@ msgstr "Проводка подписки" #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_start:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8714,7 +8850,7 @@ msgid "Unreconciled" msgstr "Не сверенные" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "Bad total !" msgstr "Плохой итог !" @@ -8722,7 +8858,7 @@ msgstr "Плохой итог !" #. module: account #: field:account.journal,sequence_id:0 msgid "Entry Sequence" -msgstr "Последовательный номер проводки" +msgstr "Нумерация проводок" #. module: account #: model:ir.actions.act_window,help:account.action_account_period_tree @@ -8772,19 +8908,22 @@ msgid "Active" msgstr "Активен" #. module: account -#: code:addons/account/invoice.py:354 +#: code:addons/account/invoice.py:353 #, python-format msgid "Unknown Error" msgstr "Неизвестная ошибка" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "" "You cannot validate a non-balanced entry !\n" "Make sure you have configured Payment Term properly !\n" "It should contain atleast one Payment Term Line with type \"Balance\" !" msgstr "" +"Вы не можете утвердить несбалансированную проводку!\n" +"Проверьте правильность настройки условия оплаты!\n" +"Должна быть хотя бы одна строка условия оплаты с типом \"Баланс\"!" #. module: account #: help:res.partner,property_account_payable:0 @@ -8808,7 +8947,7 @@ msgstr "Вторичная валюта" #. module: account #: model:ir.model,name:account.model_validate_account_move msgid "Validate Account Move" -msgstr "Утвердить действие по счету" +msgstr "Утвердить операцию по счету" #. module: account #: field:account.account,credit:0 @@ -8821,10 +8960,10 @@ msgstr "Утвердить действие по счету" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -8866,6 +9005,9 @@ msgid "" "payment term!\n" "Please define partner on it!" msgstr "" +"Дата исполнения проводки созданной строкой \"%s\" основана на условии оплаты " +"контрагента!\n" +"Пожалуйста, задайте контрагента!" #. module: account #: field:account.cashbox.line,number:0 @@ -9065,7 +9207,6 @@ msgstr "Выберите период" #: view:account.move:0 #: selection:account.move,state:0 #: view:account.move.line:0 -#: report:account.move.voucher:0 msgid "Posted" msgstr "Проведено" @@ -9084,6 +9225,7 @@ msgstr "Проведено" #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_stop:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -9102,7 +9244,7 @@ msgstr "Дата окончания" #: 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 "Отмена открывающих проводок" +msgstr "Отмена проводок открытия" #. module: account #: field:account.payment.term.line,days2:0 @@ -9137,7 +9279,7 @@ msgid "This is a model for recurring accounting entries" msgstr "Это модель для повторяющихся проводок" #. module: account -#: code:addons/account/account_analytic_line.py:100 +#: code:addons/account/account_analytic_line.py:99 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "Не определен счет доходов для ТМЦ: \"%s\" (id:%d)" @@ -9210,7 +9352,7 @@ msgstr "Журнал: Все" #: field:analytic.entries.report,company_id:0 #: field:wizard.multi.charts.accounts,company_id:0 msgid "Company" -msgstr "Компания" +msgstr "Организация" #. module: account #: model:ir.ui.menu,name:account.menu_action_subscription_form @@ -9289,8 +9431,8 @@ msgid "End period" msgstr "Конец периода" #. module: account -#: code:addons/account/account_move_line.py:738 -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:729 +#: code:addons/account/account_move_line.py:806 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_report_balance_sheet.py:70 @@ -9320,7 +9462,7 @@ msgstr "" #: view:account.automatic.reconcile:0 #: view:account.move.line.reconcile.writeoff:0 msgid "Write-Off Move" -msgstr "" +msgstr "Операция списания" #. module: account #: model:process.node,note:account.process_node_paidinvoice0 @@ -9358,10 +9500,10 @@ msgstr "Счет поставщика" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9395,7 +9537,7 @@ msgid "Recurring" msgstr "Повторение" #. module: account -#: code:addons/account/account_move_line.py:805 +#: code:addons/account/account_move_line.py:796 #, python-format msgid "Entry is already reconciled" msgstr "Проводка уже сверена" @@ -9408,7 +9550,7 @@ msgstr "Дебиторская задолженность" #. module: account #: selection:account.model.line,date_maturity:0 msgid "Partner Payment Term" -msgstr "Условия платежа партнера" +msgstr "Условие оплаты контрагента" #. module: account #: field:temp.range,name:0 @@ -9416,7 +9558,7 @@ msgid "Range" msgstr "Диапазон" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "" "Can not create an automatic sequence for this piece !\n" @@ -9432,7 +9574,7 @@ msgstr "" #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 msgid "With movements" -msgstr "" +msgstr "С движением" #. module: account #: view:account.analytic.account:0 @@ -9489,7 +9631,7 @@ msgstr "Этот период уже закрыт !" #. module: account #: help:account.move.line,currency_id:0 msgid "The optional other currency if it is a multi-currency entry." -msgstr "Дополнительная валюта, если эта запись мульти-валютная." +msgstr "Дополнительная валюта, если эта проводка мульти-валютная." #. module: account #: model:process.transition,note:account.process_transition_invoiceimport0 @@ -9518,12 +9660,12 @@ msgid "" "may keep several types of specialized journals such as a cash journal, " "purchase journal, sales journal..." msgstr "" -"Создание и управление журналами вашей компании. Журнал используется для " -"записи всех операций учета данных связанных с ежедневной деятельностью вашей " -"компании используя двойную запись. В зависимости от характера деятельности " -"и количества ежедневных операций, компания может использовать несколько " -"типов специализированных журналов таких, как кассовый журнал, журнал " -"покупок, журнал продаж..." +"Создавайте журналы организации и управляйте ими в этом меню. Журнал " +"используется для отражения всех данных операций бухгалтерского учёта, " +"связанных с повседневной деятельностью вашей организации по принципу двойной " +"записи. В зависимости от характера деятельности и количества операций, " +"организация может вести несколько типов специализированных журналов, таких " +"как кассовый журнал, журнал покупок, журнал продаж…" #. module: account #: model:ir.model,name:account.model_account_analytic_chart @@ -9553,7 +9695,7 @@ msgid "Accounts Mapping" msgstr "" #. module: account -#: code:addons/account/invoice.py:346 +#: code:addons/account/invoice.py:345 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "Счет '%s' ожидает утверждения." @@ -9578,7 +9720,7 @@ msgid "The income or expense account related to the selected product." msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1123 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "Дата вашей записи в журнале вне определенного периода!" @@ -9636,7 +9778,7 @@ msgstr "Бухгалтерские документы" #. module: account #: model:ir.model,name:account.model_validate_account_move_lines msgid "Validate Account Move Lines" -msgstr "Утвердить действия по счету" +msgstr "Утвердить операции по счету" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal @@ -9776,7 +9918,7 @@ msgstr "" #. module: account #: field:account.analytic.line,amount_currency:0 msgid "Amount currency" -msgstr "Валюта суммы" +msgstr "Сумма в валюте" #. module: account #: code:addons/account/wizard/account_report_aged_partner_balance.py:55 @@ -9785,7 +9927,7 @@ msgid "You must enter a period length that cannot be 0 or below !" msgstr "Вы должны ввести длину периода больше 0 !" #. module: account -#: code:addons/account/account.py:501 +#: code:addons/account/account.py:511 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "Нельзя удалить счет по которому есть проводки ! " diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 19544fb613b..a76da12910a 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-02-03 07:35+0000\n" +"PO-Revision-Date: 2011-07-02 15:26+0000\n" "Last-Translator: Wei \"oldrev\" Li \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: 2011-04-29 05:14+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-07-03 04:46+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -33,7 +33,7 @@ msgid "No End of year journal defined for the fiscal year" msgstr "此财务年度没有定义年终日记账" #. module: account -#: code:addons/account/account.py:506 +#: code:addons/account/account.py:516 #, python-format msgid "" "You cannot remove/deactivate an account which is set as a property to any " @@ -65,7 +65,7 @@ msgid "Residual" msgstr "剩余的" #. module: account -#: code:addons/account/invoice.py:785 +#: code:addons/account/invoice.py:793 #, python-format msgid "Please define sequence on invoice journal" msgstr "请为发票日记账对应序列" @@ -110,7 +110,7 @@ msgstr "从发票或支付凭证导入" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts msgid "wizard.multi.charts.accounts" -msgstr "wizard.multi.charts.accounts" +msgstr "多科目图表向导" #. module: account #: view:account.move:0 @@ -122,7 +122,7 @@ msgstr "借方合计" 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 "" +msgstr "如果您用非关联交易，您还必须验证所有链接到这些交易行动，因为他们不会被禁用" #. module: account #: report:account.tax.code.entries:0 @@ -130,7 +130,7 @@ msgid "Accounting Entries-" msgstr "会计分录" #. module: account -#: code:addons/account/account.py:1291 +#: code:addons/account/account.py:1305 #, python-format msgid "You can not delete posted movement: \"%s\"!" msgstr "不能删除已登账的凭证行：\"%s\"！" @@ -171,10 +171,10 @@ msgstr "选择会计年度 " msgid "" "If the active field is set to False, it will allow you to hide the payment " "term without removing it." -msgstr "" +msgstr "如果设置为false，该付款条款将会被隐藏。" #. module: account -#: code:addons/account/invoice.py:1421 +#: code:addons/account/invoice.py:1436 #, python-format msgid "Warning!" msgstr "警告！" @@ -212,7 +212,7 @@ msgid "" "Gives the type of the analytic journal. When it needs for a document (eg: an " "invoice) to create analytic entries, OpenERP will look for a matching " "journal of the same type." -msgstr "" +msgstr "给出了分析报表类型。当一个文件（如：发票），需要创建解析条目，OpenERP将寻找一个相同类型的匹配杂志。" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_template_form @@ -223,10 +223,10 @@ msgstr "税模板" #. module: account #: model:ir.model,name:account.model_account_tax msgid "account.tax" -msgstr "科目.税" +msgstr "税科目" #. module: account -#: code:addons/account/account.py:901 +#: code:addons/account/account.py:915 #, python-format msgid "" "No period defined for this date: %s !\n" @@ -238,7 +238,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_select msgid "Move line reconcile select" -msgstr "" +msgstr "选择核销行" #. module: account #: help:account.model.line,sequence:0 @@ -256,15 +256,15 @@ msgid "" msgstr "勾选此项使发票上不显示增值税" #. module: account -#: code:addons/account/invoice.py:1210 +#: code:addons/account/invoice.py:1224 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" -msgstr "" +msgstr "发票'%s'已部分支付了%s%s ，总金额为：%s%s, 尚余%s%s未付" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 msgid "Accounting entries are an input of the reconciliation." -msgstr "" +msgstr "会计分录必须借贷相等" #. module: account #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports @@ -272,7 +272,7 @@ msgid "Belgian Reports" msgstr "比利时报表" #. module: account -#: code:addons/account/account_move_line.py:1176 +#: code:addons/account/account_move_line.py:1182 #, python-format msgid "You can not add/modify entries in a closed journal." msgstr "不能添加/修改已结帐的凭证" @@ -280,7 +280,7 @@ msgstr "不能添加/修改已结帐的凭证" #. module: account #: view:account.bank.statement:0 msgid "Calculated Balance" -msgstr "" +msgstr "计算余额" #. module: account #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry @@ -310,7 +310,7 @@ msgid "St." msgstr "结单编码" #. module: account -#: code:addons/account/invoice.py:529 +#: code:addons/account/invoice.py:532 #, python-format msgid "Invoice line account company does not match with invoice company." msgstr "发票明细的科目公司与发票头的公司不匹配。" @@ -325,7 +325,7 @@ msgstr "字段名" msgid "" "Installs localized accounting charts to match as closely as possible the " "accounting needs of your company based on your country." -msgstr "" +msgstr "安装本地化财务系统以尽可能的适应本国的财务要求" #. module: account #: code:addons/account/wizard/account_move_journal.py:63 @@ -335,12 +335,12 @@ msgid "" "\n" "You can create one in the menu: \n" "Configuration/Financial Accounting/Accounts/Journals." -msgstr "" +msgstr "无法找到针对该公司%s类型的分类账簿" #. module: account #: model:ir.model,name:account.model_account_unreconcile msgid "Account Unreconcile" -msgstr "" +msgstr "科目反核销" #. module: account #: view:product.product:0 @@ -352,7 +352,7 @@ msgstr "采购属性" #: view:account.installer:0 #: view:account.installer.modules:0 msgid "Configure" -msgstr "" +msgstr "设置" #. module: account #: selection:account.entries.report,month:0 @@ -370,11 +370,12 @@ msgid "" "OpenERP. Journal items are created by OpenERP if you use Bank Statements, " "Cash Registers, or Customer/Supplier payments." msgstr "" +"本界面供财务人员在OpenERP中批量录入凭证之用。如果你在OpenERP使用银行对帐单，收银机，或者客户/供应商付款, 相应的分录会由系统自动产生。" #. module: account #: model:ir.model,name:account.model_account_tax_template msgid "account.tax.template" -msgstr "" +msgstr "account.tax.template" #. module: account #: model:ir.model,name:account.model_account_bank_accounts_wizard @@ -390,7 +391,7 @@ msgstr "建立日期" #. module: account #: selection:account.journal,type:0 msgid "Purchase Refund" -msgstr "" +msgstr "采购退款" #. module: account #: selection:account.journal,type:0 @@ -412,7 +413,7 @@ msgstr "打开会计年度" msgid "" "This field contains the informatin related to the numbering of the journal " "entries of this journal." -msgstr "" +msgstr "该字段包含该分类账簿记录数量的信息" #. module: account #: field:account.journal,default_debit_account_id:0 @@ -462,6 +463,7 @@ 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 "" +"税务表是一个树状视图，反映了税务结构，并显示当前的纳税情况。税务表反映了国家规定的不同纳税领域的纳税申报数量情况。其设置为一个层次结构，请根据需要修改。" #. module: account #: view:account.analytic.line:0 @@ -500,17 +502,17 @@ msgstr "业务类型" #. module: account #: model:ir.model,name:account.model_account_invoice_confirm msgid "Confirm the selected invoices" -msgstr "" +msgstr "确认选定的发票" #. module: account #: field:account.addtmpl.wizard,cparent_id:0 msgid "Parent target" -msgstr "" +msgstr "上级目标" #. module: account #: field:account.bank.statement,account_id:0 msgid "Account used in this journal" -msgstr "" +msgstr "这个分类账簿上的科目" #. module: account #: help:account.aged.trial.balance,chart_account_id:0 @@ -529,7 +531,7 @@ msgstr "" #: help:account.report.general.ledger,chart_account_id:0 #: help:account.vat.declaration,chart_account_id:0 msgid "Select Charts of Accounts" -msgstr "" +msgstr "选择科目表" #. module: account #: view:product.product:0 @@ -539,7 +541,7 @@ msgstr "进项税" #. module: account #: model:ir.model,name:account.model_account_invoice_refund msgid "Invoice Refund" -msgstr "" +msgstr "发票退款" #. module: account #: report:account.overdue:0 @@ -552,10 +554,10 @@ msgid "Not reconciled transactions" msgstr "没核销的交易" #. module: account -#: code:addons/account/account_cash_statement.py:348 +#: code:addons/account/account_cash_statement.py:349 #, python-format msgid "CashBox Balance is not matching with Calculated Balance !" -msgstr "" +msgstr "出纳帐与现金不一致" #. module: account #: view:account.fiscal.position:0 @@ -589,12 +591,12 @@ msgstr "所有" #. module: account #: field:account.invoice.report,address_invoice_id:0 msgid "Invoice Address Name" -msgstr "" +msgstr "发票地址" #. module: account #: selection:account.installer,period:0 msgid "3 Monthly" -msgstr "" +msgstr "3个月" #. module: account #: view:account.unreconcile.reconcile:0 @@ -606,7 +608,7 @@ msgstr "如果执行反核销, 你必须检验链接该处理的所有操作. #. module: account #: view:analytic.entries.report:0 msgid " 30 Days " -msgstr "" +msgstr " 30 天 " #. module: account #: field:ir.sequence,fiscal_ids:0 @@ -626,7 +628,7 @@ msgstr "" #. module: account #: sql_constraint:account.sequence.fiscalyear:0 msgid "Main Sequence must be different from current !" -msgstr "" +msgstr "序列号必须唯一" #. module: account #: field:account.invoice.tax,tax_amount:0 @@ -634,7 +636,7 @@ msgid "Tax Code Amount" msgstr "税事务金额" #. module: account -#: code:addons/account/account.py:2779 +#: code:addons/account/account.py:2823 #: code:addons/account/installer.py:434 #, python-format msgid "SAJ" @@ -654,7 +656,7 @@ msgstr "关闭会计期间" #. module: account #: model:ir.model,name:account.model_account_common_partner_report msgid "Account Common Partner Report" -msgstr "" +msgstr "普通合伙人的科目报表" #. module: account #: field:account.fiscalyear.close,period_id:0 @@ -664,11 +666,11 @@ msgstr "会计期间的启用凭证" #. module: account #: model:ir.model,name:account.model_account_journal_period msgid "Journal Period" -msgstr "" +msgstr "明细帐期间" #. module: account -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 #, python-format msgid "To reconcile the entries company should be the same for all entries" msgstr "" @@ -688,7 +690,7 @@ msgstr "应收款科目" #. module: account #: model:ir.model,name:account.model_account_report_general_ledger msgid "General Ledger Report" -msgstr "" +msgstr "总账报表" #. module: account #: view:account.invoice:0 @@ -708,7 +710,7 @@ msgstr "" #. module: account #: field:account.partner.reconcile.process,today_reconciled:0 msgid "Partners Reconciled Today" -msgstr "" +msgstr "今天合作伙伴不开心" #. module: account #: selection:account.payment.term.line,value:0 @@ -726,13 +728,13 @@ msgstr "表" #: model:ir.model,name:account.model_project_account_analytic_line #, python-format msgid "Analytic Entries by line" -msgstr "" +msgstr "按行显示分析科目数据" #. module: account -#: code:addons/account/wizard/account_change_currency.py:39 +#: code:addons/account/wizard/account_change_currency.py:38 #, python-format msgid "You can only change currency for Draft Invoice !" -msgstr "" +msgstr "您只能更改发票草案金额！" #. module: account #: view:account.analytic.journal:0 @@ -769,17 +771,17 @@ msgstr "反核销" #. module: account #: model:ir.model,name:account.model_account_analytic_Journal_report msgid "Account Analytic Journal" -msgstr "" +msgstr "科目分析报表" #. module: account #: model:ir.model,name:account.model_account_automatic_reconcile msgid "Automatic Reconcile" -msgstr "" +msgstr "自己核销" #. module: account #: view:account.payment.term.line:0 msgid "Due date Computation" -msgstr "" +msgstr "计算截止日期" #. module: account #: report:account.analytic.account.quantity_cost_ledger:0 @@ -793,7 +795,7 @@ msgstr "成本业务类型/凭证名称" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "September" -msgstr "" +msgstr "9月" #. module: account #: selection:account.subscription,period_type:0 @@ -804,7 +806,7 @@ msgstr "天" #: help:account.account.template,nocreate:0 msgid "" "If checked, the new chart of accounts will not contain this by default." -msgstr "" +msgstr "如果选中，这一点的新报表科目将不包含在默认情况下。" #. module: account #: code:addons/account/wizard/account_invoice_refund.py:102 @@ -812,7 +814,7 @@ msgstr "" msgid "" "Can not %s invoice which is already reconciled, invoice should be " "unreconciled first. You can only Refund this invoice" -msgstr "" +msgstr "无法%s该发票，该发票已核销，除非先将其反核销。目前只能对该发票做退款处理" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form_new @@ -827,10 +829,10 @@ msgstr "计算" #. module: account #: view:account.move.line:0 msgid "Next Partner to reconcile" -msgstr "" +msgstr "与下一个合作伙伴对帐" #. module: account -#: code:addons/account/account_move_line.py:1191 +#: code:addons/account/account_move_line.py:1197 #, python-format msgid "" "You can not do this modification on a confirmed entry ! Please note that you " @@ -841,7 +843,7 @@ msgstr "您不能修改已确认的凭证！您只能修改一些非重要字段 #: view:account.invoice.report:0 #: field:account.invoice.report,delay_to_pay:0 msgid "Avg. Delay To Pay" -msgstr "" +msgstr "延迟付款平均时间" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_chart @@ -864,7 +866,7 @@ msgstr "到期" #: view:account.invoice.report:0 #: field:account.invoice.report,price_total_tax:0 msgid "Total With Tax" -msgstr "" +msgstr "总税单（纳税合计）" #. module: account #: view:account.invoice:0 @@ -872,7 +874,7 @@ msgstr "" #: view:validate.account.move:0 #: view:validate.account.move.lines:0 msgid "Approve" -msgstr "" +msgstr "核准" #. module: account #: view:account.invoice:0 @@ -894,22 +896,22 @@ msgstr "合并" #: view:account.invoice.report:0 #: view:account.move.line:0 msgid "Extended Filters..." -msgstr "" +msgstr "增加筛选条件" #. module: account #: model:ir.ui.menu,name:account.menu_account_central_journal msgid "Centralizing Journal" -msgstr "" +msgstr "合并报表" #. module: account #: selection:account.journal,type:0 msgid "Sale Refund" -msgstr "" +msgstr "销售退款(货)" #. module: account #: model:process.node,note:account.process_node_accountingstatemententries0 msgid "Bank statement" -msgstr "" +msgstr "银行对帐单" #. module: account #: field:account.analytic.line,move_id:0 @@ -927,7 +929,7 @@ msgstr "" #. module: account #: view:account.analytic.line:0 msgid "Purchases" -msgstr "" +msgstr "采购单列表" #. module: account #: field:account.model,lines_id:0 @@ -952,11 +954,11 @@ msgid "Code" msgstr "代码" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 +#: code:addons/account/account_move_line.py:169 #: code:addons/account/invoice.py:73 -#: code:addons/account/invoice.py:670 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "No Analytic Journal !" @@ -974,13 +976,13 @@ msgstr "业务伙伴余额" #. module: account #: field:account.bank.accounts.wizard,acc_name:0 msgid "Account Name." -msgstr "" +msgstr "科目名称" #. 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 "" +msgstr "所有者权益类科目" #. module: account #: field:report.account.receivable,name:0 @@ -997,12 +999,12 @@ msgstr "横向模式" #. module: account #: view:board.board:0 msgid "Customer Invoices to Approve" -msgstr "" +msgstr "客户发票审核" #. module: account #: help:account.fiscalyear.close,fy_id:0 msgid "Select a Fiscal year to close" -msgstr "" +msgstr "关闭一个财政年度" #. module: account #: help:account.account,user_type:0 @@ -1010,12 +1012,12 @@ msgstr "" msgid "" "These types are defined according to your country. The type contains more " "information about the account and its specificities." -msgstr "" +msgstr "根据你的国家定义这些类型,该类型包含有关科目及其具体的信息。" #. module: account #: view:account.tax:0 msgid "Applicability Options" -msgstr "" +msgstr "可选项" #. module: account #: report:account.partner.balance:0 @@ -1026,16 +1028,15 @@ msgstr "争议中" #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree #: model:ir.ui.menu,name:account.journal_cash_move_lines msgid "Cash Registers" -msgstr "" +msgstr "出纳现金" #. module: account #: selection:account.account.type,report_type:0 msgid "Profit & Loss (Expense Accounts)" -msgstr "" +msgstr "损益表" #. module: account #: report:account.analytic.account.journal:0 -#: report:account.move.voucher:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "-" @@ -1044,7 +1045,7 @@ msgstr "-" #. module: account #: view:account.analytic.account:0 msgid "Manager" -msgstr "" +msgstr "经理" #. module: account #: view:account.subscription.generate:0 @@ -1054,7 +1055,7 @@ msgstr "" #. module: account #: selection:account.bank.accounts.wizard,account_type:0 msgid "Bank" -msgstr "" +msgstr "银行" #. module: account #: field:account.period,date_start:0 @@ -1064,7 +1065,7 @@ msgstr "开始会计期间" #. module: account #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0 msgid "Confirm statement" -msgstr "" +msgstr "确认报表" #. module: account #: field:account.fiscal.position.tax,tax_dest_id:0 @@ -1085,11 +1086,12 @@ msgid "" "purchase orders or receipts. This way, you can control the invoice from your " "supplier according to what you purchased or received." msgstr "" +"供应商发票，您可以输入和管理你的供应商发出的发票。 OpenERP还可以自动生成草案从采购订单发票或收据。这样，您就可以控制从供应商的发票." #. module: account #: view:account.invoice.cancel:0 msgid "Cancel Invoices" -msgstr "" +msgstr "作废发票" #. module: account #: view:account.unreconcile.reconcile:0 @@ -1121,6 +1123,7 @@ msgstr "# 处理" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1128,7 +1131,7 @@ msgid "Entry Label" msgstr "凭证标签" #. module: account -#: code:addons/account/account.py:976 +#: code:addons/account/account.py:990 #, python-format msgid "You can not modify/delete a journal with entries for this period !" msgstr "您不能修改/删除这业务类型和在此会计期间的凭证！" @@ -1175,19 +1178,19 @@ msgstr "科目" #. module: account #: field:account.tax,include_base_amount:0 msgid "Included in base amount" -msgstr "" +msgstr "含基数" #. module: account #: view:account.entries.report:0 #: model:ir.actions.act_window,name:account.action_account_entries_report_all #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all msgid "Entries Analysis" -msgstr "" +msgstr "项目分析" #. module: account #: field:account.account,level:0 msgid "Level" -msgstr "" +msgstr "级别" #. module: account #: report:account.invoice:0 @@ -1208,7 +1211,7 @@ msgstr "税" #: code:addons/account/wizard/account_report_common.py:120 #, python-format msgid "Select a starting and an ending period" -msgstr "" +msgstr "选择一个开始和结束时间" #. module: account #: model:ir.model,name:account.model_account_account_template @@ -1218,12 +1221,12 @@ msgstr "科目模板" #. module: account #: view:account.tax.code.template:0 msgid "Search tax template" -msgstr "" +msgstr "搜索税模板" #. module: account #: report:account.invoice:0 msgid "Your Reference" -msgstr "" +msgstr "你的关联单号" #. module: account #: view:account.move.reconcile:0 @@ -1242,12 +1245,12 @@ msgstr "逾期付款" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 msgid "Initial Balance" -msgstr "" +msgstr "期初余额" #. module: account #: view:account.invoice:0 msgid "Reset to Draft" -msgstr "" +msgstr "重置为草稿" #. module: account #: view:wizard.multi.charts.accounts:0 @@ -1263,13 +1266,12 @@ msgstr "报表选项" #. module: account #: model:ir.model,name:account.model_account_entries_report msgid "Journal Items Analysis" -msgstr "" +msgstr "日记帐明细分析" #. module: account -#: model:ir.actions.act_window,name:account.action_partner_all #: model:ir.ui.menu,name:account.next_id_22 msgid "Partners" -msgstr "" +msgstr "业务伙伴列表" #. module: account #: view:account.bank.statement:0 @@ -1296,7 +1298,7 @@ msgid "Central Journal" msgstr "主要的业务类型" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "You can not use this general account in this journal !" msgstr "在这业务类型您不能用这科目！" @@ -1314,7 +1316,7 @@ msgstr "余额不为0" #. module: account #: view:account.tax:0 msgid "Search Taxes" -msgstr "" +msgstr "察找税种" #. module: account #: model:ir.model,name:account.model_account_analytic_cost_ledger @@ -1329,7 +1331,7 @@ msgstr "创建凭证" #. module: account #: field:account.entries.report,nbr:0 msgid "# of Items" -msgstr "" +msgstr "项目" #. module: account #: field:account.automatic.reconcile,max_amount:0 @@ -1349,13 +1351,13 @@ msgstr "数字 #" #. module: account #: field:account.journal,entry_posted:0 msgid "Skip 'Draft' State for Manual Entries" -msgstr "" +msgstr "如果是手工分录的话就跳过“草稿”状态" #. module: account #: view:account.invoice.report:0 #: field:account.invoice.report,price_total:0 msgid "Total Without Tax" -msgstr "" +msgstr "不含税总金额" #. module: account #: model:ir.actions.act_window,help:account.action_move_journal_line @@ -1369,12 +1371,12 @@ msgstr "" #. module: account #: view:account.entries.report:0 msgid "# of Entries " -msgstr "" +msgstr "号分录 " #. module: account #: model:ir.model,name:account.model_temp_range msgid "A Temporary table used for Dashboard view" -msgstr "" +msgstr "用于仪表盘视图的临时表" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree4 @@ -1386,10 +1388,10 @@ msgstr "供应商红字发票" #: view:account.payment.term.line:0 msgid "" "Example: at 14 net days 2 percents, remaining amount at 30 days end of month." -msgstr "" +msgstr "例如：在14天内付款减百分之2，30天则没有减。" #. module: account -#: code:addons/account/invoice.py:815 +#: code:addons/account/invoice.py:823 #, python-format msgid "" "Cannot create the invoice !\n" @@ -1400,7 +1402,7 @@ msgstr "" #. module: account #: field:account.installer.modules,account_anglo_saxon:0 msgid "Anglo-Saxon Accounting" -msgstr "" +msgstr "英国会计系统" #. module: account #: selection:account.account,type:0 @@ -1416,7 +1418,7 @@ msgstr "已关闭" #. module: account #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries msgid "Recurring Entries" -msgstr "" +msgstr "经常性项目" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_template @@ -1426,7 +1428,7 @@ msgstr "财务结构模板" #. module: account #: model:account.tax.code,name:account.account_tax_code_0 msgid "Tax Code Test" -msgstr "" +msgstr "测试税代码" #. module: account #: field:account.automatic.reconcile,reconciled:0 @@ -1462,18 +1464,18 @@ msgstr "未完税" #. module: account #: view:account.partner.reconcile.process:0 msgid "Go to next partner" -msgstr "" +msgstr "下一个合作伙伴" #. module: account #: view:account.bank.statement:0 msgid "Search Bank Statements" -msgstr "" +msgstr "查阅银行对帐单" #. module: account #: sql_constraint:account.model.line:0 msgid "" "Wrong credit or debit value in model (Credit + Debit Must Be greater \"0\")!" -msgstr "" +msgstr "错误的现金或银行模型（信用+借方必须大于“0”）！" #. module: account #: view:account.chart.template:0 @@ -1502,12 +1504,12 @@ msgid "" "and the closing balance is to be found on your statement. When you are in " "the Payment column of a line, you can press F1 to open the reconciliation " "form." -msgstr "" +msgstr "银行对帐单是在一个给定的时间上的存款帐户发生的明细。当是你的一个网上交易清单，你可以按F1打开核销的形式。" #. module: account #: report:account.analytic.account.cost_ledger:0 msgid "Date/Code" -msgstr "" +msgstr "日期/代码" #. module: account #: field:account.analytic.line,general_account_id:0 @@ -1535,7 +1537,7 @@ msgstr "发票" #: model:process.node,note:account.process_node_analytic0 #: model:process.node,note:account.process_node_analyticcost0 msgid "Analytic costs to invoice" -msgstr "" +msgstr "开票成本分析" #. module: account #: view:ir.sequence:0 @@ -1548,10 +1550,9 @@ msgid "Separated Journal Sequences" msgstr "分散的业务类型序列" #. module: account -#: field:account.bank.statement,user_id:0 #: view:account.invoice:0 msgid "Responsible" -msgstr "" +msgstr "负责人" #. module: account #: report:account.overdue:0 @@ -1561,14 +1562,14 @@ msgstr "小计 :" #. module: account #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all msgid "Sales by Account Type" -msgstr "" +msgstr "销售科目类型" #. module: account #: view:account.invoice.refund:0 msgid "" "Cancel Invoice: Creates the refund invoice, validate and reconcile it to " "cancel the current invoice." -msgstr "" +msgstr "作废发票，退货发票，核销当前发票" #. module: account #: model:ir.ui.menu,name:account.periodical_processing_invoicing @@ -1594,12 +1595,12 @@ msgstr "年合计" #. module: account #: model:ir.actions.report.xml,name:account.report_account_voucher_new msgid "Print Voucher" -msgstr "" +msgstr "打印原始凭证" #. module: account #: view:account.change.currency:0 msgid "This wizard will change the currency of the invoice" -msgstr "" +msgstr "该向导将改变发票的币种" #. module: account #: model:ir.actions.act_window,help:account.action_account_chart @@ -1612,10 +1613,10 @@ msgstr "" #. module: account #: constraint:account.fiscalyear:0 msgid "Error! You cannot define overlapping fiscal years" -msgstr "" +msgstr "错误！你不能重复定义会计年度" #. module: account -#: code:addons/account/account_move_line.py:808 +#: code:addons/account/account_move_line.py:799 #, python-format msgid "The account is not defined to be reconciled !" msgstr "科目未设定为可核销！" @@ -1623,14 +1624,14 @@ msgstr "科目未设定为可核销！" #. module: account #: field:account.cashbox.line,pieces:0 msgid "Values" -msgstr "" +msgstr "值" #. module: account #: help:account.journal.period,active:0 msgid "" "If the active field is set to False, it will allow you to hide the journal " "period without removing it." -msgstr "" +msgstr "如果此字段设置为False，你可以让他隐藏而不删除它的报表。" #. module: account #: view:res.partner:0 @@ -1648,7 +1649,7 @@ msgid "Receivables & Payables" msgstr "应收&应付" #. module: account -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:806 #, python-format msgid "You have to provide an account for the write off entry !" msgstr "必须为差异凭证指定默认借贷方科目" @@ -1656,17 +1657,17 @@ msgstr "必须为差异凭证指定默认借贷方科目" #. module: account #: model:ir.model,name:account.model_account_common_journal_report msgid "Account Common Journal Report" -msgstr "" +msgstr "科目常用报表" #. module: account #: selection:account.partner.balance,display_partner:0 msgid "All Partners" -msgstr "" +msgstr "所有合作伙伴" #. module: account #: report:account.move.voucher:0 msgid "Ref. :" -msgstr "" +msgstr "关联单号:" #. module: account #: view:account.analytic.chart:0 @@ -1676,7 +1677,7 @@ msgstr "辅助核算项目一览表" #. module: account #: view:account.analytic.line:0 msgid "My Entries" -msgstr "" +msgstr "我的工作区" #. module: account #: report:account.overdue:0 @@ -1684,7 +1685,7 @@ msgid "Customer Ref:" msgstr "客户关联:" #. module: account -#: code:addons/account/account_cash_statement.py:328 +#: code:addons/account/account_cash_statement.py:329 #, python-format msgid "User %s does not have rights to access %s journal !" msgstr "" @@ -1702,10 +1703,10 @@ msgstr "银行单据草稿" #. module: account #: view:account.tax:0 msgid "Tax Declaration: Credit Notes" -msgstr "" +msgstr "纳税申报：欠款" #. module: account -#: code:addons/account/account.py:499 +#: code:addons/account/account.py:509 #, python-format msgid "You cannot deactivate an account that contains account moves." msgstr "你不能停用这科目因为它有凭证" @@ -1718,10 +1719,10 @@ msgstr "贷方金额" #. module: account #: constraint:account.move.line:0 msgid "You can not create move line on closed account." -msgstr "" +msgstr "您不能在关闭的科目上建立分录。" #. module: account -#: code:addons/account/account.py:519 +#: code:addons/account/account.py:529 #, python-format msgid "" "You cannot change the type of account from 'Closed' to any other type which " @@ -1731,65 +1732,65 @@ msgstr "你不能改变包含\"已关闭\"科目类型的凭证!" #. module: account #: view:res.company:0 msgid "Reserve And Profit/Loss Account" -msgstr "" +msgstr "损益类科目" #. module: account #: sql_constraint:account.move.line:0 msgid "Wrong credit or debit value in accounting entry !" -msgstr "" +msgstr "错误的出纳会计分录" #. module: account #: view:account.invoice.report:0 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all msgid "Invoices Analysis" -msgstr "" +msgstr "开票分析" #. module: account #: model:ir.model,name:account.model_account_period_close msgid "period close" -msgstr "" +msgstr "关闭一个会计期间" #. module: account #: view:account.installer:0 msgid "Configure Fiscal Year" -msgstr "" +msgstr "配置会计年度" #. module: account #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form msgid "Entries By Line" -msgstr "" +msgstr "进行中的项目" #. module: account #: report:account.tax.code.entries:0 msgid "A/c Code" -msgstr "" +msgstr "A/c编码" #. module: account #: field:account.invoice,move_id:0 #: field:account.invoice,move_name:0 msgid "Journal Entry" -msgstr "" +msgstr "分类账" #. module: account #: view:account.tax:0 msgid "Tax Declaration: Invoices" -msgstr "" +msgstr "纳税申报：发票" #. module: account #: field:account.cashbox.line,subtotal:0 msgid "Sub Total" -msgstr "" +msgstr "小计" #. module: account #: view:account.account:0 msgid "Treasury Analysis" -msgstr "" +msgstr "出纳报表" #. module: account #: constraint:res.company:0 msgid "Error! You can not create recursive companies." -msgstr "" +msgstr "错误！您不能创建循环的公司。" #. module: account #: view:account.analytic.account:0 @@ -1812,12 +1813,12 @@ msgstr "生效" #: model:ir.actions.act_window,name:account.action_account_print_journal #: model:ir.model,name:account.model_account_print_journal msgid "Account Print Journal" -msgstr "" +msgstr "打印科目明细帐" #. module: account #: model:ir.model,name:account.model_product_category msgid "Product Category" -msgstr "" +msgstr "产品类别" #. module: account #: selection:account.account.type,report_type:0 @@ -1827,18 +1828,18 @@ msgstr "/" #. module: account #: field:account.bs.report,reserve_account_id:0 msgid "Reserve & Profit/Loss Account" -msgstr "" +msgstr "损益类科目" #. module: account #: help:account.bank.statement,balance_end:0 msgid "Closing balance based on Starting Balance and Cash Transactions" -msgstr "" +msgstr "关闭现金交易，出纳对帐" #. 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 "" +msgstr "比较会计和支付项目" #. module: account #: view:account.tax:0 @@ -1859,7 +1860,7 @@ msgstr "勾选此项, 如果你想每个新建的业务类型使用不同的序 msgid "" "It adds the currency column if the currency is different then the company " "currency" -msgstr "" +msgstr "此选项增加一个辅助核算币种，他会自动转为记帐本位币。" #. module: account #: help:account.journal,allow_date:0 @@ -1871,19 +1872,19 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_pl_report msgid "Account Profit And Loss" -msgstr "" +msgstr "帐户盈亏" #. module: account #: field:account.installer,config_logo:0 #: field:account.installer.modules,config_logo:0 #: field:wizard.multi.charts.accounts,config_logo:0 msgid "Image" -msgstr "" +msgstr "图像" #. module: account #: report:account.move.voucher:0 msgid "Canceled" -msgstr "" +msgstr "已作废" #. module: account #: view:account.invoice:0 @@ -1896,7 +1897,7 @@ msgstr "未完税金额" msgid "" "If the active field is set to False, it will allow you to hide the tax " "without removing it." -msgstr "" +msgstr "如果此字段设置为False，你可以让他隐藏而不删除它的税表。" #. module: account #: help:account.bank.statement,name:0 @@ -1932,7 +1933,7 @@ msgstr "打开凭证" #. module: account #: field:account.automatic.reconcile,account_ids:0 msgid "Accounts to Reconcile" -msgstr "" +msgstr "科目核销" #. module: account #: model:process.transition,note:account.process_transition_filestatement0 @@ -1942,7 +1943,7 @@ msgstr "" #. module: account #: model:process.node,name:account.process_node_importinvoice0 msgid "Import from invoice" -msgstr "" +msgstr "进口发票" #. module: account #: selection:account.entries.report,month:0 @@ -1951,7 +1952,7 @@ msgstr "" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "January" -msgstr "" +msgstr "一月" #. module: account #: view:account.journal:0 @@ -1961,12 +1962,12 @@ msgstr "" #. module: account #: view:account.entries.report:0 msgid "This F.Year" -msgstr "" +msgstr "本财年" #. module: account #: view:account.tax.chart:0 msgid "Account tax charts" -msgstr "" +msgstr "纳税明细表" #. module: account #: constraint:account.period:0 @@ -1987,10 +1988,10 @@ msgstr "形式发票" #: code:addons/account/installer.py:348 #, python-format msgid " Journal" -msgstr "" +msgstr " 日记帐" #. module: account -#: code:addons/account/account.py:1319 +#: code:addons/account/account.py:1333 #, python-format msgid "" "There is no default default debit account defined \n" @@ -2012,7 +2013,7 @@ msgstr "" #. module: account #: view:account.chart.template:0 msgid "Search Chart of Account Templates" -msgstr "" +msgstr "搜索图表科目模板" #. module: account #: view:account.installer:0 @@ -2042,7 +2043,7 @@ msgid "Description" msgstr "说明" #. module: account -#: code:addons/account/account.py:2844 +#: code:addons/account/account.py:2888 #: code:addons/account/installer.py:498 #, python-format msgid "ECNJ" @@ -2062,7 +2063,7 @@ msgid "Income Account" msgstr "收入科目" #. module: account -#: code:addons/account/invoice.py:352 +#: code:addons/account/invoice.py:351 #, python-format msgid "There is no Accounting Journal of type Sale/Purchase defined!" msgstr "没定义销售/采购业务类型!" @@ -2073,6 +2074,7 @@ msgid "Accounting Properties" msgstr "会计属性" #. module: account +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 msgid "Entries Sorted By" @@ -2081,17 +2083,17 @@ msgstr "凭证排序按" #. module: account #: field:account.change.currency,currency_id:0 msgid "Change to" -msgstr "" +msgstr "更改为" #. module: account #: view:account.entries.report:0 msgid "# of Products Qty " -msgstr "" +msgstr "产品数量 " #. module: account #: model:ir.model,name:account.model_product_template msgid "Product Template" -msgstr "" +msgstr "产品模板" #. module: account #: report:account.account.balance:0 @@ -2101,6 +2103,7 @@ msgstr "" #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2189,7 +2192,7 @@ msgstr "待处理" #: model:process.node,note:account.process_node_draftinvoices0 #: model:process.node,note:account.process_node_supplierdraftinvoices0 msgid "Draft state of an invoice" -msgstr "" +msgstr "草稿状态的发票" #. module: account #: help:account.account,reconcile:0 @@ -2200,7 +2203,7 @@ msgstr "勾选, 如果用户可以在这科目核销凭证." #. module: account #: view:account.partner.reconcile.process:0 msgid "Partner Reconciliation" -msgstr "" +msgstr "往来业务核销" #. module: account #: field:account.tax,tax_code_id:0 @@ -2209,7 +2212,7 @@ msgid "Account Tax Code" msgstr "税事务科目" #. module: account -#: code:addons/account/invoice.py:545 +#: code:addons/account/invoice.py:552 #, python-format msgid "" "Can't find any account journal of %s type for this company.\n" @@ -2227,7 +2230,7 @@ msgstr "基础税事务代码" #. module: account #: help:account.invoice.tax,sequence:0 msgid "Gives the sequence order when displaying a list of invoice tax." -msgstr "" +msgstr "按顺序显示发票税列表." #. module: account #: field:account.tax,base_sign:0 @@ -2257,7 +2260,7 @@ msgstr "借方汇总" #: view:account.invoice.confirm:0 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm msgid "Confirm Draft Invoices" -msgstr "" +msgstr "草案确认发票" #. module: account #: field:account.entries.report,day:0 @@ -2266,12 +2269,12 @@ msgstr "" #: view:analytic.entries.report:0 #: field:analytic.entries.report,day:0 msgid "Day" -msgstr "" +msgstr "日" #. module: account #: model:ir.actions.act_window,name:account.act_account_renew_view msgid "Accounts to Renew" -msgstr "" +msgstr "延续科目有效期" #. module: account #: model:ir.model,name:account.model_account_model_line @@ -2279,11 +2282,11 @@ msgid "Account Model Entries" msgstr "凭证模板" #. module: account -#: code:addons/account/account.py:2796 +#: code:addons/account/account.py:2840 #: code:addons/account/installer.py:454 #, python-format msgid "EXJ" -msgstr "" +msgstr "EXJ" #. module: account #: field:product.template,supplier_taxes_id:0 @@ -2310,7 +2313,7 @@ msgstr "选择会计期间" #. module: account #: model:ir.ui.menu,name:account.menu_account_pp_statements msgid "Statements" -msgstr "" +msgstr "描述" #. module: account #: report:account.analytic.account.journal:0 @@ -2322,18 +2325,18 @@ msgstr "凭证名称" msgid "" "The fiscal position will determine taxes and the accounts used for the " "partner." -msgstr "" +msgstr "会计制度决定税的科目." #. module: account #: view:account.print.journal:0 msgid "" "This report gives you an overview of the situation of a specific journal" -msgstr "" +msgstr "这份报告是给你一个特定财务情况概述" #. module: account #: constraint:product.category:0 msgid "Error ! You can not create recursive categories." -msgstr "" +msgstr "错误!你不能创建递归的类型." #. module: account #: report:account.invoice:0 @@ -2362,10 +2365,10 @@ msgstr "辅助核算项目" #: model:ir.ui.menu,name:account.menu_action_account_form #: model:ir.ui.menu,name:account.menu_analytic msgid "Accounts" -msgstr "" +msgstr "科目" #. module: account -#: code:addons/account/invoice.py:351 +#: code:addons/account/invoice.py:350 #, python-format msgid "Configuration Error!" msgstr "设置错误!" @@ -2374,16 +2377,15 @@ msgstr "设置错误!" #: view:account.invoice.report:0 #: field:account.invoice.report,price_average:0 msgid "Average Price" -msgstr "" +msgstr "平均价格" #. module: account -#: report:account.move.voucher:0 #: report:account.overdue:0 msgid "Date:" msgstr "日期:" #. module: account -#: code:addons/account/account.py:640 +#: code:addons/account/account.py:654 #, python-format msgid "" "You cannot modify company of this journal as its related record exist in " @@ -2393,12 +2395,12 @@ msgstr "" #. module: account #: report:account.journal.period.print:0 msgid "Label" -msgstr "" +msgstr "标签" #. module: account #: view:account.tax:0 msgid "Accounting Information" -msgstr "" +msgstr "会计信息" #. module: account #: view:account.tax:0 @@ -2419,6 +2421,7 @@ msgstr "折扣(%)" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2429,12 +2432,12 @@ msgstr "关联单号" #. module: account #: help:account.move.line,tax_code_id:0 msgid "The Account can either be a base tax code or a tax code account." -msgstr "" +msgstr "该科目可以是一个基本的税法或税法帐户。（如营业税）" #. module: account #: model:ir.ui.menu,name:account.menu_automatic_reconcile msgid "Automatic Reconciliation" -msgstr "" +msgstr "自动核销" #. module: account #: field:account.invoice,reconciled:0 @@ -2452,7 +2455,7 @@ msgstr "退税事务代码" #: model:ir.actions.act_window,name:account.action_bank_statement_tree #: model:ir.ui.menu,name:account.menu_bank_statement_tree msgid "Bank Statements" -msgstr "" +msgstr "银行对帐单" #. module: account #: selection:account.tax.template,applicable_type:0 @@ -2465,7 +2468,7 @@ msgstr "真" #: view:account.move:0 #: view:account.move.line:0 msgid "Dates" -msgstr "" +msgstr "日期" #. module: account #: field:account.tax,parent_id:0 @@ -2478,7 +2481,7 @@ msgstr "上级税科目" msgid "" "Automatically generate entries based on what has been entered in the system " "before a specific date." -msgstr "" +msgstr "自动生成以这之前的预约项目." #. module: account #: view:account.aged.trial.balance:0 @@ -2491,7 +2494,7 @@ msgstr "账龄分析表" #: model:process.transition,name:account.process_transition_entriesreconcile0 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0 msgid "Accounting entries" -msgstr "" +msgstr "会计分录" #. module: account #: field:account.invoice.line,discount:0 @@ -2512,31 +2515,31 @@ msgstr "" #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart #: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble msgid "New Company Financial Setting" -msgstr "" +msgstr "新公司财务设置" #. module: account #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all #: view:report.account.sales:0 #: view:report.account_type.sales:0 msgid "Sales by Account" -msgstr "" +msgstr "销售科目" #. module: account #: view:account.use.model:0 msgid "This wizard will create recurring accounting entries" -msgstr "" +msgstr "该向导将创建经常性的会计分录" #. module: account -#: code:addons/account/account.py:1181 +#: code:addons/account/account.py:1195 #, python-format msgid "No sequence defined on the journal !" -msgstr "" +msgstr "在日记帐中没有定义的序列！" #. module: account -#: code:addons/account/account.py:2083 +#: code:addons/account/account.py:2097 #: code:addons/account/account_bank_statement.py:350 -#: code:addons/account/account_move_line.py:170 -#: code:addons/account/invoice.py:670 +#: code:addons/account/account_move_line.py:169 +#: code:addons/account/invoice.py:678 #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" @@ -2569,7 +2572,7 @@ msgstr "会计期间到" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "August" -msgstr "" +msgstr "8月" #. module: account #: code:addons/account/account_bank_statement.py:306 @@ -2601,7 +2604,7 @@ msgstr "关联单号数" #: selection:report.account.sales,month:0 #: selection:report.account_type.sales,month:0 msgid "October" -msgstr "" +msgstr "10月" #. module: account #: help:account.move.line,quantity:0 @@ -2613,7 +2616,7 @@ msgstr "" #. module: account #: view:account.payment.term.line:0 msgid "Line 2:" -msgstr "" +msgstr "第2行" #. module: account #: field:account.journal.column,required:0 @@ -2646,7 +2649,7 @@ msgstr "基础税事务代码的金额" #. module: account #: field:wizard.multi.charts.accounts,sale_tax:0 msgid "Default Sale Tax" -msgstr "" +msgstr "默认销项税" #. module: account #: help:account.model.line,date_maturity:0 @@ -2654,7 +2657,7 @@ msgid "" "The maturity date of the generated entries for this model. You can choose " "between the creation date or the creation date of the entries plus the " "partner payment terms." -msgstr "" +msgstr "您可以选择开始日期且加上该项止合作伙伴的付款条件,由此模型生成的项目的到期日." #. module: account #: model:ir.ui.menu,name:account.menu_finance_accounting @@ -2665,7 +2668,7 @@ msgstr "财务会计" #: view:account.pl.report:0 #: model:ir.ui.menu,name:account.menu_account_pl_report msgid "Profit And Loss" -msgstr "" +msgstr "盈利或亏损" #. module: account #: view:account.fiscal.position:0 @@ -2696,7 +2699,7 @@ msgid "Analytic Entries" msgstr "辅助核算凭证" #. module: account -#: code:addons/account/account.py:822 +#: code:addons/account/account.py:836 #, python-format msgid "" "No fiscal year defined for this date !\n" @@ -2728,12 +2731,12 @@ msgstr "这用户负责这业务类型" #. module: account #: view:account.period:0 msgid "Search Period" -msgstr "" +msgstr "搜寻时期" #. module: account #: view:account.change.currency:0 msgid "Invoice Currency" -msgstr "" +msgstr "货币种类" #. module: account #: field:account.payment.term,line_ids:0 @@ -2743,7 +2746,7 @@ msgstr "条款" #. module: account #: field:account.bank.statement,total_entry_encoding:0 msgid "Cash Transaction" -msgstr "" +msgstr "现金交易" #. module: account #: view:res.partner:0 @@ -2779,7 +2782,7 @@ msgstr "条款名称" #. module: account #: view:account.fiscalyear:0 msgid "Search Fiscalyear" -msgstr "" +msgstr "搜索会计年度" #. module: account #: selection:account.tax,applicable_type:0 @@ -2789,7 +2792,7 @@ msgstr "" #. module: account #: view:account.analytic.line:0 msgid "Total Quantity" -msgstr "" +msgstr "合计数量" #. module: account #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0 @@ -2822,11 +2825,11 @@ msgid "BNK%s" msgstr "" #. module: account -#: code:addons/account/account.py:2906 +#: code:addons/account/account.py:2950 #: code:addons/account/installer.py:296 #, python-format msgid "BNK" -msgstr "" +msgstr "银行" #. module: account #: field:account.move.line,analytic_lines:0 @@ -2851,17 +2854,17 @@ msgstr "税事务模板" #. module: account #: view:account.subscription:0 msgid "Starts on" -msgstr "" +msgstr "开始" #. module: account #: model:ir.model,name:account.model_account_partner_ledger msgid "Account Partner Ledger" -msgstr "" +msgstr "合作伙伴会计帐本(往来帐)" #. module: account #: help:account.journal.column,sequence:0 msgid "Gives the sequence order to journal column." -msgstr "" +msgstr "给日记帐排序号" #. module: account #: view:account.tax.template:0 @@ -2873,7 +2876,7 @@ msgstr "税说明" #: help:account.account.template,currency_id:0 #: help:account.bank.accounts.wizard,currency_id:0 msgid "Forces all moves for this account to have this secondary currency." -msgstr "" +msgstr "将此科目的所有发生都转移到他的二级科目。" #. module: account #: model:ir.actions.act_window,help:account.action_validate_account_move_line @@ -2896,7 +2899,7 @@ msgstr "从模板产生科目一览表" #. module: account #: model:ir.model,name:account.model_account_unreconcile_reconcile msgid "Account Unreconcile Reconcile" -msgstr "" +msgstr "科目核销反核销" #. module: account #: help:account.account.type,close_method:0 @@ -2931,6 +2934,7 @@ msgstr "为使用费用科目而留空" #: field:account.common.report,journal_ids:0 #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 +#: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 #: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 @@ -2952,7 +2956,7 @@ msgstr "业务类型" #. module: account #: field:account.partner.reconcile.process,to_reconcile:0 msgid "Remaining Partners" -msgstr "" +msgstr "剩下的合作伙伴" #. module: account #: view:account.subscription:0 @@ -2977,7 +2981,7 @@ msgstr "采购" #: model:ir.actions.act_window,name:account.action_account_installer #: view:wizard.multi.charts.accounts:0 msgid "Accounting Application Configuration" -msgstr "" +msgstr "会计应用程序配置" #. module: account #: model:ir.actions.act_window,name:account.open_board_account @@ -2991,7 +2995,7 @@ msgid "Starting Balance" msgstr "开始余额" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "No Partner Defined !" msgstr "未定义业务伙伴！" @@ -3018,12 +3022,12 @@ msgstr "增值税" msgid "" "The amount expressed in the related account currency if not equal to the " "company one." -msgstr "" +msgstr "如果不是同一公司, 这金额表示相关项的货币" #. module: account #: report:account.move.voucher:0 msgid "Journal:" -msgstr "" +msgstr "账簿：" #. module: account #: view:account.bank.statement:0 @@ -3033,7 +3037,6 @@ msgstr "" #: view:account.invoice.report:0 #: selection:account.invoice.report,state:0 #: selection:account.journal.period,state:0 -#: report:account.move.voucher:0 #: view:account.subscription:0 #: selection:account.subscription,state:0 #: selection:report.invoice.created,state:0 @@ -3043,7 +3046,7 @@ msgstr "草稿" #. module: account #: model:ir.actions.act_window,name:account.action_account_configuration_installer msgid "Accounting Chart Configuration" -msgstr "" +msgstr "会计图表配置" #. module: account #: field:account.tax.code,notprintable:0 @@ -3055,17 +3058,17 @@ msgstr "不打印在发票上" #: report:account.vat.declaration:0 #: field:account.vat.declaration,chart_tax_id:0 msgid "Chart of Tax" -msgstr "" +msgstr "税表" #. module: account #: view:account.journal:0 msgid "Search Account Journal" -msgstr "" +msgstr "搜索科目报表" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice msgid "Pending Invoice" -msgstr "" +msgstr "待开票" #. module: account #: selection:account.subscription,period_type:0 @@ -3075,17 +3078,17 @@ msgstr "年" #. module: account #: report:account.move.voucher:0 msgid "Authorised Signatory" -msgstr "" +msgstr "授权的签字人" #. module: account #: view:validate.account.move.lines:0 msgid "" "All selected journal entries will be validated and posted. It means you " "won't be able to modify their accounting fields anymore." -msgstr "" +msgstr "所有的凭证和报表将过帐,这意味着你将不能修改之个会计期间了。" #. module: account -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Cannot delete invoice(s) that are already opened or paid !" msgstr "无法删除未结或已付款的发票！" @@ -3118,12 +3121,12 @@ msgstr "税金额" #. module: account #: view:account.installer:0 msgid "Your bank and cash accounts" -msgstr "" +msgstr "你的科目和现金科目" #. module: account #: view:account.move:0 msgid "Search Move" -msgstr "" +msgstr "移动搜索" #. module: account #: field:account.tax.code,name:0 @@ -3143,10 +3146,10 @@ msgstr "发票草稿" msgid "" "Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' " "or 'Done' state!" -msgstr "" +msgstr "选择的发票不能被取消，因为它们已“取消”或“完成”状态了！" #. module: account -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:532 #, python-format msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " @@ -3155,24 +3158,25 @@ msgstr "你不能修改这会计类型从'%s' 到 '%s' 因为它含有凭证" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" -msgstr "" +msgstr "对方" #. module: account #: view:account.journal:0 msgid "Invoicing Data" -msgstr "" +msgstr "进销存数据" #. module: account #: field:account.invoice.report,state:0 msgid "Invoice State" -msgstr "" +msgstr "发票状态" #. module: account #: view:account.invoice.report:0 #: field:account.invoice.report,categ_id:0 msgid "Category of Product" -msgstr "" +msgstr "产品类别" #. module: account #: view:account.move:0 @@ -3180,18 +3184,18 @@ msgstr "" #: view:account.move.line:0 #: field:account.move.line,narration:0 msgid "Narration" -msgstr "" +msgstr "描述" #. module: account #: view:account.addtmpl.wizard:0 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form msgid "Create Account" -msgstr "" +msgstr "创建科目" #. module: account #: model:ir.model,name:account.model_report_account_type_sales msgid "Report of the Sales by Account Type" -msgstr "" +msgstr "销售报表的科目类型" #. module: account #: selection:account.account.type,close_method:0 @@ -3201,7 +3205,7 @@ msgstr "详情" #. module: account #: field:account.installer,bank_accounts_id:0 msgid "Your Bank and Cash Accounts" -msgstr "" +msgstr "您的银行及现金帐户" #. module: account #: report:account.invoice:0 @@ -3219,7 +3223,7 @@ msgstr "科目表" #. module: account #: view:account.tax.chart:0 msgid "(If you do not select period it will take all open periods)" -msgstr "" +msgstr "如果你不选择时间，将可以在任何期间看到" #. module: account #: field:account.journal,centralisation:0 @@ -3229,7 +3233,7 @@ msgstr "汇总副本" #. module: account #: model:ir.model,name:account.model_account_partner_reconcile_process msgid "Reconcilation Process partner by partner" -msgstr "" +msgstr "核销合作进程的合作伙伴" #. module: account #: selection:account.automatic.reconcile,power:0 @@ -3257,6 +3261,7 @@ msgstr "如果你不选择会计年度将使用所有开启的会计年度" #: field:account.entries.report,date:0 #: selection:account.general.journal,filter:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice.report,date:0 #: report:account.journal.period.print:0 #: view:account.move:0 @@ -3300,7 +3305,7 @@ msgid "Chart of Accounts Template" msgstr "科目表模板" #. module: account -#: code:addons/account/account.py:2095 +#: code:addons/account/account.py:2109 #, python-format msgid "" "Maturity date of entry line generated by model line '%s' of model '%s' is " @@ -3309,13 +3314,13 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:810 +#: code:addons/account/account_move_line.py:801 #, python-format msgid "Some entries are already reconciled !" msgstr "部分凭证已核销！" #. module: account -#: code:addons/account/account.py:1204 +#: code:addons/account/account.py:1218 #, python-format msgid "" "You cannot validate a Journal Entry unless all journal items are in same " @@ -3330,7 +3335,7 @@ msgstr "税" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets msgid "Budgets" -msgstr "" +msgstr "预算" #. module: account #: selection:account.aged.trial.balance,filter:0 @@ -3349,7 +3354,7 @@ msgstr "" #: selection:account.report.general.ledger,filter:0 #: selection:account.vat.declaration,filter:0 msgid "No Filters" -msgstr "" +msgstr "无过滤器" #. module: account #: selection:account.analytic.journal,type:0 @@ -3359,7 +3364,7 @@ msgstr "状况" #. module: account #: view:res.partner:0 msgid "History" -msgstr "" +msgstr "历史记录" #. module: account #: help:account.tax,applicable_type:0 @@ -3379,7 +3384,7 @@ msgstr "可用代码(如果类型=代码)" #: view:account.invoice.report:0 #: field:account.invoice.report,product_qty:0 msgid "Qty" -msgstr "" +msgstr "数量" #. module: account #: field:account.invoice.report,address_contact_id:0 @@ -3435,7 +3440,7 @@ msgid "Analytic Items" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "Unable to change tax !" msgstr "无法更改税目!" @@ -3446,14 +3451,14 @@ msgid "#Entries" msgstr "" #. module: account -#: code:addons/account/invoice.py:1422 +#: code:addons/account/invoice.py:1437 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." msgstr "" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #, python-format msgid "" "The Payment Term of Supplier does not have Payment Term Lines(Computation) " @@ -3491,7 +3496,7 @@ msgstr "名称" #. module: account #: model:ir.model,name:account.model_account_aged_trial_balance msgid "Account Aged Trial balance Report" -msgstr "" +msgstr "账龄试算平衡表" #. module: account #: field:account.move.line,date:0 @@ -3570,7 +3575,7 @@ msgstr "" #. module: account #: field:account.partner.balance,display_partner:0 msgid "Display Partners" -msgstr "" +msgstr "显示业务伙伴" #. module: account #: view:account.invoice:0 @@ -3747,7 +3752,7 @@ msgid "Acc.Type" msgstr "" #. module: account -#: code:addons/account/invoice.py:714 +#: code:addons/account/invoice.py:722 #, python-format msgid "Global taxes defined, but are not in invoice lines !" msgstr "已定义通用税目， 但未在发票行中出现！" @@ -3806,7 +3811,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:91 +#: code:addons/account/account_analytic_line.py:90 #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -3981,7 +3986,7 @@ msgid "Credit Notes" msgstr "退还" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "Unable to find a valid period !" @@ -4052,11 +4057,11 @@ msgid "Change" msgstr "改变" #. module: account -#: code:addons/account/account.py:1290 -#: code:addons/account/account.py:1318 -#: code:addons/account/account.py:1325 -#: code:addons/account/account_move_line.py:1055 -#: code:addons/account/invoice.py:896 +#: code:addons/account/account.py:1304 +#: code:addons/account/account.py:1332 +#: code:addons/account/account.py:1339 +#: code:addons/account/account_move_line.py:1061 +#: code:addons/account/invoice.py:904 #: code:addons/account/wizard/account_automatic_reconcile.py:152 #: code:addons/account/wizard/account_fiscalyear_close.py:78 #: code:addons/account/wizard/account_fiscalyear_close.py:81 @@ -4160,7 +4165,7 @@ msgid "You must define an analytic journal of type '%s' !" msgstr "您必须定义这辅助核算类型'%s' !" #. module: account -#: code:addons/account/account.py:1397 +#: code:addons/account/account.py:1411 #, python-format msgid "" "Couldn't create move with currency different from the secondary currency of " @@ -4225,7 +4230,7 @@ msgid "Invoices" msgstr "发票列表" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "" "Please verify the price of the invoice !\n" @@ -4337,25 +4342,24 @@ msgid "Third Party (Country)" msgstr "" #. module: account -#: code:addons/account/account.py:938 -#: code:addons/account/account.py:940 -#: code:addons/account/account.py:1181 -#: code:addons/account/account.py:1393 -#: code:addons/account/account.py:1397 -#: code:addons/account/account_cash_statement.py:249 -#: code:addons/account/account_move_line.py:780 -#: code:addons/account/account_move_line.py:803 -#: code:addons/account/account_move_line.py:805 -#: code:addons/account/account_move_line.py:808 -#: code:addons/account/account_move_line.py:810 -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account.py:952 +#: code:addons/account/account.py:954 +#: code:addons/account/account.py:1195 +#: code:addons/account/account.py:1407 +#: code:addons/account/account.py:1411 +#: code:addons/account/account_cash_statement.py:250 +#: code:addons/account/account_move_line.py:771 +#: code:addons/account/account_move_line.py:794 +#: code:addons/account/account_move_line.py:796 +#: code:addons/account/account_move_line.py:799 +#: code:addons/account/account_move_line.py:801 +#: code:addons/account/account_move_line.py:1123 #: code:addons/account/report/common_report_header.py:92 -#: code:addons/account/wizard/account_change_currency.py:39 -#: code:addons/account/wizard/account_change_currency.py:60 -#: code:addons/account/wizard/account_change_currency.py:65 -#: code:addons/account/wizard/account_change_currency.py:71 +#: 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_move_bank_reconcile.py:49 -#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_report_common.py:120 #: code:addons/account/wizard/account_report_common.py:126 #, python-format @@ -4377,7 +4381,7 @@ msgid "Bank Details" msgstr "银行信息" #. module: account -#: code:addons/account/invoice.py:720 +#: code:addons/account/invoice.py:728 #, python-format msgid "Taxes missing !" msgstr "缺少税目！" @@ -4432,7 +4436,7 @@ msgid "Check Date not in the Period" msgstr "" #. module: account -#: code:addons/account/account.py:1210 +#: code:addons/account/account.py:1224 #, python-format msgid "" "You can not modify a posted entry of this journal !\n" @@ -4453,7 +4457,7 @@ msgid "Child Tax Accounts" msgstr "子税科目" #. module: account -#: code:addons/account/account.py:940 +#: code:addons/account/account.py:954 #, python-format msgid "Start period should be smaller then End period" msgstr "" @@ -4483,6 +4487,7 @@ msgstr "辅助核算余额 -" #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 #: report:account.partner.balance:0 @@ -4565,7 +4570,7 @@ msgid "Line 1:" msgstr "" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "Integrity Error !" msgstr "完整性错误！" @@ -4711,7 +4716,7 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account.py:2067 +#: code:addons/account/account.py:2081 #: code:addons/account/wizard/account_use_model.py:69 #, python-format msgid "No period found !" @@ -4783,7 +4788,7 @@ msgid "" msgstr "在计算前加入的天数, 如日期为01/15, 天数是22, 月天数为-1,则应付日期是02/28。" #. module: account -#: code:addons/account/account.py:2896 +#: code:addons/account/account.py:2940 #: code:addons/account/installer.py:283 #: code:addons/account/installer.py:295 #, python-format @@ -4811,7 +4816,7 @@ msgid "Start of period" msgstr "开始会计期间" #. module: account -#: code:addons/account/account_move_line.py:1193 +#: code:addons/account/account_move_line.py:1199 #, python-format msgid "" "You can not do this modification on a reconciled entry ! Please note that " @@ -4867,12 +4872,12 @@ msgstr "结束会计年度业务类型" #. module: account #: code:addons/account/account_bank_statement.py:331 -#: code:addons/account/invoice.py:405 -#: code:addons/account/invoice.py:505 -#: code:addons/account/invoice.py:520 -#: code:addons/account/invoice.py:528 -#: code:addons/account/invoice.py:545 -#: code:addons/account/invoice.py:1347 +#: code:addons/account/invoice.py:408 +#: code:addons/account/invoice.py:508 +#: code:addons/account/invoice.py:523 +#: code:addons/account/invoice.py:531 +#: code:addons/account/invoice.py:552 +#: code:addons/account/invoice.py:1361 #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" @@ -4949,7 +4954,7 @@ msgid "Sort By" msgstr "" #. module: account -#: code:addons/account/account.py:1326 +#: code:addons/account/account.py:1340 #, python-format msgid "" "There is no default default credit account defined \n" @@ -5096,7 +5101,7 @@ msgid "Generate Opening Entries" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:738 +#: code:addons/account/account_move_line.py:729 #, python-format msgid "Already Reconciled!" msgstr "" @@ -5132,7 +5137,7 @@ msgstr "子科目" #. module: account #: view:account.move.line.reconcile:0 -#: code:addons/account/account_move_line.py:830 +#: code:addons/account/account_move_line.py:821 #, python-format msgid "Write-Off" msgstr "补差额" @@ -5269,7 +5274,7 @@ msgid "# of Lines" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:60 +#: code:addons/account/wizard/account_change_currency.py:59 #, python-format msgid "New currency is not confirured properly !" msgstr "" @@ -5294,14 +5299,14 @@ msgid "Filter by" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "You can not use an inactive account!" msgstr "您不能使用一个停用的科目！" #. module: account -#: code:addons/account/account_move_line.py:803 +#: code:addons/account/account_move_line.py:794 #, python-format msgid "Entries are not of the same account or already reconciled ! " msgstr "不同科目或已核算的凭证！ " @@ -5336,7 +5341,7 @@ msgstr "7" #. module: account #: code:addons/account/account_bank_statement.py:391 -#: code:addons/account/invoice.py:370 +#: code:addons/account/invoice.py:373 #, python-format msgid "Invalid action !" msgstr "无效动作！" @@ -5547,7 +5552,7 @@ msgid "Companies" msgstr "" #. module: account -#: code:addons/account/account.py:532 +#: code:addons/account/account.py:546 #, python-format msgid "" "You cannot modify Company of account as its related record exist in Entry " @@ -5813,9 +5818,9 @@ msgid "Optional create" msgstr "" #. module: account -#: code:addons/account/invoice.py:406 -#: code:addons/account/invoice.py:506 -#: code:addons/account/invoice.py:1348 +#: code:addons/account/invoice.py:409 +#: code:addons/account/invoice.py:509 +#: code:addons/account/invoice.py:1362 #, python-format msgid "Can not find account chart for this company, Please Create account." msgstr "" @@ -5964,8 +5969,8 @@ msgid "Analytic Entries Statistics" msgstr "" #. module: account -#: code:addons/account/account_analytic_line.py:143 -#: code:addons/account/account_move_line.py:905 +#: code:addons/account/account_analytic_line.py:141 +#: code:addons/account/account_move_line.py:897 #, python-format msgid "Entries: " msgstr "凭证： " @@ -5976,7 +5981,7 @@ msgid "Create manual recurring entries in a chosen journal." msgstr "" #. module: account -#: code:addons/account/account.py:1393 +#: code:addons/account/account.py:1407 #, python-format msgid "Couldn't create move between different companies" msgstr "无法创建公司之间的过帐" @@ -6014,7 +6019,7 @@ msgid "Total debit" msgstr "借方合计" #. module: account -#: code:addons/account/account_move_line.py:781 +#: code:addons/account/account_move_line.py:772 #, python-format msgid "Entry \"%s\" is not valid !" msgstr "凭证\"%s\"无效！" @@ -6078,30 +6083,31 @@ msgid " valuation: percent" msgstr "" #. module: account -#: code:addons/account/account.py:499 -#: code:addons/account/account.py:501 -#: code:addons/account/account.py:822 -#: code:addons/account/account.py:901 -#: code:addons/account/account.py:976 -#: code:addons/account/account.py:1204 -#: code:addons/account/account.py:1210 -#: code:addons/account/account.py:2095 -#: code:addons/account/account.py:2333 -#: code:addons/account/account_analytic_line.py:90 -#: code:addons/account/account_analytic_line.py:99 +#: code:addons/account/account.py:509 +#: code:addons/account/account.py:511 +#: code:addons/account/account.py:836 +#: code:addons/account/account.py:915 +#: code:addons/account/account.py:990 +#: code:addons/account/account.py:1218 +#: code:addons/account/account.py:1224 +#: code:addons/account/account.py:2109 +#: code:addons/account/account.py:2357 +#: code:addons/account/account_analytic_line.py:89 +#: code:addons/account/account_analytic_line.py:98 #: code:addons/account/account_bank_statement.py:292 #: code:addons/account/account_bank_statement.py:305 #: code:addons/account/account_bank_statement.py:345 -#: code:addons/account/account_cash_statement.py:328 -#: code:addons/account/account_cash_statement.py:348 -#: code:addons/account/account_move_line.py:1176 -#: code:addons/account/account_move_line.py:1191 -#: code:addons/account/account_move_line.py:1193 -#: code:addons/account/invoice.py:785 -#: code:addons/account/invoice.py:815 -#: code:addons/account/invoice.py:1008 +#: code:addons/account/account_cash_statement.py:329 +#: code:addons/account/account_cash_statement.py:349 +#: code:addons/account/account_move_line.py:1182 +#: code:addons/account/account_move_line.py:1197 +#: code:addons/account/account_move_line.py:1199 +#: code:addons/account/invoice.py:793 +#: code:addons/account/invoice.py:823 +#: code:addons/account/invoice.py:1014 #: code:addons/account/wizard/account_invoice_refund.py:100 #: code:addons/account/wizard/account_invoice_refund.py:102 +#: code:addons/account/wizard/account_open_closed_fiscalyear.py:40 #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" @@ -6211,7 +6217,7 @@ msgid "Journal Select" msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:65 +#: code:addons/account/wizard/account_change_currency.py:64 #, python-format msgid "Currnt currency is not confirured properly !" msgstr "" @@ -6228,9 +6234,11 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger +#: model:ir.actions.report.xml,name:account.account_general_ledger_landscape #: model:ir.ui.menu,name:account.menu_general_ledger msgid "General Ledger" msgstr "按全部业务类型打印全部凭证" @@ -6284,7 +6292,7 @@ msgid "Total:" msgstr "合计:" #. module: account -#: code:addons/account/account.py:2050 +#: code:addons/account/account.py:2064 #, python-format msgid "" "You can specify year, month and date in the name of the model using the " @@ -6314,7 +6322,7 @@ msgid "Child Codes" msgstr "子代码" #. module: account -#: code:addons/account/invoice.py:473 +#: code:addons/account/invoice.py:476 #: code:addons/account/wizard/account_invoice_refund.py:137 #, python-format msgid "Data Insufficient !" @@ -6471,7 +6479,7 @@ msgid "Lines" msgstr "明细" #. module: account -#: code:addons/account/invoice.py:521 +#: code:addons/account/invoice.py:524 #, python-format msgid "" "Can not find account chart for this company in invoice line account, Please " @@ -6639,7 +6647,7 @@ msgid "" msgstr "这字段只用于如果你开发自己的模块允许开发者在自定义域创建特定的税" #. module: account -#: code:addons/account/account.py:938 +#: code:addons/account/account.py:952 #, python-format msgid "You should have chosen periods that belongs to the same company" msgstr "" @@ -6743,7 +6751,7 @@ msgid "Sign on Reports" msgstr "报表上的符号" #. module: account -#: code:addons/account/account_cash_statement.py:249 +#: code:addons/account/account_cash_statement.py:250 #, python-format msgid "You can not have two open register for the same journal" msgstr "" @@ -6772,7 +6780,6 @@ msgstr "" #. module: account #: report:account.invoice:0 #: view:account.invoice:0 -#: report:account.move.voucher:0 msgid "PRO-FORMA" msgstr "形式发票" @@ -6788,7 +6795,7 @@ msgstr "" #: view:account.move.line:0 #: selection:account.move.line,state:0 msgid "Unbalanced" -msgstr "" +msgstr "不平衡" #. module: account #: selection:account.move.line,centralisation:0 @@ -6802,6 +6809,7 @@ msgstr "可选信息" #. module: account #: view:account.analytic.line:0 +#: field:account.bank.statement,user_id:0 #: view:account.journal:0 #: field:account.journal,user_id:0 #: view:analytic.entries.report:0 @@ -6827,13 +6835,13 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1271 +#: code:addons/account/account_move_line.py:1277 #, python-format msgid "Bad account !" msgstr "无效科目!" #. module: account -#: code:addons/account/account.py:2777 +#: code:addons/account/account.py:2821 #: code:addons/account/installer.py:432 #, python-format msgid "Sales Journal" @@ -6851,7 +6859,7 @@ msgid "Invoice Tax" msgstr "发票税" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "No piece number !" msgstr "没会计期间!" @@ -7085,17 +7093,17 @@ msgid "Fixed" msgstr "固定" #. module: account -#: code:addons/account/account.py:506 -#: code:addons/account/account.py:519 -#: code:addons/account/account.py:522 +#: code:addons/account/account.py:516 +#: code:addons/account/account.py:529 #: code:addons/account/account.py:532 -#: code:addons/account/account.py:640 -#: code:addons/account/account.py:927 -#: code:addons/account/account_move_line.py:732 -#: code:addons/account/account_move_line.py:776 -#: code:addons/account/invoice.py:714 -#: code:addons/account/invoice.py:717 -#: code:addons/account/invoice.py:720 +#: code:addons/account/account.py:546 +#: code:addons/account/account.py:654 +#: code:addons/account/account.py:941 +#: code:addons/account/account_move_line.py:723 +#: code:addons/account/account_move_line.py:767 +#: code:addons/account/invoice.py:722 +#: code:addons/account/invoice.py:725 +#: code:addons/account/invoice.py:728 #, python-format msgid "Warning !" msgstr "警告 !" @@ -7127,6 +7135,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -7157,7 +7166,7 @@ msgid "Can not %s draft/proforma/cancel invoice." msgstr "不能注销 %s 草稿/形式/取消的发票" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "No Invoice Lines !" msgstr "" @@ -7206,7 +7215,7 @@ msgid "Deferral Method" msgstr "递延方法" #. module: account -#: code:addons/account/invoice.py:359 +#: code:addons/account/invoice.py:360 #, python-format msgid "Invoice '%s' is paid." msgstr "" @@ -7267,7 +7276,7 @@ msgid "Associated Partner" msgstr "相关业务伙伴" #. module: account -#: code:addons/account/invoice.py:1284 +#: code:addons/account/invoice.py:1298 #, python-format msgid "You must first select a partner !" msgstr "你必须首先选择一个业务伙伴!" @@ -7332,7 +7341,7 @@ msgid "Choose Fiscal Year" msgstr "选择会计年度" #. module: account -#: code:addons/account/account.py:2841 +#: code:addons/account/account.py:2885 #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" @@ -7367,6 +7376,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,period_id:0 #: view:account.fiscalyear:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: view:account.invoice.report:0 #: field:account.journal.period,period_id:0 @@ -7529,7 +7539,7 @@ msgid "Account Types" msgstr "科目类型" #. module: account -#: code:addons/account/invoice.py:897 +#: code:addons/account/invoice.py:905 #, python-format msgid "Cannot create invoice move on centralised journal" msgstr "你不能在汇总的副本里创建发票凭证" @@ -7579,6 +7589,7 @@ msgstr "退款(开红字发票)业务类型" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 +#: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 msgid "Filter By" msgstr "" @@ -7617,7 +7628,7 @@ msgid "Payment Term Line" msgstr "付款条款明细" #. module: account -#: code:addons/account/account.py:2794 +#: code:addons/account/account.py:2838 #: code:addons/account/installer.py:452 #, python-format msgid "Purchase Journal" @@ -7784,8 +7795,8 @@ msgid "" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1131 -#: code:addons/account/account_move_line.py:1214 +#: code:addons/account/account_move_line.py:1137 +#: code:addons/account/account_move_line.py:1220 #, python-format msgid "Bad account!" msgstr "无效科目！" @@ -7796,7 +7807,7 @@ msgid "Keep empty for all open fiscal years" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:1056 +#: code:addons/account/account_move_line.py:1062 #, python-format msgid "The account move (%s) for centralisation has been confirmed!" msgstr "" @@ -7817,6 +7828,7 @@ msgstr "如果它是一个多货币凭证,这金额表示一个可选的其它 #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -7989,14 +8001,14 @@ msgid "Period from" msgstr "会计期间从" #. module: account -#: code:addons/account/account.py:2817 +#: code:addons/account/account.py:2861 #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" msgstr "" #. module: account -#: code:addons/account/account.py:927 +#: code:addons/account/account.py:941 #, python-format msgid "" "You cannot modify company of this period as its related record exist in " @@ -8045,7 +8057,7 @@ msgid "Purchase Tax(%)" msgstr "" #. module: account -#: code:addons/account/invoice.py:787 +#: code:addons/account/invoice.py:795 #, python-format msgid "Please create some invoice lines." msgstr "" @@ -8061,7 +8073,7 @@ msgid "Configure Your Accounting Application" msgstr "" #. module: account -#: code:addons/account/account.py:2820 +#: code:addons/account/account.py:2864 #: code:addons/account/installer.py:479 #, python-format msgid "SCNJ" @@ -8099,6 +8111,7 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8108,7 +8121,7 @@ msgid "Start Period" msgstr "" #. module: account -#: code:addons/account/account.py:2333 +#: code:addons/account/account.py:2357 #, python-format msgid "Cannot locate parent code for template account!" msgstr "" @@ -8145,7 +8158,7 @@ msgid "Accountant validates the accounting entries coming from the invoice. " msgstr "" #. module: account -#: code:addons/account/invoice.py:1008 +#: code:addons/account/invoice.py:1014 #, python-format msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " @@ -8173,7 +8186,7 @@ msgid "You can not create move line on view account." msgstr "" #. module: account -#: code:addons/account/wizard/account_change_currency.py:71 +#: code:addons/account/wizard/account_change_currency.py:70 #, python-format msgid "Current currency is not confirured properly !" msgstr "" @@ -8222,6 +8235,7 @@ msgstr "留空为使用收入科目" #: field:account.entries.report,balance:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8240,6 +8254,7 @@ msgstr "" #. module: account #: report:account.account.balance:0 +#: report:account.general.ledger_landscape:0 msgid "Display Account" msgstr "" @@ -8354,6 +8369,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.line,move_id:0 #: field:analytic.entries.report,move_id:0 @@ -8361,7 +8377,7 @@ msgid "Move" msgstr "凭证" #. module: account -#: code:addons/account/account_move_line.py:1128 +#: code:addons/account/account_move_line.py:1134 #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "您不能更改此税目，请移除并重新创建凭证！" @@ -8455,6 +8471,7 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 @@ -8498,7 +8515,7 @@ msgid "Account Subscription" msgstr "周期性凭证科目" #. module: account -#: code:addons/account/invoice.py:717 +#: code:addons/account/invoice.py:725 #, python-format msgid "" "Tax base different !\n" @@ -8527,6 +8544,7 @@ msgstr "周期性凭证" #: report:account.general.journal:0 #: field:account.general.journal,date_from:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_start:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8555,7 +8573,7 @@ msgid "Unreconciled" msgstr "反核销" #. module: account -#: code:addons/account/invoice.py:804 +#: code:addons/account/invoice.py:812 #, python-format msgid "Bad total !" msgstr "坏的合计!" @@ -8613,13 +8631,13 @@ msgid "Active" msgstr "启用" #. module: account -#: code:addons/account/invoice.py:354 +#: code:addons/account/invoice.py:353 #, python-format msgid "Unknown Error" msgstr "" #. module: account -#: code:addons/account/account.py:1167 +#: code:addons/account/account.py:1181 #, python-format msgid "" "You cannot validate a non-balanced entry !\n" @@ -8662,10 +8680,10 @@ msgstr "" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -8901,7 +8919,6 @@ msgstr "选择会计期间" #: view:account.move:0 #: selection:account.move,state:0 #: view:account.move.line:0 -#: report:account.move.voucher:0 msgid "Posted" msgstr "已登账" @@ -8920,6 +8937,7 @@ msgstr "已登账" #: report:account.general.journal:0 #: field:account.general.journal,date_to:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.installer,date_stop:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -8973,7 +8991,7 @@ msgid "This is a model for recurring accounting entries" msgstr "这是一个循环凭证模型" #. module: account -#: code:addons/account/account_analytic_line.py:100 +#: code:addons/account/account_analytic_line.py:99 #, python-format msgid "There is no income account defined for this product: \"%s\" (id:%d)" msgstr "" @@ -9123,8 +9141,8 @@ msgid "End period" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:738 -#: code:addons/account/account_move_line.py:815 +#: code:addons/account/account_move_line.py:729 +#: code:addons/account/account_move_line.py:806 #: code:addons/account/wizard/account_invoice_state.py:44 #: code:addons/account/wizard/account_invoice_state.py:68 #: code:addons/account/wizard/account_report_balance_sheet.py:70 @@ -9190,10 +9208,10 @@ msgstr "供应商发票" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 -#: report:account.move.voucher:0 #: report:account.partner.balance:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 @@ -9227,7 +9245,7 @@ msgid "Recurring" msgstr "" #. module: account -#: code:addons/account/account_move_line.py:805 +#: code:addons/account/account_move_line.py:796 #, python-format msgid "Entry is already reconciled" msgstr "凭证已经核销" @@ -9248,7 +9266,7 @@ msgid "Range" msgstr "范围" #. module: account -#: code:addons/account/account_move_line.py:1246 +#: code:addons/account/account_move_line.py:1252 #, python-format msgid "" "Can not create an automatic sequence for this piece !\n" @@ -9327,17 +9345,17 @@ msgstr "如果是一个多货币凭证可选其它货币" #: model:process.transition,note:account.process_transition_invoiceimport0 msgid "" "Import of the statement in the system from a supplier or customer invoice" -msgstr "" +msgstr "供应商或客户发票在系统中的入口" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing msgid "Billing" -msgstr "" +msgstr "发票" #. module: account #: view:account.account:0 msgid "Parent Account" -msgstr "" +msgstr "父科目" #. module: account #: model:ir.actions.act_window,help:account.action_account_journal_form @@ -9353,7 +9371,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_analytic_chart msgid "Account Analytic Chart" -msgstr "" +msgstr "科目分析图表" #. module: account #: help:account.invoice,residual:0 @@ -9363,14 +9381,14 @@ msgstr "剩余的欠款" #. module: account #: model:ir.ui.menu,name:account.menu_finance_statistic_report_statement msgid "Statistic Reports" -msgstr "" +msgstr "统计报告" #. module: account #: field:account.installer,progress:0 #: field:account.installer.modules,progress:0 #: field:wizard.multi.charts.accounts,progress:0 msgid "Configuration Progress" -msgstr "" +msgstr "配置进度" #. module: account #: view:account.fiscal.position.template:0 @@ -9378,7 +9396,7 @@ msgid "Accounts Mapping" msgstr "科目一览" #. module: account -#: code:addons/account/invoice.py:346 +#: code:addons/account/invoice.py:345 #, python-format msgid "Invoice '%s' is waiting for validation." msgstr "" @@ -9403,7 +9421,7 @@ msgid "The income or expense account related to the selected product." msgstr "和选择的产品相关的收入或费用科目" #. module: account -#: code:addons/account/account_move_line.py:1117 +#: code:addons/account/account_move_line.py:1123 #, python-format msgid "The date of your Journal Entry is not in the defined period!" msgstr "" @@ -9487,7 +9505,7 @@ msgstr "" #. module: account #: view:account.invoice.tax:0 msgid "Manual Invoice Taxes" -msgstr "手动发票税" +msgstr "上门纳税(非主营业务纳税)" #. module: account #: field:account.account,parent_right:0 @@ -9589,7 +9607,7 @@ msgstr "通常用 1或-1" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template msgid "Template Account Fiscal Mapping" -msgstr "" +msgstr "以这个会计科目为模版制图" #. module: account #: field:account.chart.template,property_account_expense:0 @@ -9599,7 +9617,7 @@ msgstr "产品模板的费用科目" #. module: account #: field:account.analytic.line,amount_currency:0 msgid "Amount currency" -msgstr "" +msgstr "金额" #. module: account #: code:addons/account/wizard/account_report_aged_partner_balance.py:55 @@ -9608,7 +9626,7 @@ msgid "You must enter a period length that cannot be 0 or below !" msgstr "您必须输入的期间长度不能为0或以下 !" #. module: account -#: code:addons/account/account.py:501 +#: code:addons/account/account.py:511 #, python-format msgid "You cannot remove an account which has account entries!. " msgstr "你不能删除这科目因为它已有凭证! " diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 9d95a5af4ba..8b1b2a0edda 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -227,21 +227,21 @@ class account_invoice(osv.osv): 'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}), 'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."), - 'amount_untaxed': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Untaxed', + 'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed', store={ 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20), 'account.invoice.tax': (_get_invoice_tax, None, 20), 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20), }, multi='all'), - 'amount_tax': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Tax', + 'amount_tax': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Tax', store={ 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20), 'account.invoice.tax': (_get_invoice_tax, None, 20), 'account.invoice.line': (_get_invoice_line, ['price_unit','invoice_line_tax_id','quantity','discount','invoice_id'], 20), }, multi='all'), - 'amount_total': fields.function(_amount_all, method=True, digits_compute=dp.get_precision('Account'), string='Total', + 'amount_total': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Total', store={ 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20), 'account.invoice.tax': (_get_invoice_tax, None, 20), @@ -252,7 +252,7 @@ class account_invoice(osv.osv): 'journal_id': fields.many2one('account.journal', 'Journal', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, change_default=True, readonly=True, states={'draft':[('readonly',False)]}), 'check_total': fields.float('Total', digits_compute=dp.get_precision('Account'), states={'open':[('readonly',True)],'close':[('readonly',True)]}), - 'reconciled': fields.function(_reconciled, method=True, string='Paid/Reconciled', type='boolean', + 'reconciled': fields.function(_reconciled, string='Paid/Reconciled', type='boolean', store={ 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, None, 50), # Check if we can remove ? 'account.move.line': (_get_invoice_from_line, None, 50), @@ -260,8 +260,8 @@ class account_invoice(osv.osv): }, help="The Journal Entry of the invoice have been totally reconciled with one or several Journal Entries of payment."), 'partner_bank_id': fields.many2one('res.partner.bank', 'Bank Account', help='Bank Account Number, Company bank account if Invoice is customer or supplier refund, otherwise Partner bank account number.', readonly=True, states={'draft':[('readonly',False)]}), - 'move_lines':fields.function(_get_lines, method=True, type='many2many', relation='account.move.line', string='Entry Lines'), - 'residual': fields.function(_amount_residual, method=True, digits_compute=dp.get_precision('Account'), string='Residual', + 'move_lines':fields.function(_get_lines, type='many2many', relation='account.move.line', string='Entry Lines'), + 'residual': fields.function(_amount_residual, digits_compute=dp.get_precision('Account'), string='Residual', store={ 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line','move_id'], 50), 'account.invoice.tax': (_get_invoice_tax, None, 50), @@ -270,7 +270,7 @@ class account_invoice(osv.osv): 'account.move.reconcile': (_get_invoice_from_reconcile, None, 50), }, help="Remaining amount due."), - 'payment_ids': fields.function(_compute_lines, method=True, relation='account.move.line', type="many2many", string='Payments'), + 'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'), 'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}), 'user_id': fields.many2one('res.users', 'Salesman', readonly=True, states={'draft':[('readonly',False)]}), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]}) @@ -1282,7 +1282,7 @@ class account_invoice_line(osv.osv): 'product_id': fields.many2one('product.product', 'Product', ondelete='set null'), 'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')), - 'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float", + 'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float", digits_compute= dp.get_precision('Account'), store=True), 'quantity': fields.float('Quantity', required=True), 'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')), @@ -1505,8 +1505,8 @@ class account_invoice_tax(osv.osv): 'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', help="The tax basis of the tax declaration."), 'tax_amount': fields.float('Tax Code Amount', digits_compute=dp.get_precision('Account')), 'company_id': fields.related('account_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), - 'factor_base': fields.function(_count_factor, method=True, string='Multipication factor for Base code', type='float', multi="all"), - 'factor_tax': fields.function(_count_factor, method=True, string='Multipication factor Tax code', type='float', multi="all") + 'factor_base': fields.function(_count_factor, string='Multipication factor for Base code', type='float', multi="all"), + 'factor_tax': fields.function(_count_factor, string='Multipication factor Tax code', type='float', multi="all") } def base_change(self, cr, uid, ids, base, currency_id=False, company_id=False, date_invoice=False): diff --git a/addons/account/partner.py b/addons/account/partner.py index 9e2aafe849a..984c7e037e0 100644 --- a/addons/account/partner.py +++ b/addons/account/partner.py @@ -142,8 +142,8 @@ class res_partner(osv.osv): _columns = { 'credit': fields.function(_credit_debit_get, - fnct_search=_credit_search, method=True, string='Total Receivable', multi='dc', help="Total amount this customer owes you."), - 'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, method=True, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."), + fnct_search=_credit_search, string='Total Receivable', multi='dc', help="Total amount this customer owes you."), + 'debit': fields.function(_credit_debit_get, fnct_search=_debit_search, string='Total Payable', multi='dc', help="Total amount you have to pay to this supplier."), 'debit_limit': fields.float('Payable Limit'), 'property_account_payable': fields.property( 'account.account', diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py index 6b22dc21fdf..6666b1ccd83 100644 --- a/addons/account/report/account_report.py +++ b/addons/account/report/account_report.py @@ -114,7 +114,7 @@ class report_aged_receivable(osv.osv): _columns = { 'name': fields.char('Month Range', size=7, readonly=True), - 'balance': fields.function(_calc_bal, method=True, string='Balance', readonly=True), + 'balance': fields.function(_calc_bal, string='Balance', readonly=True), } def init(self, cr, uid=1): diff --git a/addons/account/report/account_treasury_report.py b/addons/account/report/account_treasury_report.py index 4d3ec449204..fce3661b4c4 100644 --- a/addons/account/report/account_treasury_report.py +++ b/addons/account/report/account_treasury_report.py @@ -47,8 +47,8 @@ class account_treasury_report(osv.osv): 'credit': fields.float('Credit', readonly=True), 'balance': fields.float('Balance', readonly=True), 'date': fields.date('Beginning of Period Date', readonly=True), - 'starting_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), method=True, string='Starting Balance', multi='balance'), - 'ending_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), method=True, string='Ending Balance', multi='balance'), + 'starting_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Starting Balance', multi='balance'), + 'ending_balance': fields.function(_compute_balances, digits_compute=dp.get_precision('Account'), string='Ending Balance', multi='balance'), 'company_id': fields.many2one('res.company', 'Company', readonly=True), } diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index b7271fec84b..016c147be91 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -97,6 +97,13 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Invoice Analysis multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Account fiscal Mapping company rule diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py index 11f92614b73..22eb9401ad7 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis.py +++ b/addons/account_analytic_analysis/account_analytic_analysis.py @@ -375,49 +375,49 @@ class account_analytic_account(osv.osv): return res _columns ={ - 'ca_invoiced': fields.function(_ca_invoiced_calc, method=True, type='float', string='Invoiced Amount', + 'ca_invoiced': fields.function(_ca_invoiced_calc, type='float', string='Invoiced Amount', help="Total customer invoiced amount for this account.", digits_compute=dp.get_precision('Account')), - 'total_cost': fields.function(_total_cost_calc, method=True, type='float', string='Total Costs', + 'total_cost': fields.function(_total_cost_calc, type='float', string='Total Costs', help="Total of costs for this account. It includes real costs (from invoices) and indirect costs, like time spent on timesheets.", digits_compute=dp.get_precision('Account')), - 'ca_to_invoice': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Amount', + 'ca_to_invoice': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Amount', help="If invoice from analytic account, the remaining amount you can invoice to the customer based on the total costs.", digits_compute=dp.get_precision('Account')), - 'ca_theorical': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Theoretical Revenue', + 'ca_theorical': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Theoretical Revenue', help="Based on the costs you had on the project, what would have been the revenue if all these costs have been invoiced at the normal sale price provided by the pricelist.", digits_compute=dp.get_precision('Account')), - 'hours_quantity': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Hours Tot', + 'hours_quantity': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Hours Tot', help="Number of hours you spent on the analytic account (from timesheet). It computes on all journal of type 'general'."), - 'last_invoice_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Last Invoice Date', + 'last_invoice_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Last Invoice Date', help="If invoice from the costs, this is the date of the latest invoiced."), - 'last_worked_invoiced_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost', + 'last_worked_invoiced_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Invoiced Cost', help="If invoice from the costs, this is the date of the latest work or cost that have been invoiced."), - 'last_worked_date': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='date', string='Date of Last Cost/Work', + 'last_worked_date': fields.function(_analysis_all, multi='analytic_analysis', type='date', string='Date of Last Cost/Work', help="Date of the latest work done on this account."), - 'hours_qtt_non_invoiced': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='float', string='Uninvoiced Hours', + 'hours_qtt_non_invoiced': fields.function(_analysis_all, multi='analytic_analysis', type='float', string='Uninvoiced Hours', help="Number of hours (from journal of type 'general') that can be invoiced if you invoice based on analytic account."), - 'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, method=True, type='float', string='Invoiced Hours', + 'hours_qtt_invoiced': fields.function(_hours_qtt_invoiced_calc, type='float', string='Invoiced Hours', help="Number of hours that can be invoiced plus those that already have been invoiced."), - 'remaining_hours': fields.function(_remaining_hours_calc, method=True, type='float', string='Remaining Hours', + 'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Hours', help="Computed using the formula: Maximum Quantity - Hours Tot."), - 'remaining_ca': fields.function(_remaining_ca_calc, method=True, type='float', string='Remaining Revenue', + 'remaining_ca': fields.function(_remaining_ca_calc, type='float', string='Remaining Revenue', help="Computed using the formula: Max Invoice Price - Invoiced Amount.", digits_compute=dp.get_precision('Account')), - 'revenue_per_hour': fields.function(_revenue_per_hour_calc, method=True, type='float', string='Revenue per Hours (real)', + 'revenue_per_hour': fields.function(_revenue_per_hour_calc, type='float', string='Revenue per Hours (real)', help="Computed using the formula: Invoiced Amount / Hours Tot.", digits_compute=dp.get_precision('Account')), - 'real_margin': fields.function(_real_margin_calc, method=True, type='float', string='Real Margin', + 'real_margin': fields.function(_real_margin_calc, type='float', string='Real Margin', help="Computed using the formula: Invoiced Amount - Total Costs.", digits_compute=dp.get_precision('Account')), - 'theorical_margin': fields.function(_theorical_margin_calc, method=True, type='float', string='Theoretical Margin', + 'theorical_margin': fields.function(_theorical_margin_calc, type='float', string='Theoretical Margin', help="Computed using the formula: Theorial Revenue - Total Costs", digits_compute=dp.get_precision('Account')), - 'real_margin_rate': fields.function(_real_margin_rate_calc, method=True, type='float', string='Real Margin Rate (%)', + 'real_margin_rate': fields.function(_real_margin_rate_calc, type='float', string='Real Margin Rate (%)', help="Computes using the formula: (Real Margin / Total Costs) * 100.", digits_compute=dp.get_precision('Account')), - 'month_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'), - 'user_ids': fields.function(_analysis_all, method=True, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'), + 'month_ids': fields.function(_analysis_all, multi='analytic_analysis', type='many2many', relation='account_analytic_analysis.summary.month', string='Month'), + 'user_ids': fields.function(_analysis_all, multi='analytic_analysis', type="many2many", relation='account_analytic_analysis.summary.user', string='User'), } account_analytic_account() @@ -456,7 +456,7 @@ class account_analytic_account_summary_user(osv.osv): _columns = { 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), - 'unit_amount': fields.function(_unit_amount, method=True, type='float', + 'unit_amount': fields.function(_unit_amount, type='float', string='Total Time'), 'user': fields.many2one('res.users', 'User'), } @@ -620,7 +620,7 @@ class account_analytic_account_summary_month(osv.osv): _columns = { 'account_id': fields.many2one('account.analytic.account', 'Analytic Account', readonly=True), - 'unit_amount': fields.function(_unit_amount, method=True, type='float', string='Total Time'), + 'unit_amount': fields.function(_unit_amount, type='float', string='Total Time'), 'month': fields.char('Month', size=32, readonly=True), } diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po index 7c6b8677b1c..f6cc673966d 100644 --- a/addons/account_analytic_default/i18n/zh_CN.po +++ b/addons/account_analytic_default/i18n/zh_CN.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-09-29 09:13+0000\n" -"Last-Translator: Black Jack \n" +"PO-Revision-Date: 2011-07-01 10:20+0000\n" +"Last-Translator: digitalsatori \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: 2011-04-29 05:25+0000\n" -"X-Generator: Launchpad (build 12758)\n" +"X-Launchpad-Export-Date: 2011-07-02 05:06+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: account_analytic_default #: model:ir.module.module,shortdesc:account_analytic_default.module_meta_information @@ -49,7 +49,7 @@ msgstr "" #. module: account_analytic_default #: view:account.analytic.default:0 msgid "Group By..." -msgstr "" +msgstr "分组..." #. module: account_analytic_default #: help:account.analytic.default,date_stop:0 @@ -59,7 +59,7 @@ msgstr "" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_stock_picking msgid "Picking List" -msgstr "" +msgstr "领料/提货单" #. module: account_analytic_default #: view:account.analytic.default:0 diff --git a/addons/account_analytic_plans/account_analytic_plans.py b/addons/account_analytic_plans/account_analytic_plans.py index 990f53e91ef..c8ab5334d8a 100644 --- a/addons/account_analytic_plans/account_analytic_plans.py +++ b/addons/account_analytic_plans/account_analytic_plans.py @@ -61,7 +61,7 @@ class account_analytic_line(osv.osv): return res _columns = { - 'amount_currency': fields.function(_get_amount, string="Amount Currency", type="float", method=True, store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True), + 'amount_currency': fields.function(_get_amount, string="Amount Currency", type="float", store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True), 'percentage': fields.float('Percentage') } diff --git a/addons/account_anglo_saxon/i18n/fi.po b/addons/account_anglo_saxon/i18n/fi.po new file mode 100644 index 00000000000..4806d363e98 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/fi.po @@ -0,0 +1,111 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-29 08:04+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: account_anglo_saxon +#: view:product.category:0 +msgid " Accounting Property" +msgstr " Kirjanpito-ominaisuus" + +#. module: account_anglo_saxon +#: sql_constraint:purchase.order:0 +msgid "Order Reference must be unique !" +msgstr "Tilauksen viite tulee olla yksilöllinen!" + +#. module: account_anglo_saxon +#: constraint:product.category:0 +msgid "Error ! You can not create recursive categories." +msgstr "Virhe ! Et voi luoda rekursiivisia luokkia." + +#. module: account_anglo_saxon +#: constraint:product.template:0 +msgid "" +"Error: The default UOM and the purchase UOM must be in the same category." +msgstr "" +"Virhe: Oletus mittayksikkö ja ostojen mittayksikkö täytyy olla samassa " +"kategoriassa." + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line +msgid "Invoice Line" +msgstr "Laskun rivi" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_purchase_order +msgid "Purchase Order" +msgstr "Ostotilaus" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_template +msgid "Product Template" +msgstr "Tuotteen malli" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_category +msgid "Product Category" +msgstr "Tuotteen kategoria" + +#. module: account_anglo_saxon +#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information +msgid "Stock Accounting for Anglo Saxon countries" +msgstr "Varastokirjanpito anglosaksalaisille maille" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "Hintaerotuksen tili" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice +msgid "Invoice" +msgstr "Lasku" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_stock_picking +msgid "Picking List" +msgstr "Keräilylista" + +#. module: account_anglo_saxon +#: model:ir.module.module,description:account_anglo_saxon.module_meta_information +msgid "" +"This module will support the Anglo-Saxons accounting methodology by\n" +" changing the accounting logic with stock transactions. The difference " +"between the Anglo-Saxon accounting countries\n" +" and the Rhine or also called Continental accounting countries is the " +"moment of taking the Cost of Goods Sold versus Cost of Sales.\n" +" Anglo-Saxons accounting does take the cost when sales invoice is " +"created, Continental accounting will take the cost at the moment the goods " +"are shipped.\n" +" This module will add this functionality by using a interim account, to " +"store the value of shipped goods and will contra book this interim account\n" +" when the invoice is created to transfer this amount to the debtor or " +"creditor account.\n" +" Secondly, price differences between actual purchase price and fixed " +"product standard price are booked on a separate account" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" +"Tätä tiliä käytetään arvostamaan hintaeroa ostohinnan ja kustannushinnan " +"välillä" diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py index 12caba17374..7d9666ae5ac 100644 --- a/addons/account_budget/account_budget.py +++ b/addons/account_budget/account_budget.py @@ -196,9 +196,9 @@ class crossovered_budget_lines(osv.osv): 'date_to': fields.date('End Date', required=True), 'paid_date': fields.date('Paid Date'), 'planned_amount':fields.float('Planned Amount', required=True, digits_compute=dp.get_precision('Account')), - 'practical_amount':fields.function(_prac, method=True, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')), - 'theoritical_amount':fields.function(_theo, method=True, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')), - 'percentage':fields.function(_perc, method=True, string='Percentage', type='float'), + 'practical_amount':fields.function(_prac, string='Practical Amount', type='float', digits_compute=dp.get_precision('Account')), + 'theoritical_amount':fields.function(_theo, string='Theoretical Amount', type='float', digits_compute=dp.get_precision('Account')), + 'percentage':fields.function(_perc, string='Percentage', type='float'), 'company_id': fields.related('crossovered_budget_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True) } diff --git a/addons/account_coda/i18n/fi.po b/addons/account_coda/i18n/fi.po new file mode 100644 index 00000000000..8daf08f08c8 --- /dev/null +++ b/addons/account_coda/i18n/fi.po @@ -0,0 +1,261 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-28 09:19+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-29 04:43+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: account_coda +#: help:account.coda,journal_id:0 +#: field:account.coda.import,journal_id:0 +msgid "Bank Journal" +msgstr "Pankkitapahtumat" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda.import,note:0 +msgid "Log" +msgstr "Loki" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda_import +msgid "Account Coda Import" +msgstr "Tilien Coda tuonti" + +#. module: account_coda +#: field:account.coda,name:0 +msgid "Coda file" +msgstr "Coda tiedosto" + +#. module: account_coda +#: view:account.coda:0 +msgid "Group By..." +msgstr "Ryhmittely.." + +#. module: account_coda +#: field:account.coda.import,awaiting_account:0 +msgid "Default Account for Unrecognized Movement" +msgstr "Oletustili tuntemattomille siirroille" + +#. module: account_coda +#: help:account.coda,date:0 +msgid "Import Date" +msgstr "Tuontipäivä" + +#. module: account_coda +#: field:account.coda,note:0 +msgid "Import log" +msgstr "Tuontiloki" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Import" +msgstr "Tuo" + +#. module: account_coda +#: view:account.coda:0 +msgid "Coda import" +msgstr "Coda tuonti" + +#. module: account_coda +#: code:addons/account_coda/account_coda.py:51 +#, python-format +msgid "Coda file not found for bank statement !!" +msgstr "Coda tiedostoa ei löytynyt tiliotteelle" + +#. module: account_coda +#: help:account.coda.import,awaiting_account:0 +msgid "" +"Set here the default account that will be used, if the partner is found but " +"does not have the bank account, or if he is domiciled" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,company_id:0 +msgid "Company" +msgstr "Yritys" + +#. module: account_coda +#: help:account.coda.import,def_payable:0 +msgid "" +"Set here the payable account that will be used, by default, if the partner " +"is not found" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +msgid "Search Coda" +msgstr "Hae coda" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,user_id:0 +msgid "User" +msgstr "Käyttäjä" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,date:0 +msgid "Date" +msgstr "Päiväys" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_statement +msgid "Coda Import Logs" +msgstr "Coda tuontilokit" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_coda +msgid "coda for an Account" +msgstr "Coda tilille" + +#. module: account_coda +#: field:account.coda.import,def_payable:0 +msgid "Default Payable Account" +msgstr "Oletus maksutili" + +#. module: account_coda +#: help:account.coda,name:0 +msgid "Store the detail of bank statements" +msgstr "Talleta tiliotteiden yksityiskohdat" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Cancel" +msgstr "Peruuta" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Open Statements" +msgstr "Avaa tiliotteet" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:167 +#, python-format +msgid "The bank account %s is not defined for the partner %s.\n" +msgstr "" + +#. module: account_coda +#: model:ir.ui.menu,name:account_coda.menu_account_coda_import +msgid "Import Coda Statements" +msgstr "Tuo Coda tiedot" + +#. module: account_coda +#: view:account.coda.import:0 +#: model:ir.actions.act_window,name:account_coda.action_account_coda_import +msgid "Import Coda Statement" +msgstr "Tuo Coda tiedot" + +#. module: account_coda +#: model:ir.module.module,description:account_coda.module_meta_information +msgid "" +"\n" +" Module provides functionality to import\n" +" bank statements from coda files.\n" +" " +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +msgid "Statements" +msgstr "Tiliotteet" + +#. module: account_coda +#: field:account.bank.statement,coda_id:0 +msgid "Coda" +msgstr "Coda" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Results :" +msgstr "Tulokset :" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Result of Imported Coda Statements" +msgstr "Tulos tuoduista Coda tiliotteista" + +#. module: account_coda +#: help:account.coda.import,def_receivable:0 +msgid "" +"Set here the receivable account that will be used, by default, if the " +"partner is not found" +msgstr "" +"Valitse tähän oletustili jota käytetään jos saapuneen maksun kumppania ei " +"löydetä" + +#. module: account_coda +#: field:account.coda.import,coda:0 +#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement +msgid "Coda File" +msgstr "Coda tiedosto" + +#. module: account_coda +#: model:ir.model,name:account_coda.model_account_bank_statement +msgid "Bank Statement" +msgstr "Pankin tiliote" + +#. module: account_coda +#: model:ir.actions.act_window,name:account_coda.action_account_coda +msgid "Coda Logs" +msgstr "Coda lokit" + +#. module: account_coda +#: code:addons/account_coda/wizard/account_coda_import.py:311 +#, python-format +msgid "Result" +msgstr "Tulos" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Click on 'New' to select your file :" +msgstr "Valitse 'uusi' valitaksesi tiedostosi :" + +#. module: account_coda +#: field:account.coda.import,def_receivable:0 +msgid "Default Receivable Account" +msgstr "Oletus saamistili" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Close" +msgstr "Sulje" + +#. module: account_coda +#: field:account.coda,statement_ids:0 +msgid "Generated Bank Statements" +msgstr "Luodut tiliotteet" + +#. module: account_coda +#: model:ir.module.module,shortdesc:account_coda.module_meta_information +msgid "Account CODA - import bank statements from coda file" +msgstr "" + +#. module: account_coda +#: view:account.coda.import:0 +msgid "Configure Your Journal and Account :" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +msgid "Coda Import" +msgstr "" + +#. module: account_coda +#: view:account.coda:0 +#: field:account.coda,journal_id:0 +msgid "Journal" +msgstr "" diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py index 3337710420f..b0fb92c9abb 100644 --- a/addons/account_invoice_layout/account_invoice_layout.py +++ b/addons/account_invoice_layout/account_invoice_layout.py @@ -161,7 +161,7 @@ class account_invoice_line(osv.osv): ('break','Page Break'),] ,'Type', select=True, required=True), 'sequence': fields.integer('Sequence Number', help="Gives the sequence order when displaying a list of invoice lines."), - 'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, method=True, store=False, string="Source Account"), + 'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"), } def _default_account(self, cr, uid, context=None): diff --git a/addons/account_payment/account_invoice.py b/addons/account_payment/account_invoice.py index 1f882b48421..fd787863c7d 100644 --- a/addons/account_payment/account_invoice.py +++ b/addons/account_payment/account_invoice.py @@ -42,7 +42,7 @@ class Invoice(osv.osv): return res _columns = { - 'amount_to_pay': fields.function(_amount_to_pay, method=True, + 'amount_to_pay': fields.function(_amount_to_pay, type='float', string='Amount to be paid', help='The amount which should be paid at the current date\n' \ 'minus the amount which is already in payment order'), diff --git a/addons/account_payment/account_move_line.py b/addons/account_payment/account_move_line.py index 68bb33ca4e5..24f9486be95 100644 --- a/addons/account_payment/account_move_line.py +++ b/addons/account_payment/account_move_line.py @@ -111,7 +111,7 @@ class account_move_line(osv.osv): return line2bank _columns = { - 'amount_to_pay': fields.function(amount_to_pay, method=True, + 'amount_to_pay': fields.function(amount_to_pay, type='float', string='Amount to pay', fnct_search=_to_pay_search), } diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 19de746b7c9..a7b803b2d3b 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -96,7 +96,7 @@ class payment_order(osv.osv): ('done', 'Done')], 'State', select=True, help='When an order is placed the state is \'Draft\'.\n Once the bank is confirmed the state is set to \'Confirmed\'.\n Then the order is paid the state is \'Done\'.'), 'line_ids': fields.one2many('payment.line', 'order_id', 'Payment lines', states={'done': [('readonly', True)]}), - 'total': fields.function(_total, string="Total", method=True, type='float'), + 'total': fields.function(_total, string="Total", type='float'), 'user_id': fields.many2one('res.users', 'User', required=True, states={'done': [('readonly', True)]}), 'date_prefered': fields.selection([ ('now', 'Directly'), @@ -348,10 +348,10 @@ class payment_line(osv.osv): help='Payment amount in the company currency'), 'ml_date_created': fields.function(_get_ml_created_date, string="Effective Date", method=True, type='date', help="Invoice Effective Date"), - 'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Due Date'), - 'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref.'), - 'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'), - 'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'), + 'ml_maturity_date': fields.function(_get_ml_maturity_date, type='date', string='Due Date'), + 'ml_inv_ref': fields.function(_get_ml_inv_ref, type='many2one', relation='account.invoice', string='Invoice Ref.'), + 'info_owner': fields.function(info_owner, string="Owner Account", type="text", help='Address of the Main Partner'), + 'info_partner': fields.function(info_partner, string="Destination Account", type="text", help='Address of the Ordering Customer.'), 'date': fields.date('Payment Date', help="If no payment date is specified, the bank will treat this payment line directly"), 'create_date': fields.datetime('Created', readonly=True), 'state': fields.selection([('normal','Free'), ('structured','Structured')], 'Communication Type', required=True), diff --git a/addons/account_sequence/i18n/nb.po b/addons/account_sequence/i18n/nb.po new file mode 100644 index 00000000000..f77793fcb3e --- /dev/null +++ b/addons/account_sequence/i18n/nb.po @@ -0,0 +1,221 @@ +# Norwegian Bokmal translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-24 11:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Norwegian Bokmal \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-25 04:59+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: account_sequence +#: view:account.sequence.installer:0 +#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer +msgid "Account Sequence Application Configuration" +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create entries on different periods/journals in the same move" +msgstr "" + +#. module: account_sequence +#: help:account.move,internal_sequence_number:0 +#: help:account.move.line,internal_sequence_number:0 +msgid "Internal Sequence Number" +msgstr "Internt sekvensnummer" + +#. module: account_sequence +#: help:account.sequence.installer,number_next:0 +msgid "Next number of this sequence" +msgstr "Neste nummer på denne sekvensen" + +#. module: account_sequence +#: field:account.sequence.installer,number_next:0 +msgid "Next Number" +msgstr "Neste nummer" + +#. module: account_sequence +#: field:account.sequence.installer,number_increment:0 +msgid "Increment Number" +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,description:account_sequence.module_meta_information +msgid "" +"\n" +" This module maintains internal sequence number for accounting entries.\n" +" " +msgstr "" + +#. module: account_sequence +#: model:ir.module.module,shortdesc:account_sequence.module_meta_information +msgid "Entries Sequence Numbering" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,number_increment:0 +msgid "The next number of the sequence will be incremented by this number" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure Your Account Sequence Application" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,progress:0 +msgid "Configuration Progress" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,suffix:0 +msgid "Suffix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,company_id:0 +msgid "Company" +msgstr "" + +#. module: account_sequence +#: help:account.journal,internal_sequence_id:0 +msgid "" +"This sequence will be used to maintain the internal number for the journal " +"entries related to this journal." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,padding:0 +msgid "Number padding" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move_line +msgid "Journal Items" +msgstr "" + +#. module: account_sequence +#: field:account.move,internal_sequence_number:0 +#: field:account.move.line,internal_sequence_number:0 +msgid "Internal Number" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "Company must be same for its related account and period." +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,padding:0 +msgid "" +"OpenERP will automatically adds some '0' on the left of the 'Next Number' to " +"get the required padding size." +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,name:0 +msgid "Name" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on closed account." +msgstr "" + +#. module: account_sequence +#: constraint:account.move:0 +msgid "" +"You cannot create more than one move per period on centralized journal" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.move.line:0 +msgid "Wrong credit or debit value in accounting entry !" +msgstr "" + +#. module: account_sequence +#: field:account.journal,internal_sequence_id:0 +msgid "Internal Sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_sequence_installer +msgid "account.sequence.installer" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "Configure" +msgstr "" + +#. module: account_sequence +#: help:account.sequence.installer,prefix:0 +msgid "Prefix value of the record for the sequence" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_move +msgid "Account Entry" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,suffix:0 +msgid "Suffix" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,config_logo:0 +msgid "Image" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "title" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: field:account.sequence.installer,prefix:0 +msgid "Prefix" +msgstr "" + +#. module: account_sequence +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "" +"You can not create move line on receivable/payable account without partner" +msgstr "" + +#. module: account_sequence +#: model:ir.model,name:account_sequence.model_account_journal +msgid "Journal" +msgstr "" + +#. module: account_sequence +#: view:account.sequence.installer:0 +msgid "You can enhance the Account Sequence Application by installing ." +msgstr "" + +#. module: account_sequence +#: constraint:account.move.line:0 +msgid "You can not create move line on view account." +msgstr "" diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index b4422cd8051..dee3d81832b 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -226,7 +226,7 @@ class account_voucher(osv.osv): 'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}), 'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), 'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}), - 'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Write-Off Amount', type='float', readonly=True), + 'writeoff_amount': fields.function(_get_writeoff_amount, string='Write-Off Amount', type='float', readonly=True), } _defaults = { 'period_id': _get_period, @@ -845,8 +845,8 @@ class account_voucher_line(osv.osv): 'move_line_id': fields.many2one('account.move.line', 'Journal Item'), 'date_original': fields.related('move_line_id','date', type='date', relation='account.move.line', string='Date', readonly=1), 'date_due': fields.related('move_line_id','date_maturity', type='date', relation='account.move.line', string='Due Date', readonly=1), - 'amount_original': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Original Amount', store=True), - 'amount_unreconciled': fields.function(_compute_balance, method=True, multi='dc', type='float', string='Open Balance', store=True), + 'amount_original': fields.function(_compute_balance, multi='dc', type='float', string='Original Amount', store=True), + 'amount_unreconciled': fields.function(_compute_balance, multi='dc', type='float', string='Open Balance', store=True), 'company_id': fields.related('voucher_id','company_id', relation='res.company', type='many2one', string='Company', store=True, readonly=True), } _defaults = { @@ -991,7 +991,7 @@ class account_bank_statement_line(osv.osv): _columns = { 'amount_reconciled': fields.function(_amount_reconciled, - string='Amount reconciled', method=True, type='float'), + string='Amount reconciled', type='float'), 'voucher_id': fields.many2one('account.voucher', 'Payment'), } diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index d822c382c91..a155352adf8 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -149,18 +149,18 @@ class account_analytic_account(osv.osv): _columns = { 'name': fields.char('Account Name', size=128, required=True), - 'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'), + 'complete_name': fields.function(_complete_name_calc, type='char', string='Full Account Name'), 'code': fields.char('Account Code', size=24, select=True), 'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'), 'description': fields.text('Description'), 'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2), 'child_ids': fields.one2many('account.analytic.account', 'parent_id', 'Child Accounts'), - 'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', method=True, string="Account Hierarchy", type='many2many'), + 'child_complete_ids': fields.function(_child_compute, relation='account.analytic.account', string="Account Hierarchy", type='many2many'), 'line_ids': fields.one2many('account.analytic.line', 'account_id', 'Analytic Entries'), - 'balance': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), - 'debit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), - 'credit': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), - 'quantity': fields.function(_debit_credit_bal_qtty, method=True, type='float', string='Quantity', multi='debit_credit_bal_qtty'), + 'balance': fields.function(_debit_credit_bal_qtty, type='float', string='Balance', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), + 'debit': fields.function(_debit_credit_bal_qtty, type='float', string='Debit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), + 'credit': fields.function(_debit_credit_bal_qtty, type='float', string='Credit', multi='debit_credit_bal_qtty', digits_compute=dp.get_precision('Account')), + 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), 'quantity_max': fields.float('Maximum Quantity', help='Sets the higher limit of quantity of hours.'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'contact_id': fields.many2one('res.partner.address', 'Contact'), @@ -175,7 +175,7 @@ class account_analytic_account(osv.osv): \n* And finally when all the transactions are over, it can be in \'Close\' state. \ \n* The project can be in either if the states \'Template\' and \'Running\'.\n If it is template then we can make projects based on the template projects. If its in \'Running\' state it is a normal project.\ \n If it is to be reviewed then the state is \'Pending\'.\n When the project is completed the state is set to \'Done\'.'), - 'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, method=True, + 'currency_id': fields.function(_currency, fnct_inv=_set_company_currency, store = { 'res.company': (_get_analytic_account, ['currency_id'], 10), }, string='Currency', type='many2one', relation='res.currency'), diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po new file mode 100644 index 00000000000..5822cb824d2 --- /dev/null +++ b/addons/analytic/i18n/fi.po @@ -0,0 +1,261 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-29 06:16+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: analytic +#: field:account.analytic.account,child_ids:0 +msgid "Child Accounts" +msgstr "Alatason tilit" + +#. module: analytic +#: field:account.analytic.account,name:0 +msgid "Account Name" +msgstr "Tilin nimi" + +#. module: analytic +#: help:account.analytic.line,unit_amount:0 +msgid "Specifies the amount of quantity to count." +msgstr "Määrittelee laskettavan määrän" + +#. module: analytic +#: model:ir.module.module,description:analytic.module_meta_information +msgid "" +"Module for defining analytic accounting object.\n" +" " +msgstr "" +"Moduuli analyyttisten tilien määrittelyyn.\n" +" " + +#. module: analytic +#: field:account.analytic.account,state:0 +msgid "State" +msgstr "Tila" + +#. module: analytic +#: field:account.analytic.account,user_id:0 +msgid "Account Manager" +msgstr "Asiakas päällikkö" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Draft" +msgstr "Luonnos" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Closed" +msgstr "Suljettu" + +#. module: analytic +#: field:account.analytic.account,debit:0 +msgid "Debit" +msgstr "Debet" + +#. module: analytic +#: help:account.analytic.account,state:0 +msgid "" +"* When an account is created its in 'Draft' state. " +" \n" +"* If any associated partner is there, it can be in 'Open' state. " +" \n" +"* If any pending balance is there it can be in 'Pending'. " +" \n" +"* And finally when all the transactions are over, it can be in 'Close' " +"state. \n" +"* The project can be in either if the states 'Template' and 'Running'.\n" +" If it is template then we can make projects based on the template projects. " +"If its in 'Running' state it is a normal project. " +" \n" +" If it is to be reviewed then the state is 'Pending'.\n" +" When the project is completed the state is set to 'Done'." +msgstr "" + +#. module: analytic +#: field:account.analytic.account,type:0 +msgid "Account Type" +msgstr "Tilityyppi" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Template" +msgstr "Mallipohja" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Pending" +msgstr "Odottava" + +#. module: analytic +#: model:ir.model,name:analytic.model_account_analytic_line +msgid "Analytic Line" +msgstr "Analyyttinen rivi" + +#. module: analytic +#: field:account.analytic.account,description:0 +#: field:account.analytic.line,name:0 +msgid "Description" +msgstr "Kuvaus" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "Normal" +msgstr "Tavallinen" + +#. module: analytic +#: field:account.analytic.account,company_id:0 +#: field:account.analytic.line,company_id:0 +msgid "Company" +msgstr "Yritys" + +#. module: analytic +#: field:account.analytic.account,quantity_max:0 +msgid "Maximum Quantity" +msgstr "Maksimimäärä" + +#. module: analytic +#: field:account.analytic.line,user_id:0 +msgid "User" +msgstr "Käyttäjä" + +#. module: analytic +#: field:account.analytic.account,parent_id:0 +msgid "Parent Analytic Account" +msgstr "Ylempi analyyttinen tili" + +#. module: analytic +#: field:account.analytic.line,date:0 +msgid "Date" +msgstr "Päiväys" + +#. module: analytic +#: field:account.analytic.account,currency_id:0 +msgid "Account currency" +msgstr "Tilin valuutta" + +#. module: analytic +#: field:account.analytic.account,quantity:0 +#: field:account.analytic.line,unit_amount:0 +msgid "Quantity" +msgstr "Määrä" + +#. module: analytic +#: help:account.analytic.line,amount:0 +msgid "" +"Calculated by multiplying the quantity and the price given in the Product's " +"cost price. Always expressed in the company main currency." +msgstr "" +"Laskettu kertomalla määrä ja tuotteen kustannushinta. Yrityksen " +"päävaluutassa." + +#. module: analytic +#: help:account.analytic.account,quantity_max:0 +msgid "Sets the higher limit of quantity of hours." +msgstr "Asettaa tuntien määrän ylärajan" + +#. module: analytic +#: field:account.analytic.account,credit:0 +msgid "Credit" +msgstr "Kredit" + +#. module: analytic +#: field:account.analytic.line,amount:0 +msgid "Amount" +msgstr "Määrä" + +#. module: analytic +#: field:account.analytic.account,contact_id:0 +msgid "Contact" +msgstr "Yhteyshenkilö" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta." + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Cancelled" +msgstr "Peruttu" + +#. module: analytic +#: field:account.analytic.account,balance:0 +msgid "Balance" +msgstr "Saldo" + +#. module: analytic +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä." + +#. module: analytic +#: help:account.analytic.account,type:0 +msgid "" +"If you select the View Type, it means you won't allow to create journal " +"entries using that account." +msgstr "" +"Jos valitset näkymätyypin, se tarkoittaa että et voi luoda " +"päiväkirjamerkintöjä käyttäen sitä tiliä." + +#. module: analytic +#: field:account.analytic.account,date:0 +msgid "Date End" +msgstr "Loppupäiväys" + +#. module: analytic +#: field:account.analytic.account,code:0 +msgid "Account Code" +msgstr "Tilikoodi" + +#. module: analytic +#: field:account.analytic.account,complete_name:0 +msgid "Full Account Name" +msgstr "Tilin kokonimi" + +#. module: analytic +#: field:account.analytic.line,account_id:0 +#: model:ir.model,name:analytic.model_account_analytic_account +#: model:ir.module.module,shortdesc:analytic.module_meta_information +msgid "Analytic Account" +msgstr "Analyyttinen tili" + +#. module: analytic +#: selection:account.analytic.account,type:0 +msgid "View" +msgstr "Näkymä" + +#. module: analytic +#: field:account.analytic.account,partner_id:0 +msgid "Partner" +msgstr "Kumppani" + +#. module: analytic +#: field:account.analytic.account,date_start:0 +msgid "Date Start" +msgstr "Aloituspäivämäärä" + +#. module: analytic +#: selection:account.analytic.account,state:0 +msgid "Open" +msgstr "Avoin" + +#. module: analytic +#: field:account.analytic.account,line_ids:0 +msgid "Analytic Entries" +msgstr "Analyyttiset viennit" diff --git a/addons/analytic_user_function/i18n/fi.po b/addons/analytic_user_function/i18n/fi.po new file mode 100644 index 00000000000..78387b7f6bd --- /dev/null +++ b/addons/analytic_user_function/i18n/fi.po @@ -0,0 +1,103 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-03 16:56+0000\n" +"PO-Revision-Date: 2011-06-29 05:53+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-30 04:34+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,product_id:0 +msgid "Product" +msgstr "Tuote" + +#. module: analytic_user_function +#: code:addons/analytic_user_function/analytic_user_function.py:96 +#: code:addons/analytic_user_function/analytic_user_function.py:131 +#, python-format +msgid "Error !" +msgstr "Virhe !" + +#. module: analytic_user_function +#: model:ir.model,name:analytic_user_function.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "Tuntilistan rivi" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,account_id:0 +#: model:ir.model,name:analytic_user_function.model_account_analytic_account +msgid "Analytic Account" +msgstr "Analyyttinen tili" + +#. module: analytic_user_function +#: view:account.analytic.account:0 +#: field:account.analytic.account,user_product_ids:0 +msgid "Users/Products Rel." +msgstr "Käyttäjän/Tuotteen suhde" + +#. module: analytic_user_function +#: field:analytic_user_funct_grid,user_id:0 +msgid "User" +msgstr "Käyttäjä" + +#. module: analytic_user_function +#: constraint:account.analytic.account:0 +msgid "" +"Error! The currency has to be the same as the currency of the selected " +"company" +msgstr "Virhe! Valuutan tulee olla sama kun valitun yrityksen valutta." + +#. module: analytic_user_function +#: code:addons/analytic_user_function/analytic_user_function.py:97 +#: code:addons/analytic_user_function/analytic_user_function.py:132 +#, python-format +msgid "There is no expense account define for this product: \"%s\" (id:%d)" +msgstr "Tuotteelle ei ole määritelty kulutiliä: \"%s\" (id:%d)" + +#. module: analytic_user_function +#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid +msgid "Relation table between users and products on a analytic account" +msgstr "Viitetaulu käyttäjien ja tuotteiden välillä analyyttisellä tilillä" + +#. module: analytic_user_function +#: model:ir.module.module,description:analytic_user_function.module_meta_information +msgid "" +"\n" +"\n" +" This module allows you to define what is the default function of a " +"specific user on a given account. This is mostly used when a user encodes " +"his timesheet: the values are retrieved and the fields are auto-filled... " +"but the possibility to change these values is still available.\n" +"\n" +" Obviously if no data has been recorded for the current account, the " +"default value is given as usual by the employee data so that this module is " +"perfectly compatible with older configurations.\n" +"\n" +" " +msgstr "" + +#. module: analytic_user_function +#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information +msgid "Analytic User Function" +msgstr "Analyyttinen käyttäjätoiminto" + +#. module: analytic_user_function +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "Virhe! Et voi luoda sisäkkäisiä analyyttisiä tilejä." + +#. module: analytic_user_function +#: view:analytic_user_funct_grid:0 +msgid "User's Product for this Analytic Account" +msgstr "Käyttäjän tuote tälle analyyttiselle tilille" diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py index 2814227015a..c4a2d9f0488 100644 --- a/addons/anonymization/anonymization.py +++ b/addons/anonymization/anonymization.py @@ -240,10 +240,10 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): _columns = { 'name': fields.char(size='64', string='File Name'), - 'summary': fields.function(_get_summary, method=True, type='text', string='Summary'), + 'summary': fields.function(_get_summary, type='text', string='Summary'), 'file_export': fields.binary(string='Export'), 'file_import': fields.binary(string='Import'), - 'state': fields.function(_get_state, method=True, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False), + 'state': fields.function(_get_state, string='State', type='selection', selection=ANONYMIZATION_STATES, readonly=False), 'msg': fields.text(string='Message'), } diff --git a/addons/anonymization/i18n/fi.po b/addons/anonymization/i18n/fi.po new file mode 100644 index 00000000000..9526b2a0f71 --- /dev/null +++ b/addons/anonymization/i18n/fi.po @@ -0,0 +1,227 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-30 09:52+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-07-01 04:54+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: anonymization +#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard +msgid "ir.model.fields.anonymize.wizard" +msgstr "" + +#. module: anonymization +#: field:ir.model.fields.anonymization,field_name:0 +msgid "Field Name" +msgstr "Kentän nimi" + +#. module: anonymization +#: field:ir.model.fields.anonymization,field_id:0 +msgid "Field" +msgstr "Kenttä" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,state:0 +#: field:ir.model.fields.anonymize.wizard,state:0 +msgid "State" +msgstr "Tila" + +#. module: anonymization +#: field:ir.model.fields.anonymize.wizard,file_import:0 +msgid "Import" +msgstr "Tuo" + +#. module: anonymization +#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization +msgid "ir.model.fields.anonymization" +msgstr "" + +#. module: anonymization +#: model:ir.module.module,shortdesc:anonymization.module_meta_information +msgid "Database anonymization module" +msgstr "Tietokannan anonymisointi moduuli" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,direction:0 +msgid "Direction" +msgstr "suunta" + +#. module: anonymization +#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree +#: view:ir.model.fields.anonymization:0 +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields +msgid "Anonymized Fields" +msgstr "Anonymisoidut kentät" + +#. module: anonymization +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization +msgid "Database anonymization" +msgstr "Tietokannan anonymisointi" + +#. module: anonymization +#: code:addons/anonymization/anonymization.py:55 +#: sql_constraint:ir.model.fields.anonymization:0 +#, python-format +msgid "You cannot have two records having the same model and the same field" +msgstr "" +"Sinulla ei voi olla kahta tietuetta joilla on sama malli ja sama kenttä" + +#. module: anonymization +#: selection:ir.model.fields.anonymization,state:0 +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Anonymized" +msgstr "Anonymisoitu" + +#. module: anonymization +#: field:ir.model.fields.anonymization,state:0 +msgid "unknown" +msgstr "Tuntematon" + +#. module: anonymization +#: field:ir.model.fields.anonymization,model_id:0 +msgid "Object" +msgstr "Objekti" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,filepath:0 +msgid "File path" +msgstr "Tiedoston polku" + +#. module: anonymization +#: field:ir.model.fields.anonymization.history,date:0 +msgid "Date" +msgstr "Päiväys" + +#. module: anonymization +#: field:ir.model.fields.anonymize.wizard,file_export:0 +msgid "Export" +msgstr "Vie" + +#. module: anonymization +#: view:ir.model.fields.anonymize.wizard:0 +msgid "Reverse the Database Anonymization" +msgstr "Poista tietokannan anonymisointi" + +#. module: anonymization +#: view:ir.model.fields.anonymize.wizard:0 +msgid "Database Anonymization" +msgstr "Tietokannan anonymisointi" + +#. module: anonymization +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard +msgid "Anonymize database" +msgstr "Anonymisoi tietokanta" + +#. module: anonymization +#: view:ir.model.fields.anonymization.history:0 +#: field:ir.model.fields.anonymization.history,field_ids:0 +msgid "Fields" +msgstr "Kentät" + +#. module: anonymization +#: selection:ir.model.fields.anonymization,state:0 +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Clear" +msgstr "Tyhjennä" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,direction:0 +msgid "clear -> anonymized" +msgstr "näkyvä -> anonymisoitu" + +#. module: anonymization +#: view:ir.model.fields.anonymize.wizard:0 +#: field:ir.model.fields.anonymize.wizard,summary:0 +msgid "Summary" +msgstr "Yhteenveto" + +#. module: anonymization +#: view:ir.model.fields.anonymization:0 +msgid "Anonymized Field" +msgstr "" + +#. module: anonymization +#: model:ir.module.module,description:anonymization.module_meta_information +msgid "" +"\n" +"This module allows you to anonymize a database.\n" +" " +msgstr "" + +#. module: anonymization +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Unstable" +msgstr "Epävakaa" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,state:0 +msgid "Exception occured" +msgstr "Poikkeus tapahtui" + +#. module: anonymization +#: selection:ir.model.fields.anonymization,state:0 +#: selection:ir.model.fields.anonymize.wizard,state:0 +msgid "Not Existing" +msgstr "Ei ole olemassa" + +#. module: anonymization +#: field:ir.model.fields.anonymization,model_name:0 +msgid "Object Name" +msgstr "Objektin nimi" + +#. module: anonymization +#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree +#: view:ir.model.fields.anonymization.history:0 +#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history +msgid "Anonymization History" +msgstr "Anonymisoinnin historia" + +#. module: anonymization +#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history +msgid "ir.model.fields.anonymization.history" +msgstr "" + +#. module: anonymization +#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard +#: view:ir.model.fields.anonymize.wizard:0 +msgid "Anonymize Database" +msgstr "Anonymisoi tietokanta" + +#. module: anonymization +#: field:ir.model.fields.anonymize.wizard,name:0 +msgid "File Name" +msgstr "Tiedostonimi" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,direction:0 +msgid "anonymized -> clear" +msgstr "Anonymisoitu -> näkyvä" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,state:0 +msgid "Started" +msgstr "Käynnistetty" + +#. module: anonymization +#: selection:ir.model.fields.anonymization.history,state:0 +msgid "Done" +msgstr "Valmis" + +#. module: anonymization +#: view:ir.model.fields.anonymization.history:0 +#: field:ir.model.fields.anonymization.history,msg:0 +#: field:ir.model.fields.anonymize.wizard,msg:0 +msgid "Message" +msgstr "Viesti" diff --git a/addons/anonymization/i18n/pt_BR.po b/addons/anonymization/i18n/pt_BR.po index b710579d4d2..00f32c21c99 100644 --- a/addons/anonymization/i18n/pt_BR.po +++ b/addons/anonymization/i18n/pt_BR.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-20 02:08+0000\n" +"PO-Revision-Date: 2011-07-02 18:49+0000\n" "Last-Translator: Gustavo T \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-05-21 05:02+0000\n" -"X-Generator: Launchpad (build 12959)\n" +"X-Launchpad-Export-Date: 2011-07-03 04:47+0000\n" +"X-Generator: Launchpad (build 13168)\n" #. module: anonymization #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard @@ -25,7 +25,7 @@ msgstr "ir.model.fields.anonymize.wizard" #. module: anonymization #: field:ir.model.fields.anonymization,field_name:0 msgid "Field Name" -msgstr "Nome do Campo" +msgstr "Nome do campo" #. module: anonymization #: field:ir.model.fields.anonymization,field_id:0 @@ -138,7 +138,7 @@ msgstr "Limpar" #. module: anonymization #: selection:ir.model.fields.anonymization.history,direction:0 msgid "clear -> anonymized" -msgstr "" +msgstr "em branco -> anonimizado" #. module: anonymization #: view:ir.model.fields.anonymize.wizard:0 @@ -149,7 +149,7 @@ msgstr "Resumo" #. module: anonymization #: view:ir.model.fields.anonymization:0 msgid "Anonymized Field" -msgstr "" +msgstr "Campo Anonimizado" #. module: anonymization #: model:ir.module.module,description:anonymization.module_meta_information @@ -158,6 +158,9 @@ msgid "" "This module allows you to anonymize a database.\n" " " msgstr "" +"\n" +"Este módulo permite que você anonimize um banco de dados\n" +" " #. module: anonymization #: selection:ir.model.fields.anonymize.wizard,state:0 @@ -196,7 +199,7 @@ msgstr "ir.model.fields.anonymization.history" #: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard #: view:ir.model.fields.anonymize.wizard:0 msgid "Anonymize Database" -msgstr "" +msgstr "Anonimizar Banco de Dados" #. module: anonymization #: field:ir.model.fields.anonymize.wizard,name:0 @@ -206,21 +209,21 @@ msgstr "Nome do Arquivo" #. module: anonymization #: selection:ir.model.fields.anonymization.history,direction:0 msgid "anonymized -> clear" -msgstr "" +msgstr "anonimizado -> em branco" #. module: anonymization #: selection:ir.model.fields.anonymization.history,state:0 msgid "Started" -msgstr "" +msgstr "Iniciada" #. module: anonymization #: selection:ir.model.fields.anonymization.history,state:0 msgid "Done" -msgstr "" +msgstr "Concluído" #. module: anonymization #: view:ir.model.fields.anonymization.history:0 #: field:ir.model.fields.anonymization.history,msg:0 #: field:ir.model.fields.anonymize.wizard,msg:0 msgid "Message" -msgstr "" +msgstr "Mensagem" diff --git a/addons/association/i18n/fi.po b/addons/association/i18n/fi.po new file mode 100644 index 00000000000..9a1eae464cb --- /dev/null +++ b/addons/association/i18n/fi.po @@ -0,0 +1,141 @@ +# Finnish translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-06-27 10:43+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Finnish \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-06-28 04:40+0000\n" +"X-Generator: Launchpad (build 13168)\n" + +#. module: association +#: field:profile.association.config.install_modules_wizard,wiki:0 +msgid "Wiki" +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "Event Management" +msgstr "Tapahtumienhallinta" + +#. module: association +#: field:profile.association.config.install_modules_wizard,project_gtd:0 +msgid "Getting Things Done" +msgstr "Saada asiat tehtyä" + +#. module: association +#: model:ir.module.module,description:association.module_meta_information +msgid "This module is to create Profile for Associates" +msgstr "Tämä moduuli mahdollistaa yhdistysjäsenprofiilien luonnin" + +#. module: association +#: field:profile.association.config.install_modules_wizard,progress:0 +msgid "Configuration Progress" +msgstr "Konfiguraation eteneminen" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "" +"Here are specific applications related to the Association Profile you " +"selected." +msgstr "" +"Tässä on määritellyt ohjelmat jotka liittyvät valitsemaasi " +"yhdistysprofiiliin." + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "title" +msgstr "otsikko" + +#. module: association +#: help:profile.association.config.install_modules_wizard,event_project:0 +msgid "Helps you to manage and organize your events." +msgstr "Auttaa sinua hallitsemaan ja organisoimaan tapahtumia" + +#. module: association +#: field:profile.association.config.install_modules_wizard,config_logo:0 +msgid "Image" +msgstr "Kuva" + +#. module: association +#: help:profile.association.config.install_modules_wizard,hr_expense:0 +msgid "" +"Tracks and manages employee expenses, and can automatically re-invoice " +"clients if the expenses are project-related." +msgstr "" +"Seuraa ja hallitsee työntekijäkuluja ja voi automaattisesti laskuttaa " +"asiakasta, jos kulut liittyvät projektiin." + +#. module: association +#: help:profile.association.config.install_modules_wizard,project_gtd:0 +msgid "" +"GTD is a methodology to efficiently organise yourself and your tasks. This " +"module fully integrates GTD principle with OpenERP's project management." +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "Resources Management" +msgstr "Resurssienhallinta" + +#. module: association +#: model:ir.module.module,shortdesc:association.module_meta_information +msgid "Association profile" +msgstr "Yhdistysprofiili" + +#. module: association +#: field:profile.association.config.install_modules_wizard,hr_expense:0 +msgid "Expenses Tracking" +msgstr "Kulujenseuranta" + +#. module: association +#: model:ir.actions.act_window,name:association.action_config_install_module +#: view:profile.association.config.install_modules_wizard:0 +msgid "Association Application Configuration" +msgstr "Jäsenhakemuksen konfiguraatio" + +#. module: association +#: help:profile.association.config.install_modules_wizard,wiki:0 +msgid "" +"Lets you create wiki pages and page groups in order to keep track of " +"business knowledge and share it with and between your employees." +msgstr "" + +#. module: association +#: help:profile.association.config.install_modules_wizard,project:0 +msgid "" +"Helps you manage your projects and tasks by tracking them, generating " +"plannings, etc..." +msgstr "" +"Auttaa sinua hallitsemaan projektejasi ja tehtäviäsi seuraamalla niitä, " +"luomalla suunnitelmia yms." + +#. module: association +#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard +msgid "profile.association.config.install_modules_wizard" +msgstr "" + +#. module: association +#: field:profile.association.config.install_modules_wizard,event_project:0 +msgid "Events" +msgstr "Tapahtumat" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +#: field:profile.association.config.install_modules_wizard,project:0 +msgid "Project Management" +msgstr "Projektinhallinta" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "Configure" +msgstr "Konfiguroi" diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 0b2fc467f88..685b6ee3368 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -95,12 +95,12 @@ class auction_dates(osv.osv): 'seller_costs': fields.many2many('account.tax', 'auction_seller_taxes_rel', 'auction_id', 'tax_id', 'Seller Costs', help="Account tax for seller"), 'acc_income': fields.many2one('account.account', 'Income Account', required=True), 'acc_expense': fields.many2one('account.account', 'Expense Account', required=True), - 'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication', store=True), + 'adj_total': fields.function(_adjudication_get, string='Total Adjudication', store=True), 'state': fields.selection((('draft', 'Draft'), ('closed', 'Closed')), 'State', select=1, readonly=True, help='When auction starts the state is \'Draft\'.\n At the end of auction, the state becomes \'Closed\'.'), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=False), - 'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Buyer Invoice", type='many2many', multi=True), - 'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', method=True, string="Seller Invoice", type='many2many', multi=True), + 'buyer_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Buyer Invoice", type='many2many', multi=True), + 'seller_invoice_history': fields.function(_get_invoice, relation='account.invoice', string="Seller Invoice", type='many2many', multi=True), } _defaults = { @@ -382,8 +382,8 @@ class auction_lots(osv.osv): 'vnd_lim': fields.float('Seller limit'), 'vnd_lim_net': fields.boolean('Net limit ?', readonly=True), 'image': fields.binary('Image', help="Object Image"), - 'paid_vnd':fields.function(_getprice, string='Seller Paid', method=True, type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."), - 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', method=True, type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."), + 'paid_vnd':fields.function(_getprice, string='Seller Paid', type='boolean', store=True, multi="paid_vnd", help="When state of Seller Invoice is 'Paid', this field is selected as True."), + 'paid_ach':fields.function(_getprice, string='Buyer Invoice Reconciled', type='boolean', store=True, multi="paid_ach", help="When state of Buyer Invoice is 'Paid', this field is selected as True."), 'state': fields.selection(( ('draft', 'Draft'), ('unsold', 'Unsold'), @@ -394,14 +394,14 @@ class auction_lots(osv.osv): \n* The \'Unsold\' state is used when object does not sold for long time, user can also set it as draft state after unsold. \ \n* The \'Paid\' state is used when user pay for the object \ \n* The \'Sold\' state is used when user buy the object.'), - 'buyer_price': fields.function(_getprice, method=True, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"), - 'seller_price': fields.function(_getprice, method=True, string='Seller price', store=True, multi="seller_price", help="Seller Price"), - 'gross_revenue':fields.function(_getprice, method=True, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"), - 'gross_margin':fields.function(_getprice, method=True, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"), - 'costs':fields.function(_getprice, method=True, string='Indirect costs', store=True, multi="costs", help="Deposit cost"), + 'buyer_price': fields.function(_getprice, string='Buyer price', store=True, multi="buyer_price", help="Buyer Price"), + 'seller_price': fields.function(_getprice, string='Seller price', store=True, multi="seller_price", help="Seller Price"), + 'gross_revenue':fields.function(_getprice, string='Gross revenue', store=True, multi="gross_revenue", help="Buyer Price - Seller Price"), + 'gross_margin':fields.function(_getprice, string='Gross Margin (%)', store=True, multi="gross_margin", help="(Gross Revenue*100.0)/ Object Price"), + 'costs':fields.function(_getprice, string='Indirect costs', store=True, multi="costs", help="Deposit cost"), 'statement_id': fields.many2many('account.bank.statement.line', 'auction_statement_line_rel', 'auction_id', 'statement', 'Payment', help="Bank statement line for given buyer"), - 'net_revenue':fields.function(_getprice, method=True, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"), - 'net_margin':fields.function(_getprice, method=True, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"), + 'net_revenue':fields.function(_getprice, string='Net revenue', store=True, multi="net_revenue", help="Buyer Price - Seller Price - Indirect Cost"), + 'net_margin':fields.function(_getprice, string='Net Margin (%)', store=True, multi="net_margin", help="(Net Revenue * 100)/ Object Price"), } _defaults = { 'state':lambda *a: 'draft', diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 5688c0e05b5..a01cf0df8cf 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -1,11 +1,55 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + { - "name": "Base calendar", - "version": "2.0", - "depends": ['base'], - "js": [ - 'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.js', - 'static/src/js/calendar.js' + "name" : "Basic Calendar Functionality", + "version" : "1.0", + "depends" : ["base"], + 'description': """ +This is a full-featured calendar system. +======================================== + +It supports: + - Calendar of events + - Alerts (create requests) + - Recurring events + - Invitations to people""", + "author" : "OpenERP SA", + 'category': 'Tools', + 'website': 'http://www.openerp.com', + "init_xml" : [ + 'base_calendar_data.xml' ], - "css": ['static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler.css'], - 'active': True + "demo_xml" : [], + "update_xml" : [ + 'security/calendar_security.xml', + 'security/ir.model.access.csv', + 'wizard/base_calendar_invite_attendee_view.xml', + 'base_calendar_view.xml' + ], + "test" : ['test/base_calendar_test.yml'], + "installable" : True, + "active" : False, + "certificate" : "00694071962960352821", + 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], } + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index bfcccb3dfe0..5f24b08884a 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -22,6 +22,7 @@ from datetime import datetime, timedelta, date from dateutil import parser from dateutil import rrule +from dateutil.relativedelta import relativedelta from osv import fields, osv from service import web_services from tools.translate import _ @@ -47,20 +48,22 @@ def get_recurrent_dates(rrulestring, exdate, startdate=None, exrule=None): def todate(date): val = parser.parse(''.join((re.compile('\d')).findall(date))) return val - + if not startdate: startdate = datetime.now() + if not exdate: exdate = [] + rset1 = rrule.rrulestr(str(rrulestring), dtstart=startdate, forceset=True) - for date in exdate: datetime_obj = todate(date) rset1._exdate.append(datetime_obj) + if exrule: rset1.exrule(rrule.rrulestr(str(exrule), dtstart=startdate)) - return list(rset1._iter()) + return list(rset1) def base_calendar_id2real_id(base_calendar_id=None, with_date=False): """ @@ -338,26 +341,26 @@ class calendar_attendee(osv.osv): help="Status of the attendee's participation"), 'rsvp': fields.boolean('Required Reply?', help="Indicats whether the favor of a reply is requested"), - 'delegated_to': fields.function(_compute_data, method=True, \ + 'delegated_to': fields.function(_compute_data, \ string='Delegated To', type="char", size=124, store=True, \ multi='delegated_to', help="The users that the original \ request was delegated to"), - 'delegated_from': fields.function(_compute_data, method=True, string=\ + 'delegated_from': fields.function(_compute_data, string=\ 'Delegated From', type="char", store=True, size=124, multi='delegated_from'), 'parent_ids': fields.many2many('calendar.attendee', 'calendar_attendee_parent_rel', \ 'attendee_id', 'parent_id', 'Delegrated From'), 'child_ids': fields.many2many('calendar.attendee', 'calendar_attendee_child_rel', \ 'attendee_id', 'child_id', 'Delegrated To'), - 'sent_by': fields.function(_compute_data, method=True, string='Sent By', \ + 'sent_by': fields.function(_compute_data, string='Sent By', \ type="char", multi='sent_by', store=True, size=124, \ help="Specify the user that is acting on behalf of the calendar user"), - 'sent_by_uid': fields.function(_compute_data, method=True, string='Sent By User', \ + 'sent_by_uid': fields.function(_compute_data, string='Sent By User', \ type="many2one", relation="res.users", multi='sent_by_uid'), - 'cn': fields.function(_compute_data, method=True, string='Common name', \ + 'cn': fields.function(_compute_data, string='Common name', \ type="char", size=124, multi='cn', store=True), 'dir': fields.char('URI Reference', size=124, help="Reference to the URI\ that points to the directory information corresponding to the attendee."), - 'language': fields.function(_compute_data, method=True, string='Language', \ + 'language': fields.function(_compute_data, string='Language', \ type="selection", selection=_lang_get, multi='language', \ store=True, help="To specify the language for text values in a\ property or property parameter."), @@ -366,14 +369,15 @@ property or property parameter."), 'partner_id': fields.related('partner_address_id', 'partner_id', type='many2one', \ relation='res.partner', string='Partner', help="Partner related to contact"), 'email': fields.char('Email', size=124, help="Email of Invited Person"), - 'event_date': fields.function(_compute_data, method=True, string='Event Date', \ + 'event_date': fields.function(_compute_data, string='Event Date', \ type="datetime", multi='event_date'), - 'event_end_date': fields.function(_compute_data, method=True, \ + 'event_end_date': fields.function(_compute_data, \ string='Event End Date', type="datetime", \ multi='event_end_date'), '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', @@ -411,7 +415,7 @@ property or property parameter."), cal = vobject.iCalendar() event = cal.add('vevent') if not event_obj.date_deadline or not event_obj.date: - raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!")) + raise osv.except_osv(_('Warning !'),_("Couldn't Invite because date is not specified!")) event.add('created').value = ics_datetime(time.strftime('%Y-%m-%d %H:%M:%S')) event.add('dtstart').value = ics_datetime(event_obj.date) event.add('dtend').value = ics_datetime(event_obj.date_deadline) @@ -456,7 +460,7 @@ property or property parameter."), trigger.value = delta # Compute other details valarm.add('DESCRIPTION').value = alarm_data['name'] or 'OpenERP' - + for attendee in event_obj.attendee_ids: attendee_add = event.add('attendee') attendee_add.params['CUTYPE'] = [str(attendee.cutype)] @@ -674,7 +678,7 @@ true, it will allow you to hide the event alarm information without removing it. new_res_alarm = alarm_ids[0] cr.execute('UPDATE %s ' % model_obj._table + \ ' SET base_calendar_alarm_id=%s, alarm_id=%s ' \ - ' WHERE id=%s', + ' WHERE id=%s', (cal_alarm.id, new_res_alarm, data.id)) self.do_alarm_unlink(cr, uid, [data.id], model) @@ -806,7 +810,6 @@ class calendar_alarm(osv.osv): @param use_new_cursor: False or the dbname @param context: A standard dictionary for contextual values """ - return True # XXX FIXME REMOVE THIS AFTER FIXING get_recurrent_dates!! if context is None: context = {} current_datetime = datetime.now() @@ -914,22 +917,6 @@ class calendar_event(osv.osv): def _tz_get(self, cr, uid, context=None): return [(x.lower(), x) for x in pytz.all_timezones] - def onchange_allday(self, cr, uid, ids, allday, context=None): - """Sets duration as 24 Hours if event is selected for all day - @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 allday: Value of allday boolean - @param context: A standard dictionary for contextual values - """ - if not allday or not ids: - return {} - value = { - 'duration': 24 - } - return {'value': value} - def onchange_dates(self, cr, uid, ids, start_date, duration=False, end_date=False, allday=False, context=None): """Returns duration and/or end date based on values passed @param self: The object pointer @@ -952,8 +939,13 @@ class calendar_event(osv.osv): value['duration'] = duration if allday: # For all day event - value = {'duration': 24} + value = {'duration': 24.0} duration = 24.0 + if start_date: + start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S") + start_date = datetime.strftime(datetime(start.year, start.month, start.day, 0,0,0), "%Y-%m-%d %H:%M:%S") + value['date'] = start_date + start = datetime.strptime(start_date, "%Y-%m-%d %H:%M:%S") if end_date and not duration: @@ -966,7 +958,7 @@ class calendar_event(osv.osv): value['date_deadline'] = end.strftime("%Y-%m-%d %H:%M:%S") elif end_date and duration and not allday: # we have both, keep them synchronized: - # set duration based on end_date (arbitrary decision: this avoid + # set duration based on end_date (arbitrary decision: this avoid # getting dates like 06:31:48 instead of 06:32:00) end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S") diff = end - start @@ -982,88 +974,10 @@ class calendar_event(osv.osv): """ if context is None: context = {} - cr.execute('select id from '+self._table+' where recurrent_uid in %s', (tuple(ids),)) - r_ids = map(lambda x: x[0], cr.fetchall()) - self.unlink(cr, uid, r_ids, context=context) - return True - - def _set_rrulestring(self, cr, uid, id, name, value, arg, context=None): - """ - Sets values of fields that defines event recurrence from the value of rrule string - @param self: The object pointer - @param cr: the current row, from the database cursor, - @param id: List of calendar event's ids. - @param context: A standard dictionary for contextual values - @return: dictionary of rrule value. - """ - if context is None: - context = {} - cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\ - mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\ - day=0,select1='date',month_list=Null ,byday=Null where id=%%s" % (self._table), (id,)) - - if not value: - cr.execute("UPDATE %s set rrule_type='none' where id=%%s" % self._table,(id,)) - return True - val = {} - for part in value.split(';'): - if part.lower().__contains__('freq') and len(value.split(';')) <=2: - rrule_type = part.lower()[5:] - break - else: - rrule_type = 'custom' - break - ans = value.split(';') - for i in ans: - val[i.split('=')[0].lower()] = i.split('=')[1].lower() - if not val.get('interval'): - rrule_type = 'custom' - elif int(val.get('interval')) > 1: #If interval is other than 1 rule is custom - rrule_type = 'custom' - - qry = "UPDATE \"%s\" set rrule_type=%%s " % self._table - qry_args = [ rrule_type, ] - new_val = val.copy() - for k, v in val.items(): - if val['freq'] == 'weekly' and val.get('byday'): - for day in val['byday'].split(','): - new_val[day] = True - val.pop('byday') - - if val.get('until'): - until = parser.parse(''.join((re.compile('\d')).findall(val.get('until')))) - new_val['end_date'] = until.strftime('%Y-%m-%d') - val.pop('until') - new_val.pop('until') - - if val.get('bymonthday'): - new_val['day'] = val.get('bymonthday') - val.pop('bymonthday') - new_val['select1'] = 'date' - new_val.pop('bymonthday') - - if val.get('byday'): - d = val.get('byday') - if '-' in d: - new_val['byday'] = d[:2] - new_val['week_list'] = d[2:4].upper() - else: - new_val['byday'] = d[:1] - new_val['week_list'] = d[1:3].upper() - new_val['select1'] = 'day' - - if val.get('bymonth'): - new_val['month_list'] = val.get('bymonth') - val.pop('bymonth') - new_val.pop('bymonth') - - for k, v in new_val.items(): - qry += ", %s=%%s" % k - qry_args.append(v) - - qry = qry + " where id=%s" - qry_args.append(id) - cr.execute(qry, qry_args) + for event_id in ids: + cr.execute("select id from %s where recurrent_uid=%%s" % (self._table), (event_id,)) + r_ids = map(lambda x: x[0], cr.fetchall()) + self.unlink(cr, uid, r_ids, context=context) return True def _get_rulestring(self, cr, uid, ids, name, arg, context=None): @@ -1075,28 +989,15 @@ class calendar_event(osv.osv): @param context: A standard dictionary for contextual values @return: dictionary of rrule value. """ + result = {} - for datas in self.read(cr, uid, ids, context=context): + 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('rrule_type'): - if datas.get('rrule_type') == 'none': - result[event] = False - cr.execute("UPDATE %s set exrule=Null where id=%%s" % self._table,( event,)) - if datas.get('rrule_type') : - if datas.get('interval', 0) < 0: - raise osv.except_osv(_('Warning!'), _('Interval can not be Negative')) - if datas.get('count', 0) < 0: - raise osv.except_osv(_('Warning!'), _('Count can not be Negative')) - rrule_custom = self.compute_rule_string(cr, uid, datas, \ - context=context) - result[event] = rrule_custom - else: - result[event] = self.compute_rule_string(cr, uid, {'freq': datas.get('rrule_type').upper(), 'interval': 1}, context=context) - - for id, myrule in result.items(): - #Remove the events generated from recurrent event - if not myrule: - self.unlink_events(cr, uid, [id], context=context) + if datas.get('interval', 0) < 0: + raise osv.except_osv(_('Warning!'), _('Interval can not be Negative')) + if datas.get('count', 0) < 0: + raise osv.except_osv(_('Warning!'), _('Count can not be Negative')) + result[event] = self.compute_rule_string(datas) return result _columns = { @@ -1121,15 +1022,11 @@ class calendar_event(osv.osv): 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, method=True, \ - string='Recurrent Rule', store=True, \ - fnct_inv=_set_rrulestring, help='Defines a\ - rule or repeating pattern for recurring events\n\ -e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ - FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU'), + 'rrule': fields.function(_get_rulestring, type='char', size=124, \ + store=True, string='Recurrent Rule'), 'rrule_type': fields.selection([('none', ''), ('daily', 'Daily'), \ ('weekly', 'Weekly'), ('monthly', 'Monthly'), \ - ('yearly', 'Yearly'),], + ('yearly', 'Yearly'),], 'Recurrency', states={'done': [('readonly', True)]}, help="Let the event automatically repeat at that interval"), 'alarm_id': fields.many2one('res.alarm', 'Alarm', states={'done': [('readonly', True)]}, @@ -1141,14 +1038,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ '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_id': fields.many2one('res.users', 'Organizer', states={'done': [('readonly', True)]}), - 'freq': fields.selection([('None', 'No Repeat'), - ('hourly', 'Hours'), - ('daily', 'Days'), - ('weekly', 'Weeks'), - ('monthly', 'Months'), - ('yearly', 'Years'), ], 'Frequency'), - - 'end_type' : fields.selection([('forever', 'Forever'), ('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'), + 'end_type' : fields.selection([('count', 'Fix amout of times'), ('end_date','End date')], 'Way to end reccurency'), 'interval': fields.integer('Repeat every', help="Repeat every (Days/Week/Month/Year)"), 'count': fields.integer('Repeat', help="Repeat x times"), 'mo': fields.boolean('Mon'), @@ -1158,7 +1048,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ 'fr': fields.boolean('Fri'), 'sa': fields.boolean('Sat'), 'su': fields.boolean('Sun'), - 'select1': fields.selection([('date', 'Date of month'), + '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'), \ @@ -1175,8 +1065,8 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ 'allday': fields.boolean('All Day', states={'done': [('readonly', True)]}), 'active': fields.boolean('Active', help="If the active field is set to \ true, it will allow you to hide the event alarm information without removing it."), - 'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"), - 'edit_all': fields.boolean('Edit All', help="Edit all Occurrences of recurrent Meeting."), + 'recurrency': fields.boolean('Recurrent', help="Recurrent Meeting"), + 'edit_all': fields.boolean('Edit All', help="Edit all Occurrences of recurrent Meeting."), } def default_organizer(self, cr, uid, context=None): user_pool = self.pool.get('res.users') @@ -1187,11 +1077,12 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ return res _defaults = { - 'end_type' : 'forever', + 'end_type' : 'count', + 'count' : 1, + 'rrule_type' : 'none', 'state': 'tentative', 'class': 'public', 'show_as': 'busy', - 'freq': 'None', 'select1': 'date', 'interval': 1, 'active': 1, @@ -1200,43 +1091,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ 'edit_all' : False, } - def onchange_edit_all(self, cr, uid, ids, rrule_type,edit_all, context=None): - if not context: - context = {} - - value = {} - if edit_all and rrule_type: - for id in ids: - base_calendar_id2real_id(id) - return value - - def modify_all(self, cr, uid, event_ids, defaults, context=None, *args): - """ - Modifies the recurring event - @param cr: the current row, from the database cursor, - @param uid: the current user’s ID for security checks, - @param event_ids: List of crm meeting’s IDs. - @param context: A standard dictionary for contextual values - @return: True - """ - for event_id in event_ids: - event_id = base_calendar_id2real_id(event_id) - - defaults.pop('id') - defaults.update({'table': self._table}) - - qry = "UPDATE %(table)s set name = '%(name)s', \ - date = '%(date)s', date_deadline = '%(date_deadline)s'" - if defaults.get('alarm_id'): - qry += ", alarm_id = %(alarm_id)s" - if defaults.get('location'): - qry += ", location = '%(location)s'" - qry += "WHERE id = %s" % (event_id) - cr.execute(qry, defaults) - - return True - - def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100): + def get_recurrent_ids(self, cr, uid, select, base_start_date, base_until_date, limit=100, context=None): """Gives virtual event ids for recurring events based on value of Recurrence Rule This method gives ids of dates that comes between start date and end date of calendar views @param self: The object pointer @@ -1245,46 +1100,32 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ @param base_start_date: Get Start Date @param base_until_date: Get End Date @param limit: The Number of Results to Return """ + if not context: + context = {} + + virtual_id = context and context.get('virtual_id', False) or False - if not limit: - limit = 100 if isinstance(select, (str, int, long)): ids = [select] else: ids = select result = [] - recur_dict = [] - if ids and (base_start_date or base_until_date): - cr.execute("select m.id, m.rrule, m.date, m.date_deadline, m.duration, \ - m.exdate, m.exrule, m.recurrent_id, m.recurrent_uid from " + self._table + \ - " m where m.id = ANY(%s)", (ids,) ) - - count = 0 - for data in cr.dictfetchall(): + if ids and virtual_id: + for data in super(calendar_event, self).read(cr, uid, ids, context=context): start_date = base_start_date and datetime.strptime(base_start_date[:10]+ ' 00:00:00' , "%Y-%m-%d %H:%M:%S") or False until_date = base_until_date and datetime.strptime(base_until_date[:10]+ ' 23:59:59', "%Y-%m-%d %H:%M:%S") or False - if count > limit: - break 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 - start_date = event_date + if not data['rrule']: if start_date and (event_date < start_date): continue if until_date and (event_date > until_date): continue - idval = real_id2base_calendar_id(data['id'], data['date']) - if not data['recurrent_id']: - result.append(idval) - count += 1 - else: - ex_id = real_id2base_calendar_id(data['recurrent_uid'], data['recurrent_id']) - ls = base_calendar_id2real_id(ex_id, with_date=data and data.get('duration', 0) or 0) - if not isinstance(ls, (str, int, long)) and len(ls) >= 2: - if ls[1] == data['recurrent_id']: - result.append(idval) - recur_dict.append(ex_id) + idval = data['id'] + result.append(idval) else: + start_date = event_date exdate = data['exdate'] and data['exdate'].split(',') or [] rrule_str = data['rrule'] new_rrule_str = [] @@ -1300,6 +1141,8 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ until_date = rrule_until_date if until_date: value = until_date.strftime("%Y%m%d%H%M%S") + else: + value = value.strftime("%Y%m%d%H%M%S") new_rule = '%s=%s' % (name, value) new_rrule_str.append(new_rule) if not is_until and until_date: @@ -1309,6 +1152,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ new_rrule_str.append(new_rule) new_rrule_str = ';'.join(new_rrule_str) rdates = get_recurrent_dates(str(new_rrule_str), exdate, start_date, data['exrule']) + for r_date in rdates: if start_date and r_date < start_date: continue @@ -1316,77 +1160,75 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ continue idval = real_id2base_calendar_id(data['id'], r_date.strftime("%Y-%m-%d %H:%M:%S")) result.append(idval) - count += 1 + if result: - ids = list(set(result)-set(recur_dict)) + ids = list(set(result)) if isinstance(select, (str, int, long)): return ids and ids[0] or False return ids - def compute_rule_string(self, cr, uid, datas, context=None, *args): + def compute_rule_string(self, datas): """ Compute rule string according to value type RECUR of iCalendar from the values given. @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 datas: dictionary of freq and interval value. - @param context: A standard dictionary for contextual values - @return: String value of the format RECUR of iCalendar """ - - weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su'] - weekstring = '' - monthstring = '' - yearstring = '' - freq=datas.get('rrule_type') - if freq == 'none': + + def get_week_string(freq, datas): + 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)) + if byday: + return ';BYDAY=' + ','.join(byday) + return '' + + def get_month_string(freq, datas): + if freq == 'monthly': + if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31): + raise osv.except_osv(_('Error!'), ("Please select proper Day of 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')) 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' - interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or '' - - if freq == 'weekly': - byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas)) - if byday: - weekstring = ';BYDAY=' + ','.join(byday) - - elif freq == 'monthly': - if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31): - raise osv.except_osv(_('Error!'), ("Please select proper Day of month")) - if datas.get('select1')=='day': - monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list') - elif datas.get('select1')=='date': - monthstring = ';BYMONTHDAY=' + str(datas.get('day')) - + 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 '') - if datas.get('end_date'): - datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + 'T235959Z' - enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\ - ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '') + freq=datas.get('rrule_type') + if freq == 'none': + return '' + 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) - rrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \ - + enddate + monthstring + yearstring - return rrule_string - - def search(self, cr, uid, args, offset=0, limit=100, order=None, + def remove_virtual_id(self, ids): + if isinstance(ids, (str, int)): + return base_calendar_id2real_id(ids) + + if isinstance(ids, (list, tuple)): + res = [] + for id in ids: + res.append(base_calendar_id2real_id(id)) + return res + + def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False): - """ - Overrides orm search method. - @param cr: the current row, from the database cursor, - @param user: the current user’s ID for security checks, - @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. - @param offset: The Number of Results to Pass - @param limit: The Number of Results to Return - @param context: A standard dictionary for contextual values - @param count: If its True the method returns number of records instead of ids - @return: List of id - """ args_without_date = [] start_date = False until_date = False for arg in args: - if arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')): + if arg[0] == "id": + new_id = self.remove_virtual_id(arg[2]) + new_arg = (arg[0], arg[1], new_id) + args_without_date.append(new_arg) + elif arg[0] not in ('date', unicode('date'), 'date_deadline', unicode('date_deadline')): args_without_date.append(arg) else: if arg[1] in ('>', '>='): @@ -1397,12 +1239,17 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ if until_date: continue until_date = arg[2] + res = super(calendar_event, self).search(cr, uid, args_without_date, \ - offset, limit, order, context, count) + 0, 0, order, context, count=False) + res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit, context=context) + if count: + return len(res) + elif limit: + return res[offset:offset+limit] + else: + return res - res = self.get_recurrent_ids(cr, uid, res, start_date, until_date, limit) - return res - def get_edit_all(self, cr, uid, id, vals=None): """ @@ -1413,22 +1260,25 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ if(vals and 'edit_all' in vals): #we jsut check edit_all return vals['edit_all'] else: #it's a recurrent event and edit_all is already check - return meeting['recurrency'] and meeting['edit_all'] + return meeting['recurrency'] and meeting['edit_all'] + def _get_data(self, cr, uid, id, context=None): + res = self.read(cr, uid, [id],['date', 'date_deadline']) + return res[0] - - + def need_to_update(self, event_id, vals): + split_id = str(event_id).split("-") + if len(split_id) < 2: + return False + else: + date_start = vals.get('date', '') + try: + date_start = datetime.strptime(date_start, '%Y-%m-%d %H:%M:%S').strftime("%Y%m%d%H%M%S") + return date_start == split_id[1] + except Exception: + return True + def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True): - """ - Overrides orm write 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 crm meeting's ids - @param vals: Dictionary of field value. - @param context: A standard dictionary for contextual values - @return: True - """ if context is None: context = {} if isinstance(ids, (str, int, long)): @@ -1440,12 +1290,15 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ for event_id in select: real_event_id = base_calendar_id2real_id(event_id) - - if(self.get_edit_all(cr, uid, event_id, vals=vals)): + edit_all = self.get_edit_all(cr, uid, event_id, vals=vals) + if edit_all: + if self.need_to_update(event_id, vals): + res = self._get_data(cr, uid, real_event_id, context=context) + vals.update(res) event_id = real_event_id - - - if len(str(event_id).split('-')) > 1: + + #if edit one instance of a reccurrent id + if len(str(event_id).split('-')) > 1 and not edit_all: data = self.read(cr, uid, event_id, ['date', 'date_deadline', \ 'rrule', 'duration', 'exdate']) if data.get('rrule'): @@ -1458,15 +1311,15 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ 'edit_all': False, 'recurrency' : False, }) - + new_id = self.copy(cr, uid, real_event_id, default=data, context=context) - + date_new = event_id.split('-')[1] date_new = time.strftime("%Y%m%dT%H%M%S", \ time.strptime(date_new, "%Y%m%d%H%M%S")) exdate = (data['exdate'] and (data['exdate'] + ',') or '') + date_new res = self.write(cr, uid, [real_event_id], {'exdate': exdate}) - + context.update({'active_id': new_id, 'active_ids': [new_id]}) continue if not real_event_id in new_ids: @@ -1482,10 +1335,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ vals.get('allday', False), context=context) vals.update(updated_vals.get('value', {})) - - if not 'edit_all' in vals: - vals['edit_all'] = False - if new_ids: res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context) @@ -1494,18 +1343,9 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ # change alarm details alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context) - return res + return res or True and False def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None): - """ - Overrides orm browse 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 crm meeting's ids - @param context: A standard dictionary for contextual values - @return: the object list. - """ if isinstance(ids, (str, int, long)): select = [ids] else: @@ -1518,19 +1358,29 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ return res + def read_group(self, cr, uid, domain, fields, groupby, offset=0, limit=None, context=None, orderby=False): + if not context: + context = {} + + if 'date' in groupby: + raise osv.except_osv(_('Warning !'), _('Group by date not supported, use the calendar view instead')) + virtual_id = context.get('virtual_id', False) + context.update({'virtual_id': False}) + res = super(calendar_event, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby) + for re in res: + #remove the count, since the value is not consistent with the result of the search when expand the group + for groupname in groupby: + if re.get(groupname + "_count"): + del re[groupname + "_count"] + re.get('__context').update({'virtual_id' : virtual_id}) + return res + def read(self, cr, uid, ids, fields=None, context=None, load='_classic_read'): - """ - Overrides orm Read method.Read List of fields for calendar event. - @param cr: the current row, from the database cursor, - @param user: the current user’s ID for security checks, - @param ids: List of calendar event's id. - @param fields: List of fields. - @param context: A standard dictionary for contextual values - @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...] - """ # FIXME This whole id mangling has to go! if context is None: context = {} + + if isinstance(ids, (str, int, long)): select = [ids] @@ -1544,9 +1394,10 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ fields.append('duration') - for base_calendar_id, real_id in select: + for base_calendar_id, real_id in select: #REVET: Revision ID: olt@tinyerp.com-20100924131709-cqsd1ut234ni6txn res = super(calendar_event, self).read(cr, uid, real_id, fields=fields, context=context, load=load) + if not res : continue ls = base_calendar_id2real_id(base_calendar_id, with_date=res and res.get('duration', 0) or 0) @@ -1558,41 +1409,34 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ result.append(res) if isinstance(ids, (str, int, long)): return result and result[0] or False + return result def copy(self, cr, uid, id, default=None, context=None): - """ - Duplicate record on specified id. - @param self: the object pointer. - @param cr: the current row, from the database cursor, - @param id: id of record from which we duplicated. - @param context: A standard dictionary for contextual values - @return: Duplicate record id. - """ if context is None: context = {} + res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context) alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context) - return res - + + def unlink(self, cr, uid, ids, context=None): - """ - Deletes records specified in ids. - @param self: the object pointer. - @param cr: the current row, from the database cursor, - @param id: List of calendar event's id. - @param context: A standard dictionary for contextual values - @return: True - """ - res = False - for event_datas in self.read(cr, uid, ids, ['date', 'rrule', 'exdate'], context=context): - event_id = event_datas['id'] + if not isinstance(ids, list): + ids = [ids] + res = False + for id in ids: + data_list = self.read(cr, uid, [id], ['date', 'rrule', 'exdate'], context=context) + if len(data_list) < 1: + continue + event_data = data_list[0] + event_id = event_data['id'] + if self.get_edit_all(cr, uid, event_id, vals=None): event_id = base_calendar_id2real_id(event_id) - + if isinstance(event_id, (int, long)): res = super(calendar_event, self).unlink(cr, uid, event_id, context=context) self.pool.get('res.alarm').do_alarm_unlink(cr, uid, [event_id], self._name) @@ -1600,11 +1444,11 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ else: str_event, date_new = event_id.split('-') event_id = int(str_event) - if event_datas['rrule']: + if event_data['rrule']: # Remove one of the recurrent event date_new = time.strftime("%Y%m%dT%H%M%S", \ time.strptime(date_new, "%Y%m%d%H%M%S")) - exdate = (event_datas['exdate'] and (event_datas['exdate'] + ',') or '') + date_new + exdate = (event_data['exdate'] and (event_data['exdate'] + ',') or '') + date_new res = self.write(cr, uid, [event_id], {'exdate': exdate}) else: res = super(calendar_event, self).unlink(cr, uid, [event_id], context=context) @@ -1613,15 +1457,6 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ return res def create(self, cr, uid, vals, context=None): - """ - Create new record. - @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: dictionary of every field value. - @param context: A standard dictionary for contextual values - @return: new created record id. - """ if context is None: context = {} @@ -1635,11 +1470,13 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\ vals.get('allday', False), context=context) vals.update(updated_vals.get('value', {})) - res = super(calendar_event, self).create(cr, uid, vals, context) alarm_obj = self.pool.get('res.alarm') alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context) + return res + + def do_tentative(self, cr, uid, ids, context=None, *args): """ Makes event invitation as Tentative @@ -1710,12 +1547,12 @@ class calendar_todo(osv.osv): @param args: list of tuples of form [(‘name_of_the_field’, ‘operator’, value), ...]. @param context: A standard dictionary for contextual values """ - + assert name == 'date' return self.write(cr, uid, id, { 'date_start': value }, context=context) _columns = { - 'date': fields.function(_get_date, method=True, fnct_inv=_set_date, \ + 'date': fields.function(_get_date, fnct_inv=_set_date, \ string='Duration', store=True, type='datetime'), 'duration': fields.integer('Duration'), } @@ -1742,9 +1579,9 @@ class ir_attachment(osv.osv): for arg in args: args1.append(map(lambda x:str(x).split('-')[0], arg)) return super(ir_attachment, self).search_count(cr, user, args1, context) - - - + + + def create(self, cr, uid, vals, context=None): if context: id = context.get('default_res_id', False) @@ -1913,7 +1750,7 @@ class res_users(osv.osv): _columns = { 'availability': fields.function(_get_user_avail_fun, type='selection', \ selection=[('free', 'Free'), ('busy', 'Busy')], \ - string='Free/Busy', method=True), + string='Free/Busy'), } res_users() diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index d5525e48e74..451152b2b58 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -242,8 +242,7 @@ widget="selection" /> - + diff --git a/addons/base_calendar/test/base_calendar_test.yml b/addons/base_calendar/test/base_calendar_test.yml index 4c0f3fc126f..5512839e635 100644 --- a/addons/base_calendar/test/base_calendar_test.yml +++ b/addons/base_calendar/test/base_calendar_test.yml @@ -15,7 +15,8 @@ Now I will set recurrence for this event to occur monday and friday of week - !python {model: calendar.event}: | - self.write(cr, uid, [ref("calendar_event_technicalpresentation0")], {'fr': 1, 'mo': 1, 'interval': 1, 'rrule_type': 'weekly'}) + data = {'fr': 1, 'mo': 1, 'interval': 1, 'rrule_type': 'weekly', 'end_type': 'end_date', 'end_date': '2011-05-31 00:00:00'} + self.write(cr, uid, [ref("calendar_event_technicalpresentation0")], data) - | In order to check that recurrent events are views successfully in calendar view, I will open calendar view of events @@ -27,7 +28,7 @@ I will search for one of the recurrent event and count the number of events - !python {model: calendar.event}: | - ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')] ) + ids = self.search(cr, uid, [('date', '>=', '2011-04-30 16:00:00'), ('date', '<=', '2011-05-31 00:00:00')], context={'virtual_id': True} ) assert len(ids) == 9 - | Now I will make All day event and test it diff --git a/addons/base_calendar/wizard/__init__.py b/addons/base_calendar/wizard/__init__.py index 8b45dc18a17..cd0690b1dc0 100644 --- a/addons/base_calendar/wizard/__init__.py +++ b/addons/base_calendar/wizard/__init__.py @@ -19,9 +19,7 @@ # ############################################################################## -import calendar_event_edit_all import base_calendar_invite_attendee -import base_calendar_set_exrule # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule.py b/addons/base_calendar/wizard/base_calendar_set_exrule.py deleted file mode 100644 index 80fe1e44720..00000000000 --- a/addons/base_calendar/wizard/base_calendar_set_exrule.py +++ /dev/null @@ -1,163 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from base_calendar import base_calendar -from osv import fields, osv -from tools.translate import _ -import tools -import re - - -months = { - 1: "January", 2: "February", 3: "March", 4: "April", \ - 5: "May", 6: "June", 7: "July", 8: "August", 9: "September", \ - 10: "October", 11: "November", 12: "December" -} - -class base_calendar_set_exrule(osv.osv_memory): - """ - Set Exrule. - """ - - _name = "base.calendar.set.exrule" - _description = "Set Exrule" - - _columns = { - 'freq': fields.selection([('None', 'No Repeat'), \ - ('secondly', 'Secondly'), \ - ('minutely', 'Minutely'), \ - ('hourly', 'Hourly'), \ - ('daily', 'Daily'), \ - ('weekly', 'Weekly'), \ - ('monthly', 'Monthly'), \ - ('yearly', 'Yearly')], 'Frequency',required=True), - 'interval': fields.integer('Interval'), - 'count': fields.integer('Count'), - 'mo': fields.boolean('Mon'), - 'tu': fields.boolean('Tue'), - 'we': fields.boolean('Wed'), - 'th': fields.boolean('Thu'), - 'fr': fields.boolean('Fri'), - 'sa': fields.boolean('Sat'), - 'su': fields.boolean('Sun'), - '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'), - 'month_list': fields.selection(months.items(),'Month'), - 'end_date': fields.date('Repeat Until'), - - } - - def view_init(self, cr, uid, fields, context=None): - """ - This function checks for precondition before wizard executes - @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 fields: List of fields for default value - @param context: A standard dictionary for contextual values - """ - if context is None: - context = {} - event_obj = self.pool.get(context.get('active_model')) - for event in event_obj.browse(cr, uid, context.get('active_ids', []), context=context): - if not event.rrule: - raise osv.except_osv(_("Warning !"), _("Please Apply Recurrency before applying Exception Rule.")) - return False - - def compute_exrule_string(self, cr, uid, ids, context=None): - """ - Compute rule string. - @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 datas: dictionary of freq and interval value. - @return: string value which compute FREQILY;INTERVAL - """ - - weekdays = ['mo', 'tu', 'we', 'th', 'fr', 'sa', 'su'] - weekstring = '' - monthstring = '' - yearstring = '' - if context is None: - context = {} - ex_id = base_calendar.base_calendar_id2real_id(context.get('active_id', False)) - model = context.get('model', False) - model_obj = self.pool.get(model) - for datas in self.read(cr, uid, ids, context=context): - freq = datas.get('freq') - if freq == 'None': - model_obj.write(cr, uid, ex_id,{'exrule': ''}) - return{} - - interval_srting = datas.get('interval') and (';INTERVAL=' + str(datas.get('interval'))) or '' - - if freq == 'weekly': - - byday = map(lambda x: x.upper(), filter(lambda x: datas.get(x) and x in weekdays, datas)) - if byday: - weekstring = ';BYDAY=' + ','.join(byday) - - elif freq == 'monthly': - if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31): - raise osv.except_osv(_('Error!'), ("Please select proper Day of month")) - if datas.get('select1')=='day': - monthstring = ';BYDAY=' + datas.get('byday') + datas.get('week_list') - elif datas.get('select1')=='date': - monthstring = ';BYMONTHDAY=' + str(datas.get('day')) - - elif freq == 'yearly': - if datas.get('select1')=='date' and (datas.get('day') < 1 or datas.get('day') > 31): - raise osv.except_osv(_('Error!'), ("Please select proper Day of month")) - bymonth = ';BYMONTH=' + str(datas.get('month_list')) - if datas.get('select1')=='day': - bystring = ';BYDAY=' + datas.get('byday') + datas.get('week_list') - elif datas.get('select1')=='date': - bystring = ';BYMONTHDAY=' + str(datas.get('day')) - yearstring = bymonth + bystring - - if datas.get('end_date'): - datas['end_date'] = ''.join((re.compile('\d')).findall(datas.get('end_date'))) + '235959Z' - enddate = (datas.get('count') and (';COUNT=' + str(datas.get('count'))) or '') +\ - ((datas.get('end_date') and (';UNTIL=' + datas.get('end_date'))) or '') - - exrule_string = 'FREQ=' + freq.upper() + weekstring + interval_srting \ - + enddate + monthstring + yearstring - - model_obj.write(cr, uid, ex_id,{'exrule': exrule_string}) - return {'type': 'ir.actions.act_window_close'} - - _defaults = { - 'freq': lambda *x: 'None', - 'select1': lambda *x: 'date', - 'interval': lambda *x: 1, - } - -base_calendar_set_exrule() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml b/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml deleted file mode 100644 index 2a2d6412d4b..00000000000 --- a/addons/base_calendar/wizard/base_calendar_set_exrule_view.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - base.calendar.set.exrule.form - base.calendar.set.exrule - form - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -