diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index 8db025d7648..50c0fc515ef 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-03-10 12:10+0000\n" +"PO-Revision-Date: 2011-03-14 19:24+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-03-11 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-03-15 04:54+0000\n" "X-Generator: Launchpad (build 12559)\n" #. module: account @@ -244,7 +244,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 @@ -297,7 +297,7 @@ msgstr "Вычисленный баланс" #: model:ir.actions.act_window,name:account.action_view_account_use_model #: model:ir.ui.menu,name:account.menu_action_manual_recurring msgid "Manual Recurring" -msgstr "" +msgstr "Повтор вручную" #. module: account #: view:account.fiscalyear.close.state:0 @@ -380,9 +380,9 @@ msgid "" "OpenERP. Journal items are created by OpenERP if you use Bank Statements, " "Cash Registers, or Customer/Supplier payments." msgstr "" -"Этот вид используется, бухгалтерами для массовой регистрации записей в " -"OpenERP. Пункты журнала создаются OpenERP если вы используете банковские " -"выписки, фискальные регистраторы, или платежи заказчик / поставщик." +"Этот вид используется бухгалтерами для массового ввода проводок в OpenERP. " +"Элементы журнала создаются OpenERP если вы используете банковские выписки, " +"фискальные регистраторы, платежи от заказчика или поставщику." #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -467,6 +467,9 @@ msgid "" "it comes to 'Printed' state. When all transactions are done, it comes in " "'Done' state." msgstr "" +"При создании периода журнала его состояние - 'Черновик'. Если отчет " +"напечатан оно становится 'Напечатано'. Когда все операции произведены, оно " +"становится 'Сделано'." #. module: account #: model:ir.actions.act_window,help:account.action_account_tax_chart @@ -616,6 +619,8 @@ msgid "" "If you unreconciliate transactions, you must also verify all the actions " "that are linked to those transactions because they will not be disable" msgstr "" +"Если вы отменили сверку операций, вы должны также проверить все действия, " +"которые связаны с этими операциями, потому что они не будут отключены." #. module: account #: view:analytic.entries.report:0 @@ -936,7 +941,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 @@ -1287,7 +1292,7 @@ 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 @@ -1343,7 +1348,7 @@ msgstr "Искать налоги" #. module: account #: model:ir.model,name:account.model_account_analytic_cost_ledger msgid "Account Analytic Cost Ledger" -msgstr "" +msgstr "Аналитический счет журнала издержек" #. module: account #: view:account.model:0 @@ -1389,6 +1394,10 @@ msgid "" "entry per accounting document: invoice, refund, supplier payment, bank " "statements, etc." msgstr "" +"Запись журнала состоит из нескольких элементов журнала, каждый из которых " +"дебетовая или кредитовая операция. OpenERP автоматически создает одну запись " +"в журнале на один бухгалтерский документ: счет, возврат, платеж поставщику, " +"платежное поручение и т.д." #. module: account #: view:account.entries.report:0 @@ -1424,7 +1433,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 @@ -1612,7 +1621,7 @@ msgstr "" #: field:account.partner.ledger,initial_balance:0 #: field:account.report.general.ledger,initial_balance:0 msgid "Include initial balances" -msgstr "" +msgstr "Включать начальные остатки" #. module: account #: field:account.tax.code,sum:0 @@ -1636,6 +1645,9 @@ msgid "" "Have a complete tree view of all journal items per account code by clicking " "on an account." msgstr "" +"Отображение плана счетов вашей компании на финансовый год с фильтром по " +"периодам. Отображается как древовидная структура всех элементов журнала по " +"коду счета при нажатии на счет." #. module: account #: constraint:account.fiscalyear:0 @@ -1736,7 +1748,7 @@ msgstr "" #: code:addons/account/account.py:499 #, python-format msgid "You cannot deactivate an account that contains account moves." -msgstr "" +msgstr "Вы не можете отключить счет, по которому есть движение." #. module: account #: field:account.move.line.reconcile,credit:0 @@ -1746,7 +1758,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 @@ -1755,6 +1767,8 @@ msgid "" "You cannot change the type of account from 'Closed' to any other type which " "contains account entries!" msgstr "" +"Вы не можете изменить тип счета с 'Закрыт' на любой другой, содержащий " +"проводки!" #. module: account #: view:res.company:0 @@ -1786,7 +1800,7 @@ 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 @@ -1840,7 +1854,7 @@ 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 @@ -1855,7 +1869,7 @@ 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 @@ -1890,6 +1904,7 @@ msgid "" "It adds the currency column if the currency is different then the company " "currency" msgstr "" +"Добавляет столбец валюты , если валюта отличается, от валюты компании." #. module: account #: help:account.journal,allow_date:0 @@ -1929,6 +1944,8 @@ msgid "" "If the active field is set to False, it will allow you to hide the tax " "without removing it." msgstr "" +"Если поле 'Активно' имеет значение Ложь, то это позволит вам скрыть налог, " +"не удаляя его." #. module: account #: help:account.bank.statement,name:0 @@ -2057,6 +2074,9 @@ msgid "" "certified Chart of Accounts exists for your specified country, a generic one " "can be installed and will be selected by default." msgstr "" +"План счетов по умолчанию соответствует выбранной стране. Если для выбранной " +"страны нет сертифицированного плана счетов, то общий план счетов может быть " +"установлен и выбран по умолчанию." #. module: account #: view:account.account.type:0 @@ -2122,7 +2142,7 @@ msgstr "Изменить на" #. module: account #: view:account.entries.report:0 msgid "# of Products Qty " -msgstr "" +msgstr "# кол. ТМЦ " #. module: account #: model:ir.model,name:account.model_product_template @@ -2264,7 +2284,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 @@ -2431,6 +2451,8 @@ 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 @@ -2521,6 +2543,8 @@ msgid "" "Automatically generate entries based on what has been entered in the system " "before a specific date." msgstr "" +"Автоматически генерируются проводки основанные на том, что было введено в " +"систему до определенной даты." #. module: account #: view:account.aged.trial.balance:0 @@ -2549,6 +2573,10 @@ msgid "" "Note that journal entries that are automatically created by the system are " "always skipping that state." msgstr "" +"Отметьте, если не хотите, чтобы новые записи в журнале проходили через " +"состояние 'Черновик', а сразу проводились без утверждения вручную. \n" +"Автоматически создаваемые системой записи в журнал всегда пропускают это " +"состояние." #. module: account #: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart @@ -3369,6 +3397,8 @@ msgid "" "You cannot validate a Journal Entry unless all journal items are in same " "chart of accounts !" msgstr "" +"Вы не можете утвердить запись в журнале, если не все элементы журнала одном " +"плане счетов!" #. module: account #: view:account.tax:0 @@ -3454,6 +3484,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 @@ -3602,7 +3634,7 @@ msgstr "" #: view:account.installer.modules:0 #: view:wizard.multi.charts.accounts:0 msgid "title" -msgstr "обращение" +msgstr "title" #. module: account #: view:account.invoice:0 @@ -3752,7 +3784,7 @@ msgstr "Тип счета" #: model:ir.actions.report.xml,name:account.account_account_balance #: model:ir.ui.menu,name:account.menu_general_Balance_report msgid "Trial Balance" -msgstr "Пробный баланс" +msgstr "Оборотно-сальдовая ведомость" #. module: account #: model:ir.model,name:account.model_account_invoice_cancel @@ -3898,7 +3930,7 @@ msgstr "Все проведенные проводки" #: code:addons/account/account_bank_statement.py:357 #, python-format msgid "Statement %s is confirmed, journal items are created." -msgstr "Документ %s подтвержден, записи в журнал сделаны." +msgstr "Документ %s подтвержден, элементы журнала созданы." #. module: account #: constraint:account.fiscalyear:0 @@ -4116,7 +4148,7 @@ msgstr "Изменить" #: code:addons/account/wizard/account_report_aged_partner_balance.py:57 #, python-format msgid "UserError" -msgstr "Ошибка пользователя" +msgstr "UserError" #. module: account #: field:account.journal,type_control_ids:0 @@ -4194,7 +4226,7 @@ msgstr "" #: code:addons/account/invoice.py:320 #, python-format msgid "Customer" -msgstr "Клиент" +msgstr "Заказчик" #. module: account #: view:account.bank.statement:0 @@ -4360,7 +4392,7 @@ msgstr "Вычислить" #. module: account #: field:account.tax,type_tax_use:0 msgid "Tax Application" -msgstr "Налоги" +msgstr "Применение налога" #. module: account #: view:account.move:0 @@ -4421,7 +4453,7 @@ msgstr "" #: code:addons/account/wizard/account_report_common.py:126 #, python-format msgid "Error" -msgstr "Ошибка" +msgstr "Error" #. module: account #: field:account.analytic.Journal.report,date2:0 @@ -4646,7 +4678,7 @@ msgstr "месяц" #: code:addons/account/account_bank_statement.py:293 #, python-format msgid "Journal Item \"%s\" is not valid" -msgstr "Запись \"%s\" в журнале не верна" +msgstr "Элемент \"%s\" в журнале не верный" #. module: account #: view:account.payment.term:0 @@ -4772,7 +4804,7 @@ 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 @@ -4942,7 +4974,7 @@ msgstr "Журнал проводок конца года" #: code:addons/account/wizard/account_move_journal.py:63 #, python-format msgid "Configuration Error !" -msgstr "Ошибка конфигурации !" +msgstr "Configuration Error !" #. module: account #: help:account.partner.reconcile.process,to_reconcile:0 @@ -5012,7 +5044,7 @@ msgstr "" #. module: account #: field:account.report.general.ledger,sortby:0 msgid "Sort By" -msgstr "" +msgstr "Сортировать по" #. module: account #: code:addons/account/account.py:1326 @@ -5151,7 +5183,7 @@ msgstr "Автоматическая сверка счета" #: view:account.move:0 #: view:account.move.line:0 msgid "Journal Item" -msgstr "Запись в журнале" +msgstr "Элемент журнала" #. module: account #: model:ir.model,name:account.model_account_move_journal @@ -5204,7 +5236,7 @@ msgstr "Подчиненный счет" #: code:addons/account/account_move_line.py:830 #, python-format msgid "Write-Off" -msgstr "Сртсание" +msgstr "Списание" #. module: account #: field:res.partner,debit:0 @@ -5335,7 +5367,7 @@ msgstr "Установить период" #: view:account.invoice.report:0 #: field:account.invoice.report,nbr:0 msgid "# of Lines" -msgstr "Кол-во позиций" +msgstr "# строк" #. module: account #: code:addons/account/wizard/account_change_currency.py:60 @@ -5408,7 +5440,7 @@ msgstr "7" #: code:addons/account/invoice.py:370 #, python-format msgid "Invalid action !" -msgstr "Неверное действие !" +msgstr "Invalid action !" #. module: account #: code:addons/account/wizard/account_move_journal.py:102 @@ -5851,7 +5883,7 @@ msgstr "Ликвидность" #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form #: model:ir.ui.menu,name:account.account_analytic_journal_entries msgid "Analytic Journal Items" -msgstr "Аналитические записи журнала" +msgstr "Элементы журнала аналитики" #. module: account #: view:account.fiscalyear.close:0 @@ -5898,7 +5930,7 @@ msgstr "" #: code:addons/account/wizard/account_report_aged_partner_balance.py:57 #, python-format msgid "Enter a Start date !" -msgstr "Введите дату начала !" +msgstr "" #. module: account #: report:account.invoice:0 @@ -5911,7 +5943,7 @@ msgstr "Возврат средств от поставщика" #. module: account #: model:ir.ui.menu,name:account.menu_dashboard_acc msgid "Dashboard" -msgstr "Инф. панель" +msgstr "Инфо-панель" #. module: account #: field:account.bank.statement,move_line_ids:0 @@ -5963,7 +5995,7 @@ msgstr "Отчет по счету прибыль и убыток" #. module: account #: field:account.invoice.line,uos_id:0 msgid "Unit of Measure" -msgstr "Ед. изм." +msgstr "Единица измерения" #. module: account #: constraint:account.payment.term.line:0 @@ -6181,7 +6213,7 @@ msgstr " оценка: процент" #: code:addons/account/wizard/account_use_model.py:44 #, python-format msgid "Error !" -msgstr "Ошибка !" +msgstr "Error !" #. module: account #: view:account.vat.declaration:0 @@ -6500,7 +6532,7 @@ msgstr "" #: view:analytic.entries.report:0 #: field:analytic.entries.report,product_uom_id:0 msgid "Product UOM" -msgstr "Ед. изм." +msgstr "Ед. изм. продукции" #. module: account #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree @@ -6563,6 +6595,8 @@ msgid "" "Can not find account chart for this company in invoice line account, Please " "Create account." msgstr "" +"Не могу найти план счетов для этой компании в позиции счета, пожалуйста " +"создайте бух. счет." #. module: account #: view:account.tax.template:0 @@ -6572,7 +6606,7 @@ msgstr "Шаблон налогового счета" #. module: account #: view:account.journal.select:0 msgid "Are you sure you want to open Journal Entries?" -msgstr "" +msgstr "Вы уверены, что хотите открыть записи журнала ?" #. module: account #: view:account.state.open:0 @@ -6588,7 +6622,7 @@ msgstr "Бухгалтерские проводки" #. module: account #: field:account.account.template,parent_id:0 msgid "Parent Account Template" -msgstr "" +msgstr "Шаблон основного счета" #. module: account #: view:account.bank.statement:0 @@ -6601,7 +6635,7 @@ msgstr "Выписка" #. module: account #: help:account.journal,default_debit_account_id:0 msgid "It acts as a default account for debit amount" -msgstr "" +msgstr "Действует как счет по умолчанию для дебетовых сумм" #. module: account #: model:ir.module.module,description:account.module_meta_information @@ -6702,7 +6736,7 @@ msgstr "Дата окончания" #. module: account #: field:wizard.multi.charts.accounts,purchase_tax:0 msgid "Default Purchase Tax" -msgstr "" +msgstr "Налог на покупку по умолчанию" #. module: account #: view:account.bank.statement:0 @@ -6871,6 +6905,8 @@ msgid "" "Helps you generate reminder letters for unpaid invoices, including multiple " "levels of reminding and customized per-partner policies." msgstr "" +"Поможет вам создавать письма - напоминания о неоплаченных счетах и " +"многоуровневые напоминания в соответствии с настройками партнера." #. module: account #: selection:account.entries.report,move_line_state:0 @@ -6932,7 +6968,7 @@ msgstr "Журнал продаж" #: code:addons/account/wizard/account_move_journal.py:104 #, python-format msgid "Open Journal Items !" -msgstr "" +msgstr "Открыть элементы журнала" #. module: account #: model:ir.model,name:account.model_account_invoice_tax @@ -7014,7 +7050,7 @@ msgstr "" #. module: account #: view:validate.account.move:0 msgid "Post Journal Entries of a Journal" -msgstr "" +msgstr "Провести записи журнала из журнала" #. module: account #: view:product.product:0 @@ -7033,7 +7069,7 @@ msgstr "Наличные" #: field:account.fiscal.position.account,account_dest_id:0 #: field:account.fiscal.position.account.template,account_dest_id:0 msgid "Account Destination" -msgstr "" +msgstr "Счет назначения" #. module: account #: model:process.node,note:account.process_node_supplierpaymentorder0 @@ -7064,7 +7100,7 @@ msgstr "Отчет - баланс счета" msgid "" "Check this if the price you use on the product and invoices includes this " "tax." -msgstr "" +msgstr "Отметьте, если цена ТМЦ и счета включают этот налог." #. module: account #: view:account.state.open:0 @@ -7079,7 +7115,7 @@ msgstr "Продажи по типу счета" #. module: account #: help:account.invoice,move_id:0 msgid "Link to the automatically generated Journal Items." -msgstr "" +msgstr "Ссылка на созданные автоматически элементы журнала." #. module: account #: selection:account.installer,period:0 @@ -7095,6 +7131,8 @@ msgid "" "in which they will appear. Then you can create a new journal and link your " "view to it." msgstr "" +"Здесь вы можете настроить существующий вид журнала или создать новый вид. " +"Вид журнала определяет каким образом создаются записи в вашем журнале." #. module: account #: view:account.payment.term.line:0 @@ -7104,18 +7142,18 @@ msgstr " кол-во дней: 14" #. module: account #: view:analytic.entries.report:0 msgid " 7 Days " -msgstr "" +msgstr " 7 дней " #. module: account #: field:account.partner.reconcile.process,progress:0 msgid "Progress" -msgstr "" +msgstr "Выполнение" #. module: account #: field:account.account,parent_id:0 #: view:account.analytic.account:0 msgid "Parent" -msgstr "Контрагент" +msgstr "Предыдущий" #. module: account #: field:account.installer.modules,account_analytic_plans:0 @@ -7191,18 +7229,18 @@ msgstr "Фиксированный" #: code:addons/account/invoice.py:720 #, python-format msgid "Warning !" -msgstr "Внимание!" +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 @@ -7236,12 +7274,12 @@ msgstr "Величина (прописью):" #: model:ir.model,name:account.model_res_partner #: field:report.invoice.created,partner_id:0 msgid "Partner" -msgstr "Партнер" +msgstr "Контрагент" #. module: account #: help:account.change.currency,currency_id:0 msgid "Select a currency to apply on the invoice" -msgstr "" +msgstr "Выбрать валюту применяемую в счете" #. module: account #: code:addons/account/wizard/account_invoice_refund.py:100 @@ -7291,7 +7329,7 @@ msgstr "Использовать налог в" #: code:addons/account/account_bank_statement.py:346 #, python-format msgid "The account entries lines are not in valid state." -msgstr "" +msgstr "Проводки в ненадлежащем состоянии." #. module: account #: field:account.account.type,close_method:0 @@ -7307,12 +7345,12 @@ msgstr "Счет '%s' оплачен." #. module: account #: model:process.node,note:account.process_node_electronicfile0 msgid "Automatic entry" -msgstr "" +msgstr "Автоматическая проводка" #. module: account #: constraint:account.tax.code.template:0 msgid "Error ! You can not create recursive Tax Codes." -msgstr "" +msgstr "Ошибка ! Нельзя создавать рекурсивные коды налогов." #. module: account #: view:account.invoice.line:0 @@ -7376,7 +7414,7 @@ msgstr "Дополнительная информация" #. module: account #: view:account.installer:0 msgid "Bank and Cash Accounts" -msgstr "" +msgstr "Банковские и кассовые счета" #. module: account #: view:account.invoice.report:0 @@ -7431,7 +7469,7 @@ msgstr "Закрыть отчетный год" #: code:addons/account/installer.py:495 #, python-format msgid "Purchase Refund Journal" -msgstr "" +msgstr "Журнал возврата покупок" #. module: account #: help:account.tax.template,amount:0 @@ -7449,6 +7487,8 @@ msgid "" "Modify Invoice: Cancels the current invoice and creates a new copy of it " "ready for editing." msgstr "" +"Изменить счет: отменяет текущий счет и создает его новую копию готовую для " +"редактирования." #. module: account #: model:ir.module.module,shortdesc:account.module_meta_information @@ -7550,7 +7590,7 @@ msgstr "" #. module: account #: report:account.invoice:0 msgid "Tel. :" -msgstr "тел.:" +msgstr "Тел. :" #. module: account #: field:account.account,company_currency_id:0 @@ -7585,6 +7625,8 @@ msgid "" "You can check this box to mark this journal item as a litigation with the " "associated partner" msgstr "" +"Отметьте для обозначения этого элемента журнала как спорного с " +"соответствующим партнером" #. module: account #: field:account.move.line,reconcile_partial_id:0 @@ -7737,7 +7779,7 @@ msgstr "" #. module: account #: view:account.model.line:0 msgid "Journal Entry Model Line" -msgstr "" +msgstr "Модель записи журнала" #. module: account #: view:account.invoice:0 @@ -7791,7 +7833,7 @@ msgstr "Статистика" #: field:account.analytic.chart,from_date:0 #: field:project.account.analytic.line,from_date:0 msgid "From" -msgstr "От" +msgstr "С" #. module: account #: model:ir.model,name:account.model_account_fiscalyear_close @@ -7828,7 +7870,7 @@ msgstr "" #: view:account.analytic.inverted.balance:0 #: view:account.common.report:0 msgid "Print" -msgstr "Распечатать" +msgstr "Печать" #. module: account #: view:account.journal:0 @@ -7850,13 +7892,13 @@ msgstr "Прочее" #. module: account #: help:res.partner,debit:0 msgid "Total amount you have to pay to this supplier." -msgstr "Всего вы должны заплатить этому поставщику." +msgstr "Общая сумма к оплате этому поставщику." #. module: account #: model:process.node,name:account.process_node_analytic0 #: model:process.node,name:account.process_node_analyticcost0 msgid "Analytic Costs" -msgstr "" +msgstr "Аналитические расходы" #. module: account #: field:account.analytic.journal,name:0 @@ -7884,7 +7926,7 @@ msgstr "" #: code:addons/account/account_move_line.py:1214 #, python-format msgid "Bad account!" -msgstr "" +msgstr "Плохой счет!" #. module: account #: help:account.chart,fiscalyear:0 @@ -7936,11 +7978,12 @@ msgstr "Валюта" msgid "" "Gives the sequence order when displaying a list of bank statement lines." msgstr "" +"Определяет последовательность вывода списка позиций банковской выписки." #. module: account #: model:process.transition,note:account.process_transition_validentries0 msgid "Accountant validates the accounting entries coming from the invoice." -msgstr "" +msgstr "Бухгалтер проверяет проводки созданные по счет-фактуре." #. module: account #: model:ir.actions.act_window,help:account.action_account_fiscalyear_form @@ -7985,7 +8028,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_partner_balance msgid "Print Account Partner Balance" -msgstr "" +msgstr "Печать баланс счета партнера" #. module: account #: field:res.partner,contract_ids:0 @@ -8025,7 +8068,7 @@ msgstr "Тип ссылки" #. module: account #: view:account.analytic.cost.ledger.journal.report:0 msgid "Cost Ledger for period" -msgstr "" +msgstr "Журнал издержек за период" #. module: account #: help:account.tax,child_depend:0 @@ -8038,7 +8081,7 @@ msgstr "" #. module: account #: selection:account.tax,applicable_type:0 msgid "Given by Python Code" -msgstr "" +msgstr "Задается кодом на Python" #. module: account #: field:account.analytic.journal,code:0 @@ -8089,7 +8132,7 @@ msgstr "Период с" #: code:addons/account/installer.py:476 #, python-format msgid "Sales Refund Journal" -msgstr "" +msgstr "Журнал возврата продаж" #. module: account #: code:addons/account/account.py:927 @@ -8201,13 +8244,13 @@ msgstr "Управление напоминаниями" #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 msgid "Start Period" -msgstr "" +msgstr "Начало периода" #. module: account #: code:addons/account/account.py:2333 #, python-format msgid "Cannot locate parent code for template account!" -msgstr "" +msgstr "Не удается найти родительский код для шаблона счета!" #. module: account #: field:account.aged.trial.balance,direction_selection:0 @@ -8238,7 +8281,7 @@ msgstr "Всего кредит" #. module: account #: model:process.transition,note:account.process_transition_suppliervalidentries0 msgid "Accountant validates the accounting entries coming from the invoice. " -msgstr "" +msgstr "Бухгалтер проверяет проводки созданные по счет-фактуре. " #. module: account #: code:addons/account/invoice.py:1008 @@ -8268,7 +8311,7 @@ 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 @@ -8293,7 +8336,7 @@ msgstr "" #. module: account #: report:account.move.voucher:0 msgid "Particulars" -msgstr "" +msgstr "Детали" #. module: account #: selection:account.account.type,report_type:0 @@ -8334,7 +8377,7 @@ msgstr "Остаток" #. module: account #: model:process.node,note:account.process_node_supplierbankstatement0 msgid "Manually or automatically entered in the system" -msgstr "" +msgstr "Вручную или автоматически введенные в систему" #. module: account #: report:account.account.balance:0 @@ -8463,6 +8506,7 @@ msgstr "Перемещение" #, python-format msgid "You can not change the tax, you should remove and recreate lines !" msgstr "" +"Вы не можете изменить налог, вы должны удалить и создать заново позиции !" #. module: account #: report:account.central.journal:0 @@ -8472,7 +8516,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement msgid "Bank statements" -msgstr "Банковская выписка" +msgstr "Банковские выписки" #. module: account #: help:account.addtmpl.wizard,cparent_id:0 @@ -8524,7 +8568,7 @@ msgstr "" #: model:process.transition,name:account.process_transition_paymentorderbank0 #: model:process.transition,name:account.process_transition_paymentreconcile0 msgid "Payment entries" -msgstr "" +msgstr "Проводки платежей" #. module: account #: selection:account.entries.report,month:0 @@ -8548,7 +8592,7 @@ msgstr "Подписка" #. module: account #: model:ir.model,name:account.model_account_analytic_balance msgid "Account Analytic Balance" -msgstr "" +msgstr "Аналитический баланс" #. module: account #: report:account.account.balance:0 @@ -8561,7 +8605,7 @@ msgstr "" #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 msgid "End Period" -msgstr "" +msgstr "Конец периода" #. module: account #: field:account.aged.trial.balance,chart_account_id:0 @@ -8790,12 +8834,12 @@ msgstr "Через :" #: view:account.general.journal:0 #: model:ir.ui.menu,name:account.menu_account_general_journal msgid "General Journals" -msgstr "" +msgstr "Общие журналы" #. module: account #: view:account.model:0 msgid "Journal Entry Model" -msgstr "" +msgstr "Модель записи журнала" #. module: account #: code:addons/account/wizard/account_use_model.py:44 @@ -8819,7 +8863,7 @@ msgstr "Номер" #: selection:account.bank.statement.line,type:0 #: selection:account.journal,type:0 msgid "General" -msgstr "Общие" +msgstr "Общий" #. module: account #: selection:account.aged.trial.balance,filter:0 @@ -8967,7 +9011,7 @@ msgstr "Обычный" #: field:account.account.template,type:0 #: field:account.entries.report,type:0 msgid "Internal Type" -msgstr "" +msgstr "Внутренний тип" #. module: account #: report:account.move.voucher:0 @@ -9038,7 +9082,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 @@ -9116,7 +9160,7 @@ msgstr "Всего" #: code:addons/account/wizard/account_move_journal.py:97 #, python-format msgid "Journal: All" -msgstr "" +msgstr "Журнал: Все" #. module: account #: field:account.account,company_id:0 @@ -9161,7 +9205,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 @@ -9196,6 +9240,8 @@ msgstr "Черновые выписки" msgid "" "Manual or automatic creation of payment entries according to the statements" msgstr "" +"Ручное или автоматическое создание проводок оплаты в соответствии с " +"документами" #. module: account #: view:account.invoice:0 @@ -9233,7 +9279,7 @@ msgstr "Конец периода" #: code:addons/account/wizard/account_validate_account_move.py:61 #, python-format msgid "Warning" -msgstr "" +msgstr "Warning" #. module: account #: help:product.category,property_account_expense_categ:0 @@ -9242,6 +9288,8 @@ msgid "" "This account will be used to value outgoing stock for the current product " "category using cost price" msgstr "" +"Счет будет использован для исчисления себестоимости исходящих ТМЦ текущей " +"категории." #. module: account #: report:account.move.voucher:0 @@ -9421,13 +9469,14 @@ 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 msgid "" "Import of the statement in the system from a supplier or customer invoice" msgstr "" +"Импорт документа в систему из счета-фактуры поставщика или покупателя." #. module: account #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing @@ -9449,11 +9498,17 @@ 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 msgid "Account Analytic Chart" -msgstr "" +msgstr "План счетов аналитики" #. module: account #: help:account.invoice,residual:0 @@ -9470,7 +9525,7 @@ msgstr "Статистические отчеты" #: 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 @@ -9561,7 +9616,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 @@ -9672,7 +9727,7 @@ msgstr "Будущие" #. module: account #: view:account.move.line:0 msgid "Search Journal Items" -msgstr "Искать записи в журале" +msgstr "Искать элементы журала" #. module: account #: help:account.tax,base_sign:0 diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index f38d43471ad..8fd35a21a89 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -56,19 +56,19 @@ child_complete_ids - + - + - + @@ -82,7 +82,7 @@ - + diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 5f429270e29..b7271fec84b 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -32,6 +32,7 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + Journal multi-company @@ -79,7 +80,7 @@ Tax multi-company - ['|',('company_id','=',False),('company_id','=',user.company_id.id)] + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -110,4 +111,25 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Invoice Line company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Account bank statement company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + Account bank statement line company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + diff --git a/addons/account/wizard/account_automatic_reconcile.py b/addons/account/wizard/account_automatic_reconcile.py index 432a430868c..b9e5363e7d2 100644 --- a/addons/account/wizard/account_automatic_reconcile.py +++ b/addons/account/wizard/account_automatic_reconcile.py @@ -143,15 +143,15 @@ class account_automatic_reconcile(osv.osv_memory): obj_model = self.pool.get('ir.model.data') if context is None: context = {} - form = self.read(cr, uid, ids, [])[0] - max_amount = form.get('max_amount', False) and form.get('max_amount') or 0.0 - power = form['power'] - allow_write_off = form['allow_write_off'] + form = self.browse(cr, uid, ids, context=context)[0] + max_amount = form.max_amount or 0.0 + power = form.power + allow_write_off = form.allow_write_off reconciled = unreconciled = 0 - if not form['account_ids']: + if not form.account_ids: raise osv.except_osv(_('UserError'), _('You must select accounts to reconcile')) - for account_id in form['account_ids']: - params = (account_id,) + for account_id in form.account_ids: + params = (account_id.id,) if not allow_write_off: query = """SELECT partner_id FROM account_move_line WHERE account_id=%s AND reconcile_id IS NULL AND state <> 'draft' GROUP BY partner_id @@ -172,12 +172,12 @@ class account_automatic_reconcile(osv.osv_memory): "AND partner_id=%s " \ "AND state <> 'draft' " \ "AND reconcile_id IS NULL", - (account_id, partner_id)) + (account_id.id, partner_id)) line_ids = [id for (id,) in cr.fetchall()] if line_ids: reconciled += len(line_ids) if allow_write_off: - move_line_obj.reconcile(cr, uid, line_ids, 'auto', form['writeoff_acc_id'], form['period_id'], form['journal_id'], context) + move_line_obj.reconcile(cr, uid, line_ids, 'auto', form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context) else: move_line_obj.reconcile_partial(cr, uid, line_ids, 'manual', context=context) @@ -191,7 +191,7 @@ class account_automatic_reconcile(osv.osv_memory): "AND partner_id IS NOT NULL " \ "GROUP BY partner_id " \ "HAVING count(*)>1", - (account_id,)) + (account_id.id,)) partner_ids = [id for (id,) in cr.fetchall()] #filter? for partner_id in partner_ids: @@ -205,7 +205,7 @@ class account_automatic_reconcile(osv.osv_memory): "AND state <> 'draft' " \ "AND debit > 0 " \ "ORDER BY date_maturity", - (account_id, partner_id)) + (account_id.id, partner_id)) debits = cr.fetchall() # get the list of unreconciled 'credit transactions' for this partner @@ -218,10 +218,10 @@ class account_automatic_reconcile(osv.osv_memory): "AND state <> 'draft' " \ "AND credit > 0 " \ "ORDER BY date_maturity", - (account_id, partner_id)) + (account_id.id, partner_id)) credits = cr.fetchall() - (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form['writeoff_acc_id'], form['period_id'], form['journal_id'], context) + (rec, unrec) = self.do_reconcile(cr, uid, credits, debits, max_amount, power, form.writeoff_acc_id.id, form.period_id.id, form.journal_id.id, context) reconciled += rec unreconciled += unrec @@ -234,7 +234,7 @@ class account_automatic_reconcile(osv.osv_memory): "WHERE account_id=%s " \ "AND reconcile_id IS NULL " \ "AND state <> 'draft' " + partner_filter, - (account_id,)) + (account_id.id,)) additional_unrec = cr.fetchone()[0] unreconciled = unreconciled + additional_unrec context.update({'reconciled': reconciled, 'unreconciled': unreconciled}) @@ -252,4 +252,4 @@ class account_automatic_reconcile(osv.osv_memory): account_automatic_reconcile() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_change_currency.py b/addons/account/wizard/account_change_currency.py index d915a1cd34b..009352aa7c9 100644 --- a/addons/account/wizard/account_change_currency.py +++ b/addons/account/wizard/account_change_currency.py @@ -45,8 +45,8 @@ class account_change_currency(osv.osv_memory): obj_currency = self.pool.get('res.currency') if context is None: context = {} - data = self.read(cr, uid, ids)[0] - new_currency = data['currency_id'] + data = self.browse(cr, uid, ids, context=context)[0] + new_currency = data.currency_id.id invoice = obj_inv.browse(cr, uid, context['active_id'], context=context) if invoice.currency_id.id == new_currency: @@ -76,4 +76,4 @@ class account_change_currency(osv.osv_memory): account_change_currency() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 6190f792c7f..89e28950535 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -56,22 +56,22 @@ class account_fiscalyear_close(osv.osv_memory): obj_acc_account = self.pool.get('account.account') obj_acc_journal_period = self.pool.get('account.journal.period') - data = self.read(cr, uid, ids, context=context) + data = self.browse(cr, uid, ids, context=context) if context is None: context = {} - fy_id = data[0]['fy_id'] + fy_id = data[0].fy_id.id - cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0]['fy2_id']),)) + cr.execute("SELECT id FROM account_period WHERE date_stop < (SELECT date_start FROM account_fiscalyear WHERE id = %s)", (str(data[0].fy2_id.id),)) fy_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall())) cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),)) fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall())) - period = obj_acc_period.browse(cr, uid, data[0]['period_id'], context=context) - new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy2_id'], context=context) - old_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0]['fy_id'], context=context) + period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context) + new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context) + old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context) - new_journal = data[0]['journal_id'] + new_journal = data[0].journal_id.id new_journal = obj_acc_journal.browse(cr, uid, new_journal, context=context) if not new_journal.default_credit_account_id or not new_journal.default_debit_account_id: @@ -107,7 +107,7 @@ class account_fiscalyear_close(osv.osv_memory): obj_acc_move_line.create(cr, uid, { 'debit': account.balance>0 and account.balance, 'credit': account.balance<0 and -account.balance, - 'name': data[0]['report_name'], + 'name': data[0].report_name, 'date': period.date_start, 'journal_id': new_journal.id, 'period_id': period.id, @@ -204,7 +204,7 @@ class account_fiscalyear_close(osv.osv_memory): if ids: obj_acc_move_line.reconcile(cr, uid, ids, context=context) - new_period = data[0]['period_id'] + new_period = data[0].period_id.id ids = obj_acc_journal_period.search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)]) if not ids: ids = [obj_acc_journal_period.create(cr, uid, { diff --git a/addons/account/wizard/account_fiscalyear_close_state.py b/addons/account/wizard/account_fiscalyear_close_state.py index abf054746ce..68c758eb495 100644 --- a/addons/account/wizard/account_fiscalyear_close_state.py +++ b/addons/account/wizard/account_fiscalyear_close_state.py @@ -41,7 +41,7 @@ class account_fiscalyear_close_state(osv.osv_memory): """ for data in self.read(cr, uid, ids, context=context): - fy_id = data['fy_id'] + fy_id = data['fy_id'][0] cr.execute('UPDATE account_journal_period ' \ 'SET state = %s ' \ @@ -61,4 +61,4 @@ class account_fiscalyear_close_state(osv.osv_memory): account_fiscalyear_close_state() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_invoice_refund.py b/addons/account/wizard/account_invoice_refund.py index 672e2a28fba..08615eb6f9c 100644 --- a/addons/account/wizard/account_invoice_refund.py +++ b/addons/account/wizard/account_invoice_refund.py @@ -88,29 +88,29 @@ class account_invoice_refund(osv.osv_memory): if context is None: context = {} - for form in self.read(cr, uid, ids, context=context): + for form in self.browse(cr, uid, ids, context=context): created_inv = [] date = False period = False description = False company = res_users_obj.browse(cr, uid, uid, context=context).company_id - journal_id = form.get('journal_id', False) + journal_id = form.journal_id.id for inv in inv_obj.browse(cr, uid, context.get('active_ids'), context=context): if inv.state in ['draft', 'proforma2', 'cancel']: raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode)) if inv.reconciled and mode in ('cancel', 'modify'): raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode)) - if form['period']: - period = form['period'] + if form.period.id: + period = form.period.id else: period = inv.period_id and inv.period_id.id or False if not journal_id: journal_id = inv.journal_id.id - if form['date']: - date = form['date'] - if not form['period']: + if form.date: + date = form.date + if not form.period.id: cr.execute("select name from ir_model_fields \ where model = 'account.period' \ and name = 'company_id'") @@ -128,8 +128,8 @@ class account_invoice_refund(osv.osv_memory): period = res[0] else: date = inv.date_invoice - if form['description']: - description = form['description'] + if form.description: + description = form.description else: description = inv.name @@ -211,10 +211,10 @@ class account_invoice_refund(osv.osv_memory): return result def invoice_refund(self, cr, uid, ids, context=None): - data_refund = self.read(cr, uid, ids, [],context=context)[0]['filter_refund'] + data_refund = self.read(cr, uid, ids, ['filter_refund'],context=context)[0]['filter_refund'] return self.compute_refund(cr, uid, ids, data_refund, context=context) account_invoice_refund() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py index 47b83bb23f1..dec34e6e717 100644 --- a/addons/account/wizard/account_move_journal.py +++ b/addons/account/wizard/account_move_journal.py @@ -148,7 +148,7 @@ class account_move_journal(osv.osv_memory): journal_id = self._get_journal(cr, uid, context) period_id = self._get_period(cr, uid, context) - target_move = self.read(cr, uid, ids, [])[0]['target_move'] + target_move = self.read(cr, uid, ids, ['target_move'], context=context)[0]['target_move'] name = _("Journal Items") if journal_id: diff --git a/addons/account/wizard/account_open_closed_fiscalyear.py b/addons/account/wizard/account_open_closed_fiscalyear.py index 39c5be00f15..d48a561473e 100644 --- a/addons/account/wizard/account_open_closed_fiscalyear.py +++ b/addons/account/wizard/account_open_closed_fiscalyear.py @@ -31,14 +31,13 @@ class account_open_closed_fiscalyear(osv.osv_memory): } def remove_entries(self, cr, uid, ids, context=None): - fy_obj = self.pool.get('account.fiscalyear') move_obj = self.pool.get('account.move') - data = self.read(cr, uid, ids, [], context=context)[0] - data_fyear = fy_obj.browse(cr, uid, data['fyear_id'], context=context) - if not data_fyear.end_journal_period_id: + data = self.browse(cr, uid, ids, context=context)[0] + period_journal = data.fyear_id.end_journal_period_id or False + if not period_journal: raise osv.except_osv(_('Error !'), _('No End of year journal defined for the fiscal year')) - period_journal = data_fyear.end_journal_period_id + ids_move = move_obj.search(cr, uid, [('journal_id','=',period_journal.journal_id.id),('period_id','=',period_journal.period_id.id)]) if ids_move: cr.execute('delete from account_move where id IN %s', (tuple(ids_move),)) @@ -46,4 +45,4 @@ class account_open_closed_fiscalyear(osv.osv_memory): account_open_closed_fiscalyear() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index a4f87f55da8..7a8a0365208 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -131,7 +131,10 @@ class account_common_report(osv.osv_memory): data = {} data['ids'] = context.get('active_ids', []) data['model'] = context.get('active_model', 'ir.ui.menu') - data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'])[0] + data['form'] = self.read(cr, uid, ids, ['date_from', 'date_to', 'fiscalyear_id', 'journal_ids', 'period_from', 'period_to', 'filter', 'chart_account_id', 'target_move'], context=context)[0] + for field in ['fiscalyear_id', 'chart_account_id', 'period_from', 'period_to']: + if isinstance(data['form'][field], tuple): + data['form'][field] = data['form'][field][0] used_context = self._build_contexts(cr, uid, ids, data, context=context) data['form']['periods'] = used_context.get('periods', False) and used_context['periods'] or [] data['form']['used_context'] = used_context diff --git a/addons/account/wizard/account_tax_chart.py b/addons/account/wizard/account_tax_chart.py index 9e02931f34d..adf09c4052c 100644 --- a/addons/account/wizard/account_tax_chart.py +++ b/addons/account/wizard/account_tax_chart.py @@ -54,21 +54,19 @@ class account_tax_chart(osv.osv_memory): period_obj = self.pool.get('account.period') if context is None: context = {} - data = self.read(cr, uid, ids, [], context=context)[0] + data = self.browse(cr, uid, ids, context=context)[0] result = mod_obj.get_object_reference(cr, uid, 'account', 'action_tax_code_tree') id = result and result[1] or False result = act_obj.read(cr, uid, [id], context=context)[0] - if data['period_id']: - fiscalyear_id = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['fiscalyear_id'][0] - result['context'] = str({'period_id': data['period_id'], \ - 'fiscalyear_id': fiscalyear_id, \ - 'state': data['target_move']}) - else: - result['context'] = str({'state': data['target_move']}) - - if data['period_id']: - period_code = period_obj.read(cr, uid, [data['period_id']], context=context)[0]['code'] + if data.period_id: + result['context'] = str({'period_id': data.period_id.id, \ + 'fiscalyear_id': data.period_id.fiscalyear_id.id, \ + 'state': data.target_move}) + period_code = data.period_id.code result['name'] += period_code and (':' + period_code) or '' + else: + result['context'] = str({'state': data.target_move}) + return result _defaults = { @@ -78,4 +76,4 @@ class account_tax_chart(osv.osv_memory): account_tax_chart() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/account_validate_account_move.py b/addons/account/wizard/account_validate_account_move.py index ddcfa2c5353..818442a6b3b 100644 --- a/addons/account/wizard/account_validate_account_move.py +++ b/addons/account/wizard/account_validate_account_move.py @@ -33,8 +33,8 @@ class validate_account_move(osv.osv_memory): obj_move = self.pool.get('account.move') if context is None: context = {} - data = self.read(cr, uid, ids, context=context)[0] - ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data['journal_id']),('period_id','=',data['period_id'])]) + data = self.browse(cr, uid, ids, context=context)[0] + ids_move = obj_move.search(cr, uid, [('state','=','draft'),('journal_id','=',data.journal_id.id),('period_id','=',data.period_id.id)]) if not ids_move: raise osv.except_osv(_('Warning'), _('Specified Journal does not have any account move entries in draft state for this period')) obj_move.button_validate(cr, uid, ids_move, context=context) diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py index 863ae055428..3aecfb04a30 100644 --- a/addons/account/wizard/account_vat.py +++ b/addons/account/wizard/account_vat.py @@ -46,7 +46,10 @@ class account_vat_declaration(osv.osv_memory): context = {} datas = {'ids': context.get('active_ids', [])} datas['model'] = 'account.tax.code' - datas['form'] = self.read(cr, uid, ids)[0] + datas['form'] = self.read(cr, uid, ids, context=context)[0] + for field in datas['form'].keys(): + if isinstance(datas['form'][field], tuple): + datas['form'][field] = datas['form'][field][0] datas['form']['company_id'] = self.pool.get('account.tax.code').browse(cr, uid, [datas['form']['chart_tax_id']], context=context)[0].company_id.id return { 'type': 'ir.actions.report.xml', diff --git a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py index 4eaca49e2ca..86fa1c888f5 100644 --- a/addons/account_analytic_plans/wizard/account_crossovered_analytic.py +++ b/addons/account_analytic_plans/wizard/account_crossovered_analytic.py @@ -45,6 +45,7 @@ class account_crossovered_analytic(osv.osv_memory): acc_ids = [x[0] for x in res] data = self.read(cr, uid, ids, [], context=context)[0] + data['ref'] = data['ref'][0] obj_acc = self.pool.get('account.analytic.account').browse(cr, uid, data['ref'], context=context) name = obj_acc.name @@ -72,4 +73,4 @@ class account_crossovered_analytic(osv.osv_memory): account_crossovered_analytic() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py index 6d3743116db..8d9f29c3072 100644 --- a/addons/account_coda/wizard/account_coda_import.py +++ b/addons/account_coda/wizard/account_coda_import.py @@ -69,14 +69,14 @@ class account_coda_import(osv.osv_memory): if context is None: context = {} - data = self.read(cr, uid, ids)[0] + data = self.browse(cr, uid, ids, context=context)[0] - codafile = data['coda'] - journal_code = journal_obj.browse(cr, uid, data['journal_id'], context=context).code + codafile = data.coda + journal_code = data.journal_id.code period = account_period_obj.find(cr, uid, context=context)[0] - def_pay_acc = data['def_payable'] - def_rec_acc = data['def_receivable'] + def_pay_acc = data.def_payable.id + def_rec_acc = data.def_receivable.id err_log = "Errors:\n------\n" nb_err=0 @@ -96,7 +96,7 @@ class account_coda_import(osv.osv_memory): bank_statement["bank_statement_line"]={} bank_statement_lines = {} bank_statement['date'] = str2date(line[5:11]) - bank_statement['journal_id']=data['journal_id'] + bank_statement['journal_id']=data.journal_id.id period_id = account_period_obj.search(cr, uid, [('date_start', '<=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d"))), ('date_stop', '>=', time.strftime('%Y-%m-%d', time.strptime(bank_statement['date'], "%y/%m/%d")))]) bank_statement['period_id'] = period_id and period_id[0] or False bank_statement['state']='draft' @@ -144,7 +144,7 @@ class account_coda_import(osv.osv_memory): bank_statement["bank_statement_line"]=bank_statement_lines elif line[1] == '2': st_line_name = line[2:6] - bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']}) + bank_statement_lines[st_line_name].update({'account_id': data.awaiting_account.id}) elif line[1] == '3': # movement data record 3.1 @@ -165,7 +165,7 @@ class account_coda_import(osv.osv_memory): else: nb_err += 1 err_log += _('The bank account %s is not defined for the partner %s.\n')%(cntry_number, contry_name) - bank_statement_lines[st_line_name].update({'account_id': data['awaiting_account']}) + bank_statement_lines[st_line_name].update({'account_id': data.awaiting_account.id}) bank_statement["bank_statement_line"]=bank_statement_lines elif line[0]=='3': @@ -296,7 +296,7 @@ class account_coda_import(osv.osv_memory): 'name': codafile, 'statement_ids': [(6, 0, bkst_list,)], 'note': str_log1+str_not+std_log+err_log, - 'journal_id': data['journal_id'], + 'journal_id': data.journal_id.id, 'date': time.strftime("%Y-%m-%d"), 'user_id': uid, }) @@ -336,4 +336,4 @@ class account_coda_import(osv.osv_memory): account_coda_import() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index 5d9c2da860f..3a062202bfa 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -48,10 +48,10 @@ class account_followup_print(osv.osv_memory): if context is None: context = {} - data = self.read(cr, uid, ids, [], context=context)[0] + data = self.browse(cr, uid, ids, context=context)[0] model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] - context.update({'followup_id': data['followup_id'], 'date':data['date']}) + context.update({'followup_id': data.followup_id.id, 'date':data.date}) return { 'name': _('Select Partners'), 'view_type': 'form', @@ -146,7 +146,7 @@ class account_followup_print_all(osv.osv_memory): if context is None: context = {} if ids: - data = self.read(cr, uid, ids, [], context=context)[0] + data = self.browse(cr, uid, ids, context=context)[0] cr.execute( "SELECT l.partner_id, l.followup_line_id,l.date_maturity, l.date, l.id "\ "FROM account_move_line AS l "\ @@ -162,8 +162,8 @@ class account_followup_print_all(osv.osv_memory): move_lines = cr.fetchall() old = None fups = {} - fup_id = 'followup_id' in context and context['followup_id'] or data['followup_id'] - date = 'date' in context and context['date'] or data['date'] + fup_id = 'followup_id' in context and context['followup_id'] or data.followup_id.id + date = 'date' in context and context['date'] or data.date current_date = datetime.date(*time.strptime(date, '%Y-%m-%d')[:3]) @@ -208,14 +208,15 @@ class account_followup_print_all(osv.osv_memory): if context is None: context = {} - data = self.read(cr, uid, ids, [], context=context)[0] + data = self.browse(cr, uid, ids, context=context)[0] + partner_ids = [partner_id.id for partner_id in data.partner_ids] model_data_ids = mod_obj.search(cr, uid, [('model','=','ir.ui.view'),('name','=','view_account_followup_print_all_msg')], context=context) resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id'] - if data['email_conf']: + if data.email_conf: msg_sent = '' msg_unsent = '' data_user = user_obj.browse(cr, uid, uid, context=context) - move_lines = line_obj.browse(cr, uid, data['partner_ids'], context=context) + move_lines = line_obj.browse(cr, uid, partner_ids, context=context) partners = [] dict_lines = {} for line in move_lines: @@ -235,8 +236,8 @@ class account_followup_print_all(osv.osv_memory): if adr.email: dest = [adr.email] src = tools.config.options['email_from'] - if not data['partner_lang']: - body = data['email_body'] + if not data.partner_lang: + body = data.email_body else: cxt = context.copy() cxt['lang'] = partner.lang @@ -272,7 +273,7 @@ class account_followup_print_all(osv.osv_memory): 'date':time.strftime('%Y-%m-%d'), } body = body%val - sub = tools.ustr(data['email_subject']) + sub = tools.ustr(data.email_subject) msg = '' if dest: try: diff --git a/addons/account_invoice_layout/report/special_message_invoice.py b/addons/account_invoice_layout/report/special_message_invoice.py index bac4a467ae1..20943d01fe1 100644 --- a/addons/account_invoice_layout/report/special_message_invoice.py +++ b/addons/account_invoice_layout/report/special_message_invoice.py @@ -37,7 +37,8 @@ class account_invoice_with_message(report_sxw.rml_parse): self.context = context def spcl_msg(self, form): - account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, form['message']) + msg_id = form['message'][0] + account_msg_data = pooler.get_pool(self.cr.dbname).get('notify.message').browse(self.cr, self.uid, msg_id) msg = account_msg_data.msg return msg diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 138be103f2e..f3259f846cc 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -94,6 +94,7 @@ class payment_order(osv.osv): ], "Preferred date", change_default=True, required=True, states={'done': [('readonly', True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."), 'date_created': fields.date('Creation date', readonly=True), 'date_done': fields.date('Execution date', readonly=True), + 'company_id': fields.related('mode', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } _defaults = { @@ -343,7 +344,8 @@ class payment_line(osv.osv): '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), - 'bank_statement_line_id': fields.many2one('account.bank.statement.line', 'Bank statement line') + 'bank_statement_line_id': fields.many2one('account.bank.statement.line', 'Bank statement line'), + 'company_id': fields.related('order_id', 'company_id', type='many2one', relation='res.company', string='Company', store=True, readonly=True), } _defaults = { 'name': lambda obj, cursor, user, context: obj.pool.get('ir.sequence' diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index b829748cb93..56ff30e5ded 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -107,6 +107,7 @@