diff --git a/addons/account/account.py b/addons/account/account.py index 511997ecc88..8a2cbdb8451 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -301,10 +301,11 @@ class account_account(osv.osv): for fn in field_names: sums.setdefault(current.id, {})[fn] = accounts.get(current.id, {}).get(fn, 0.0) for child in current.child_id: - if child.company_id.currency_id.id == current.company_id.currency_id.id: - sums[current.id][fn] += sums[child.id][fn] - else: - sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context) + if sums.get(child.id, False): + if child.company_id.currency_id.id == current.company_id.currency_id.id: + sums[current.id][fn] += sums[child.id][fn] + else: + sums[current.id][fn] += currency_obj.compute(cr, uid, child.company_id.currency_id.id, current.company_id.currency_id.id, sums[child.id][fn], context=context) res = {} null_result = dict((fn, 0.0) for fn in field_names) for id in ids: @@ -995,7 +996,7 @@ class account_journal_period(osv.osv): return super(account_journal_period, self).write(cr, uid, ids, vals, context=context) def create(self, cr, uid, vals, context=None): - period_id=vals.get('period_id',False) + period_id = vals.get('period_id',False) if period_id: period = self.pool.get('account.period').browse(cr, uid, period_id, context=context) vals['state']=period.state diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index a2e641dc39c..3e738d5e516 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -314,7 +314,6 @@ class account_bank_statement(osv.osv): return state=='draft' def button_confirm_bank(self, cr, uid, ids, context=None): - done = [] obj_seq = self.pool.get('ir.sequence') if context is None: context = {} @@ -355,7 +354,6 @@ class account_bank_statement(osv.osv): self.write(cr, uid, [st.id], {'name': st_number}, context=context) self.log(cr, uid, st.id, _('Statement %s is confirmed, journal items are created.') % (st_number,)) - done.append(st.id) return self.write(cr, uid, ids, {'state':'confirm'}, context=context) def button_cancel(self, cr, uid, ids, context=None): @@ -463,7 +461,7 @@ class account_bank_statement_line(osv.osv): select=True, required=True, ondelete='cascade'), 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), 'move_ids': fields.many2many('account.move', - 'account_bank_statement_line_move_rel', 'move_id','statement_id', + 'account_bank_statement_line_move_rel', 'statement_id','move_id', 'Moves'), 'ref': fields.char('Reference', size=32), 'note': fields.text('Notes'), diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 85d8b4fb7db..113e5f683b4 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-30 13:30+0000\n" +"PO-Revision-Date: 2011-01-31 09:25+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ \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-01-31 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-02-01 04:41+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account @@ -2753,7 +2753,7 @@ msgstr "Kötelezõ" #: field:product.category,property_account_expense_categ:0 #: field:product.template,property_account_expense:0 msgid "Expense Account" -msgstr "Elábé/közvetlen önktg számla" +msgstr "Beszerzés főkönyvi számla" #. module: account #: help:account.invoice,period_id:0 @@ -3987,8 +3987,7 @@ msgstr "" #, python-format msgid "There is no expense account defined for this product: \"%s\" (id:%d)" msgstr "" -"\"%s\" (kód: %d) termékre nem állítottak be elábé/értékesítés elszámolt " -"közvetlen önköltsége számlát" +"\"%s\" (kód: %d) termékre nem állítottak be beszerzés főkönyvi számlát" #. module: account #: view:res.partner:0 @@ -6193,7 +6192,7 @@ msgstr "Modell neve" #. module: account #: field:account.chart.template,property_account_expense_categ:0 msgid "Expense Category Account" -msgstr "Elábé/közvetlen önktg számla" +msgstr "Beszerzés főkönyvi számla" #. module: account #: view:account.bank.statement:0 @@ -7068,9 +7067,9 @@ msgid "" "Tax related to this account and the counter-part \"Account Payable\"." msgstr "" "Ez a menüpont tömeges adatrögzítésre szolgál. Ha egy bejövő számlát akar " -"rögzíteni, kezdje az adatbevitelt a költség/eszköz főkönyvi számlával, a " -"rendszer automatikusan felajánlja az ehhez kapcsolt ÁFA számlát és a " -"szállító ellenszámlát." +"rögzíteni, kezdje az adatbevitelt a beszerzés főkönyvi számlával, a rendszer " +"automatikusan felajánlja az ehhez kapcsolt ÁFA számlát és a szállító " +"ellenszámlát." #. module: account #: help:res.company,property_reserve_and_surplus_account:0 @@ -9911,8 +9910,7 @@ msgstr "account.installer.modules" #: help:account.invoice.line,account_id:0 msgid "The income or expense account related to the selected product." msgstr "" -"A kiválasztott termékre vonatkozó árbevétel vagy elábé/értékesítés elszámolt " -"közvetlen önköltsége főkönyvi számla." +"A kiválasztott termékre vonatkozó árbevétel vagy beszerzés főkönyvi számla." #. module: account #: code:addons/account/account_move_line.py:1117 @@ -10106,7 +10104,7 @@ msgstr "Sablon főkönyvi számla ÁFA pozíció leképezés" #. module: account #: field:account.chart.template,property_account_expense:0 msgid "Expense Account on Product Template" -msgstr "Elábé/közvetlen önktg számla a termék sablonban" +msgstr "Beszerzés főkönyvi számla a terméksablonban" #. module: account #: field:account.analytic.line,amount_currency:0 diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 365121ba8c6..ad8ec97e1d9 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-30 12:18+0000\n" +"PO-Revision-Date: 2011-02-01 17:57+0000\n" "Last-Translator: Vincenzo Marino \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-01-31 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-02-02 04:40+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account @@ -64,7 +64,7 @@ msgstr "Statistiche contabili" #: field:account.invoice,residual:0 #: field:report.invoice.created,residual:0 msgid "Residual" -msgstr "Riserva" +msgstr "Residuo" #. module: account #: code:addons/account/invoice.py:785 @@ -9049,7 +9049,7 @@ msgstr "Valuta secondaria" #. module: account #: model:ir.model,name:account.model_validate_account_move msgid "Validate Account Move" -msgstr "" +msgstr "Convalida movimento in conto" #. module: account #: field:account.account,credit:0 @@ -9082,6 +9082,9 @@ msgid "" "created. If you leave that field empty, it will use the same journal as the " "current invoice." msgstr "" +"Quì puoi selezionare il registro da usare per le note di credito che " +"verranno create. Se lasci questo campo vuoto, verrà utilizzato lo stesso " +"registro delle fatture correnti." #. module: account #: report:account.move.voucher:0 @@ -9176,7 +9179,7 @@ msgstr "Aprile" #. module: account #: view:account.move.line.reconcile.select:0 msgid "Open for Reconciliation" -msgstr "" +msgstr "Apri per la riconciliazione" #. module: account #: field:account.account,parent_left:0 @@ -9195,6 +9198,8 @@ msgstr "" msgid "" "Allows invoice lines to impact multiple analytic accounts simultaneously." msgstr "" +"Consenti le linee della fattura di coinvolgere più conti analitici " +"simultaneamente." #. module: account #: field:account.installer,sale_tax:0 @@ -9472,6 +9477,9 @@ msgid "" "reconciliation process today. The current partner is counted as already " "processed." msgstr "" +"Questo raffigura il numero totale dei partner che sono passati attraverso il " +"processo di riconciliazione nella giornata di oggi. L'attuale partner è " +"considerato come già processato." #. module: account #: view:account.fiscalyear:0 @@ -9498,6 +9506,7 @@ msgstr "Movimenti in bozza." msgid "" "Manual or automatic creation of payment entries according to the statements" msgstr "" +"Creazione manuale o automatica delle voci di pagamento in base agli estratti" #. module: account #: view:account.invoice:0 @@ -9544,6 +9553,8 @@ msgid "" "This account will be used to value outgoing stock for the current product " "category using cost price" msgstr "" +"Questo conto verrà usato per valutare l'uscita di merci dalla categoria " +"corrente di prodotto usando il prezzo di costo" #. module: account #: report:account.move.voucher:0 @@ -9730,6 +9741,8 @@ msgstr "" msgid "" "Import of the statement in the system from a supplier or customer invoice" msgstr "" +"Importare l'estratto nel sistema dalla fattura di un fornitore o da un " +"cliente" #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing @@ -9751,6 +9764,12 @@ msgid "" "may keep several types of specialized journals such as a cash journal, " "purchase journal, sales journal..." msgstr "" +"Crea e gestisti i registri dell'azienda da questo menu. Un Registro è usato " +"per inserire tutte le transazioni di contabilità relative agli affari " +"giornalieri utilizzando il sistema della partita doppia. A seconda della " +"natura dell'attività ed al numero di transazioni giornaliere, un'azienda può " +"mantenere diversi tipi di registri specializzati quali ad esempio il " +"registro di cassa, registro acquisti, registro vendite ecc..." #. module: account #: model:ir.model,name:account.model_account_analytic_chart diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 40918b64e8c..6ea298376e0 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-31 02:11+0000\n" +"PO-Revision-Date: 2011-02-01 21:51+0000\n" "Last-Translator: Emerson \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-01-31 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-02-02 04:41+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account @@ -3938,7 +3938,7 @@ msgstr "Fechar Caixa" #: view:account.invoice.report:0 #: field:account.invoice.report,due_delay:0 msgid "Avg. Due Delay" -msgstr "" +msgstr "Atraso Médio" #. module: account #: view:account.entries.report:0 @@ -5709,6 +5709,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 "" +"Esta tela pode ser usada por contadores para gravar rapidamente lançamentos " +"no OpenERP. Se você quer gravar uma fatura de fornecedor, inicie pela " +"gravação da linha da conta de despesa. O OpenERP irá propor automaticamente " +"a Taxa relacionada a esta conta e a contra-partida \"Conta Pagável\"." #. module: account #: field:account.entries.report,date_created:0 @@ -7116,6 +7120,8 @@ msgid "" "Helps you generate reminder letters for unpaid invoices, including multiple " "levels of reminding and customized per-partner policies." msgstr "" +"Ajuda você a gerar cartas de cobrança para faturas não pagas, incluindo " +"múltiplos níveis de lembrete e políticas customizadas por parceiro." #. module: account #: selection:account.entries.report,move_line_state:0 @@ -7159,6 +7165,8 @@ msgid "" "This field is used for payable and receivable journal entries. You can put " "the limit date for the payment of this line." msgstr "" +"Este campo é usado para lançamentos pagáveis e recebíveis de diário. Você " +"pode colocar data limite para o pagamento desta linha." #. module: account #: code:addons/account/account_move_line.py:1271 diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 8f7ac2de99a..9fb9831b2a3 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-28 12:39+0000\n" +"PO-Revision-Date: 2011-02-01 19:28+0000\n" "Last-Translator: Chertykov Denis \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-01-29 04:55+0000\n" +"X-Launchpad-Export-Date: 2011-02-02 04:41+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account @@ -45,7 +45,7 @@ msgstr "" #. module: account #: view:account.move.reconcile:0 msgid "Journal Entry Reconcile" -msgstr "Согласование проводки журнала" +msgstr "Сверка проводки журнала" #. module: account #: field:account.installer.modules,account_voucher:0 @@ -95,7 +95,7 @@ msgstr "" #. module: account #: field:account.partner.ledger,reconcil:0 msgid "Include Reconciled Entries" -msgstr "Включать согласованные проводки" +msgstr "Включать сверенные проводки" #. module: account #: view:account.pl.report:0 @@ -137,7 +137,7 @@ msgstr "Бухгалтерские проводки-" #: code:addons/account/account.py:1291 #, python-format msgid "You can not delete posted movement: \"%s\"!" -msgstr "Вы не можете удалять подтвержденное перемещение: \"%s\"!" +msgstr "Нельзя удалить проведенное перемещение: \"%s\"!" #. module: account #: report:account.invoice:0 @@ -346,7 +346,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_unreconcile msgid "Account Unreconcile" -msgstr "" +msgstr "Отменить сверку счета" #. module: account #: view:product.product:0 @@ -439,7 +439,7 @@ msgstr "Положительный" #. module: account #: view:account.move.line.unreconcile.select:0 msgid "Open For Unreconciliation" -msgstr "Открыть для рассогласования" +msgstr "Открыть для отмены сверки" #. module: account #: field:account.fiscal.position.template,chart_template_id:0 @@ -650,7 +650,7 @@ msgstr "КнП" #. module: account #: help:account.bank.statement,balance_end_real:0 msgid "closing balance entered by the cashbox verifier" -msgstr "" +msgstr "Конечное сальдо введенное ответственным за кассу" #. module: account #: view:account.period:0 @@ -678,8 +678,7 @@ msgstr "Период журнала" #: code:addons/account/account_move_line.py:776 #, python-format msgid "To reconcile the entries company should be the same for all entries" -msgstr "" -"Для согласования проводок компания должна быть одна во всех проводках." +msgstr "Для сверки проводок компания должна быть одна во всех проводках." #. module: account #: view:account.account:0 @@ -716,7 +715,7 @@ msgstr "Проверка" #. module: account #: field:account.partner.reconcile.process,today_reconciled:0 msgid "Partners Reconciled Today" -msgstr "" +msgstr "Партнеры сверенные сегодня" #. module: account #: code:addons/account/account_bank_statement.py:306 @@ -788,7 +787,7 @@ 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 @@ -841,7 +840,7 @@ 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 @@ -850,8 +849,8 @@ msgid "" "You can not do this modification on a confirmed entry ! Please note that you " "can just change some non important fields !" msgstr "" -"Вы не можете сделать это изменение по подтвердила вступление! Обратите " -"внимание на то, что вы можете просто изменить некоторые важные поля!" +"Нельзя изменить подтвержденную запись! Обратите внимание, можно изменить " +"только второстепенные поля!" #. module: account #: view:account.invoice.report:0 @@ -1042,12 +1041,12 @@ 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 @@ -1110,7 +1109,7 @@ msgstr "Отменить счета" #. module: account #: view:account.unreconcile.reconcile:0 msgid "Unreconciliation transactions" -msgstr "Неподтвержденные транзакции" +msgstr "Не сверенные транзакции" #. module: account #: field:account.invoice.tax,tax_code_id:0 @@ -1585,8 +1584,8 @@ msgid "" "Cancel Invoice: Creates the refund invoice, validate and reconcile it to " "cancel the current invoice." msgstr "" -"Отмена счета: Создается счет на возврат, проверьте и согласуйте его для " -"отмены текущего счета." +"Отмена счета: создается возврат счета, утвердите и сверьте его для отмены " +"текущего счета." #. module: account #: model:ir.ui.menu,name:account.periodical_processing_invoicing @@ -1636,7 +1635,7 @@ msgstr "Ошибка! Вы не можете определить перекры #: code:addons/account/account_move_line.py:808 #, python-format msgid "The account is not defined to be reconciled !" -msgstr "" +msgstr "Счет не определен для сверки !" #. module: account #: field:account.cashbox.line,pieces:0 @@ -1715,7 +1714,7 @@ msgstr "Эти периоды могут перекрываться." #. module: account #: model:process.node,name:account.process_node_draftstatement0 msgid "Draft statement" -msgstr "" +msgstr "Черновик документа" #. module: account #: view:account.tax:0 @@ -1736,7 +1735,7 @@ 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 @@ -1754,7 +1753,7 @@ 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 @@ -1850,13 +1849,13 @@ 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 @@ -1870,6 +1869,8 @@ msgid "" "Check this box if you want to use a different sequence for each created " "journal. Otherwise, all will use the same sequence." msgstr "" +"Отметьте, если вы хотите использовать различную нумерацию для каждого " +"создаваемого журнала. Иначе будет сквозная нумерация." #. module: account #: help:account.partner.ledger,amount_currency:0 @@ -1885,6 +1886,8 @@ msgid "" "If set to True then do not accept the entry if the entry date is not into " "the period dates" msgstr "" +"Если отмечено, то проводки с датой не попадающей в период приниматься не " +"будут" #. module: account #: model:ir.actions.act_window,name:account.action_account_pl_report @@ -1929,7 +1932,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile #: model:ir.actions.act_window,name:account.action_account_unreconcile_select msgid "Unreconcile Entries" -msgstr "Несогласованные проводки" +msgstr "Отмена сверки проводок" #. module: account #: field:account.move.reconcile,line_partial_ids:0 @@ -1950,12 +1953,12 @@ 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 msgid "Import of the statement in the system from an electronic file" -msgstr "" +msgstr "Импорт электронного документа в систему из файла" #. module: account #: model:process.node,name:account.process_node_importinvoice0 @@ -1984,7 +1987,7 @@ msgstr "Этот фин. год" #. module: account #: view:account.tax.chart:0 msgid "Account tax charts" -msgstr "" +msgstr "План налоговых счетов" #. module: account #: constraint:account.period:0 @@ -1992,6 +1995,8 @@ msgid "" "Invalid period ! Some periods overlap or the date period is not in the scope " "of the fiscal year. " msgstr "" +"Неверный период ! Периоды перекрываются или даты периода выходят за " +"финансовый год. " #. module: account #: selection:account.invoice,state:0 @@ -2014,6 +2019,8 @@ msgid "" "There is no default default debit account defined \n" "on journal \"%s\"" msgstr "" +"Не определен дебетовый счет по умолчанию \n" +"для журнала \"%s\"" #. module: account #: help:account.account,type:0 @@ -2214,11 +2221,12 @@ msgstr "Состояние счета - \"Черновик\"" msgid "" "Check this if the user is allowed to reconcile entries in this account." msgstr "" +"Отметьте, если пользователю разрешается сверять проводки по этому счету." #. module: account #: view:account.partner.reconcile.process:0 msgid "Partner Reconciliation" -msgstr "" +msgstr "Сверка партнера" #. module: account #: field:account.tax,tax_code_id:0 @@ -2457,12 +2465,12 @@ msgstr "" #. module: account #: model:ir.ui.menu,name:account.menu_automatic_reconcile msgid "Automatic Reconciliation" -msgstr "" +msgstr "Автоматическая сверка" #. module: account #: field:account.invoice,reconciled:0 msgid "Paid/Reconciled" -msgstr "Оплаченный/согласованный" +msgstr "Оплаченный/сверенный" #. module: account #: field:account.tax,ref_base_code_id:0 @@ -2494,7 +2502,7 @@ msgstr "Даты" #: field:account.tax,parent_id:0 #: field:account.tax.template,parent_id:0 msgid "Parent Tax Account" -msgstr "" +msgstr "Главный налоговый счет" #. module: account #: view:account.subscription.generate:0 @@ -2553,7 +2561,7 @@ msgstr "Этот помощник создаст повторяющиеся бу #: code:addons/account/account.py:1181 #, python-format msgid "No sequence defined on the journal !" -msgstr "" +msgstr "Нумерация в журнале не определена !" #. module: account #: code:addons/account/account.py:2083 @@ -2563,7 +2571,7 @@ msgstr "" #: code:addons/account/wizard/account_use_model.py:81 #, python-format msgid "You have to define an analytic journal on the '%s' journal!" -msgstr "" +msgstr "Вы должны определить журнал аналитики для журнала '%s' !" #. module: account #: view:account.invoice.tax:0 @@ -2604,7 +2612,7 @@ msgstr "Ожидаемый баланс (%.2f) отличается от выч #. module: account #: model:process.transition,note:account.process_transition_paymentreconcile0 msgid "Payment entries are the second input of the reconciliation." -msgstr "" +msgstr "Записи о платеже - вторая часть сверяемого." #. module: account #: report:account.move.voucher:0 @@ -2669,7 +2677,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 @@ -2768,7 +2776,7 @@ msgstr "Условия" #. module: account #: field:account.bank.statement,total_entry_encoding:0 msgid "Cash Transaction" -msgstr "" +msgstr "Операции по кассе" #. module: account #: view:res.partner:0 @@ -3083,7 +3091,7 @@ 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 @@ -3106,6 +3114,8 @@ msgid "" "All selected journal entries will be validated and posted. It means you " "won't be able to modify their accounting fields anymore." msgstr "" +"Все выбранные проводки будут утверждены и проведены. Это означает, что вы " +"больше не сможете изменять их бухгалтерские поля." #. module: account #: code:addons/account/invoice.py:370 @@ -3141,12 +3151,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 @@ -3175,11 +3185,12 @@ msgid "" "You cannot change the type of account from '%s' to '%s' type as it contains " "account entries!" msgstr "" +"Нельзя изменить тип счета с '%s' на '%s' так, как он содержит проводки !" #. module: account #: report:account.general.ledger:0 msgid "Counterpart" -msgstr "" +msgstr "Корреспондирующая сторона" #. module: account #: view:account.journal:0 @@ -3203,7 +3214,7 @@ msgstr "Категория продукции" #: view:account.move.line:0 #: field:account.move.line,narration:0 msgid "Narration" -msgstr "" +msgstr "Пояснение" #. module: account #: view:account.addtmpl.wizard:0 @@ -3214,7 +3225,7 @@ 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 @@ -3224,7 +3235,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 @@ -3243,6 +3254,7 @@ msgstr "План счетов" #: view:account.tax.chart:0 msgid "(If you do not select period it will take all open periods)" msgstr "" +"(Если вы не выбрали период, то будут использованы все открытые периоды)" #. module: account #: field:account.journal,centralisation:0 @@ -3252,7 +3264,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 @@ -3263,6 +3275,8 @@ msgstr "2" #: view:account.chart:0 msgid "(If you do not select Fiscal year it will take all open fiscal years)" msgstr "" +"(Если вы не выбрали финансовый год, то будут использованы все открытые " +"финансовые годы)" #. module: account #: selection:account.aged.trial.balance,filter:0 @@ -3335,7 +3349,7 @@ msgstr "" #: code:addons/account/account_move_line.py:810 #, python-format msgid "Some entries are already reconciled !" -msgstr "Некоторые записи уже согласованы!" +msgstr "Некоторые записи уже сверены!" #. module: account #: code:addons/account/account.py:1204 @@ -3440,8 +3454,7 @@ msgstr "Платежное поручение" msgid "" "Check this option if you want the user to reconcile entries in this account." msgstr "" -"Отметьте, если вы хотите, чтобы пользователь согласовывал проводки по этому " -"счету." +"Отметьте, если вы хотите, чтобы пользователь сверял проводки по этому счету." #. module: account #: model:ir.actions.report.xml,name:account.account_account_balance_landscape @@ -3457,7 +3470,7 @@ msgstr "Цена за ед." #. module: account #: model:ir.actions.act_window,name:account.action_account_tree1 msgid "Analytic Items" -msgstr "" +msgstr "Элементы аналитики" #. module: account #: code:addons/account/account_move_line.py:1128 @@ -3468,14 +3481,14 @@ msgstr "Невозможно изменить налог !" #. module: account #: field:analytic.entries.report,nbr:0 msgid "#Entries" -msgstr "" +msgstr "#Проводок" #. module: account #: code:addons/account/invoice.py:1422 #, python-format msgid "" "You selected an Unit of Measure which is not compatible with the product." -msgstr "" +msgstr "Вы выбрали единицу измерения не совместимую с ТМЦ." #. module: account #: code:addons/account/invoice.py:473 @@ -3590,12 +3603,12 @@ msgstr "Установить в 'Черновик'" #. module: account #: model:ir.actions.act_window,name:account.action_subscription_form msgid "Recurring Lines" -msgstr "" +msgstr "Повторяющиеся строки" #. module: account #: field:account.partner.balance,display_partner:0 msgid "Display Partners" -msgstr "" +msgstr "Вывести партнеров" #. module: account #: view:account.invoice:0 @@ -3628,8 +3641,7 @@ msgstr "Средний курс" #. module: account #: view:account.state.open:0 msgid "(Invoice should be unreconciled if you want to open it)" -msgstr "" -"(счет необходимо отметить как не сверенный, если вы хотите его открыть)" +msgstr "(счет должен быть не сверен, если вы хотите его открыть)" #. module: account #: field:account.aged.trial.balance,period_from:0 @@ -3649,7 +3661,7 @@ msgstr "" #: field:account.report.general.ledger,period_from:0 #: field:account.vat.declaration,period_from:0 msgid "Start period" -msgstr "" +msgstr "Начало периода" #. module: account #: field:account.tax,name:0 @@ -3759,7 +3771,7 @@ msgstr "" #. module: account #: view:account.bank.statement:0 msgid "Close CashBox" -msgstr "" +msgstr "Закрыть кассу" #. module: account #: view:account.invoice.report:0 @@ -3869,7 +3881,7 @@ msgstr "Описание налога" #: code:addons/account/report/common_report_header.py:68 #, python-format msgid "All Posted Entries" -msgstr "Все добавленные проводки" +msgstr "Все проведенные проводки" #. module: account #: code:addons/account/account_bank_statement.py:357 @@ -3890,7 +3902,7 @@ msgstr "" #. module: account #: help:account.analytic.balance,empty_acc:0 msgid "Check if you want to display Accounts with 0 balance too." -msgstr "" +msgstr "Отметьте, если хотите выводить счета с 0 балансом." #. module: account #: view:account.tax:0 @@ -3950,7 +3962,7 @@ msgstr "Название счета" #. module: account #: help:account.fiscalyear.close,report_name:0 msgid "Give name of the new entries" -msgstr "" +msgstr "Дать название новым проводкам" #. module: account #: model:ir.model,name:account.model_account_invoice_report @@ -3960,7 +3972,7 @@ msgstr "Статистика по счетам" #. module: account #: model:process.transition,note:account.process_transition_paymentorderreconcilation0 msgid "Bank statements are entered in the system." -msgstr "" +msgstr "Банковские выписки введены в систему." #. module: account #: code:addons/account/wizard/account_reconcile.py:133 @@ -3994,12 +4006,12 @@ msgstr "Не реализовано" #. module: account #: model:ir.model,name:account.model_account_journal_select msgid "Account Journal Select" -msgstr "" +msgstr "Выбор журнала счета" #. module: account #: view:account.invoice:0 msgid "Print Invoice" -msgstr "" +msgstr "Печать счета" #. module: account #: view:account.tax.template:0 @@ -4026,7 +4038,7 @@ msgstr "res_config_contents" #. module: account #: view:account.unreconcile:0 msgid "Unreconciliate transactions" -msgstr "" +msgstr "Отмена сверки транзакций" #. module: account #: view:account.use.model:0 @@ -4036,7 +4048,7 @@ msgstr "Создать проводки по моделям" #. module: account #: field:account.account.template,reconcile:0 msgid "Allow Reconciliation" -msgstr "Разрегить сверку" +msgstr "Разрешить сверку" #. module: account #: view:account.analytic.account:0 @@ -4049,6 +4061,8 @@ msgid "" "This will automatically configure your chart of accounts, bank accounts, " "taxes and journals according to the selected template" msgstr "" +"Автоматическая настройка плана счетов, банковских счетов, налогов и журналов " +"в соответствии с выбранным шаблоном." #. module: account #: field:account.tax,price_include:0 @@ -4091,7 +4105,7 @@ msgstr "Изменить" #: code:addons/account/wizard/account_report_aged_partner_balance.py:57 #, python-format msgid "UserError" -msgstr "" +msgstr "Ошибка пользователя" #. module: account #: field:account.journal,type_control_ids:0 @@ -4101,12 +4115,12 @@ msgstr "" #. module: account #: help:account.journal,default_credit_account_id:0 msgid "It acts as a default account for credit amount" -msgstr "" +msgstr "Используется как кредитовый счет по умолчанию" #. module: account #: help:account.partner.ledger,reconcil:0 msgid "Consider reconciled entries" -msgstr "" +msgstr "Учесть сверенные проводки" #. module: account #: model:ir.actions.act_window,name:account.action_validate_account_move_line @@ -4114,7 +4128,7 @@ msgstr "" #: view:validate.account.move:0 #: view:validate.account.move.lines:0 msgid "Post Journal Entries" -msgstr "" +msgstr "Провести записи журнала" #. module: account #: selection:account.invoice,state:0 @@ -4126,7 +4140,7 @@ msgstr "Отменено" #. module: account #: help:account.bank.statement,balance_end_cash:0 msgid "Closing balance based on cashBox" -msgstr "" +msgstr "Остаток по кассе" #. module: account #: constraint:account.account:0 @@ -4140,6 +4154,8 @@ msgid "" "You cannot create an account! \n" "Make sure if the account has children then it should be type \"View\"!" msgstr "" +"Вы не можете создать счет! \n" +"Убедитесь, что если счет имеет подсчета, то он должен иметь тип \"Вид\" !" #. module: account #: view:account.subscription.generate:0 @@ -4237,7 +4253,7 @@ msgstr "Счет доходов и расходов из шаблона ТМЦ" #: help:res.partner,last_reconciliation_date:0 msgid "" "Date on which the partner accounting entries were reconciled last time" -msgstr "" +msgstr "Дата последней сверки проводок партнера" #. module: account #: field:account.fiscalyear.close,fy2_id:0 @@ -4358,12 +4374,12 @@ msgstr "Налоги" #: model:ir.ui.menu,name:account.menu_eaction_account_moves_sale #, python-format msgid "Journal Items" -msgstr "Записи журнала" +msgstr "Элементы журнала" #. module: account #: selection:account.account.type,report_type:0 msgid "Balance Sheet (Assets Accounts)" -msgstr "" +msgstr "Баланс (счета активов)" #. module: account #: report:account.tax.code.entries:0 @@ -4447,7 +4463,7 @@ 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 @@ -4473,9 +4489,9 @@ msgid "" "You should set the journal to allow cancelling entries if you want to do " "that." msgstr "" -"Вы не можете изменить сохранённую в этом журнале запись!\n" -"Вам необходимо разрешить отмену записей для этого журнала если вы хотите это " -"сделать." +"Вы не можете изменить проведенную запись в этом журнале!\n" +"Вам необходимо разрешить отмену записей для этого журнала, если вы хотите " +"это сделать." #. module: account #: model:ir.ui.menu,name:account.account_template_folder @@ -4592,7 +4608,7 @@ msgstr "Год" #. module: account #: field:account.bank.statement,starting_details_ids:0 msgid "Opening Cashbox" -msgstr "" +msgstr "Открытие кассы" #. module: account #: view:account.payment.term.line:0 @@ -4629,7 +4645,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 @@ -4732,6 +4748,8 @@ msgid "" "The Journal Entry of the invoice have been totally reconciled with one or " "several Journal Entries of payment." msgstr "" +"Запись в журнале счетов была полностью сверена с одной или несколькими " +"записями в журнале платежей." #. module: account #: field:account.tax,child_depend:0 @@ -4852,8 +4870,8 @@ msgid "" "You can not do this modification on a reconciled entry ! Please note that " "you can just change some non important fields !" msgstr "" -"Вы не можете исправить согласованную проводку! Обратите внимание на то, что " -"вы можете просто изменить некоторые неважные поля!" +"Вы не можете исправить сверенную проводку! Обратите внимание на то, что вы " +"можете просто изменить некоторые второстепенные поля!" #. module: account #: model:ir.model,name:account.model_account_common_account_report @@ -4863,7 +4881,7 @@ msgstr "" #. module: account #: field:account.bank.statement.line,name:0 msgid "Communication" -msgstr "Общение" +msgstr "Назначение" #. module: account #: model:ir.ui.menu,name:account.menu_analytic_accounting @@ -4940,7 +4958,7 @@ msgstr "Количество ТМЦ" #: selection:account.move,state:0 #: view:account.move.line:0 msgid "Unposted" -msgstr "" +msgstr "Непроведено" #. module: account #: view:account.change.currency:0 @@ -5012,7 +5030,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_view_move_line msgid "Lines to reconcile" -msgstr "" +msgstr "Позиции для сверки" #. module: account #: report:account.analytic.account.balance:0 @@ -5090,7 +5108,7 @@ msgstr "С валютой" #. module: account #: view:account.bank.statement:0 msgid "Open CashBox" -msgstr "" +msgstr "Открыть кассу" #. module: account #: view:account.move.line.reconcile:0 @@ -5116,7 +5134,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile msgid "Account Automatic Reconcile" -msgstr "" +msgstr "Автоматическая сверка счета" #. module: account #: view:account.move:0 @@ -5139,7 +5157,7 @@ msgstr "" #: code:addons/account/account_move_line.py:738 #, python-format msgid "Already Reconciled!" -msgstr "" +msgstr "Уже сверено !" #. module: account #: help:account.tax,type:0 @@ -5344,7 +5362,7 @@ msgstr "Нельзя использовать неактивный счет !" #: code:addons/account/account_move_line.py:803 #, python-format msgid "Entries are not of the same account or already reconciled ! " -msgstr "Проводки не по одному счету и тому же счету или уже согласованы! " +msgstr "Проводки не по одному счету и тому же счету или уже сверены! " #. module: account #: field:account.tax,account_collected_id:0 @@ -5385,7 +5403,7 @@ msgstr "Неверное действие !" #: code:addons/account/wizard/account_move_journal.py:102 #, python-format msgid "Period: %s" -msgstr "" +msgstr "Период: %s" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template @@ -5454,6 +5472,8 @@ msgid "" "Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-" "Forma' state!" msgstr "" +"Выбранные счета нельзя подтвердить так, как их состояние не \"Черновик\" и " +"не \"Проформа\" !" #. module: account #: report:account.invoice:0 @@ -5520,6 +5540,8 @@ msgid "" "As soon as the reconciliation is done, the invoice's state turns to “done” " "(i.e. paid) in the system." msgstr "" +"Как только произойдет сверка, состояние счета в системе установится в " +"\"Сделано\" (т.е. оплачено)." #. module: account #: code:addons/account/invoice.py:989 @@ -5536,7 +5558,7 @@ msgstr "Корневой счет" #. module: account #: field:res.partner,last_reconciliation_date:0 msgid "Latest Reconciliation Date" -msgstr "" +msgstr "Дата последней сверки" #. module: account #: model:ir.model,name:account.model_account_analytic_line @@ -5637,7 +5659,7 @@ msgstr "Отчетный год" #. module: account #: view:account.move.reconcile:0 msgid "Partial Reconcile Entries" -msgstr "" +msgstr "Частичная сверка проводок" #. module: account #: view:account.addtmpl.wizard:0 @@ -5707,7 +5729,7 @@ msgstr "Счет по кредиту по умолчанию" #. module: account #: view:account.installer:0 msgid "Configure Your Accounting Chart" -msgstr "" +msgstr "Настройка вашего плана счетов" #. module: account #: view:account.payment.term.line:0 @@ -5727,7 +5749,7 @@ msgstr "Текущий" #. module: account #: view:account.bank.statement:0 msgid "CashBox" -msgstr "" +msgstr "Касса" #. module: account #: selection:account.tax,type:0 @@ -5762,7 +5784,7 @@ msgstr "Вид проводок аналитики" #. module: account #: selection:account.account.type,report_type:0 msgid "Balance Sheet (Liability Accounts)" -msgstr "" +msgstr "Баланс (счета пассивов)" #. module: account #: field:account.invoice,internal_number:0 @@ -5780,7 +5802,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.action_account_partner_reconcile msgid "Reconciliation: Go to Next Partner" -msgstr "" +msgstr "Сверка: следующий партнер" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance @@ -5893,7 +5915,7 @@ msgstr "Централизация" #. module: account #: view:wizard.multi.charts.accounts:0 msgid "Generate Your Accounting Chart from a Chart Template" -msgstr "" +msgstr "Генерировать ваш план счетов из шаблона" #. module: account #: view:account.account:0 @@ -5958,7 +5980,7 @@ msgstr "Журнал аналитики" #. module: account #: view:account.entries.report:0 msgid "Reconciled" -msgstr "" +msgstr "Сверено" #. module: account #: report:account.invoice:0 @@ -5979,13 +6001,13 @@ msgstr "Категория счета расходов" #. module: account #: view:account.bank.statement:0 msgid "Cash Transactions" -msgstr "Операции с наличными" +msgstr "Операции по кассе" #. module: account #: code:addons/account/wizard/account_state_open.py:37 #, python-format msgid "Invoice is already reconciled" -msgstr "" +msgstr "Счет уже сверен" #. module: account #: view:account.account:0 @@ -6014,7 +6036,7 @@ msgstr "Проводки: " #. module: account #: view:account.use.model:0 msgid "Create manual recurring entries in a chosen journal." -msgstr "" +msgstr "Создать вручную повторяющиеся проводки в выбранном журнале" #. module: account #: code:addons/account/account.py:1393 @@ -6041,6 +6063,8 @@ msgid "" "corresponds with the entries (or records) of that account in your accounting " "system." msgstr "" +"Сверка по банку заключается в проверке соответствия выписки с проводками по " +"бухгалтерскому счету в системе бухучета." #. module: account #: model:process.node,note:account.process_node_draftstatement0 @@ -6339,6 +6363,14 @@ msgid "" "\n" "e.g. My model on %(date)s" msgstr "" +"Вы можете задать год, месяц и дату в названии модели, используя следующие " +"выражения:\n" +"\n" +"%(year)s: задать год \n" +"%(month)s: задать месяц \n" +"%(date)s: текущая дата \n" +"\n" +"пример: Моя модель на %(date)s" #. module: account #: model:ir.actions.act_window,name:account.action_aged_income @@ -6426,12 +6458,12 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled Entries" -msgstr "" +msgstr "Не сверенные проводки" #. module: account #: model:ir.ui.menu,name:account.menu_menu_Bank_process msgid "Statements Reconciliation" -msgstr "" +msgstr "Сверка документов" #. module: account #: report:account.invoice:0 @@ -6644,7 +6676,7 @@ msgstr "" #. module: account #: field:account.bank.statement,closing_date:0 msgid "Closed On" -msgstr "" +msgstr "Дата закрытия" #. module: account #: model:ir.model,name:account.model_account_bank_statement_line @@ -6713,7 +6745,7 @@ msgstr "" #. module: account #: field:account.bank.statement,ending_details_ids:0 msgid "Closing Cashbox" -msgstr "" +msgstr "Закрытие кассы" #. module: account #: view:account.journal:0 @@ -6911,7 +6943,7 @@ msgstr "Свойства продаж" #. module: account #: model:ir.ui.menu,name:account.menu_manual_reconcile msgid "Manual Reconciliation" -msgstr "" +msgstr "Ручная сверка" #. module: account #: report:account.overdue:0 @@ -7112,7 +7144,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_cashbox_line msgid "CashBox Line" -msgstr "" +msgstr "Строка кассы" #. module: account #: view:account.partner.ledger:0 @@ -7159,7 +7191,7 @@ msgstr "" #: 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 @@ -7573,7 +7605,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 @@ -7590,7 +7622,7 @@ msgstr "" #. module: account #: field:account.account.type,report_type:0 msgid "P&L / BS Category" -msgstr "" +msgstr "Категория: баланс / прибыль и убыток" #. module: account #: view:account.automatic.reconcile:0 @@ -7615,7 +7647,7 @@ msgstr "Счет к получению" #. module: account #: view:account.bank.statement:0 msgid "CashBox Balance" -msgstr "" +msgstr "Остаток в кассе" #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close_state @@ -8204,6 +8236,8 @@ msgid "" "You cannot cancel the Invoice which is Partially Paid! You need to " "unreconcile concerned payment entries!" msgstr "" +"Нельзя отменить частично оплаченный счет! Надо отменить сверку с " +"соответствующими проводками платежа !" #. module: account #: report:account.overdue:0 @@ -8253,7 +8287,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 msgid "Profit & Loss (Income Accounts)" -msgstr "" +msgstr "Прибыль и убыток (счета доходов)" #. module: account #: view:account.tax:0 @@ -8309,7 +8343,7 @@ msgstr "Изменить" #. module: account #: view:account.account.type:0 msgid "Closing Method" -msgstr "" +msgstr "Метод закрытия" #. module: account #: model:ir.actions.act_window,help:account.action_account_partner_balance @@ -8357,13 +8391,13 @@ msgstr "" #: code:addons/account/account_bank_statement.py:391 #, python-format msgid "Cannot delete bank statement(s) which are already confirmed !" -msgstr "" +msgstr "Нельзя удалить банковский документ, который уже подтвержден !" #. module: account #: code:addons/account/wizard/account_automatic_reconcile.py:152 #, python-format msgid "You must select accounts to reconcile" -msgstr "Вы должны выбрать счета для согласования" +msgstr "Вы должны выбрать счета для сверки" #. module: account #: model:ir.actions.act_window,name:account.action_account_receivable_graph @@ -8373,7 +8407,7 @@ msgstr "Баланс по типу счета" #. module: account #: model:process.transition,note:account.process_transition_entriesreconcile0 msgid "Accounting entries are the first input of the reconciliation." -msgstr "" +msgstr "Проводки - первый источник сверки." #. module: account #: model:ir.actions.act_window,help:account.action_account_period_form @@ -8447,6 +8481,8 @@ msgid "" "You have to define the bank account\n" "in the journal definition for reconciliation." msgstr "" +"Для сверки вы должны определить \n" +"счет банка при создании журнала." #. module: account #: view:account.move.line.reconcile:0 @@ -8603,7 +8639,7 @@ msgstr "Черновики счетов" #: view:account.entries.report:0 #: view:account.move.line:0 msgid "Unreconciled" -msgstr "Несогласованные" +msgstr "Не сверенные" #. module: account #: code:addons/account/invoice.py:804 @@ -8827,7 +8863,7 @@ msgstr "Апрель" #. module: account #: view:account.move.line.reconcile.select:0 msgid "Open for Reconciliation" -msgstr "" +msgstr "Открыть для сверки" #. module: account #: field:account.account,parent_left:0 @@ -8850,7 +8886,7 @@ msgstr "" #. module: account #: field:account.installer,sale_tax:0 msgid "Sale Tax(%)" -msgstr "" +msgstr "Налог с продаж (%)" #. module: account #: model:ir.actions.act_window,name:account.action_invoice_tree2 @@ -8954,7 +8990,7 @@ msgstr "Выберите период" #: view:account.move.line:0 #: report:account.move.voucher:0 msgid "Posted" -msgstr "" +msgstr "Проведено" #. module: account #: report:account.account.balance:0 @@ -9112,7 +9148,7 @@ msgstr "" #. module: account #: help:account.bank.statement,total_entry_encoding:0 msgid "Total cash transactions" -msgstr "" +msgstr "Сумма операций по кассе" #. module: account #: help:account.partner.reconcile.process,today_reconciled:0 @@ -9281,7 +9317,7 @@ msgstr "Повторение" #: code:addons/account/account_move_line.py:805 #, python-format msgid "Entry is already reconciled" -msgstr "" +msgstr "Проводка уже сверена" #. module: account #: model:ir.model,name:account.model_report_account_receivable @@ -9528,7 +9564,7 @@ msgstr "Состояние счета - Сделано" #. module: account #: model:process.transition,note:account.process_transition_reconcilepaid0 msgid "As soon as the reconciliation is done, the invoice can be paid." -msgstr "" +msgstr "Как только сверка будет выполнена, счет может быть оплачен." #. module: account #: view:account.account.template:0 diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 64634e34a96..a50bb37a981 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -94,7 +94,7 @@ class account_invoice(osv.osv): if invoice.move_id: for m in invoice.move_id.line_id: if m.account_id.type in ('receivable','payable'): - result[invoice.id] = m.amount_residual_currency + result[invoice.id] += m.amount_residual_currency return result # Give Journal Items related to the payment reconciled to this invoice @@ -353,6 +353,8 @@ class account_invoice(osv.osv): raise orm.except_orm(_('Unknown Error'), str(e)) def confirm_paid(self, cr, uid, ids, context=None): + if context is None: + context = {} self.write(cr, uid, ids, {'state':'paid'}, context=context) for inv_id, name in self.name_get(cr, uid, ids, context=context): message = _("Invoice '%s' is paid.") % name @@ -360,6 +362,8 @@ class account_invoice(osv.osv): return True def unlink(self, cr, uid, ids, context=None): + if context is None: + context = {} invoices = self.read(cr, uid, ids, ['state'], context=context) unlink_ids = [] for t in invoices: @@ -518,7 +522,7 @@ class account_invoice(osv.osv): if not result_id: raise osv.except_osv(_('Configuration Error !'), _('Can not find account chart for this company in invoice line account, Please Create account.')) - inv_line_obj.write(cr, uid, [line.id], {'account_id': result_id[0]}) + inv_line_obj.write(cr, uid, [line.id], {'account_id': result_id[-1]}) else: if invoice_line: for inv_line in invoice_line: @@ -598,6 +602,8 @@ class account_invoice(osv.osv): return res def copy(self, cr, uid, id, default={}, context=None): + if context is None: + context = {} default.update({ 'state':'draft', 'number':False, @@ -1304,65 +1310,6 @@ class account_invoice_line(osv.osv): result = {} res = self.pool.get('product.product').browse(cr, uid, product, context=context) - if company_id: - property_obj = self.pool.get('ir.property') - account_obj = self.pool.get('account.account') - in_pro_id = property_obj.search(cr, uid, [('name','=','property_account_income'),('res_id','=','product.template,'+str(res.product_tmpl_id.id)+''),('company_id','=',company_id)]) - if not in_pro_id: - in_pro_id = property_obj.search(cr, uid, [('name','=','property_account_income_categ'),('res_id','=','product.template,'+str(res.categ_id.id)+''),('company_id','=',company_id)]) - exp_pro_id = property_obj.search(cr, uid, [('name','=','property_account_expense'),('res_id','=','product.template,'+str(res.product_tmpl_id.id)+''),('company_id','=',company_id)]) - if not exp_pro_id: - exp_pro_id = property_obj.search(cr, uid, [('name','=','property_account_expense_categ'),('res_id','=','product.template,'+str(res.categ_id.id)+''),('company_id','=',company_id)]) - - if not in_pro_id: - in_acc = res.product_tmpl_id.property_account_income - in_acc_cate = res.categ_id.property_account_income_categ - if in_acc: - app_acc_in = in_acc - else: - app_acc_in = in_acc_cate - else: - # Get the fields from the ir.property record - my_value = property_obj.read(cr,uid,in_pro_id,['name','value_reference','res_id']) - # Parse the value_reference field to get the ID of the account.account record - account_id = int (my_value[0]["value_reference"].split(",")[1]) - # Use the ID of the account.account record in the browse for the account.account record - app_acc_in = account_obj.browse(cr, uid, account_id, context=context) - if not exp_pro_id: - ex_acc = res.product_tmpl_id.property_account_expense - ex_acc_cate = res.categ_id.property_account_expense_categ - if ex_acc: - app_acc_exp = ex_acc - else: - app_acc_exp = ex_acc_cate - else: - app_acc_exp = account_obj.browse(cr, uid, exp_pro_id, context=context)[0] - if not in_pro_id and not exp_pro_id: - in_acc = res.product_tmpl_id.property_account_income - in_acc_cate = res.categ_id.property_account_income_categ - ex_acc = res.product_tmpl_id.property_account_expense - ex_acc_cate = res.categ_id.property_account_expense_categ - if in_acc or ex_acc: - app_acc_in = in_acc - app_acc_exp = ex_acc - else: - app_acc_in = in_acc_cate - app_acc_exp = ex_acc_cate - if app_acc_in and app_acc_in.company_id.id != company_id and app_acc_exp and app_acc_exp.company_id.id != company_id: - in_res_id = account_obj.search(cr, uid, [('name','=',app_acc_in.name),('company_id','=',company_id)]) - exp_res_id = account_obj.search(cr, uid, [('name','=',app_acc_exp.name),('company_id','=',company_id)]) - if not in_res_id and not exp_res_id: - raise osv.except_osv(_('Configuration Error !'), - _('Can not find account chart for this company, Please Create account.')) - in_obj_acc = account_obj.browse(cr, uid, in_res_id, context=context) - exp_obj_acc = account_obj.browse(cr, uid, exp_res_id, context=context) - if in_acc or ex_acc: - res.product_tmpl_id.property_account_income = in_obj_acc[0] - res.product_tmpl_id.property_account_expense = exp_obj_acc[0] - else: - res.categ_id.property_account_income_categ = in_obj_acc[0] - res.categ_id.property_account_expense_categ = exp_obj_acc[0] - if type in ('out_invoice','out_refund'): a = res.product_tmpl_id.property_account_income.id if not a: diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 46867c8bf23..ce3496e3e30 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -136,7 +136,7 @@ The normal chart of accounts has a structure defined by the legal requirement of the country. The analytic chart of account structure should reflect your own business needs in term of costs/revenues reporting. They are usually structured by contracts, projects, products or departements. Most of the OpenERP operations (invoices, timesheets, expenses, etc) generate analytic entries on the related account. - @@ -373,7 +373,7 @@ To print an analytics (or costs) journal for a given period. The report give code, move name, account number, general amount and analytic amount. # diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 8fe9af39e00..5d9cfac5699 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -89,10 +89,10 @@ class account_balance(report_sxw.rml_parse, common_report_header): self.sum_debit += account_rec['debit'] self.sum_credit += account_rec['credit'] if disp_acc == 'bal_movement': - if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0: + if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) elif disp_acc == 'bal_solde': - if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0: + if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) else: self.result_acc.append(res) diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py index 8576850ff5e..a11d3bc285d 100644 --- a/addons/account/report/account_balance_landscape.py +++ b/addons/account/report/account_balance_landscape.py @@ -207,7 +207,6 @@ class account_balance_landscape(report_sxw.rml_parse): return cmp(x.code, y.code) for n in range(0,len(accounts)): accounts[n].sort(cmp_code) - common={} merged_accounts=zip(*accounts) for entry in merged_accounts: diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 8762b44e1e2..f22061a5785 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -143,10 +143,10 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.balance if data['form']['display_account'] == 'bal_movement': - if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: + if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) elif data['form']['display_account'] == 'bal_solde': - if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: + if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) else: accounts_temp.append(account_dict) diff --git a/addons/account/report/account_partner_balance.py b/addons/account/report/account_partner_balance.py index eacafb02eda..187b9b2578f 100644 --- a/addons/account/report/account_partner_balance.py +++ b/addons/account/report/account_partner_balance.py @@ -296,7 +296,6 @@ class partner_balance(report_sxw.rml_parse, common_report_header): def _get_partners(self): cr, uid = self.cr, self.uid - context = self.localcontext # all of it? if self.result_selection == 'customer': return _('Receivable Accounts') diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index c17d2e7b23e..bd1635e91fc 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -113,10 +113,10 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += abs(account.debit - account.credit) if data['form']['display_account'] == 'bal_movement': - if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: + if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) elif data['form']['display_account'] == 'bal_solde': - if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: + if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) else: accounts_temp.append(account) diff --git a/addons/account/wizard/account_state_open.py b/addons/account/wizard/account_state_open.py index 81705771d67..62e837b7366 100644 --- a/addons/account/wizard/account_state_open.py +++ b/addons/account/wizard/account_state_open.py @@ -36,7 +36,7 @@ class account_state_open(osv.osv_memory): if data_inv.reconciled: raise osv.except_osv(_('Warning'), _('Invoice is already reconciled')) wf_service = netsvc.LocalService("workflow") - res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr) + wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr) return {'type': 'ir.actions.act_window_close'} account_state_open() diff --git a/addons/account/wizard/account_use_model.py b/addons/account/wizard/account_use_model.py index 15719dcf138..6e444b8b4e6 100644 --- a/addons/account/wizard/account_use_model.py +++ b/addons/account/wizard/account_use_model.py @@ -107,7 +107,7 @@ class account_use_model(osv.osv_memory): }) c = context.copy() c.update({'journal_id': model.journal_id.id,'period_id': period_id}) - id_line = account_move_line_obj.create(cr, uid, val, context=c) + account_move_line_obj.create(cr, uid, val, context=c) context.update({'move_ids':move_ids}) model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context) diff --git a/addons/account_accountant/i18n/bg.po b/addons/account_accountant/i18n/bg.po new file mode 100644 index 00000000000..834102325d0 --- /dev/null +++ b/addons/account_accountant/i18n/bg.po @@ -0,0 +1,38 @@ +# Bulgarian 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-01-31 13:18+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Bulgarian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-02-01 04:42+0000\n" +"X-Generator: Launchpad (build 12177)\n" + +#. module: account_accountant +#: model:ir.module.module,description:account_accountant.module_meta_information +msgid "" +"\n" +"This module gives the admin user the access to all the accounting features " +"like the journal\n" +"items and the chart of accounts.\n" +" " +msgstr "" +"\n" +"Този модул дава достъп на администратора до всички счетоводни свойства като " +"счетоводни\n" +"дневници и сметкоплан.\n" +" " + +#. module: account_accountant +#: model:ir.module.module,shortdesc:account_accountant.module_meta_information +msgid "Accountant" +msgstr "Счетоводител" diff --git a/addons/account_analytic_default/i18n/hu.po b/addons/account_analytic_default/i18n/hu.po index af4e139007a..569b0a7caf2 100644 --- a/addons/account_analytic_default/i18n/hu.po +++ b/addons/account_analytic_default/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-30 15:12+0000\n" +"PO-Revision-Date: 2011-02-01 18:11+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ \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-01-31 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-02-02 04:41+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account_analytic_default @@ -96,7 +96,7 @@ msgstr "Termék" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_analytic_default msgid "Analytic Distribution" -msgstr "Felosztás" +msgstr "Analitikus felosztás" #. module: account_analytic_default #: view:account.analytic.default:0 @@ -205,7 +205,7 @@ msgstr "Kezdő dátum" #: help:account.analytic.default,sequence:0 msgid "" "Gives the sequence order when displaying a list of analytic distribution" -msgstr "Megadja a felosztások listázási sorrendjét." +msgstr "Megadja az analitikus felosztások listázási sorrendjét." #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_sale_order_line diff --git a/addons/account_analytic_plans/i18n/hu.po b/addons/account_analytic_plans/i18n/hu.po index b1f35e395e2..42ed257df9f 100644 --- a/addons/account_analytic_plans/i18n/hu.po +++ b/addons/account_analytic_plans/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-03 16:56+0000\n" -"PO-Revision-Date: 2011-01-30 18:04+0000\n" +"PO-Revision-Date: 2011-02-01 18:15+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ \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-01-31 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-02-02 04:41+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account_analytic_plans @@ -171,7 +171,7 @@ msgstr "Lementett felosztási modell" #. module: account_analytic_plans #: model:ir.actions.act_window,name:account_analytic_plans.account_analytic_plan_instance_action msgid "Analytic Distribution's Models" -msgstr "Felosztási modell" +msgstr "Analitikus felosztási modellek" #. module: account_analytic_plans #: view:account.crossovered.analytic:0 @@ -475,7 +475,7 @@ msgstr "4.gyűjtőkód azonosító" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 msgid "Analytic Distribution Lines" -msgstr "Felosztás sorok" +msgstr "Analitikus felosztás sorok" #. module: account_analytic_plans #: code:addons/account_analytic_plans/account_analytic_plans.py:214 @@ -496,7 +496,7 @@ msgstr "Gyűjtőkód megnevezése" #. module: account_analytic_plans #: view:account.analytic.plan.instance.line:0 msgid "Analytic Distribution Line" -msgstr "Felosztás sor" +msgstr "Analitikus felosztás sor" #. module: account_analytic_plans #: field:account.analytic.plan.instance,code:0 @@ -522,7 +522,7 @@ msgstr "100.00%" #: field:account.move.line,analytics_id:0 #: model:ir.model,name:account_analytic_plans.model_account_analytic_default msgid "Analytic Distribution" -msgstr "Felosztás" +msgstr "Analitikus felosztás" #. module: account_analytic_plans #: model:ir.model,name:account_analytic_plans.model_account_journal diff --git a/addons/account_followup/i18n/hu.po b/addons/account_followup/i18n/hu.po index 93714a3bc3e..b336f71e41e 100644 --- a/addons/account_followup/i18n/hu.po +++ b/addons/account_followup/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-30 17:21+0000\n" +"PO-Revision-Date: 2011-01-31 13:21+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ \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-01-31 04:55+0000\n" +"X-Launchpad-Export-Date: 2011-02-01 04:40+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account_followup @@ -308,6 +308,26 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Tisztelt %(partner_name)s!\n" +"\n" +"Sajnálattal állapítottuk meg, hogy az elküldött fizetési emlékeztető " +"levelünk ellenére továbbra is lejárt tartozásuk áll fenn társaságunkkal " +"szemben.\n" +"\n" +"Lényeges, hogy azonnal rendezzék tartozásukat, különben kénytelenek leszünk " +"megfontolni az Önök felé teljesítendő további termékértékesítéseink vagy " +"szolgáltatásnyújtásaink leállítását.\n" +"Kérjük, tegyék meg a megfelelő intézkedéseket a tartozás 8 napon belül " +"történő kiegyenlítésére.\n" +"\n" +"Ha olyan problémájuk van a számlák kifizetésével kapcsolatban, amelynek nem " +"vagyunk tudatában, kérjük, vegyék fel a kapcsolatot a pénzügyi " +"részlegünkkel, hogy gyorsan meg tudjuk oldani az ügyet.\n" +"\n" +"A lejárt tartozás részletezése az alábbiakban található.\n" +"\n" +"Üdvözlettel,\n" #. module: account_followup #: field:account.followup.print.all,partner_lang:0 @@ -366,6 +386,18 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Tisztelt %(partner_name)s!\n" +"\n" +"Nyilvántartásaink alapján megállapítottuk, hogy az alábbiakban részletezett " +"számlák összegét nem egyenlítették ki társaságunk felé. Kérjük, tegyék meg a " +"megfelelő intézkedéseket a tartozás 8 napon belül történő kifizetésére.\n" +"\n" +"Ha időközben rendezték tartozásukat, kérjük, tekintsék tárgytalannak jelen " +"levelünket. Probléma esetén, kérjük vegyék fel a kapcsolatot pénzügyi " +"részlegünkkel.\n" +"\n" +"Üdvözlettel,\n" #. module: account_followup #: model:account_followup.followup.line,description:account_followup.demo_followup_line3 @@ -386,6 +418,23 @@ msgid "" "\n" "Best Regards,\n" msgstr "" +"\n" +"Tisztelt %(partner_name)s!\n" +"\n" +"Több fizetési emlékeztető levelünk ellenére sem rendezték tartozásukat " +"társaságunk felé.\n" +"\n" +"Amennyiben 8 napon belül nem egyenlítik ki a tartozás teljes összegét, " +"minden további értesítés nélkül megtesszük a szükséges jogi lépéseket a " +"követelésünk behajtása érdekében.\n" +"\n" +"Bízunk benne, hogy ez az intézkedés szükségtelennek bizonyul. A lejárt " +"tartozás részletezése az alábbiakban található.\n" +"\n" +"Ha bármilyen, az ügyet érintő kérdés felmerülne, kérjük, vegyék fel a " +"kapcsolatot a pénzügyi részlegünkkel.\n" +"\n" +"Üdvözlettel,\n" #. module: account_followup #: view:account.followup.print.all:0 diff --git a/addons/account_invoice_layout/i18n/hu.po b/addons/account_invoice_layout/i18n/hu.po index 04ec8214016..3f38bd7b28f 100644 --- a/addons/account_invoice_layout/i18n/hu.po +++ b/addons/account_invoice_layout/i18n/hu.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-30 18:00+0000\n" +"PO-Revision-Date: 2011-02-01 12:12+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ \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-01-31 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-02-02 04:41+0000\n" "X-Generator: Launchpad (build 12177)\n" #. module: account_invoice_layout @@ -59,7 +59,7 @@ msgstr "Megjegyzés" #. module: account_invoice_layout #: model:ir.model,name:account_invoice_layout.model_notify_message msgid "Notify By Messages" -msgstr "" +msgstr "Értesítés üzenetként" #. module: account_invoice_layout #: help:notify.message,msg:0 @@ -92,6 +92,20 @@ msgid "" "\n" " " msgstr "" +"\n" +" Ez a modul néhány eszközt biztosít a számla elrendezésének javítására.\n" +"\n" +" Megadja a lehetőséget az alábbiakra:\n" +" * számla sorainak sorba rendezése\n" +" * megnevezések, megjegyzés sorok, részösszeg sorok hozzáadása\n" +" * vízszintes vonalak húzása és oldaltörések berakása\n" +"\n" +" Továbbá lehetővé teszi a kiválasztott számlák kinyomtatását speciális " +"üzenetek megjelenítésével a számla alján. Ez a funkció nagyon hasznos lehet " +"év végi jókívánságokat, speciális feltételeket, stb. tartalmazó számlák " +"nyomtatására.\n" +"\n" +" " #. module: account_invoice_layout #: report:account.invoice.layout:0 @@ -297,7 +311,7 @@ msgstr "Partner hivatkozása" #. module: account_invoice_layout #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information msgid "Invoices Layout Improvement" -msgstr "" +msgstr "Számlák elrendezésének javítása" #. module: account_invoice_layout #: report:account.invoice.layout:0 diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index d5858d94f80..138be103f2e 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -306,7 +306,7 @@ class payment_line(osv.osv): if id.move_line_id: res[id.id] = id.move_line_id.date_maturity else: - res[id.id] = "" + res[id.id] = False return res def _get_ml_created_date(self, cr, uid, ids, *a): @@ -315,7 +315,7 @@ class payment_line(osv.osv): if id.move_line_id: res[id.id] = id.move_line_id.date_created else: - res[id.id] = "" + res[id.id] = False return res _columns = { diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 5c935f188fb..b829748cb93 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -108,7 +108,7 @@