diff options
| author | Vir (Open ERP) <vir@tinyerp.com> | 2010-07-12 10:44:02 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-07-12 10:44:02 +0530 |
| commit | ae8606e55c087065699d5dbb4affe9133bfc7fda (patch) | |
| tree | d1a607164bd914bc9b85ca8dbb37fa75a38805e7 | |
| parent | be457f52fd4439e361adf66ec4619d950106b1b9 (diff) | |
| parent | 7c8eebb32a072ad68ed35edb2cb93cb517e035d0 (diff) | |
[Merge]
bzr revid: vir@tinyerp.com-20100712051402-0t2rb5q45vyk4u03
76 files changed, 3030 insertions, 993 deletions
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index e5a7ff528f4..a5532964919 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-07-07 22:55+0000\n" +"PO-Revision-Date: 2010-07-10 11:35+0000\n" "Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account @@ -113,7 +113,7 @@ msgstr "Распечатать налоговый отчет" #. module: account #: field:account.account,parent_id:0 msgid "Parent" -msgstr "Предок" +msgstr "Контрагент" #. module: account #: selection:account.move,type:0 @@ -131,7 +131,7 @@ msgstr "Остаток" #: field:account.tax.template,base_sign:0 #: field:account.tax.template,ref_base_sign:0 msgid "Base Code Sign" -msgstr "" +msgstr "Знак основного кода" #. module: account #: model:ir.actions.wizard,name:account.wizard_unreconcile_select @@ -162,7 +162,7 @@ msgstr "Централизация Дебета" #. module: account #: model:ir.actions.wizard,name:account.wizard_invoice_state_confirm msgid "Confirm draft invoices" -msgstr "Подтверить черновики счетов" +msgstr "Подтвердить черновики счетов" #. module: account #: help:account.payment.term.line,days2:0 @@ -514,7 +514,7 @@ msgstr "Периодическая обработка" #. module: account #: view:report.hr.timesheet.invoice.journal:0 msgid "Analytic Entries Stats" -msgstr "Состояния проводок аналитики" +msgstr "Состояние проводок аналитического учета" #. module: account #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form @@ -525,7 +525,7 @@ msgstr "Шаблоны кодов налога" #. module: account #: view:account.invoice:0 msgid "Supplier invoice" -msgstr "Счет поставщика" +msgstr "Счет-фактура поставщика" #. module: account #: model:process.transition,name:account.process_transition_reconcilepaid0 @@ -685,7 +685,7 @@ msgstr "Подитог:" #: model:ir.actions.act_window,name:account.action_account_analytic_line_form #: model:ir.ui.menu,name:account.next_id_41 msgid "Analytic Entries" -msgstr "Проводки аналитики" +msgstr "Проводки аналитического учета" #. module: account #: selection:account.subscription,period_type:0 @@ -718,7 +718,7 @@ msgstr "Выберите период для проведения анализа #: field:account.tax.template,ref_tax_sign:0 #: field:account.tax.template,tax_sign:0 msgid "Tax Code Sign" -msgstr "" +msgstr "Символ кода налога" #. module: account #: help:res.partner,credit:0 @@ -1155,12 +1155,12 @@ msgstr "Период с" #. module: account #: model:ir.model,name:account.model_wizard_multi_charts_accounts msgid "wizard.multi.charts.accounts" -msgstr "" +msgstr "Мультиплановые счета" #. module: account #: model:account.journal,name:account.sales_journal msgid "Journal de vente" -msgstr "" +msgstr "Журнал продаж" #. module: account #: help:account.model.line,amount_currency:0 @@ -1171,7 +1171,7 @@ msgstr "Сумма выраженная в дополнительной друг #: view:account.fiscal.position.template:0 #: field:account.fiscal.position.template,name:0 msgid "Fiscal Position Template" -msgstr "" +msgstr "Шаблон финансовой области" #. module: account #: field:account.payment.term,line_ids:0 @@ -1212,7 +1212,7 @@ msgstr "Список шаблонов налогов" #. module: account #: model:process.transition,name:account.process_transition_invoiceimport0 msgid "Invoice import" -msgstr "" +msgstr "Счет импорта" #. module: account #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select @@ -1228,6 +1228,11 @@ msgid "" "software system you may have to use the rate at date. Incoming transactions " "always use the rate at date." msgstr "" +"Это позволит выбрать текущий валютный курс для расчета сумм в сделке. В " +"большинстве стран правового метода является \"средний\", но лишь немногие " +"программные системы способны управлять этим. Так что если вы импортируете из " +"другого программного обеспечения системы вы можете использовать курс на " +"дату. Входящие сделки всегда используют ставку на сегодняшний день." #. module: account #: field:account.account,company_currency_id:0 @@ -1237,12 +1242,12 @@ msgstr "Валюта компании" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account_template msgid "Fiscal Position Template Account Mapping" -msgstr "" +msgstr "Шаблон структуры счетов финансовой области" #. module: account #: field:account.analytic.account,parent_id:0 msgid "Parent Analytic Account" -msgstr "" +msgstr "Основной аналитический счет" #. module: account #: wizard_button:account.move.line.reconcile,init_partial,addendum:0 @@ -1252,12 +1257,12 @@ msgstr "Сверить со списанием" #. module: account #: field:account.move.line,tax_amount:0 msgid "Tax/Base Amount" -msgstr "" +msgstr "Налоговые / базовая сумма" #. module: account #: help:wizard.multi.charts.accounts,code_digits:0 msgid "No. of Digits to use for account code" -msgstr "" +msgstr "Кол-во цифр для использования в коде счета" #. module: account #: field:account.bank.statement,balance_end_real:0 @@ -1282,7 +1287,7 @@ msgstr "Фиксированная величина" #. module: account #: rml:account.analytic.account.analytic.check:0 msgid "Analytic Credit" -msgstr "" +msgstr "Аналитический Кредит" #. module: account #: field:account.move.line,reconcile_partial_id:0 @@ -1300,12 +1305,12 @@ msgstr "Не сверенные транзакции" #: field:account.fiscal.position,tax_ids:0 #: field:account.fiscal.position.template,tax_ids:0 msgid "Tax Mapping" -msgstr "" +msgstr "Структура налога" #. module: account #: view:account.config.wizard:0 msgid "Continue" -msgstr "" +msgstr "Продолжить" #. module: account #: field:account.payment.term.line,value:0 @@ -1360,7 +1365,7 @@ msgstr "Вид" #: selection:account.tax,type_tax_use:0 #: selection:account.tax.template,type_tax_use:0 msgid "All" -msgstr "" +msgstr "Все" #. module: account #: field:account.move.line,analytic_lines:0 @@ -1390,7 +1395,7 @@ msgstr "" #. module: account #: model:process.node,name:account.process_node_electronicfile0 msgid "Electronic File" -msgstr "" +msgstr "Электронный файл" #. module: account #: view:res.partner:0 @@ -1439,23 +1444,23 @@ msgstr "Журнал" #: field:account.account,child_id:0 #: field:account.analytic.account,child_ids:0 msgid "Child Accounts" -msgstr "" +msgstr "Подчиненный счет" #. module: account #: field:account.account,check_history:0 msgid "Display History" -msgstr "" +msgstr "Показать историю" #. module: account #: wizard_field:account.third_party_ledger.report,init,date1:0 msgid " Start date" -msgstr "" +msgstr " Дата начала" #. module: account #: wizard_field:account.account.balance.report,checktype,display_account:0 #: wizard_field:account.general.ledger.report,checktype,display_account:0 msgid "Display accounts " -msgstr "" +msgstr "Показать счета " #. module: account #: model:ir.model,name:account.model_account_bank_statement_reconcile_line @@ -1521,7 +1526,7 @@ msgstr "Поставщик" #. module: account #: rml:account.invoice:0 msgid "Tel. :" -msgstr "" +msgstr "тел.:" #. module: account #: field:account.invoice.tax,tax_amount:0 @@ -1556,7 +1561,7 @@ msgstr "Движение счета" #: model:ir.ui.menu,name:account.menu_wizard #: view:wizard.multi.charts.accounts:0 msgid "Generate Chart of Accounts from a Chart Template" -msgstr "" +msgstr "Основной план счетов на основе шаблона" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement @@ -1567,7 +1572,7 @@ msgstr "" #: field:account.tax.code,parent_id:0 #: field:account.tax.code.template,parent_id:0 msgid "Parent Code" -msgstr "" +msgstr "Основной код" #. module: account #: wizard_button:account.move.line.reconcile.select,init,open:0 @@ -1612,7 +1617,7 @@ msgstr "Ссылка на партнера" #: selection:account.partner.balance.report,init,result_selection:0 #: selection:account.third_party_ledger.report,init,result_selection:0 msgid "Receivable and Payable Accounts" -msgstr "" +msgstr "Счета дебиторской и кредиторской задолженности" #. module: account #: view:account.subscription:0 @@ -1687,7 +1692,7 @@ msgstr "" #: model:ir.actions.wizard,name:account.wizard_period_close #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree msgid "Close a Period" -msgstr "" +msgstr "Закрыть период" #. module: account #: model:ir.actions.act_window,name:account.act_acc_analytic_acc_2_report_hr_timesheet_invoice_journal @@ -1707,7 +1712,7 @@ msgstr "Номер счета" #. module: account #: view:account.config.wizard:0 msgid "Skip" -msgstr "" +msgstr "Пропустить" #. module: account #: field:account.invoice,period_id:0 @@ -1728,12 +1733,12 @@ msgstr "Открыть повторно" #. module: account #: wizard_view:account.fiscalyear.close,init:0 msgid "Are you sure you want to create entries?" -msgstr "" +msgstr "Вы действительно хотите создать проводки?" #. module: account #: field:account.tax,include_base_amount:0 msgid "Include in base amount" -msgstr "" +msgstr "Включить в базовую сумму" #. module: account #: rml:account.analytic.account.analytic.check:0 @@ -1810,7 +1815,7 @@ msgstr "Продажа" #: wizard_button:account.account.balance.report,account_selection,checktype:0 #: wizard_button:account.general.ledger.report,account_selection,checktype:0 msgid "Next" -msgstr "" +msgstr "Далее" #. module: account #: help:res.partner,property_account_position:0 @@ -1818,11 +1823,13 @@ msgid "" "The fiscal position will determine taxes and the accounts used for the the " "partner." msgstr "" +"Финансовая область будет определять налоги и счета, используемые для " +"контрагента." #. module: account #: rml:account.analytic.account.cost_ledger:0 msgid "Date or Code" -msgstr "" +msgstr "Дата или Код" #. module: account #: field:account.analytic.account,user_id:0 @@ -2014,7 +2021,7 @@ msgstr "Возврат средств клиенту" #. module: account #: rml:account.vat.declaration:0 msgid "Tax Amount" -msgstr "" +msgstr "Сумма налога" #. module: account #: rml:account.analytic.account.quantity_cost_ledger:0 @@ -2062,7 +2069,7 @@ msgstr "" #. module: account #: rml:account.invoice:0 msgid "Draft Invoice" -msgstr "" +msgstr "Черновик счета" #. module: account #: model:account.account.type,name:account.account_type_expense @@ -2265,7 +2272,7 @@ msgstr "" #. module: account #: view:account.config.wizard:0 msgid "Create a Fiscal Year" -msgstr "" +msgstr "Создать финансовый год" #. module: account #: field:product.template,taxes_id:0 @@ -3224,7 +3231,7 @@ msgstr "Налоги" #. module: account #: wizard_view:account.fiscalyear.close,init:0 msgid "Close Fiscal Year with new entries" -msgstr "" +msgstr "Закрыть учетный год с новыми проводками" #. module: account #: selection:account.account,currency_mode:0 @@ -3673,7 +3680,7 @@ msgstr "" #. module: account #: model:ir.actions.todo,note:account.config_fiscalyear msgid "Define Fiscal Years and Select Charts of Account" -msgstr "" +msgstr "Определить отчетный год и выбрать план счетов" #. module: account #: wizard_field:account.move.line.reconcile,addendum,period_id:0 @@ -3762,7 +3769,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_tax_template msgid "Fiscal Position Template Tax Mapping" -msgstr "" +msgstr "Структура налоговых шаблонов для финансовой области" #. module: account #: rml:account.invoice:0 @@ -4102,7 +4109,7 @@ msgstr "" #. module: account #: field:wizard.multi.charts.accounts,seq_journal:0 msgid "Separated Journal Sequences" -msgstr "" +msgstr "Отдельные последовательности журнала" #. module: account #: help:account.bank.statement.reconcile,total_second_currency:0 @@ -4403,7 +4410,7 @@ msgstr "" #. module: account #: view:ir.sequence:0 msgid "Fiscal Year Sequences" -msgstr "" +msgstr "Последовательности отчетного года" #. module: account #: view:account.model.line:0 @@ -4509,7 +4516,7 @@ msgstr "" #: model:process.transition,name:account.process_transition_suppliervalidentries0 #: model:process.transition,name:account.process_transition_validentries0 msgid "Valid Entries" -msgstr "" +msgstr "Согласованные проводки" #. module: account #: model:ir.actions.wizard,name:account.wizard_account_use_model @@ -4550,7 +4557,7 @@ msgstr "" #. module: account #: view:res.partner:0 msgid "Supplier Accounting Properties" -msgstr "" +msgstr "Настройки бухгалтерского учета для контрагента-поставщика" #. module: account #: view:account.analytic.account:0 @@ -5196,7 +5203,7 @@ msgstr "Данный месяц" #. module: account #: field:account.account.type,sign:0 msgid "Sign on Reports" -msgstr "" +msgstr "Знак в отчётах" #. module: account #: help:account.move.line,currency_id:0 @@ -5541,7 +5548,7 @@ msgstr "" #. module: account #: rml:account.general.journal:0 msgid "Printing Date :" -msgstr "" +msgstr "Печать Даты:" #. module: account #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger @@ -5703,7 +5710,7 @@ msgstr "" #. module: account #: rml:account.analytic.account.balance:0 msgid "Analytic Balance -" -msgstr "" +msgstr "Остаток по аналитике" #. module: account #: wizard_field:account_use_models,init_form,model:0 @@ -5955,7 +5962,7 @@ msgstr "" #. module: account #: wizard_button:account.subscription.generate,init,generate:0 msgid "Compute Entry Dates" -msgstr "" +msgstr "Вычислить даты проводки" #. module: account #: view:board.board:0 diff --git a/addons/account_analytic_analysis/i18n/ru.po b/addons/account_analytic_analysis/i18n/ru.po index 0dfe435544d..a46739a07a8 100644 --- a/addons/account_analytic_analysis/i18n/ru.po +++ b/addons/account_analytic_analysis/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-18 15:21+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-10 11:40+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_analytic_analysis @@ -22,6 +22,8 @@ msgid "" "Number of hours that can be invoiced plus those that already have been " "invoiced." msgstr "" +"Количество часов, которое может быть выставлено в счете, а также те, которые " +"уже были выставлены к оплате." #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user @@ -31,17 +33,20 @@ msgstr "Итого часов по пользователям" #. module: account_analytic_analysis #: field:account.analytic.account,last_invoice_date:0 msgid "Last Invoice Date" -msgstr "" +msgstr "Последняя дата выписки счета" #. module: account_analytic_analysis #: help:account.analytic.account,remaining_ca:0 msgid "Computed using the formula: Max Invoice Price - Invoiced Amount." msgstr "" +"Вычислено, с использованием формулы: Максимальная цена по Счету - Итоговая " +"сумма по выставленным счета." #. module: account_analytic_analysis #: help:account.analytic.account,remaining_hours:0 msgid "Computed using the formula: Maximum Quantity - Hours Tot." msgstr "" +"Вычисленное используя формулу: Максимальное Количество - Всего Часов." #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all @@ -52,7 +57,7 @@ msgstr "Все счета аналитики" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_open #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_open msgid "My Current Accounts" -msgstr "" +msgstr "Мои текущие счета" #. module: account_analytic_analysis #: constraint:ir.ui.view:0 @@ -62,12 +67,12 @@ msgstr "Неправильный XML для просмотра архитект #. module: account_analytic_analysis #: help:account.analytic.account,last_invoice_date:0 msgid "Date of the last invoice created for this analytic account." -msgstr "" +msgstr "Дата последнего счета, созданного для этого аналитического счета." #. module: account_analytic_analysis #: field:account.analytic.account,ca_theorical:0 msgid "Theorical Revenue" -msgstr "" +msgstr "Теоретический доход" #. module: account_analytic_analysis #: constraint:ir.actions.act_window:0 @@ -77,7 +82,7 @@ msgstr "" #. module: account_analytic_analysis #: help:account.analytic.account,theorical_margin:0 msgid "Computed using the formula: Theorial Revenue - Total Costs" -msgstr "" +msgstr "Вычисленное используя формулу: Доход теоретический - Общая Стоимость" #. module: account_analytic_analysis #: constraint:ir.model:0 @@ -96,23 +101,23 @@ msgstr "Новый счет аналитики" #. module: account_analytic_analysis #: field:account.analytic.account,theorical_margin:0 msgid "Theorical Margin" -msgstr "" +msgstr "Теоретическая маржа" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin_rate:0 msgid "Real Margin Rate (%)" -msgstr "" +msgstr "Реальный размер маржи (%)" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_open #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_open msgid "Current Analytic Accounts" -msgstr "" +msgstr "Текущие счета аналитики" #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_date:0 msgid "Date of the latest work done on this account." -msgstr "" +msgstr "Дата последней работы сделанной на этом счете." #. module: account_analytic_analysis #: help:account.analytic.account,last_worked_invoiced_date:0 @@ -120,21 +125,23 @@ msgid "" "If invoice from the costs, this is the date of the latest work or cost that " "have been invoiced." msgstr "" +"Если счет составлен из расходов, это дата последней работы и затраты, " +"которые были при выставлении счета." #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_invoicing msgid "Invoicing" -msgstr "" +msgstr "Выставление счетов" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_date:0 msgid "Date of Last Cost/Work" -msgstr "" +msgstr "Дата Последней Стоимости / Работы" #. module: account_analytic_analysis #: field:account.analytic.account,total_cost:0 msgid "Total Costs" -msgstr "" +msgstr "Общая Стоимость" #. module: account_analytic_analysis #: help:account.analytic.account,hours_quantity:0 @@ -142,11 +149,13 @@ msgid "" "Number of hours you spent on the analytic account (from timesheet). It " "computes on all journal of type 'general'." msgstr "" +"Количество часов, которые Вы истратили на аналитический счет (из табеля). " +"Вычисляется по всем журналам типа 'Общий'." #. module: account_analytic_analysis #: field:account.analytic.account,remaining_hours:0 msgid "Remaining Hours" -msgstr "" +msgstr "Оставшиеся часы" #. module: account_analytic_analysis #: help:account.analytic.account,ca_theorical:0 @@ -166,7 +175,7 @@ msgstr "Пользователь" #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed_pending #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_to_valid_pending msgid "My Pending Accounts" -msgstr "" +msgstr "Мои Незаконченные Отчеты" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_my @@ -177,13 +186,13 @@ msgstr "" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin:0 msgid "Computed using the formula: Invoiced Amount - Total Costs." -msgstr "" +msgstr "Вычисленно используя формулу: Общая сумма по счету - Общая Стоимость" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_managed #: model:ir.ui.menu,name:account_analytic_analysis.menu_analytic_account_managed msgid "My Accounts" -msgstr "" +msgstr "Мои аккаунты" #. module: account_analytic_analysis #: model:ir.module.module,description:account_analytic_analysis.module_meta_information @@ -196,12 +205,12 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_non_invoiced:0 msgid "Uninvoiced Hours" -msgstr "" +msgstr "Не выставлено Часов" #. module: account_analytic_analysis #: field:account.analytic.account,hours_quantity:0 msgid "Hours Tot" -msgstr "" +msgstr "Часов всего" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.menu_account @@ -216,43 +225,43 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,ca_invoiced:0 msgid "Invoiced Amount" -msgstr "" +msgstr "Сумма к оплате" #. module: account_analytic_analysis #: model:ir.ui.menu,name:account_analytic_analysis.next_id_71 msgid "Financial Project Management" -msgstr "" +msgstr "Финансовое Управление Проектом" #. module: account_analytic_analysis #: field:account.analytic.account,last_worked_invoiced_date:0 msgid "Date of Last Invoiced Cost" -msgstr "" +msgstr "Дата последнего счета расходов" #. module: account_analytic_analysis #: field:account.analytic.account,ca_to_invoice:0 msgid "Uninvoiced Amount" -msgstr "" +msgstr "Сумма не выставлена" #. module: account_analytic_analysis #: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_all_pending #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_all_pending msgid "Pending Analytic Accounts" -msgstr "Счета аналитики в ожидании" +msgstr "Незаконченные Аналитические Отчеты" #. module: account_analytic_analysis #: field:account.analytic.account,hours_qtt_invoiced:0 msgid "Invoiced Hours" -msgstr "" +msgstr "Выставленные часы" #. module: account_analytic_analysis #: field:account.analytic.account,real_margin:0 msgid "Real Margin" -msgstr "" +msgstr "Реальная маржа" #. module: account_analytic_analysis #: help:account.analytic.account,ca_invoiced:0 msgid "Total customer invoiced amount for this account." -msgstr "" +msgstr "Итого сумма к оплате заказчику для этого счета." #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month @@ -263,6 +272,7 @@ msgstr "Итоги в часах по месяцам" #: help:account.analytic.account,real_margin_rate:0 msgid "Computes using the formula: (Real Margin / Total Costs) * 100." msgstr "" +"Вычислить, используя формулу: (Реальная Маржа / общий объем расходов) * 100." #. module: account_analytic_analysis #: help:account.analytic.account,hours_qtt_non_invoiced:0 @@ -270,6 +280,8 @@ msgid "" "Number of hours (from journal of type 'general') that can be invoiced if you " "invoice based on analytic account." msgstr "" +"Количество часов (из журнала типа \"Общие\"), которые могут быть занесены в " +"счет, если счет основан на аналитическом счету." #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -279,7 +291,7 @@ msgstr "Счета аналитики" #. module: account_analytic_analysis #: field:account.analytic.account,remaining_ca:0 msgid "Remaining Revenue" -msgstr "" +msgstr "Оставшийся доход" #. module: account_analytic_analysis #: help:account.analytic.account,ca_to_invoice:0 @@ -287,6 +299,8 @@ msgid "" "If invoice from analytic account, the remaining amount you can invoice to " "the customer based on the total costs." msgstr "" +"Если счет основан на аналитическом счете, оставшуюся сумму вы можете " +"выставить клиенту на основе совокупного объема расходов." #. module: account_analytic_analysis #: help:account.analytic.account,revenue_per_hour:0 @@ -296,7 +310,7 @@ msgstr "" #. module: account_analytic_analysis #: field:account.analytic.account,revenue_per_hour:0 msgid "Revenue per Hours (real)" -msgstr "" +msgstr "Доход за Часы (реальные)" #. module: account_analytic_analysis #: field:account_analytic_analysis.summary.month,unit_amount:0 @@ -326,7 +340,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all msgid "All Uninvoiced Entries" -msgstr "" +msgstr "Все не выставленные записи" #. module: account_analytic_analysis #: help:account.analytic.account,total_cost:0 @@ -334,3 +348,5 @@ msgid "" "Total of costs for this account. It includes real costs (from invoices) and " "indirect costs, like time spent on timesheets." msgstr "" +"Общий объем расходов на этот счет. Он включает в себя реальные затраты (из " +"счетов) и косвенные издержки, как и время, затраченное по табелям." diff --git a/addons/account_followup/i18n/ru.po b/addons/account_followup/i18n/ru.po index 48857702160..a674babca2c 100644 --- a/addons/account_followup/i18n/ru.po +++ b/addons/account_followup/i18n/ru.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:23+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-10 16:56+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Date :" -msgstr "" +msgstr "Дата :" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,partner_ids:0 @@ -40,7 +40,7 @@ msgstr "Все проводки к оплате" #. module: account_followup #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: account_followup #: field:account_followup.followup.line,description:0 @@ -87,7 +87,7 @@ msgstr "Дебет" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Email Settings" -msgstr "" +msgstr "Параметры эл. почты" #. module: account_followup #: field:account_followup.stat,account_type:0 @@ -151,7 +151,7 @@ msgstr "Компания" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Invoice Date" -msgstr "" +msgstr "Дата счета-фактуры" #. module: account_followup #: wizard_field:account_followup.followup.print.all,next,email_subject:0 @@ -186,7 +186,7 @@ msgstr "Критерии дальнейших действий" #. module: account_followup #: wizard_view:account_followup.followup.print.all,next:0 msgid "Partner Selection" -msgstr "" +msgstr "Выбор партнера" #. module: account_followup #: constraint:ir.ui.view:0 @@ -242,7 +242,7 @@ msgstr "" #. module: account_followup #: wizard_button:account_followup.followup.print.all,summary,end:0 msgid "Ok" -msgstr "" +msgstr "Ок" #. module: account_followup #: field:account_followup.followup,name:0 @@ -264,7 +264,7 @@ msgstr "Конец месяца" #: view:account_followup.followup.line:0 #: wizard_view:account_followup.followup.print.all,next:0 msgid "%(company_name)s: User's Company name" -msgstr "" +msgstr "%(company_name): Название компании пользователя" #. module: account_followup #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all @@ -275,7 +275,7 @@ msgstr "" #. module: account_followup #: view:account_followup.followup:0 msgid "Lines" -msgstr "" +msgstr "Линии" #. module: account_followup #: model:ir.actions.wizard,name:account_followup.action_account_followup_all_wizard @@ -312,7 +312,7 @@ msgstr "" #: wizard_view:account_followup.followup.print.all,summary:0 #: wizard_field:account_followup.followup.print.all,summary,summary:0 msgid "Summary" -msgstr "" +msgstr "Сводка" #. module: account_followup #: view:account_followup.followup.line:0 @@ -439,7 +439,7 @@ msgstr "" #. module: account_followup #: rml:account_followup.followup.print:0 msgid "Maturity Date" -msgstr "" +msgstr "Срок платежа" #. module: account_followup #: view:account_followup.followup.line:0 diff --git a/addons/account_invoice_layout/i18n/ru.po b/addons/account_invoice_layout/i18n/ru.po index 743bf14ab02..71790c25bb9 100644 --- a/addons/account_invoice_layout/i18n/ru.po +++ b/addons/account_invoice_layout/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-11-03 17:56+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 09:01+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:11+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_invoice_layout @@ -48,7 +48,7 @@ msgstr "Название" #. module: account_invoice_layout #: model:ir.actions.wizard,name:account_invoice_layout.wizard_notify_message msgid "Invoices with Layout and Message" -msgstr "" +msgstr "Счет-фактура с макетом и сообщением" #. module: account_invoice_layout #: rml:account.invoice.layout:0 @@ -119,7 +119,7 @@ msgstr "Ссылка на клиента:" #. module: account_invoice_layout #: rml:account.invoice.layout:0 msgid ")" -msgstr "" +msgstr ")" #. module: account_invoice_layout #: field:account.invoice.line,state:0 @@ -209,7 +209,7 @@ msgstr "Продукт" #. module: account_invoice_layout #: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1 msgid "Invoices with Layout" -msgstr "" +msgstr "Счет-фактура с макетом" #. module: account_invoice_layout #: rml:account.invoice.layout:0 diff --git a/addons/account_payment/i18n/ru.po b/addons/account_payment/i18n/ru.po index 448159269a0..bf83119b853 100644 --- a/addons/account_payment/i18n/ru.po +++ b/addons/account_payment/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-11-03 18:51+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 09:03+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_payment @@ -39,7 +39,7 @@ msgstr "" #. module: account_payment #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: account_payment #: view:payment.line:0 @@ -283,7 +283,7 @@ msgstr "" #. module: account_payment #: field:payment.line,communication:0 msgid "Communication" -msgstr "" +msgstr "Связь" #. module: account_payment #: selection:payment.order,date_prefered:0 @@ -309,7 +309,7 @@ msgstr "" #: view:payment.type:0 #: help:payment.type,name:0 msgid "Payment Type" -msgstr "" +msgstr "Способ оплаты" #. module: account_payment #: help:payment.line,amount_currency:0 @@ -526,7 +526,7 @@ msgstr "" #. module: account_payment #: field:payment.line,company_currency:0 msgid "Company Currency" -msgstr "" +msgstr "Валюта компании" #. module: account_payment #: model:ir.ui.menu,name:account_payment.menu_main diff --git a/addons/account_report/i18n/ru.po b/addons/account_report/i18n/ru.po index a56c044a359..3e52fa8766e 100644 --- a/addons/account_report/i18n/ru.po +++ b/addons/account_report/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-11-03 18:54+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-10 17:01+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_report @@ -26,12 +26,12 @@ msgstr "Индикатор" #. module: account_report #: wizard_field:print.indicators.pdf,init,file:0 msgid "Select a PDF File" -msgstr "" +msgstr "Выберете PDF документ" #. module: account_report #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: account_report #: view:account.report.report:0 @@ -46,7 +46,7 @@ msgstr "Предок" #. module: account_report #: field:account.report.report,disp_graph:0 msgid "Display As Graph" -msgstr "" +msgstr "Показать как график" #. module: account_report #: view:account.report.report:0 @@ -143,7 +143,7 @@ msgstr "" #. module: account_report #: wizard_button:print.indicators,init,next:0 msgid "Next" -msgstr "" +msgstr "Далее" #. module: account_report #: model:ir.module.module,shortdesc:account_report.module_meta_information @@ -154,7 +154,7 @@ msgstr "" #: wizard_button:print.indicators,next,print:0 #: wizard_button:print.indicators.pdf,init,print:0 msgid "Print" -msgstr "" +msgstr "Печать" #. module: account_report #: field:account.report.report,type:0 @@ -195,7 +195,7 @@ msgstr "" #. module: account_report #: wizard_field:print.indicators,init,select_base:0 msgid "Choose Criteria" -msgstr "" +msgstr "Выберите критерии" #. module: account_report #: view:account.report.report:0 @@ -321,7 +321,7 @@ msgstr "" #. module: account_report #: field:account.report.history,period_id:0 msgid "Period" -msgstr "" +msgstr "Период" #. module: account_report #: view:account.report.report:0 @@ -338,12 +338,12 @@ msgstr "Описание операторов" #: wizard_button:print.indicators,next,end:0 #: wizard_button:print.indicators.pdf,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: account_report #: field:account.report.report,child_ids:0 msgid "Children" -msgstr "" +msgstr "Дети" #. module: account_report #: constraint:ir.model:0 @@ -402,7 +402,7 @@ msgstr "" #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other #: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other msgid "Other reports" -msgstr "" +msgstr "Другие отчеты" #. module: account_report #: view:account.report.report:0 @@ -414,7 +414,7 @@ msgstr "" #. module: account_report #: rml:print.indicators:0 msgid ")" -msgstr "" +msgstr ")" #. module: account_report #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal @@ -431,7 +431,7 @@ msgstr "" #: model:ir.actions.report.xml,name:account_report.report_print_indicators #: rml:print.indicators:0 msgid "Indicators" -msgstr "" +msgstr "Индикаторы" #. module: account_report #: wizard_view:print.indicators.pdf,init:0 @@ -454,7 +454,7 @@ msgstr "Название" #. module: account_report #: wizard_field:print.indicators,next,base_selection:0 msgid "Select Criteria" -msgstr "" +msgstr "Выбор критерия" #. module: account_report #: view:account.report.report:0 @@ -464,7 +464,7 @@ msgstr "" #. module: account_report #: field:account.report.history,fiscalyear_id:0 msgid "Fiscal Year" -msgstr "" +msgstr "Финансовый год" #. module: account_report #: model:ir.actions.act_window,name:account_report.action_account_report_tree @@ -477,12 +477,12 @@ msgstr "Пользовательскаяя отчетность" #. module: account_report #: rml:print.indicators:0 msgid "Page" -msgstr "" +msgstr "Страница" #. module: account_report #: selection:account.report.report,type:0 msgid "View" -msgstr "" +msgstr "Просмотр" #. module: account_report #: rml:print.indicators:0 diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po index 83ba2a80dea..35c3707987d 100644 --- a/addons/account_voucher/i18n/ru.po +++ b/addons/account_voucher/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-09 16:29+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:15+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: account_voucher @@ -36,12 +36,12 @@ msgstr "" #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "State :" -msgstr "" +msgstr "Статус:" #. module: account_voucher #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -61,7 +61,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,company_id:0 msgid "Company" -msgstr "" +msgstr "Компания" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -69,17 +69,17 @@ msgstr "" #: model:ir.actions.act_window,name:account_voucher.action_view_jour_voucher_form #: model:ir.ui.menu,name:account_voucher.menu_action_view_jour_voucher_form msgid "Journal Voucher" -msgstr "" +msgstr "Журнальный ваучер" #. module: account_voucher #: rml:voucher.cash_receipt.drcr:0 msgid "," -msgstr "" +msgstr "," #. module: account_voucher #: view:account.voucher:0 msgid "Set to Draft" -msgstr "" +msgstr "Установить в 'Черновик'" #. module: account_voucher #: wizard_button:account.voucher.open,init,open:0 @@ -94,13 +94,13 @@ msgstr "" #. module: account_voucher #: view:account.move:0 msgid "Total Credit" -msgstr "" +msgstr "Всего кредит" #. module: account_voucher #: field:account.voucher,account_id:0 #: field:account.voucher.line,account_id:0 msgid "Account" -msgstr "" +msgstr "Счет" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -110,7 +110,7 @@ msgstr "" #. module: account_voucher #: field:account.account,level:0 msgid "Level" -msgstr "" +msgstr "Уровень" #. module: account_voucher #: view:account.move:0 @@ -120,14 +120,14 @@ msgstr "Проводка по счету" #. module: account_voucher #: view:account.move:0 msgid "Total Debit" -msgstr "" +msgstr "Всего дебет" #. module: account_voucher #: field:account.voucher,amount:0 #: field:account.voucher.line,amount:0 #: rml:voucher.cash_amount:0 msgid "Amount" -msgstr "" +msgstr "Количество" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -150,7 +150,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher.line,account_analytic_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Счет аналитического учета" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -189,18 +189,18 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 msgid "Create" -msgstr "" +msgstr "Создать" #. module: account_voucher #: selection:account.account,type1:0 #: selection:account.account.template,type1:0 msgid "None" -msgstr "" +msgstr "Отсутствует" #. module: account_voucher #: field:account.voucher,number:0 msgid "Number" -msgstr "" +msgstr "Номер" #. module: account_voucher #: view:account.move:0 @@ -215,13 +215,13 @@ msgstr "Состояние" #: selection:account.voucher.line,type:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Debit" -msgstr "" +msgstr "Дебет" #. module: account_voucher #: field:account.voucher,type:0 #: field:account.voucher.line,type:0 msgid "Type" -msgstr "" +msgstr "Тип" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_voucher_list @@ -245,7 +245,7 @@ msgstr "" #: field:account.voucher.line,voucher_id:0 #: model:res.request.link,name:account_voucher.req_link_voucher msgid "Voucher" -msgstr "" +msgstr "Товарный чек" #. module: account_voucher #: wizard_view:account.voucher.open,init:0 @@ -273,7 +273,7 @@ msgstr "" #: field:account.voucher,partner_id:0 #: field:account.voucher.line,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Партнер" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form @@ -289,7 +289,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,currency_id:0 msgid "Currency" -msgstr "" +msgstr "Валюта" #. module: account_voucher #: view:account.move:0 @@ -317,7 +317,7 @@ msgstr "" #. module: account_voucher #: field:account.account,open_bal:0 msgid "Opening Balance" -msgstr "" +msgstr "Начальное сальдо" #. module: account_voucher #: selection:account.voucher,state:0 @@ -325,13 +325,13 @@ msgstr "" #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Draft" -msgstr "" +msgstr "Черновик" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "PRO-FORMA" -msgstr "" +msgstr "Проформа" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list @@ -356,13 +356,13 @@ msgstr "" #. module: account_voucher #: field:account.voucher,date:0 msgid "Date" -msgstr "" +msgstr "Дата" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid ":" -msgstr "" +msgstr ":" #. module: account_voucher #: field:account.account,type1:0 @@ -387,7 +387,7 @@ msgstr "" #: selection:account.voucher.line,type:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Credit" -msgstr "" +msgstr "Кредит" #. module: account_voucher #: rml:voucher.cash_amount:0 @@ -398,7 +398,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,reference_type:0 msgid "Reference Type" -msgstr "" +msgstr "Тип ссылки" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_voucher @@ -408,7 +408,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher,period_id:0 msgid "Period" -msgstr "" +msgstr "Период" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list @@ -423,7 +423,7 @@ msgstr "Общая информация" #. module: account_voucher #: wizard_field:account.voucher.open,init,period_ids:0 msgid "Periods" -msgstr "" +msgstr "Периоды" #. module: account_voucher #: view:account.voucher:0 @@ -431,14 +431,14 @@ msgstr "" #: wizard_button:account.voucher.open,init,end:0 #: selection:account.voucher.open,init,state:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: account_voucher #: view:account.voucher:0 #: selection:account.voucher,state:0 #: selection:account.voucher.open,init,state:0 msgid "Pro-forma" -msgstr "" +msgstr "Проформа" #. module: account_voucher #: constraint:ir.model:0 @@ -451,7 +451,7 @@ msgstr "" #. module: account_voucher #: view:account.voucher:0 msgid "Other Info" -msgstr "" +msgstr "Прочая информация" #. module: account_voucher #: model:ir.module.module,shortdesc:account_voucher.module_meta_information @@ -472,13 +472,13 @@ msgstr "" #. module: account_voucher #: field:account.voucher.line,name:0 msgid "Description" -msgstr "" +msgstr "Описание" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Canceled" -msgstr "" +msgstr "Отменено" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -493,13 +493,13 @@ msgstr "" #. module: account_voucher #: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list msgid "Bank Receipt" -msgstr "" +msgstr "Квитанция банка" #. module: account_voucher #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "-" -msgstr "" +msgstr "-" #. module: account_voucher #: selection:account.move,voucher_type:0 @@ -518,7 +518,7 @@ msgstr "" #. module: account_voucher #: field:account.voucher.line,ref:0 msgid "Ref." -msgstr "" +msgstr "Ссылка" #. module: account_voucher #: selection:account.voucher,state:0 @@ -526,12 +526,12 @@ msgstr "" #: rml:voucher.cash_amount:0 #: rml:voucher.cash_receipt.drcr:0 msgid "Posted" -msgstr "" +msgstr "Проведено" #. module: account_voucher #: field:account.voucher,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: account_voucher #: field:account.voucher,move_ids:0 @@ -546,12 +546,12 @@ msgstr "" #. module: account_voucher #: field:account.voucher,move_id:0 msgid "Account Entry" -msgstr "" +msgstr "Проводка по счету" #. module: account_voucher #: view:account.voucher:0 msgid "Entry Lines" -msgstr "" +msgstr "Строки проводок" #. module: account_voucher #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form @@ -597,4 +597,4 @@ msgstr "" #: field:account.account,journal_id:0 #: field:account.voucher,journal_id:0 msgid "Journal" -msgstr "" +msgstr "Журнал" diff --git a/addons/analytic_journal_billing_rate/i18n/ru.po b/addons/analytic_journal_billing_rate/i18n/ru.po index 1b8c3fac862..8ed33f027b8 100644 --- a/addons/analytic_journal_billing_rate/i18n/ru.po +++ b/addons/analytic_journal_billing_rate/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 08:33+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:18+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: analytic_journal_billing_rate @@ -24,7 +24,7 @@ msgstr "Неправильный XML для просмотра архитект #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,journal_id:0 msgid "Analytic Journal" -msgstr "" +msgstr "Книга аналитики" #. module: analytic_journal_billing_rate #: constraint:ir.model:0 @@ -42,7 +42,7 @@ msgstr "" #. module: analytic_journal_billing_rate #: field:analytic_journal_rate_grid,account_id:0 msgid "Analytic Account" -msgstr "" +msgstr "Счет аналитического учета" #. module: analytic_journal_billing_rate #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid diff --git a/addons/audittrail/i18n/ru.po b/addons/audittrail/i18n/ru.po index 88479f08b1a..b1e9cebc14a 100644 --- a/addons/audittrail/i18n/ru.po +++ b/addons/audittrail/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 12:33+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:27+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: audittrail @@ -32,12 +32,12 @@ msgstr "" #. module: audittrail #: field:audittrail.log.line,log_id:0 msgid "Log" -msgstr "" +msgstr "Журнал" #. module: audittrail #: selection:audittrail.rule,state:0 msgid "Subscribed" -msgstr "" +msgstr "Подписка" #. module: audittrail #: view:audittrail.log:0 @@ -47,7 +47,7 @@ msgstr "" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Create" -msgstr "" +msgstr "Создать" #. module: audittrail #: wizard_view:audittrail.view.log,init:0 @@ -57,27 +57,27 @@ msgstr "" #. module: audittrail #: field:audittrail.rule,state:0 msgid "State" -msgstr "" +msgstr "Состояние" #. module: audittrail #: selection:audittrail.rule,state:0 msgid "Draft" -msgstr "" +msgstr "Черновик" #. module: audittrail #: field:audittrail.log.line,old_value:0 msgid "Old Value" -msgstr "" +msgstr "Старое значение" #. module: audittrail #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: audittrail #: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log msgid "View log" -msgstr "" +msgstr "Просмотреть журнал" #. module: audittrail #: model:ir.model,name:audittrail.model_audittrail_log_line @@ -87,7 +87,7 @@ msgstr "" #. module: audittrail #: field:audittrail.log,method:0 msgid "Method" -msgstr "" +msgstr "Метод" #. module: audittrail #: wizard_field:audittrail.view.log,init,from:0 @@ -107,7 +107,7 @@ msgstr "" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Write" -msgstr "" +msgstr "Написать" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail @@ -122,18 +122,18 @@ msgstr "" #. module: audittrail #: view:audittrail.rule:0 msgid "Subscribe" -msgstr "" +msgstr "Подписаться" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Read" -msgstr "" +msgstr "Читать" #. module: audittrail #: field:audittrail.log,object_id:0 #: field:audittrail.rule,object_id:0 msgid "Object" -msgstr "" +msgstr "Объект" #. module: audittrail #: view:audittrail.rule:0 @@ -162,12 +162,12 @@ msgstr "" #. module: audittrail #: field:audittrail.log,timestamp:0 msgid "Date" -msgstr "" +msgstr "Дата" #. module: audittrail #: field:audittrail.log,user_id:0 msgid "User" -msgstr "" +msgstr "Пользователь" #. module: audittrail #: view:audittrail.log:0 @@ -182,7 +182,7 @@ msgstr "Неправильный XML для просмотра архитект #. module: audittrail #: field:audittrail.log,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: audittrail #: field:audittrail.log,line_ids:0 @@ -197,7 +197,7 @@ msgstr "" #. module: audittrail #: field:audittrail.log.line,field_id:0 msgid "Fields" -msgstr "" +msgstr "Поля" #. module: audittrail #: view:audittrail.rule:0 @@ -212,7 +212,7 @@ msgstr "" #. module: audittrail #: view:audittrail.rule:0 msgid "UnSubscribe" -msgstr "" +msgstr "Отписаться" #. module: audittrail #: field:audittrail.rule,log_write:0 @@ -232,7 +232,7 @@ msgstr "" #. module: audittrail #: selection:audittrail.log,method:0 msgid "Delete" -msgstr "" +msgstr "Удалить" #. module: audittrail #: wizard_button:audittrail.view.log,init,open:0 @@ -247,7 +247,7 @@ msgstr "" #. module: audittrail #: field:audittrail.rule,name:0 msgid "Rule Name" -msgstr "" +msgstr "Название правила" #. module: audittrail #: field:audittrail.rule,log_read:0 @@ -257,7 +257,7 @@ msgstr "" #. module: audittrail #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree msgid "Logs" -msgstr "" +msgstr "Журналы" #. module: audittrail #: field:audittrail.log.line,new_value:0 @@ -292,7 +292,7 @@ msgstr "" #. module: audittrail #: field:audittrail.rule,user_id:0 msgid "Users" -msgstr "" +msgstr "Пользователи" #. module: audittrail #: field:audittrail.log.line,old_value_text:0 @@ -302,7 +302,7 @@ msgstr "" #. module: audittrail #: wizard_button:audittrail.view.log,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: audittrail #: field:audittrail.rule,log_unlink:0 diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 79b883c0236..b1ef4f5ca13 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -61,7 +61,6 @@ class base_action_rule(osv.osv): _columns = { 'name': fields.many2one('ir.model', 'Object', required=True), - 'max_level': fields.integer('Max Level', help='Specifies maximum level.'), 'create_date': fields.datetime('Create Date', readonly=1), 'active': fields.boolean('Active', help="If the active field is set to False,\ it will allow you to hide the rule without removing it."), @@ -111,19 +110,16 @@ the rule to mark CC(mail to any other person defined in actions)."), \nNote: This is case sensitive search."), 'server_action_id': fields.many2one('ir.actions.server', 'Server Action', help="Describes the action name.\neg:on which object which action to be taken on basis of which condition"), 'filter_id':fields.many2one('ir.filters', 'Filter', required=False), - 'domain':fields.char('Domain', size=124, required=False, readonly=False), } _defaults = { 'active': lambda *a: True, - 'max_level': lambda *a: 15, 'trg_date_type': lambda *a: 'none', 'trg_date_range_type': lambda *a: 'day', 'act_mail_to_user': lambda *a: 0, 'act_remind_partner': lambda *a: 0, 'act_remind_user': lambda *a: 0, 'act_mail_to_watchers': lambda *a: 0, - 'domain': lambda *a: '[]' } _order = 'sequence' @@ -249,9 +245,13 @@ the rule to mark CC(mail to any other person defined in actions)."), @param uid: the current user’s ID for security checks, @param context: A standard dictionary for contextual values """ ok = True - if eval(action.domain): - obj_ids = obj._table.search(cr, uid, eval(action.domain), context=context) - if not obj.id in obj_ids: + if action.filter_id: + if action.name.model == action.filter_id.model_id: + context.update(eval(action.filter_id.context)) + obj_ids = obj._table.search(cr, uid, eval(action.filter_id.domain), context=context) + if not obj.id in obj_ids: + ok = False + else: ok = False if hasattr(obj, 'user_id'): ok = ok and (not action.trg_user_id.id or action.trg_user_id.id==obj.user_id.id) @@ -344,9 +344,6 @@ the rule to mark CC(mail to any other person defined in actions)."), if not scrit: scrit = [] for action in self.browse(cr, uid, ids): - level = action.max_level - if not level: - break model_obj = self.pool.get(action.name.model) for obj in objects: ok = self.do_check(cr, uid, action, obj, context=context) @@ -391,7 +388,6 @@ the rule to mark CC(mail to any other person defined in actions)."), if ok: self.do_action(cr, uid, action, model_obj, obj, context) break - level -= 1 context.update({'action': False}) return True diff --git a/addons/base_action_rule/base_action_rule_view.xml b/addons/base_action_rule/base_action_rule_view.xml index 36140e62649..ef0b70ebdc2 100644 --- a/addons/base_action_rule/base_action_rule_view.xml +++ b/addons/base_action_rule/base_action_rule_view.xml @@ -17,8 +17,6 @@ <field name="name" select="1"/> <field name="active"/> <field name="sequence"/> - <field name="max_level" /> - <field name="domain"/> <field name="filter_id"/> <notebook colspan="4"> <page string="Conditions"> @@ -96,10 +94,9 @@ <field name="type">tree</field> <field name="arch" type="xml"> <tree string="Action Rule"> - <field name="name" colspan="4"/> <field name="sequence"/> - <field name="max_level"/> - <field name="domain"/> + <field name="name" colspan="4"/> + <field name="filter_id"/> </tree> </field> </record> diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po index 73a7999b29e..a20fea0d577 100644 --- a/addons/base_setup/i18n/pl.po +++ b/addons/base_setup/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 08:51+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 21:40+0000\n" +"Last-Translator: Maciej Jędrusik <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:03+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: base_setup @@ -254,7 +254,7 @@ msgstr "Ulica" #. module: base_setup #: wizard_button:base_setup.base_setup,finish,menu:0 msgid "Use Directly" -msgstr "" +msgstr "Użyj bezpośrednio" #. module: base_setup #: wizard_button:base_setup.base_setup,init,menu:0 diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index a490a800beb..f23b61df5ea 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -85,6 +85,8 @@ Create dashboard for CRM that includes: 'wizard/crm_forward_to_partner_view.xml', 'wizard/crm_send_email_view.xml', + 'wizard/crm_custom_create_menu_view.xml', + 'crm_view.xml', 'crm_action_rule_view.xml', diff --git a/addons/crm/board_crm_statistical_view.xml b/addons/crm/board_crm_statistical_view.xml index b23fdeac1cd..01d0472c21e 100644 --- a/addons/crm/board_crm_statistical_view.xml +++ b/addons/crm/board_crm_statistical_view.xml @@ -36,7 +36,7 @@ <field name="arch" type="xml"> <graph string="Opportunities By Stage" type="bar"> <field name="stage_id"/> - <field name="nbr" operator="+"/> + <field name="planned_revenue" operator="+"/> <field name="user_id" group="True"/> </graph> </field> @@ -60,7 +60,7 @@ </record> <record model="ir.actions.act_window" id="act_oppor_stage_user"> - <field name="res_model">Number of Opportunities by stage</field> + <field name="res_model">Planned revenue by user and stage</field> <field name="res_model">crm.lead.report</field> <field name="view_type">form</field> <field name="view_mode">graph,tree,form</field> @@ -93,7 +93,7 @@ <child2> <action - string="Number of Opportunities by Stage and User" + string="Planned Revenue by Stage and User" name="%(act_oppor_stage_user)d" colspan="4"/> diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml index ed6044a6fd6..ccaf0f7e35c 100644 --- a/addons/crm/board_crm_view.xml +++ b/addons/crm/board_crm_view.xml @@ -51,7 +51,7 @@ <field name="view_type">form</field> <field name="view_mode">graph,tree,form</field> <field name="view_id" ref="view_report_crm_oppor_graph"/> - <field name="domain">['&', ('user_id','=',uid), '!' , '&', ('state', '=', 'done'), ('date_closed','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field> + <field name="domain">['&', '&', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&', ('state', '=', 'done'), ('date_closed','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field> </record> <record model="ir.actions.act_window" id="act_sales_pipeline"> @@ -84,11 +84,11 @@ </child1> <child2> <action - string="Revenues by stage" + string="Planned Revenues by Stage" name="%(act_my_oppor_stage)d" colspan="4"/> <action - string="Win/Lost Ratio for the last Year" + string="Win/Lost Ratio for the Last Year" name="%(act_sales_pipeline)d" colspan="4"/> </child2> diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 575c2a8a3e3..ba05269c474 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -639,4 +639,86 @@ class res_partner(osv.osv): } res_partner() + +class crm_case_section_custom(osv.osv): + _name = "crm.case.section.custom" + _description = 'Custom CRM Case Section' + + _columns = { + 'name': fields.char('Case Section',size=64, required=True, translate=True), + 'code': fields.char('Section Code',size=8), + 'active': fields.boolean('Active'), + 'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"), + 'sequence': fields.integer('Sequence'), + 'user_id': fields.many2one('res.users', 'Responsible User'), + 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this section"), + 'parent_id': fields.many2one('crm.case.section.custom', 'Parent Section'), + 'note': fields.text('Notes'), + } + + _defaults = { + 'active': 1, + 'allow_unlink': 1, + } + + _sql_constraints = [ + ('code_uniq', 'unique (code)', 'The code of the section must be unique !') + ] + + def _check_recursion(self, cr, uid, ids): + level = 100 + while len(ids): + cr.execute('SELECT DISTINCT parent_id FROM crm_case_section_custom '\ + 'WHERE id IN %s', + (tuple(ids),)) + ids = filter(None, map(lambda x:x[0], cr.fetchall())) + if not level: + return False + level -= 1 + return True + _constraints = [ + (_check_recursion, 'Error ! You cannot create recursive sections.', ['parent_id']) + ] + +crm_case_section_custom() + + +class crm_case_custom(osv.osv, crm_case): + _name = 'crm.case.custom' + _inherit = 'mailgate.thread' + _description = "Custom CRM Case" + + _columns = { + 'id': fields.integer('ID', readonly=True), + 'name': fields.char('Name',size=64,required=True), + 'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'), + 'active': fields.boolean('Active'), + 'description': fields.text('Description'), + 'section_id': fields.many2one('crm.case.section.custom', 'Section', required=True, select=True), + 'probability': fields.float('Probability (%)'), + 'email_from': fields.char('Partner Email', size=128), + 'email_cc': fields.char('CC', size=252), + 'partner_id': fields.many2one('res.partner', 'Partner'), + 'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', domain="[('partner_id','=',partner_id)]"), + 'date': fields.datetime('Date'), + 'create_date': fields.datetime('Created' ,readonly=True), + 'date_deadline': fields.datetime('Deadline'), + 'date_closed': fields.datetime('Closed', readonly=True), + 'user_id': fields.many2one('res.users', 'Responsible'), + 'state': fields.selection(AVAILABLE_STATES, 'Status', size=16, readonly=True), + 'ref' : fields.reference('Reference', selection=_links_get, size=128), + 'date_action_last': fields.datetime('Last Action', readonly=1), + 'date_action_next': fields.datetime('Next Action', readonly=1), + } + + _defaults = { + 'active': 1, + 'state': 'draft', + 'priority': AVAILABLE_PRIORITIES[2][0], + 'date': time.strftime('%Y-%m-%d %H:%M:%S'), + } + +crm_case_custom() + + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml index 74786ad91f6..61da1ab6cc9 100644 --- a/addons/crm/crm_view.xml +++ b/addons/crm/crm_view.xml @@ -17,6 +17,13 @@ <menuitem id="base.next_id_64" name="Reporting" parent="base.menu_base_partner" sequence="11" /> + <menuitem action="crm_custom_create_menu_action" + id="crm_case_create_custom_menu" + parent="base.menu_crm_config_sales" + groups="base.group_extended" + name="Create Menu for Custom Cases" /> + + <!-- Case Sections Form View --> <record id="crm_case_section_view_form" model="ir.ui.view"> @@ -428,5 +435,262 @@ </field> </field> </record> + + + <!-- Custom Case Sections --> + <record id="crm_case_section_custom_view_form" model="ir.ui.view"> + <field name="name">crm.case.section.custom.form</field> + <field name="model">crm.case.section.custom</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Custom Case Section"> + <group col="6" colspan="4"> + <field name="name" select="1" colspan="2"/> + <field name="parent_id" select="2" widget="selection"/> + <field name="code" select="1"/> + <newline/> + <field name="user_id" select="2"/> + <field name="active" select="2"/> + </group> + <notebook colspan="4"> + <page string="Information"> + <group col="2" colspan="1"> + <separator string="Mailgateway" colspan="2"/> + <field name="reply_to" select="2"/> + </group> + <group col="2" colspan="1"> + <separator string="Configuration" colspan="2"/> + <field name="allow_unlink" select="2"/> + </group> + </page> + <page string="Notes"> + <field name="note" select="1" colspan="4" nolabel="1"/> + </page> + </notebook> + </form> + </field> + </record> + <record id="crm_case_section_custom_view_tree" model="ir.ui.view"> + <field name="name">crm.case.section.custom.tree</field> + <field name="model">crm.case.section.custom</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree string="Custom Case Section"> + <field name="name" select="1"/> + <field name="code" select="1"/> + <field name="user_id" select="1"/> + </tree> + </field> + </record> + + <!-- Custom crm case--> + + <record id="crm_case_custom_tree_view" model="ir.ui.view"> + <field name="name">Custom Cases - Tree</field> + <field name="model">crm.case.custom</field> + <field name="type">tree</field> + <field name="arch" type="xml"> + <tree colors="red:date_deadline<current_date and state=='open'" string="Custom Cases"> + <field name="id"/> + <field name="date"/> + <field name="date_deadline"/> + <field name="name"/> + <field name="partner_id"/> + <field name="user_id"/> + <field name="priority"/> + <field name="state"/> + <field name="create_date" invisible="1"/> + </tree> + </field> + </record> + + <record id="crm_case_custom_form_view" model="ir.ui.view"> + <field name="name">Custom Cases - Form</field> + <field name="model">crm.case.custom</field> + <field name="type">form</field> + <field name="priority" eval="1"/> + <field name="arch" type="xml"> + <form string="Custom Cases"> + <group colspan="4" col="6"> + <field name="name" select="1"/> + <field name="section_id" widget="selection"/> + <field name="user_id" select="1"/> + <field name="priority"/> + <field name="date" select="1"/> + <field name="date_deadline" select="2"/> + </group> + <notebook colspan="4"> + <page string="General"> + <group col="4" colspan="4"> + <separator string="Communication" colspan="4"/> + <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" select="1"/> + <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" select="2"/> + <newline/> + <field name="email_from" select="2"/> + </group> + + <separator string="Notes" colspan="4"/> + <field colspan="4" name="description" nolabel="1" select="2"/> + + <separator colspan="4"/> + <group col="8" colspan="4"> + <field name="state"/> + <button name="case_open" string="Open" + states="draft,pending" type="object" + icon="gtk-go-forward" /> + <button name="case_close" string="Close" + states="open,draft,pending" type="object" + icon="gtk-close" /> + <button name="case_pending" string="Pending" + states="draft,open" type="object" + icon="gtk-media-pause" /> + <button name="case_cancel" string="Cancel" + states="draft,open,pending" type="object" + icon="gtk-cancel" /> + <button name="case_reset" + string="Reset to Draft" states="done,cancel" + type="object" icon="gtk-convert" /> + </group> + </page> + <page string="Extra Info"> + <separator colspan="4" string="Dates"/> + <field name="create_date"/> + <field name="date_closed"/> + <field name="date_action_last"/> + <field name="date_action_next"/> + <separator colspan="4" string="Others"/> + <field name="id" select="1"/> + <field name="active" select="2"/> + <separator colspan="4" string="References"/> + <field colspan="4" name="ref"/> + <field colspan="4" name="log_ids" nolabel="1"> + <tree string="Logs"> + <field name="name" colspan="4"/> + <field name="date"/> + <field name="user_id"/> + </tree> + <form string="Logs"> + <separator string="Action Information" colspan="4"/> + <field name="name" colspan="4"/> + <field name="date"/> + <field name="user_id"/> + </form> + </field> + </page> + <page string="Emails" groups="base.group_extended"> + <group colspan="4"> + <field colspan="4" name="email_cc" string="CC" widget="char" size="512"/> + </group> + <field name="message_ids" colspan="4" nolabel="1" mode="form,tree"> + <form string="Communication history"> + <group col="4" colspan="4"> + <field name="email_from"/> + <field name="date"/> + <field name="email_to" widget="char" size="512"/> + <field name="email_cc" widget="char" size="512"/> + <field name="name" colspan="4" widget="char" size="512"/> + </group> + <notebook colspan="4"> + <page string="Details"> + <field name="description" colspan="4" nolabel="1"/> + </page> + <page string="Attachments"> + <field name="attachment_ids" colspan="4" readonly="1" nolabel="1"/> + </page> + </notebook> + <button colspan="4" + string="Reply" + name="%(crm.action_crm_send_mail)d" + context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}" + icon="gtk-undo" type="action" /> + </form> + <tree string="Communication history"> + <field name="date"/> + <field name="email_from" /> + <field name="email_to"/> + <field name="description"/> + </tree> + </field> + <button colspan="2" string="Send New Email" + name="%(crm.action_crm_send_mail)d" + context="{'mail':'new', 'model': 'crm.case.custom'}" + icon="gtk-go-forward" type="action" /> + <button colspan="2" string="Forward to Partner" + name="%(crm_lead_forward_to_partner_act)d" + icon="gtk-go-forward" type="action" /> + </page> + </notebook> + </form> + </field> + </record> + + <record model="ir.ui.view" id="crm_case_custom_calendar_view"> + <field name="name">Custom Cases - Calendar</field> + <field name="model">crm.case.custom</field> + <field name="type">calendar</field> + <field name="priority" eval="2"/> + <field name="arch" type="xml"> + <calendar string="Cases" + date_start="date" color="user_id"> + <field name="name" /> + <field name="partner_id" /> + </calendar> + </field> + </record> + + <!-- Custom Cases Search View --> + + <record id="crm_case_custom_search_view" model="ir.ui.view"> + <field name="name">Custom Cases - Search</field> + <field name="model">crm.case.custom</field> + <field name="type">search</field> + <field name="arch" type="xml"> + <search string="Search Cases"> + <filter icon="terp-check" + string="Current" + default="1" name="current" + domain="[('state','in',('draft','open'))]"/> + <filter icon="terp-camera_test" + string="Open" + domain="[('state','=','open')]"/> + <filter icon="terp-gtk-media-pause" + string="Pending" + domain="[('state','=','pending')]"/> + + <separator orientation="vertical"/> + <filter icon="terp-go-today" string="Today" + domain="[('create_date','<', time.strftime('%%Y-%%m-%%d 23:59:59')), ('create_date','>=', time.strftime('%%Y-%%m-%%d 00:00:00'))]" + help="Todays' Cases" /> + <filter icon="terp-go-week" string="7 Days" + help="Cases creating during last 7 days" + domain="[('create_date','<', time.strftime('%%Y-%%m-%%d 23:59:59')),('create_date','>=',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d 00:00:00'))]" + /> + <separator orientation="vertical"/> + <field name="name"/> + <field name="user_id"> + <filter icon="terp-personal-" + domain="[('user_id','=', False)]" + help="Unassigned Cases" /> + </field> + <newline/> + <group expand="0" string="Extended options..." groups="base.group_extended"> + <field name="create_date" string="Creation Date"/> + <field name="date_closed"/> + </group> + <newline/> + <group expand="0" string="Group By..."> + <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> + <filter string="Priority" icon="terp-rating-rated" + domain="[]" context="{'group_by':'priority'}" /> + <separator orientation="vertical"/> + <filter string="Salesman" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/> + <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> + <separator orientation="vertical"/> + <filter string="Creation" icon="terp-go-month" + domain="[]" context="{'group_by':'create_date'}" /> + </group> + </search> + </field> + </record> </data> </openerp> diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po index f93dd7758fe..1d08c7e83d7 100644 --- a/addons/crm/i18n/ru.po +++ b/addons/crm/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2010-01-05 05:59+0000\n" -"PO-Revision-Date: 2010-07-08 16:42+0000\n" +"PO-Revision-Date: 2010-07-10 12:39+0000\n" "Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: crm @@ -95,7 +95,7 @@ msgstr "Название стадии" #: model:ir.ui.menu,name:crm.menu_crm_case_categ0-act #: model:ir.ui.menu,name:crm.next_id_51 msgid "Cases" -msgstr "" +msgstr "Вопросы" #. module: crm #: help:crm.segmentation,categ_id:0 @@ -220,7 +220,7 @@ msgstr "Партнер" #: field:crm.case.stage,section_id:0 #: model:ir.model,name:crm.model_crm_case_section msgid "Case Section" -msgstr "" +msgstr "Секция вопроса" #. module: crm #: view:crm.job:0 @@ -496,7 +496,7 @@ msgstr "Конфиденциальность" #. module: crm #: view:crm.case.rule:0 msgid "%(partner)s = Partner name" -msgstr "" +msgstr "%(partner)s = Название партнера" #. module: crm #: view:crm.case:0 @@ -529,7 +529,7 @@ msgstr "Недопустимое имя модели в определении #. module: crm #: view:crm.case.rule:0 msgid "Conditions" -msgstr "" +msgstr "Условия" #. module: crm #: model:ir.actions.act_window,name:crm.crm_case_categ0-act_open @@ -1413,7 +1413,7 @@ msgstr "" #: code:addons/crm/crm.py:0 #, python-format msgid "You can not delete this case. You should better cancel it." -msgstr "" +msgstr "Вы не можете удалить этот вопрос. Лучше отмените его." #. module: crm #: wizard_button:caldav.crm.subscribe,init,open:0 @@ -2123,7 +2123,7 @@ msgstr "" #. module: crm #: view:crm.case.section:0 msgid "Case section" -msgstr "" +msgstr "Секция вопроса" #. module: crm #: model:process.node,note:crm.process_node_meeting0 @@ -2144,7 +2144,7 @@ msgstr "Ошибка!" #. module: crm #: view:crm.case.rule:0 msgid "Fields to Change" -msgstr "" +msgstr "Поля для изменения" #. module: crm #: model:crm.case.category2,name:crm.category_lead1 @@ -2154,7 +2154,7 @@ msgstr "" #. module: crm #: model:ir.ui.menu,name:crm.menu_crm_case_history-act_main msgid "Cases Histories" -msgstr "" +msgstr "Истории вопросов" #. module: crm #: field:crm.case,create_date:0 @@ -2916,7 +2916,7 @@ msgstr "" #. module: crm #: view:crm.case.history:0 msgid "Case Description" -msgstr "" +msgstr "Описание вопроса" #. module: crm #: wizard_field:crm.job.reschedule_phone_call,init,user_id:0 @@ -3576,7 +3576,7 @@ msgstr "" #. module: crm #: field:crm.case.section,parent_id:0 msgid "Parent Section" -msgstr "" +msgstr "Родительская секция" #. module: crm #: wizard_view:crm.job.reschedule_phone_call,init:0 @@ -3595,6 +3595,8 @@ msgstr "Запланировать телефонный звонок" msgid "" "Can not send mail with empty body,you should have description in the body" msgstr "" +"Невозможно отослать письмо с пустым содержанием, Вам следует заполнить " +"содержание письма." #. module: crm #: selection:report.crm.case.section.categ.categ2,month:0 @@ -3612,7 +3614,7 @@ msgstr "Договор" #. module: crm #: field:crm.case.section,child_ids:0 msgid "Child Sections" -msgstr "" +msgstr "Дочерняя секция" #. module: crm #: view:crm.case:0 @@ -3917,7 +3919,7 @@ msgstr "" #: field:crm.case.section,sequence:0 #: field:crm.case.stage,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Последовательность" #. module: crm #: wizard_view:caldav.crm.import,init:0 @@ -3939,7 +3941,7 @@ msgstr "" #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree #: model:ir.ui.menu,name:crm.menu_crm_case_section_act_tree msgid "Cases by section" -msgstr "" +msgstr "Вопросы по секциям" #. module: crm #: view:crm.job:0 diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index bd881630aff..a849c040ece 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -39,3 +39,7 @@ "access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","crm.group_crm_user",1,0,0,0 "mail_gateway_mailgate_message","mail_gateway.mailgate.message","mail_gateway.model_mailgate_message","crm.group_crm_user",1,1,1,1 "mail_gateway_mailgate_thread","mail_gateway.mailgate.thread","mail_gateway.model_mailgate_thread","crm.group_crm_user",1,1,1,1 +"access_crm_case_section_custom_user","crm.case.section.custom.user","model_crm_case_section_custom","crm.group_crm_user",1,0,0,0 +"access_crm_case_section_custom_manager","crm.case.section.custom.manager","model_crm_case_section_custom","crm.group_crm_manager",1,1,1,1 +"access_crm_case_custom_user","crm.case.custom.user","model_crm_case_custom","crm.group_crm_user",1,1,1,1 +"access_crm_case_custom_manager","crm.case.custom.manager","model_crm_case_custom","crm.group_crm_manager",1,1,1,1 diff --git a/addons/crm/test/test_crm_lead.yml b/addons/crm/test/test_crm_lead.yml index 97c54b5ef2b..f61021a5606 100644 --- a/addons/crm/test/test_crm_lead.yml +++ b/addons/crm/test/test_crm_lead.yml @@ -78,24 +78,12 @@ !python {model: crm.lead2opportunity}: | self.action_apply(cr, uid, [ref('crm_lead2opportunity_stonage_0')], {'active_id': ref('crm_lead_newcustomer0')}) -- | - I can check that a lead and a business opportunity is now assigned to this - lead. -#- -# !python {model: crm.lead, id: crm_lead_newcustomer0}: -# - opportunity_id == False - - | - I check that the partner associated to this lead as the same country, phone number - and name than the opportunity. + In order to check the opportunity is created or not, I check type. - !python {model: crm.lead}: | lead = self.browse(cr, uid, ref("crm_lead_newcustomer0")) - obj_opportunity = self.pool.get('crm.lead') - ids = obj_opportunity.search(cr, uid, [('name', '=', lead.partner_name)]) - opportunity = obj_opportunity.browse(cr, uid, ids)[0] - assert lead.partner_name == opportunity.partner_id.name - assert lead.phone == opportunity.phone + assert lead.type == 'opportunity' #- # | diff --git a/addons/crm/test/test_crm_opportunity.yml b/addons/crm/test/test_crm_opportunity.yml index 48a71de1dce..cf62d05e0b6 100644 --- a/addons/crm/test/test_crm_opportunity.yml +++ b/addons/crm/test/test_crm_opportunity.yml @@ -4,7 +4,7 @@ - !record {model: crm.lead, id: crm_opportunity_abcfuelcounits0}: email_from: info@balmerinc.be - name: 'ABC FUEL CO 829264 - 10002 units ' + name: 'ABC FUEL CO 829264 - 10002 units' partner_address_id: base.res_partner_address_1 partner_id: base.res_partner_9 probability: 1.0 @@ -35,17 +35,15 @@ then I click on the date on which I want schedule meeting. I fill proper data for that meeting and save it - - !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}: - alarm_id: base_calendar.alarm3 + !record {model: crm.meeting, id: crm_meeting_abcfuelcounits0}: date: '2010-04-16 00:00:00' date_deadline: '2010-04-16 08:00:00' duration: 8.0 email_from: info@balmerinc.be - name: 'ABC FUEL CO 829264 - 10002 units ' + name: 'ABC FUEL CO 829264 - 10002 units' opportunity_id: 'crm_opportunity_abcfuelcounits0' partner_address_id: base.res_partner_address_1 partner_id: base.res_partner_9 - rrule_type: weekly section_id: crm.section_sales_department state: open - | @@ -54,7 +52,7 @@ - !record {model: crm.opportunity2phonecall, id: crm_opportunity2phonecall_abcfuelcounits0}: date: '2010-04-17 11:15:00' - name: 'ABC FUEL CO 829264 - 10002 units ' + name: 'ABC FUEL CO 829264 - 10002 units' section_id: crm.section_sales_department user_id: base.user_demo - | @@ -66,8 +64,9 @@ I check that phonecall record is created for that opportunity. - !python {model: crm.phonecall}: | - ids = self.search(cr, uid, [('name', '=', 'ABC FUEL CO 829264 - 10002 units')]) - assert len(ids) + phone_obj = self.pool.get('crm.phonecall') + ids = phone_obj.search(cr, uid, [('name', '=', 'ABC FUEL CO 829264 - 10002 units')]) + assert len(ids) - | I can see phonecall record after click on "Schedule call" wizard. - @@ -78,4 +77,4 @@ partner_address_id: base.res_partner_address_1 partner_id: base.res_partner_9 section_id: crm.section_sales_department -
\ No newline at end of file + diff --git a/addons/crm/test/test_crm_phonecall.yml b/addons/crm/test/test_crm_phonecall.yml index f2020659aed..af28c19a10e 100644 --- a/addons/crm/test/test_crm_phonecall.yml +++ b/addons/crm/test/test_crm_phonecall.yml @@ -33,22 +33,19 @@ - !python {model: crm.phonecall2opportunity}: | self.action_apply(cr, uid, [ref("crm_phonecall2opportunity_interviewcall0")], {"active_id": ref("crm_phonecall_interviewcall0")}) -- - # This is not working, find a way to do that in YAML - + - | I can see that a business opportunity is now assigned to this phonecall - !assert {model: crm.phonecall, id: crm_phonecall_interviewcall0}: - - opportunity_id == True + - opportunity_id != False - | And I check that the phonecall and the newly created business opportunity is linked to same partner - !python {model: crm.phonecall}: | - xid= ref('crm_phonecall_interviewcall0') - obj_phonecall = self.browse(cr, uid, xid) + obj_phonecall = self.browse(cr, uid, ref('crm_phonecall_interviewcall0')) ids = self.pool.get('crm.lead').search(cr, uid, [('name', '=', obj_phonecall.opportunity_id.name)]) obj_opp = self.pool.get('crm.lead').browse(cr, uid, ids)[0] assert obj_phonecall.partner_id == obj_opp.partner_id @@ -77,12 +74,6 @@ phonecall_id: 'crm_phonecall_interviewcall0' rrule_type: weekly state: open - -- - #This is not working for yaml -- | - I can jump to this meeting by "Meetings" shortcut from my phonecall's form view -- - | In order to schedule other phonecall to the partner diff --git a/addons/crm/wizard/__init__.py b/addons/crm/wizard/__init__.py index e4eb233a9b8..8c6a650b8da 100644 --- a/addons/crm/wizard/__init__.py +++ b/addons/crm/wizard/__init__.py @@ -30,5 +30,7 @@ import crm_phonecall_to_partner import crm_phonecall_to_opportunity import crm_partner_to_opportunity +import crm_custom_create_menu + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_custom_create_menu.py b/addons/crm/wizard/crm_custom_create_menu.py new file mode 100644 index 00000000000..8cf8619c074 --- /dev/null +++ b/addons/crm/wizard/crm_custom_create_menu.py @@ -0,0 +1,78 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + +from osv import fields,osv + + +class crm_case_custom_create_menu(osv.osv_memory): + ''' + Create menu for custom Cases + ''' + _name = 'crm.custom.create.menu' + _description = 'Create menu for custom Cases' + + _columns = { + 'name': fields.char('Menu Name', size=64, required=True), + 'menu_parent_id': fields.many2one('ir.ui.menu', 'Parent Menu', required=True), + 'section_id': fields.many2one('crm.case.section.custom', 'Section', required=True), + 'view_form': fields.many2one('ir.ui.view', 'Form View', domain=[('type','=','form'),('model','=','crm.case.custom')]), + 'view_tree': fields.many2one('ir.ui.view', 'Tree View', domain=[('type','=','tree'),('model','=','crm.case.custom')]), + 'view_calendar': fields.many2one('ir.ui.view', 'Calendar View', domain=[('type','=','calendar'),('model','=','crm.case.custom')]), + 'view_search': fields.many2one('ir.ui.view', 'Search View', domain=[('type','=','search'),('model','=','crm.case.custom')]), + } + + def menu_create(self, cr, uid, ids, context=None): + """ + Creates Menus for selected custom section + """ + data_obj = self.pool.get('ir.model.data') + for this in self.browse(cr, uid, ids, context=context): + domain = [('section_id', '=', this.section_id.id)] + view_mode = [this.view_tree and 'tree', this.view_form and 'form', this.view_calendar and 'calendar'] + view_mode = filter(None , view_mode) + action_id = self.pool.get('ir.actions.act_window').create(cr,uid, { + 'name': this.name, + 'res_model': 'crm.case.custom', + 'domain': domain, + 'view_type': 'form', + 'view_mode': ','.join(view_mode), + 'search_view_id': this.view_search.id or False, + 'context': {'default_section_id': this.section_id.id, 'default_user_id': uid} + }) + menu_id=self.pool.get('ir.ui.menu').create(cr, uid, { + 'name': this.name, + 'parent_id': this.menu_parent_id.id, + 'icon': 'STOCK_JUSTIFY_FILL' + }) + self.pool.get('ir.values').create(cr, uid, { + 'name': 'Custom Cases', + 'key2': 'tree_but_open', + 'model': 'ir.ui.menu', + 'res_id': menu_id, + 'value': 'ir.actions.act_window,%d'%action_id, + 'object': True + }) + return {} + +crm_case_custom_create_menu() + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm/wizard/crm_custom_create_menu_view.xml b/addons/crm/wizard/crm_custom_create_menu_view.xml new file mode 100644 index 00000000000..ddd4f2339f0 --- /dev/null +++ b/addons/crm/wizard/crm_custom_create_menu_view.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<openerp> + <data> + <record model="ir.ui.view" id="crm_custom_create_menu_form"> + <field name="name">crm.custom.create.menu.form</field> + <field name="model">crm.custom.create.menu</field> + <field name="type">form</field> + <field name="arch" type="xml"> + <form string="Create Menu for Custom Cases"> + <separator string="Menu Information" colspan="4"/> + <field name="name"/> + <field name="menu_parent_id"/> + <field name="section_id"/> + <label string="This wizard will create all sub-menus, within the selected menu." align="0.0" colspan="4"/> + <label string="You may want to create a new parent menu to put all the created menus in." align="0.0" colspan="4"/> + <separator string="Select Views (Empty for default)" colspan="4"/> + <field name="view_form"/> + <field name="view_tree"/> + <field name="view_calendar"/> + <field name="view_search"/> + <separator string="" colspan="4"/> + <label string="" colspan="2"/> + <button special="cancel" string="_Cancel" icon="gtk-cancel"/> + <button name="menu_create" string="Create _Menu" type="object" icon='gtk-ok'/> + </form> + </field> + </record> + + <record model="ir.actions.act_window" id="crm_custom_create_menu_action"> + <field name="name">Create Menu</field> + <field name="res_model">crm.custom.create.menu</field> + <field name="view_type">form</field> + <field name="view_mode">form</field> + <field name="target">new</field> + </record> + + </data> +</openerp> diff --git a/addons/crm/wizard/crm_forward_to_partner.py b/addons/crm/wizard/crm_forward_to_partner.py index fb607eefdbc..1e323eddedb 100644 --- a/addons/crm/wizard/crm_forward_to_partner.py +++ b/addons/crm/wizard/crm_forward_to_partner.py @@ -48,7 +48,7 @@ class crm_lead_forward_to_partner(osv.osv_memory): _defaults = { 'name' : 'email', - 'history': 'latest', + 'history': 'info', 'add_cc': True, 'email_from': lambda self, cr, uid, *a: self.pool.get('res.users')._get_email_from(cr, uid, uid)[uid] } diff --git a/addons/crm_claim/test/test_crm_claim.yml b/addons/crm_claim/test/test_crm_claim.yml index e8000161a1e..14551ad65ad 100644 --- a/addons/crm_claim/test/test_crm_claim.yml +++ b/addons/crm_claim/test/test_crm_claim.yml @@ -21,11 +21,6 @@ !assert {model: crm.claim, id: crm_claim_damagedproduct0}: - state == 'draft' - | - Now I make sure that claim is at "Accepted" stage. -- - !assert {model: crm.claim, id: crm_claim.crm_claim_damagedproduct0}: - stage_id: crm_claim.stage_claim1 -- | I can change that stage by next button right on it - !python {model: crm.claim}: | diff --git a/addons/crm_helpdesk/test/test_crm_helpdesk.yml b/addons/crm_helpdesk/test/test_crm_helpdesk.yml index 6d3beb43b41..6872a99a60e 100644 --- a/addons/crm_helpdesk/test/test_crm_helpdesk.yml +++ b/addons/crm_helpdesk/test/test_crm_helpdesk.yml @@ -22,17 +22,8 @@ !python {model: crm.helpdesk}: | self.case_open(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')]) - | - I can see that "Send Reminder" button is visible, which is used to send reminder to partner from - responsible person or send reminder to responsible person from partner. -- - #this is not work for yaml. -- -# !python {model: crm.helpdesk}: | -# self.remind_user(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')], context={}, attach=False, destination=True) -- | After a proper communication for the request via email I make sure that the request is fulfilled and I close this HelpDesk Request by clicking on "Close" button. - !python {model: crm.helpdesk}: | - self.case_close(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')]) -- + self.case_close(cr, uid, [ref('crm_helpdesk_somefunctionalquestion0')]) diff --git a/addons/document_ics/i18n/ru.po b/addons/document_ics/i18n/ru.po index f9716fcc4a1..9496b3d9c3f 100644 --- a/addons/document_ics/i18n/ru.po +++ b/addons/document_ics/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.1\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-29 06:31+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:37+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: document_ics @@ -32,7 +32,7 @@ msgstr "" #. module: document_ics #: constraint:document.directory:0 msgid "Error! You can not create recursive Directories." -msgstr "" +msgstr "Ошибка! Вы не можете созадавать вложенные друг в друга директории." #. module: document_ics #: field:document.ics.crm.wizard,jobs:0 @@ -42,12 +42,12 @@ msgstr "" #. module: document_ics #: view:document.ics.crm.wizard:0 msgid "Configure Calendars for CRM Sections" -msgstr "" +msgstr "Конфигурирование Календарей для секции CRM" #. module: document_ics #: field:document.ics.crm.wizard,helpdesk:0 msgid "Helpdesk" -msgstr "" +msgstr "Техподдержка" #. module: document_ics #: field:document.directory.ics.fields,field_id:0 @@ -57,17 +57,17 @@ msgstr "" #. module: document_ics #: view:document.ics.crm.wizard:0 msgid "Next" -msgstr "" +msgstr "Далее" #. module: document_ics #: field:document.directory.ics.fields,content_id:0 msgid "Content" -msgstr "" +msgstr "Содержание" #. module: document_ics #: field:document.ics.crm.wizard,meeting:0 msgid "Calendar of Meetings" -msgstr "" +msgstr "Календарь встреч" #. module: document_ics #: model:crm.case.section,name:document_ics.section_meeting @@ -77,12 +77,12 @@ msgstr "" #. module: document_ics #: selection:document.directory.ics.fields,name:0 msgid "url" -msgstr "" +msgstr "адрес URL" #. module: document_ics #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия" #. module: document_ics #: help:document.ics.crm.wizard,bugs:0 @@ -111,12 +111,12 @@ msgstr "" #. module: document_ics #: selection:document.directory.ics.fields,name:0 msgid "description" -msgstr "" +msgstr "описание" #. module: document_ics #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories msgid "Configure Calendars for Sections " -msgstr "" +msgstr "Конфигурирование Календарей для Секций " #. module: document_ics #: help:document.ics.crm.wizard,opportunity:0 @@ -142,12 +142,12 @@ msgstr "" #. module: document_ics #: field:document.directory.content,ics_object_id:0 msgid "Object" -msgstr "" +msgstr "Объект" #. module: document_ics #: constraint:crm.case.section:0 msgid "Error ! You cannot create recursive sections." -msgstr "" +msgstr "Ошибка! Вы не можете создавать рекурсивные секции." #. module: document_ics #: model:ir.module.module,shortdesc:document_ics.module_meta_information @@ -157,12 +157,12 @@ msgstr "" #. module: document_ics #: selection:document.directory.ics.fields,name:0 msgid "location" -msgstr "" +msgstr "местоположение" #. module: document_ics #: view:document.directory:0 msgid "ICS Calendar" -msgstr "" +msgstr "Календарь формата ICS" #. module: document_ics #: field:document.directory.ics.fields,name:0 @@ -172,7 +172,7 @@ msgstr "" #. module: document_ics #: model:ir.module.module,description:document_ics.module_meta_information msgid "Allows to synchronise calendars with others applications." -msgstr "" +msgstr "Разрешает синхронизировать календари с другими приложенями." #. module: document_ics #: constraint:ir.ui.view:0 @@ -189,7 +189,7 @@ msgstr "" #. module: document_ics #: field:document.ics.crm.wizard,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: document_ics #: help:document.ics.crm.wizard,meeting:0 @@ -199,7 +199,7 @@ msgstr "" #. module: document_ics #: field:document.directory.content,ics_domain:0 msgid "Domain" -msgstr "" +msgstr "Домен" #. module: document_ics #: help:document.ics.crm.wizard,claims:0 @@ -221,12 +221,12 @@ msgstr "" #. module: document_ics #: view:crm.case:0 msgid "Duration(In Hour)" -msgstr "" +msgstr "Продолжительность(в часах)" #. module: document_ics #: field:document.ics.crm.wizard,document_ics:0 msgid "Shared Calendar" -msgstr "" +msgstr "Общий календарь" #. module: document_ics #: field:document.ics.crm.wizard,claims:0 @@ -248,17 +248,17 @@ msgstr "" #. module: document_ics #: field:document.ics.crm.wizard,phonecall:0 msgid "Phone Calls" -msgstr "" +msgstr "Телефонные звонки" #. module: document_ics #: field:document.ics.crm.wizard,bugs:0 msgid "Bug Tracking" -msgstr "" +msgstr "Учет ошибок" #. module: document_ics #: selection:document.directory.ics.fields,name:0 msgid "categories" -msgstr "" +msgstr "категории" #. module: document_ics #: field:document.ics.crm.wizard,lead:0 @@ -273,7 +273,7 @@ msgstr "" #. module: document_ics #: selection:document.directory.ics.fields,name:0 msgid "created" -msgstr "" +msgstr "создан" #. module: document_ics #: field:crm.case,code:0 @@ -283,7 +283,7 @@ msgstr "" #. module: document_ics #: selection:document.directory.ics.fields,name:0 msgid "summary" -msgstr "" +msgstr "сводка" #. module: document_ics #: model:ir.model,name:document_ics.model_document_ics_crm_wizard @@ -303,17 +303,17 @@ msgstr "" #. module: document_ics #: field:document.directory.content,ics_field_ids:0 msgid "Fields Mapping" -msgstr "" +msgstr "Соответствие полей" #. module: document_ics #: view:document.ics.crm.wizard:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: document_ics #: field:document.ics.crm.wizard,opportunity:0 msgid "Business Opportunities" -msgstr "" +msgstr "Возможные сделки" #. module: document_ics #: selection:document.directory.ics.fields,name:0 diff --git a/addons/event/event.py b/addons/event/event.py index 73ff7f6755a..8efa132477b 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -454,7 +454,7 @@ and users by email"), contact_id = self.pool.get('res.partner.contact').browse(cr, uid, contact) data['badge_name'] = contact_id.name - data['badge_title'] = contact_id.title + data['badge_title'] = contact_id.title.name if partner: partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id', '=', partner)]) job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id', '=', contact), ('address_id', 'in', partner_addresses)]) @@ -471,7 +471,9 @@ and users by email"), data_event = self.pool.get('event.event').browse(cr, uid, event_id) context['currency_id'] = data_event.currency_id.id - + if data_event.user_id.id: + return {'value': {'user_id':data_event.user_id.id}} + if data_event.product_id: if not partner_invoice_id: unit_price=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id] @@ -516,6 +518,7 @@ and users by email"), data_event = self.pool.get('event.event').browse(cr, uid, event_id) if data_event.product_id: + data['event_product']=data_event.product_id.name if not partner_invoice_id: data['unit_price']=self.pool.get('product.product').price_get(cr, uid, [data_event.product_id.id], context=context)[data_event.product_id.id] return {'value': data} diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po index 493e45e734a..0871b844bc6 100644 --- a/addons/event/i18n/ru.po +++ b/addons/event/i18n/ru.po @@ -7,35 +7,35 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-11-02 13:02+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-10 20:34+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:58+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: event #: field:event.event,date_end:0 #: field:report.event.registration,date_end:0 msgid "Ending date" -msgstr "" +msgstr "Дата окончания" #. module: event #: field:event.event,register_min:0 msgid "Minimum Registrations" -msgstr "" +msgstr "Мин. кол-во регистраций" #. module: event #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: event #: field:event.event,mail_registr:0 msgid "Registration Email" -msgstr "" +msgstr "Регистрация ел. почты" #. module: event #: model:crm.case.section,name:event.event_0_crm_case_section @@ -45,27 +45,27 @@ msgstr "" #. module: event #: field:event.event,mail_confirm:0 msgid "Confirmation Email" -msgstr "" +msgstr "Подтверждение ел. почты" #. module: event #: constraint:crm.case.section:0 msgid "Error ! You cannot create recursive sections." -msgstr "" +msgstr "Ошибка! Вы не можете создавать рекурсивные секции." #. module: event #: model:ir.model,name:event.model_event_registration msgid "Event Registration" -msgstr "" +msgstr "Регистрация события" #. module: event #: model:ir.actions.wizard,name:event.event_reg_invoice msgid "Make Invoice" -msgstr "" +msgstr "Выпустить счет" #. module: event #: field:report.event.type.registration,draft_state:0 msgid "Draft Registrations" -msgstr "" +msgstr "Предварительные регистрации" #. module: event #: view:report.event.registration:0 @@ -75,27 +75,27 @@ msgstr "" #. module: event #: wizard_button:event.reg_make_invoice,init,end:0 msgid "Ok" -msgstr "" +msgstr "Ок" #. module: event #: field:event.event,mail_auto_confirm:0 msgid "Mail Auto Confirm" -msgstr "" +msgstr "Письмо автоматически подтверждено" #. module: event #: model:product.template,name:event.event_product_1_product_template msgid "Ticket for Opera" -msgstr "" +msgstr "Билет в оперу" #. module: event #: wizard_field:event.reg_make_invoice,init,inv_rejected:0 msgid "Invoice Rejected" -msgstr "" +msgstr "Счет отклонен" #. module: event #: view:event.event:0 msgid "Confirm Event" -msgstr "" +msgstr "Подтвердить событие" #. module: event #: model:crm.case.section,name:event.event_1_crm_case_section @@ -105,12 +105,12 @@ msgstr "" #. module: event #: field:report.event.registration,draft_state:0 msgid "Draft Registration" -msgstr "" +msgstr "Предварительная регистрация" #. module: event #: wizard_view:event.reg_make_invoice,init:0 msgid "Create Invoices" -msgstr "" +msgstr "Создать счета" #. module: event #: model:ir.module.module,description:event.module_meta_information @@ -134,18 +134,18 @@ msgstr "" #. module: event #: view:event.registration:0 msgid "Extra Info" -msgstr "" +msgstr "Доп. информация" #. module: event #: view:event.registration:0 msgid "Registration" -msgstr "" +msgstr "Регистрация" #. module: event #: field:event.type,name:0 #: model:ir.model,name:event.model_event_type msgid "Event type" -msgstr "" +msgstr "Тип события" #. module: event #: view:event.event:0 @@ -153,44 +153,44 @@ msgstr "" #: model:ir.module.module,shortdesc:event.module_meta_information #: field:report.event.registration,name:0 msgid "Event" -msgstr "" +msgstr "Событие" #. module: event #: selection:event.event,state:0 msgid "Confirmed" -msgstr "" +msgstr "Подтверждено" #. module: event #: wizard_view:event.confirm_registration,split:0 msgid "Registration Confirmation" -msgstr "" +msgstr "Регистрация подтверждена" #. module: event #: view:event.registration:0 msgid "Dates" -msgstr "" +msgstr "Даты" #. module: event #: field:event.event,register_current:0 #: model:ir.actions.act_window,name:event.action_registration_confirm #: model:ir.ui.menu,name:event.menu_action_registration_confirm msgid "Confirmed Registrations" -msgstr "" +msgstr "Подтвержденные регистрации" #. module: event #: field:event.event,mail_auto_registr:0 msgid "Mail Auto Register" -msgstr "" +msgstr "П\\\\" #. module: event #: view:event.registration:0 msgid "Badge" -msgstr "" +msgstr "Бэйдж" #. module: event #: field:event.event,section_id:0 msgid "Case section" -msgstr "" +msgstr "Секция вопроса" #. module: event #: field:event.registration,tobe_invoiced:0 @@ -200,7 +200,7 @@ msgstr "" #. module: event #: model:ir.ui.menu,name:event.menu_event_event msgid "All Events" -msgstr "" +msgstr "Все события" #. module: event #: model:ir.ui.menu,name:event.menu_report_event @@ -210,12 +210,12 @@ msgstr "Отчетность" #. module: event #: view:event.registration:0 msgid "Cancel Registration" -msgstr "" +msgstr "Отменить регистрацию" #. module: event #: model:ir.ui.menu,name:event.menu_action_event_categories msgid "Events by Categories" -msgstr "" +msgstr "События по категориям" #. module: event #: wizard_view:event.confirm_registration,split:0 @@ -225,19 +225,19 @@ msgstr "" #. module: event #: field:report.event.type.registration,confirm_state:0 msgid "Confirm Registrations" -msgstr "" +msgstr "Подтвердить регистрации" #. module: event #: view:event.registration:0 msgid "References" -msgstr "" +msgstr "Ссылки" #. module: event #: model:ir.actions.act_window,name:event.action_event_type_registration #: model:ir.ui.menu,name:event.menu_report_event_type_registration #: view:report.event.type.registration:0 msgid "Registration By Event Types" -msgstr "" +msgstr "Регистрация по типу событий" #. module: event #: model:ir.ui.menu,name:event.menu_event_config @@ -262,7 +262,7 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Parent Category" -msgstr "" +msgstr "Родительская категория" #. module: event #: view:event.registration:0 @@ -272,34 +272,34 @@ msgstr "" #. module: event #: field:report.event.type.registration,nbevent:0 msgid "Number Of Events" -msgstr "" +msgstr "Кол-во событий" #. module: event #: view:event.event:0 msgid "Cancel Event" -msgstr "" +msgstr "Отменить событие" #. module: event #: wizard_field:event.reg_make_invoice,init,inv_rej_reason:0 msgid "Error Messages" -msgstr "" +msgstr "Сообщения об ошибках" #. module: event #: view:event.event:0 msgid "Mailing" -msgstr "" +msgstr "Рассылка" #. module: event #: model:product.template,name:event.event_product_0_product_template msgid "Ticket for Concert" -msgstr "" +msgstr "Билет на концерт" #. module: event #: field:event.event,register_prospect:0 #: model:ir.actions.act_window,name:event.action_registration_draft #: model:ir.ui.menu,name:event.menu_action_registration_draft msgid "Unconfirmed Registrations" -msgstr "" +msgstr "Неподтвержденные регистрации" #. module: event #: field:event.registration,partner_invoice_id:0 @@ -309,22 +309,22 @@ msgstr "" #. module: event #: view:event.registration:0 msgid "Communication history" -msgstr "" +msgstr "Журнал переписки" #. module: event #: selection:event.event,state:0 msgid "Canceled" -msgstr "" +msgstr "Отменено" #. module: event #: view:event.event:0 msgid "Event Done" -msgstr "" +msgstr "Событие завершено" #. module: event #: field:event.registration,badge_name:0 msgid "Badge Name" -msgstr "" +msgstr "Имя на бэдже" #. module: event #: model:ir.actions.act_window,name:event.action_event_registration @@ -341,22 +341,22 @@ msgstr "" #. module: event #: wizard_field:event.reg_make_invoice,init,inv_created:0 msgid "Invoice Created" -msgstr "" +msgstr "Счет создан" #. module: event #: view:event.event:0 msgid "Statistics" -msgstr "" +msgstr "Статистика" #. module: event #: selection:event.event,state:0 msgid "Draft" -msgstr "" +msgstr "Черновик" #. module: event #: view:event.event:0 msgid "Event description" -msgstr "" +msgstr "Описание события" #. module: event #: model:ir.model,name:event.model_report_event_type_registration @@ -374,7 +374,7 @@ msgstr "" #. module: event #: field:event.registration,event_id:0 msgid "Event Related" -msgstr "" +msgstr "Относится к событию" #. module: event #: model:crm.case.section,name:event.case_section_event @@ -386,24 +386,24 @@ msgstr "События" #. module: event #: field:event.registration,nb_register:0 msgid "Number of Registration" -msgstr "" +msgstr "Кол-во регистраций" #. module: event #: view:event.event:0 #: field:event.event,state:0 #: view:event.registration:0 msgid "Status" -msgstr "" +msgstr "Состояние" #. module: event #: model:ir.actions.act_window,name:event.action_event_categories msgid "Events by section" -msgstr "" +msgstr "События по разделам" #. module: event #: model:ir.ui.menu,name:event.menu_action_registration msgid "All Registrations" -msgstr "" +msgstr "Все регистрации" #. module: event #: help:event.event,mail_auto_registr:0 @@ -414,29 +414,29 @@ msgstr "" #. module: event #: view:event.event:0 msgid "Set To Draft" -msgstr "" +msgstr "Установть в 'Черновик'" #. module: event #: view:event.registration:0 #: model:ir.actions.wizard,name:event.event_confirm_registration #: field:report.event.registration,confirm_state:0 msgid "Confirm Registration" -msgstr "" +msgstr "Подтвердить регистрацию" #. module: event #: view:event.registration:0 msgid "History" -msgstr "" +msgstr "Журнал" #. module: event #: model:ir.ui.menu,name:event.menu_event_type msgid "Types of Events" -msgstr "" +msgstr "Типы событий" #. module: event #: field:event.registration,contact_id:0 msgid "Partner Contact" -msgstr "" +msgstr "Контакт партнера" #. module: event #: view:event.event:0 @@ -447,28 +447,28 @@ msgstr "" #: view:event.event:0 #: view:event.registration:0 msgid "General" -msgstr "" +msgstr "Общее" #. module: event #: view:event.registration:0 msgid "Send Reminder" -msgstr "" +msgstr "Отправить напоминание" #. module: event #: selection:event.event,state:0 msgid "Done" -msgstr "" +msgstr "Выполнено" #. module: event #: field:event.event,date_begin:0 #: field:report.event.registration,date_begin:0 msgid "Beginning date" -msgstr "" +msgstr "Дата начала" #. module: event #: field:event.registration,invoice_id:0 msgid "Invoice" -msgstr "" +msgstr "Счет" #. module: event #: model:ir.model,name:event.model_report_event_registration @@ -478,28 +478,28 @@ msgstr "" #. module: event #: wizard_button:event.confirm_registration,split,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: event #: wizard_button:event.reg_make_invoice,init,open:0 msgid "Open" -msgstr "" +msgstr "Открыть" #. module: event #: field:event.registration,badge_title:0 msgid "Badge Title" -msgstr "" +msgstr "Должность на бэдже" #. module: event #: model:ir.actions.act_window,name:event.action_new_event_form #: model:ir.ui.menu,name:event.menu_event_new_event msgid "New event" -msgstr "" +msgstr "Новое событие" #. module: event #: field:event.registration,unit_price:0 msgid "Unit Price" -msgstr "" +msgstr "Цена за ед." #. module: event #: model:crm.case.section,name:event.event_2_crm_case_section @@ -509,24 +509,24 @@ msgstr "" #. module: event #: field:event.registration,badge_partner:0 msgid "Badge Partner" -msgstr "" +msgstr "Бэдж партнера" #. module: event #: model:ir.actions.act_window,name:event.action_event_view_confirm #: model:ir.ui.menu,name:event.menu_event_event_confirm msgid "Confirmed Events" -msgstr "" +msgstr "подтвержденные события" #. module: event #: field:event.event,register_max:0 #: field:report.event.registration,register_max:0 msgid "Maximum Registrations" -msgstr "" +msgstr "Макс. кол-во регистраций" #. module: event #: field:event.event,type:0 msgid "Type" -msgstr "" +msgstr "Тип" #. module: event #: help:event.event,mail_registr:0 @@ -536,17 +536,17 @@ msgstr "" #. module: event #: model:product.template,name:event.event_product_2_product_template msgid "Ticket for Conference" -msgstr "" +msgstr "Билет на конференцию" #. module: event #: field:event.registration,case_id:0 msgid "Case" -msgstr "" +msgstr "Вопрос" #. module: event #: view:event.event:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: event #: help:event.event,mail_auto_confirm:0 @@ -566,7 +566,7 @@ msgstr "" #. module: event #: field:event.event,product_id:0 msgid "Product" -msgstr "" +msgstr "Продукция" #. module: event #: field:event.registration,invoice_label:0 @@ -576,20 +576,20 @@ msgstr "" #. module: event #: view:event.registration:0 msgid "Payments" -msgstr "" +msgstr "Платежи" #. module: event #: view:event.type:0 #: field:report.event.type.registration,name:0 msgid "Event Type" -msgstr "" +msgstr "Тип события" #. module: event #: view:event.event:0 #: model:ir.actions.act_window,name:event.action_registration #: model:ir.actions.wizard,name:event.wizard_event_registration msgid "Registrations" -msgstr "" +msgstr "Регистрации" #. module: event #: model:ir.actions.act_window,name:event.action_event_view_draft @@ -600,12 +600,12 @@ msgstr "" #. module: event #: model:ir.ui.menu,name:event.menu_event_main msgid "Events Organisation" -msgstr "" +msgstr "Организация событий" #. module: event #: view:event.registration:0 msgid "Actions" -msgstr "" +msgstr "Действия" #. module: event #: model:ir.actions.wizard,name:event.wizard_event_reg_partners diff --git a/addons/hr_attendance/i18n/ru.po b/addons/hr_attendance/i18n/ru.po index f9b35e28107..8cf79393427 100644 --- a/addons/hr_attendance/i18n/ru.po +++ b/addons/hr_attendance/i18n/ru.po @@ -7,20 +7,20 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-04 06:32+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:42+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_attendance #: field:hr.employee,state:0 #: model:ir.model,name:hr_attendance.model_hr_attendance msgid "Attendance" -msgstr "" +msgstr "Посещаемость" #. module: hr_attendance #: constraint:ir.model:0 @@ -70,7 +70,7 @@ msgstr "Выход" #. module: hr_attendance #: rml:report.hr.timesheet.attendance.error:0 msgid "Delay" -msgstr "" +msgstr "Задержка" #. module: hr_attendance #: wizard_field:hr.si_so,init,name:0 @@ -93,7 +93,7 @@ msgstr "" #. module: hr_attendance #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: hr_attendance #: model:ir.actions.wizard,name:hr_attendance.print_week @@ -136,17 +136,17 @@ msgstr "Причина действия" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "March" -msgstr "" +msgstr "Март" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "August" -msgstr "" +msgstr "Август" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "May" -msgstr "" +msgstr "Май" #. module: hr_attendance #: wizard_field:hr.si_so,so_ask_si,last_time:0 @@ -156,7 +156,7 @@ msgstr "Ваш послежний вход" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "June" -msgstr "" +msgstr "Июнь" #. module: hr_attendance #: model:ir.actions.wizard,name:hr_attendance.print_month @@ -197,7 +197,7 @@ msgstr "Дата" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "July" -msgstr "" +msgstr "Июль" #. module: hr_attendance #: wizard_view:hr.si_so,si_ask_so:0 @@ -215,7 +215,7 @@ msgstr "" #: wizard_field:hr.attendance.print_week,init,init_date:0 #: wizard_field:hr.attendance.report,init,init_date:0 msgid "Starting Date" -msgstr "" +msgstr "Дата начала" #. module: hr_attendance #: selection:hr.employee,state:0 @@ -230,12 +230,12 @@ msgstr "Отсутствует" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "February" -msgstr "" +msgstr "Февраль" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "October" -msgstr "" +msgstr "Октябрь" #. module: hr_attendance #: wizard_field:hr.si_so,si_ask_so,last_time:0 @@ -267,7 +267,7 @@ msgstr "Вход" #. module: hr_attendance #: wizard_view:hr.attendance.report,init:0 msgid "Analysis Information" -msgstr "" +msgstr "Данные анализа" #. module: hr_attendance #: wizard_field:hr.si_so,init,state:0 @@ -277,12 +277,12 @@ msgstr "Текущее состояние" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "January" -msgstr "" +msgstr "Январь" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "April" -msgstr "" +msgstr "Апрель" #. module: hr_attendance #: model:ir.actions.act_window,name:hr_attendance.open_view_attendance @@ -316,7 +316,7 @@ msgstr "" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "November" -msgstr "" +msgstr "Ноябрь" #. module: hr_attendance #: wizard_view:hr.attendance.report,init:0 @@ -326,7 +326,7 @@ msgstr "" #. module: hr_attendance #: wizard_field:hr.attendance.report,init,max_delay:0 msgid "Max. Delay (Min)" -msgstr "" +msgstr "Макс. задержка (мин)" #. module: hr_attendance #: wizard_view:hr.attendance.print_week,init:0 @@ -337,7 +337,7 @@ msgstr "" #: wizard_field:hr.attendance.print_week,init,end_date:0 #: wizard_field:hr.attendance.report,init,end_date:0 msgid "Ending Date" -msgstr "" +msgstr "Дата окончания" #. module: hr_attendance #: wizard_view:hr.si_so,so_ask_si:0 @@ -351,12 +351,12 @@ msgstr "" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "September" -msgstr "" +msgstr "Сентябрь" #. module: hr_attendance #: selection:hr.attendance.print_month,init,month:0 msgid "December" -msgstr "" +msgstr "Декабрь" #. module: hr_attendance #: view:hr.attendance:0 @@ -366,12 +366,12 @@ msgstr "" #. module: hr_attendance #: wizard_view:hr.attendance.print_month,init:0 msgid "Select a month" -msgstr "" +msgstr "Выбрать месяц" #. module: hr_attendance #: wizard_field:hr.attendance.print_month,init,month:0 msgid "Month" -msgstr "" +msgstr "Месяц" #. module: hr_attendance #: model:ir.module.module,description:hr_attendance.module_meta_information @@ -386,7 +386,7 @@ msgstr "" #. module: hr_attendance #: wizard_field:hr.attendance.print_month,init,year:0 msgid "Year" -msgstr "" +msgstr "Год" #. module: hr_attendance #: wizard_button:hr.attendance.print_month,init,end:0 @@ -401,4 +401,4 @@ msgstr "Отмена" #. module: hr_attendance #: rml:report.hr.timesheet.attendance.error:0 msgid "Operation" -msgstr "" +msgstr "Операция" diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po index 1d77f541f3c..e02350dcb6d 100644 --- a/addons/hr_expense/i18n/ru.po +++ b/addons/hr_expense/i18n/ru.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-16 15:54+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-10 20:16+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_expense #: model:process.node,name:hr_expense.process_node_confirmedexpenses0 msgid "Confirmed Expenses" -msgstr "" +msgstr "Подтвержденные расходы" #. module: hr_expense #: model:ir.model,name:hr_expense.model_hr_expense_line @@ -72,7 +72,7 @@ msgstr "Все расходы" #. module: hr_expense #: model:process.node,name:hr_expense.process_node_approved0 msgid "Approved" -msgstr "" +msgstr "Утвержден" #. module: hr_expense #: field:hr.expense.line,uom_id:0 @@ -93,7 +93,7 @@ msgstr "Примечания" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Cancelled" -msgstr "" +msgstr "Отменен" #. module: hr_expense #: view:hr.expense.expense:0 @@ -106,6 +106,8 @@ msgid "" "Determine if the product can be visible in the list of product within a " "selection from an HR expense sheet line." msgstr "" +"Определите, что продукт может быть виден в списке продуктов при отборе из " +"списка расходов персонала." #. module: hr_expense #: selection:hr.expense.expense,state:0 @@ -122,7 +124,7 @@ msgstr "Ссылка" #. module: hr_expense #: rml:hr.expense:0 msgid "Certified honest and conform," -msgstr "Проверено и соотыетствует," +msgstr "Проверено и соответствует," #. module: hr_expense #: model:ir.actions.report.xml,name:hr_expense.hr_expenses @@ -132,7 +134,7 @@ msgstr "Распечатать расходы кадров" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_refuseexpense0 msgid "Refuse expense" -msgstr "" +msgstr "Неподтвержденные расходы" #. module: hr_expense #: view:hr.expense.expense:0 @@ -143,7 +145,7 @@ msgstr "Подтвердить" #. module: hr_expense #: model:process.node,note:hr_expense.process_node_supplierinvoice0 msgid "The accoutant validates the sheet" -msgstr "" +msgstr "Бухгалтер проверяет лист" #. module: hr_expense #: field:hr.expense.line,analytic_account:0 @@ -154,7 +156,7 @@ msgstr "Счет аналитики" #: model:process.node,name:hr_expense.process_node_supplierinvoice0 #: model:process.transition,name:hr_expense.process_transition_approveinvoice0 msgid "Supplier Invoice" -msgstr "" +msgstr "Счета поставщиков" #. module: hr_expense #: field:hr.expense.expense,state:0 @@ -170,17 +172,17 @@ msgstr "Сотрудник" #. module: hr_expense #: rml:hr.expense:0 msgid "Qty" -msgstr "" +msgstr "Кол-во" #. module: hr_expense #: rml:hr.expense:0 msgid "Total Price" -msgstr "" +msgstr "Итоговая цена" #. module: hr_expense #: model:process.node,note:hr_expense.process_node_reinvoicing0 msgid "Some costs may be reinvoices to the customer" -msgstr "" +msgstr "Некоторые расходы могут быть пересчитаны клиенту" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_my @@ -191,33 +193,33 @@ msgstr "Мои расходы" #. module: hr_expense #: field:hr.expense.expense,id:0 msgid "Sheet ID" -msgstr "ID отчета о оасходах" +msgstr "ID отчета о расходах" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_reimburseexpense0 msgid "Reimburse expense" -msgstr "" +msgstr "Возмещение расходов" #. module: hr_expense #: field:hr.expense.expense,journal_id:0 msgid "Force Journal" -msgstr "" +msgstr "Принудительно в журнал" #. module: hr_expense #: model:ir.actions.act_window,name:hr_expense.expense_my_new #: model:ir.ui.menu,name:hr_expense.menu_expense_my_new msgid "New Expenses Sheet" -msgstr "" +msgstr "Новый отчет о расходах" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_reimburseexpense0 msgid "After creating invoice, reimburse expenses" -msgstr "" +msgstr "После создания счета, возмещать расходы" #. module: hr_expense #: model:process.node,name:hr_expense.process_node_reimbursement0 msgid "Reimbursement" -msgstr "" +msgstr "Компенсации" #. module: hr_expense #: constraint:ir.ui.view:0 @@ -245,7 +247,7 @@ msgstr "Валюта" #. module: hr_expense #: model:process.node,note:hr_expense.process_node_draftexpenses0 msgid "Employee encode all his expenses" -msgstr "" +msgstr "Сотрудник описывает все свои расходы" #. module: hr_expense #: selection:hr.expense.expense,state:0 @@ -265,7 +267,7 @@ msgstr "Примечание" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_reimbursereinvoice0 msgid "Create Customer invoice" -msgstr "" +msgstr "Создать счет клиента" #. module: hr_expense #: selection:hr.expense.expense,state:0 @@ -283,22 +285,22 @@ msgstr "" #. module: hr_expense #: view:hr.expense.expense:0 msgid "Accounting data" -msgstr "Бухггалтерсике данные" +msgstr "Бухгалтерские данные" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_approveexpense0 msgid "Expense is approved." -msgstr "" +msgstr "Утвержденные расходы." #. module: hr_expense #: field:hr.expense.expense,amount:0 msgid "Total Amount" -msgstr "Итоговая сымма" +msgstr "Итоговая сумма" #. module: hr_expense #: model:process.node,name:hr_expense.process_node_draftexpenses0 msgid "Draft Expenses" -msgstr "" +msgstr "Плановые расходы" #. module: hr_expense #: field:hr.expense.expense,user_id:0 @@ -325,17 +327,17 @@ msgstr "Расходы отдела кадров" #. module: hr_expense #: field:hr.expense.expense,date_valid:0 msgid "Date Validated" -msgstr "" +msgstr "Дата проверки" #. module: hr_expense #: field:hr.expense.expense,account_move_id:0 msgid "Account Move" -msgstr "" +msgstr "Счет перемещения" #. module: hr_expense #: model:process.node,note:hr_expense.process_node_confirmedexpenses0 msgid "The employee validates his expense sheet" -msgstr "" +msgstr "Сотрудник проверяет свой отчет о расходах" #. module: hr_expense #: model:process.node,note:hr_expense.process_node_refused0 @@ -379,12 +381,12 @@ msgstr "Отмена" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_reimbursereinvoice0 msgid "Reinvoice" -msgstr "" +msgstr "Пересчитать" #. module: hr_expense #: model:process.process,name:hr_expense.process_process_expenseprocess0 msgid "Expense Process" -msgstr "" +msgstr "Процесс расходов" #. module: hr_expense #: view:hr.expense.expense:0 @@ -400,12 +402,12 @@ msgstr "Черновик расходов" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_confirmexpense0 msgid "Confirm expense" -msgstr "" +msgstr "Подтвердить расход" #. module: hr_expense #: model:process.transition,name:hr_expense.process_transition_approveexpense0 msgid "Approve expense" -msgstr "" +msgstr "Утвердить расход" #. module: hr_expense #: view:hr.expense.expense:0 @@ -416,12 +418,12 @@ msgstr "Принять" #. module: hr_expense #: rml:hr.expense:0 msgid "This document must be dated and signed for reimbursement" -msgstr "" +msgstr "Этот документ должен быть датирован и подписан на возмещение" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_refuseexpense0 msgid "Expense is refused." -msgstr "" +msgstr "Неподтвержденные орасходы" #. module: hr_expense #: rml:hr.expense:0 @@ -464,22 +466,22 @@ msgstr "Отклонено" #. module: hr_expense #: field:product.product,hr_expense_ok:0 msgid "Can be Expensed" -msgstr "" +msgstr "Может быть расходом" #. module: hr_expense #: rml:hr.expense:0 msgid "Ref." -msgstr "" +msgstr "Ссылка" #. module: hr_expense #: field:hr.expense.expense,user_valid:0 msgid "Validation User" -msgstr "" +msgstr "Проверка пользователя" #. module: hr_expense #: rml:hr.expense:0 msgid "(Date and signature)" -msgstr "" +msgstr "(Дата и подпись)" #. module: hr_expense #: rml:hr.expense:0 @@ -494,12 +496,12 @@ msgstr "Краткое описание" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_approveinvoice0 msgid "Creates supplier invoice." -msgstr "" +msgstr "Создает поставщику счет." #. module: hr_expense #: model:process.node,note:hr_expense.process_node_approved0 msgid "The direct manager approves the sheet" -msgstr "" +msgstr "Руководитель утверждает отчет" #. module: hr_expense #: field:hr.expense.line,sequence:0 @@ -509,7 +511,7 @@ msgstr "Последовательность" #. module: hr_expense #: model:process.transition,note:hr_expense.process_transition_confirmexpense0 msgid "Expense is confirmed." -msgstr "" +msgstr "Расход подтверждается" #. module: hr_expense #: view:hr.expense.expense:0 @@ -525,4 +527,4 @@ msgstr "Всего" #. module: hr_expense #: model:process.node,name:hr_expense.process_node_reinvoicing0 msgid "Reinvoicing" -msgstr "" +msgstr "Перевыставление счета" diff --git a/addons/hr_holidays/i18n/ru.po b/addons/hr_holidays/i18n/ru.po index 0da5931fdf5..8bd39b95bc3 100644 --- a/addons/hr_holidays/i18n/ru.po +++ b/addons/hr_holidays/i18n/ru.po @@ -8,54 +8,54 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-05 14:58+0000\n" -"Last-Translator: Dmitry Klimanov <k-dmitry2@narod.ru>\n" +"PO-Revision-Date: 2010-07-10 19:59+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new msgid "New Holidays Request" -msgstr "" +msgstr "Новое заявление на отпуск" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday msgid "All Holidays Requests" -msgstr "" +msgstr "Все заявления на отпуск" #. module: hr_holidays #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: hr_holidays #: field:hr.holidays.per.user,remaining_leaves:0 msgid "Remaining Leaves" -msgstr "" +msgstr "Оставшиеся отпуска" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting msgid "Requests Awaiting for Validation" -msgstr "" +msgstr "Заявления, ожидающие проверки" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Blue" -msgstr "" +msgstr "Светло-синий" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Brown" -msgstr "" +msgstr "Коричневый" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "of the" -msgstr "" +msgstr "из" #. module: hr_holidays #: xsl:holidays.summary:0 @@ -67,7 +67,7 @@ msgstr "" #: view:hr.holidays.per.user:0 #: model:process.transition,name:hr_holidays.process_transition_employeeholidays0 msgid "Employee Holidays" -msgstr "" +msgstr "Отпуска сотрудника" #. module: hr_holidays #: view:hr.holidays:0 @@ -80,27 +80,27 @@ msgstr "" #: model:ir.model,name:hr_holidays.model_hr_holidays #: model:process.node,name:hr_holidays.process_node_holidays0 msgid "Holidays" -msgstr "" +msgstr "Отпуска" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "to" -msgstr "" +msgstr "до" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Cyan" -msgstr "" +msgstr "Светло-голубой" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Green" -msgstr "" +msgstr "Светло-зеленый" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0 msgid "Employee Declaration" -msgstr "" +msgstr "Заявления сотрудника" #. module: hr_holidays #: view:hr.holidays:0 @@ -112,91 +112,91 @@ msgstr "Проверить" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_refusedrequest0 msgid "Refused Request" -msgstr "" +msgstr "Запрос, которому отказывают." #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_approved0 msgid "Approved" -msgstr "" +msgstr "Утвержденный" #. module: hr_holidays #: selection:hr.holidays.summary.employee,init,holiday_type:0 msgid "Both" -msgstr "" +msgstr "Оба" #. module: hr_holidays #: view:hr.holidays:0 msgid "Refuse" -msgstr "" +msgstr "Отклонить" #. module: hr_holidays #: wizard_button:hr.holidays.summary,notify,end:0 #: wizard_button:hr.holidays.summary.employee,notify,end:0 msgid "Ok" -msgstr "" +msgstr "Ок" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday msgid "My Holidays Requests" -msgstr "" +msgstr "Мои заявления на отпуск" #. module: hr_holidays #: field:hr.holidays,notes:0 #: field:hr.holidays.per.user,notes:0 msgid "Notes" -msgstr "" +msgstr "Примечания" #. module: hr_holidays #: field:hr.holidays,holiday_status:0 #: field:hr.holidays.log,holiday_status:0 #: field:hr.holidays.per.user,holiday_status:0 msgid "Holiday's Status" -msgstr "" +msgstr "Статус отпуска" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_refusedrequest0 msgid "Request is refused." -msgstr "" +msgstr "На запрос отказано." #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays msgid "Holidays Management" -msgstr "" +msgstr "Управление отпусками" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "Analyze from" -msgstr "" +msgstr "Анализировать с" #. module: hr_holidays #: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary msgid "Summary Of Holidays" -msgstr "" +msgstr "Сводка отпусков" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_calendar0 msgid "The holiday is set in the calendar" -msgstr "" +msgstr "Отпуск установлен в календаре" #. module: hr_holidays #: view:hr.holidays.status:0 msgid "Holiday status" -msgstr "" +msgstr "Статус отпуска" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_status msgid "Holidays Status" -msgstr "" +msgstr "Статус отпусков" #. module: hr_holidays #: field:hr.holidays,date_to:0 msgid "Vacation end day" -msgstr "" +msgstr "Последний день отпуска" #. module: hr_holidays #: view:hr.holidays.per.user:0 msgid "Holidays Allowed" -msgstr "" +msgstr "Разрешено отпусков" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_legaldeclaration0 @@ -206,12 +206,12 @@ msgstr "" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Magenta" -msgstr "" +msgstr "Пурпурный" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_per_user msgid "Holidays Per User" -msgstr "" +msgstr "Отпусков на пользователя" #. module: hr_holidays #: view:hr.holidays.status:0 @@ -222,13 +222,13 @@ msgstr "" #: selection:hr.holidays.summary,init,holiday_type:0 #: selection:hr.holidays.summary.employee,init,holiday_type:0 msgid "Confirmed" -msgstr "" +msgstr "Подтверждено" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,date_from:0 #: wizard_field:hr.holidays.summary.employee,init,date_from:0 msgid "From" -msgstr "" +msgstr "От" #. module: hr_holidays #: view:hr.holidays:0 @@ -240,12 +240,12 @@ msgstr "Подтвердить" #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting msgid "My Awaiting Confirmation Holidays Requests" -msgstr "" +msgstr "Мои заявления на отпуск в ожидании подтверждения" #. module: hr_holidays #: field:hr.holidays,user_id:0 msgid "Employee_id" -msgstr "" +msgstr "ID сотрудника" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_holidaysdefinition0 @@ -257,7 +257,7 @@ msgstr "" #: field:hr.holidays.log,employee_id:0 #: field:hr.holidays.per.user,employee_id:0 msgid "Employee" -msgstr "" +msgstr "Сотрудник" #. module: hr_holidays #: selection:hr.holidays,state:0 @@ -272,12 +272,12 @@ msgstr "" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Salmon" -msgstr "" +msgstr "Светлый оранжево-розовый" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Wheat" -msgstr "" +msgstr "Пшеничный" #. module: hr_holidays #: field:hr.holidays.log,nb_holidays:0 @@ -287,26 +287,26 @@ msgstr "" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request msgid "My Holiday Requests" -msgstr "" +msgstr "Мои запросы отпусков" #. module: hr_holidays #: view:hr.holidays:0 #: view:hr.holidays.per.user:0 msgid "Number of Days" -msgstr "" +msgstr "Кол-во дней" #. module: hr_holidays #: field:hr.holidays.status,name:0 #: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status #: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status msgid "Holiday Status" -msgstr "" +msgstr "Статус отпуска" #. module: hr_holidays #: wizard_view:hr.holidays.summary,init:0 #: wizard_view:hr.holidays.summary.employee,init:0 msgid "Report Options" -msgstr "" +msgstr "Параметры отчета" #. module: hr_holidays #: constraint:ir.ui.view:0 @@ -316,39 +316,39 @@ msgstr "Неправильный XML для просмотра архитект #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_approved0 msgid "His manager approves the request" -msgstr "" +msgstr "Его менеджер одобряет запрос" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0 msgid "If holidays available, employee can take it and fill it." -msgstr "" +msgstr "Если доступен отпуск, служащий может взять и заполнить это." #. module: hr_holidays #: wizard_view:hr.holidays.summary.employee,notify:0 msgid "You have to select at least 1 Employee. Try again." -msgstr "" +msgstr "Выберите хотя бы 1 сотрудника. Повторите попытку." #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate msgid "My Validated Holidays Requests" -msgstr "" +msgstr "Мои проверенные заявления на отпуск" #. module: hr_holidays #: wizard_field:hr.holidays.summary.employee,init,emp:0 msgid "Employee(s)" -msgstr "" +msgstr "Сотрудник(и)" #. module: hr_holidays #: field:hr.holidays,number_of_days:0 msgid "Number of Days in this Holiday Request" -msgstr "" +msgstr "Количество дней в данном заявлении на отпуск" #. module: hr_holidays #: view:hr.holidays.per.user:0 #: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user #: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user msgid "Holidays Per Employee" -msgstr "" +msgstr "Отпусков на сотрудника" #. module: hr_holidays #: field:hr.holidays.status,limit:0 @@ -358,32 +358,32 @@ msgstr "" #. module: hr_holidays #: field:hr.holidays.log,holiday_user_id:0 msgid "Holidays user" -msgstr "" +msgstr "Отпуска пользователя" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Lavender" -msgstr "" +msgstr "Бледно-лиловый" #. module: hr_holidays #: model:ir.model,name:hr_holidays.model_hr_holidays_log msgid "hr.holidays.log" -msgstr "" +msgstr "Регистрация отпусков" #. module: hr_holidays #: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary msgid "Print Summary of Employee's Holidays" -msgstr "" +msgstr "Распечатать сводку отпусков сотрудников" #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_calendar0 msgid "Calendar" -msgstr "" +msgstr "Календарь" #. module: hr_holidays #: field:hr.holidays,date_from:0 msgid "Vacation start day" -msgstr "" +msgstr "Первый день отпуска" #. module: hr_holidays #: model:ir.module.module,description:hr_holidays.module_meta_information @@ -426,159 +426,159 @@ msgstr "" #: wizard_view:hr.holidays.summary,notify:0 #: wizard_view:hr.holidays.summary.employee,notify:0 msgid "Notification" -msgstr "" +msgstr "Уведомление" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_holidaysrequest0 msgid "Employee fills in a request for holidays" -msgstr "" +msgstr "Сотрудник заполняется в запросе об отпусках" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_setholiday0 msgid "Holiday is set in the calendar." -msgstr "" +msgstr "Отпуск установлен в календаре." #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Coral" -msgstr "" +msgstr "Светло-коралловый" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available msgid "My Available Holidays" -msgstr "" +msgstr "Мои доступные отпуска" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Black" -msgstr "" +msgstr "Черный" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse msgid "My Refused Holidays Requests" -msgstr "" +msgstr "Мои отклоненные заявления на отпуск" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_setholiday0 msgid "Set Holiday" -msgstr "" +msgstr "Установить отпуск" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft msgid "My Draft Holidays Requests" -msgstr "" +msgstr "Мои черновые заявления на отпуск" #. module: hr_holidays #: field:hr.holidays.per.user,max_leaves:0 msgid "Maximum Leaves Allowed" -msgstr "" +msgstr "Максимально позволенные отпуска" #. module: hr_holidays #: field:hr.holidays,state:0 msgid "Status" -msgstr "" +msgstr "Состояние" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Ivory" -msgstr "" +msgstr "Слоновой кости" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday msgid "My Holidays Request" -msgstr "" +msgstr "Мои заявления на отпуск" #. module: hr_holidays #: field:hr.holidays.status,color_name:0 msgid "Color of the status" -msgstr "" +msgstr "Цвет статуса" #. module: hr_holidays #: selection:hr.holidays.summary,init,holiday_type:0 msgid "Both Validated and Confirmed" -msgstr "" +msgstr "Оба Утвержденные и Подтвержденные" #. module: hr_holidays #: field:hr.holidays.per.user,leaves_taken:0 msgid "Leaves Already Taken" -msgstr "" +msgstr "Отпуска, уже взятые" #. module: hr_holidays #: xsl:holidays.summary:0 msgid "holidays." -msgstr "" +msgstr "отпусков." #. module: hr_holidays #: selection:hr.holidays,state:0 msgid "draft" -msgstr "" +msgstr "черновик" #. module: hr_holidays #: field:hr.holidays.per.user,user_id:0 msgid "User" -msgstr "" +msgstr "Пользователь" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0 msgid "Document for employee" -msgstr "" +msgstr "Документ для сотрудника" #. module: hr_holidays #: field:hr.holidays.log,date:0 msgid "Date" -msgstr "" +msgstr "Дата" #. module: hr_holidays #: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0 msgid "Reufse" -msgstr "" +msgstr "Отказать" #. module: hr_holidays #: field:hr.holidays.status,section_id:0 msgid "Section" -msgstr "" +msgstr "Раздел" #. module: hr_holidays #: field:hr.holidays,manager_id:0 msgid "Holiday manager" -msgstr "" +msgstr "Ответственный за график отпусков" #. module: hr_holidays #: field:hr.holidays.per.user,active:0 #: field:hr.holidays.status,active:0 msgid "Active" -msgstr "" +msgstr "Активно" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft msgid "My Holidays Request Draft" -msgstr "" +msgstr "Мой черновик заявления на отпуск" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_approvedrequest0 msgid "Approved Request" -msgstr "" +msgstr "Одобренный Запрос" #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_holidaysrequest0 msgid "Holidays Request" -msgstr "" +msgstr "Заявление на отпуск" #. module: hr_holidays #: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting msgid "Holidays Requests Awaiting for Validation" -msgstr "" +msgstr "Заявления на отпуск в ожидании проверки" #. module: hr_holidays #: view:hr.holidays:0 msgid "General" -msgstr "" +msgstr "Общие" #. module: hr_holidays #: view:hr.holidays.per.user:0 msgid "General Information" -msgstr "" +msgstr "Общая информация" #. module: hr_holidays #: view:hr.holidays:0 @@ -586,23 +586,23 @@ msgstr "" #: wizard_button:hr.holidays.summary,init,end:0 #: wizard_button:hr.holidays.summary.employee,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: hr_holidays #: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0 msgid "Holidays def Request" -msgstr "" +msgstr "Определение запросов на отпуск" #. module: hr_holidays #: selection:hr.holidays.summary,init,holiday_type:0 #: selection:hr.holidays.summary.employee,init,holiday_type:0 msgid "Validated" -msgstr "" +msgstr "Проверено" #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse msgid "My Holidays Request Refused" -msgstr "" +msgstr "Мои отклоненные заявления на отпуск" #. module: hr_holidays #: constraint:ir.model:0 @@ -616,23 +616,23 @@ msgstr "" #: wizard_button:hr.holidays.summary,init,checkdept:0 #: wizard_button:hr.holidays.summary.employee,init,checkemp:0 msgid "Print" -msgstr "" +msgstr "Печать" #. module: hr_holidays #: model:ir.actions.wizard,name:hr_holidays.holidays_summary #: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary msgid "Print Summary of Holidays" -msgstr "" +msgstr "Распечатать сводку отпустков" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,depts:0 msgid "Department(s)" -msgstr "" +msgstr "Отдел(ы)" #. module: hr_holidays #: field:hr.holidays,name:0 msgid "Description" -msgstr "" +msgstr "Описание" #. module: hr_holidays #: selection:hr.holidays,state:0 @@ -643,23 +643,23 @@ msgstr "Отклонено" #. module: hr_holidays #: model:process.transition,note:hr_holidays.process_transition_approvedrequest0 msgid "Request is approved." -msgstr "" +msgstr "Запрос одобрен." #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_holidaysdefinition0 msgid "Holidays Definition" -msgstr "" +msgstr "Определение отпусков" #. module: hr_holidays #: wizard_field:hr.holidays.summary,init,holiday_type:0 #: wizard_field:hr.holidays.summary.employee,init,holiday_type:0 msgid "Select Holiday Type" -msgstr "" +msgstr "Выбор типа отпуска" #. module: hr_holidays #: field:hr.holidays,case_id:0 msgid "Case" -msgstr "" +msgstr "Вопрос" #. module: hr_holidays #: field:hr.holidays,holiday_user_id:0 @@ -669,7 +669,7 @@ msgstr "" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_holidays0 msgid "Encode number of available holidays" -msgstr "" +msgstr "Расшифровать число имеющихся отпусков" #. module: hr_holidays #: model:process.node,name:hr_holidays.process_node_legaldeclaration0 @@ -679,12 +679,12 @@ msgstr "" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Violet" -msgstr "" +msgstr "Фиолетовый" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Red" -msgstr "" +msgstr "Красный" #. module: hr_holidays #: model:ir.module.module,shortdesc:hr_holidays.module_meta_information @@ -694,34 +694,34 @@ msgstr "" #. module: hr_holidays #: model:process.process,name:hr_holidays.process_process_holidaysprocess0 msgid "Holidays Process" -msgstr "" +msgstr "Процесс отпусков" #. module: hr_holidays #: wizard_view:hr.holidays.summary,notify:0 msgid "You have to select at least 1 Department. Try again." -msgstr "" +msgstr "Вы должны выбрать по крайней мере один отдел. Попробуйте еще раз." #. module: hr_holidays #: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate msgid "My Holidays Request Validated" -msgstr "" +msgstr "Мои проверенные заявления на отпуск" #. module: hr_holidays #: field:hr.holidays.log,holiday_req_id:0 msgid "Holiday Request ID" -msgstr "" +msgstr "ID запроса на отпуск" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Yellow" -msgstr "" +msgstr "Светло-желтый" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 msgid "Light Pink" -msgstr "" +msgstr "Светло-розовый" #. module: hr_holidays #: model:process.node,note:hr_holidays.process_node_refused0 msgid "His manager refuses the request" -msgstr "" +msgstr "Его менеджер отказывает по запросу" diff --git a/addons/hr_timesheet/i18n/ru.po b/addons/hr_timesheet/i18n/ru.po index eb42fb4f1cf..25d2cc311d4 100644 --- a/addons/hr_timesheet/i18n/ru.po +++ b/addons/hr_timesheet/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0_rc3\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-16 14:20+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:49+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet @@ -75,7 +75,7 @@ msgstr "Текущая дата" #. module: hr_timesheet #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: hr_timesheet #: wizard_button:hr.analytical.timesheet,init,report:0 @@ -120,7 +120,7 @@ msgstr "Книга аналитики" #. module: hr_timesheet #: model:product.uom,name:hr_timesheet.uom_hour msgid "Hour" -msgstr "" +msgstr "Час" #. module: hr_timesheet #: model:ir.actions.wizard,name:hr_timesheet.wizard_hr_timesheet @@ -214,7 +214,7 @@ msgstr "Общая стоимость" #. module: hr_timesheet #: model:product.uom,name:hr_timesheet.uom_day msgid "Day" -msgstr "" +msgstr "День" #. module: hr_timesheet #: wizard_field:hr_timesheet.si_so,sign_in,date:0 @@ -242,6 +242,8 @@ msgstr "Позиция аналитики" #: constraint:product.template:0 msgid "Error: UOS must be in a different category than the UOM" msgstr "" +"Ошибка. Единицы продажи и единицы измерения должны принадлежать к разным " +"категориям." #. module: hr_timesheet #: wizard_view:hr.analytical.timesheet_users,init:0 @@ -448,7 +450,7 @@ msgstr "Пользователи" #. module: hr_timesheet #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime msgid "Working Time" -msgstr "" +msgstr "Время работы" #. module: hr_timesheet #: view:account.analytic.account:0 diff --git a/addons/hr_timesheet_invoice/i18n/ru.po b/addons/hr_timesheet_invoice/i18n/ru.po index deaef481ad7..ea53d6001a2 100644 --- a/addons/hr_timesheet_invoice/i18n/ru.po +++ b/addons/hr_timesheet_invoice/i18n/ru.po @@ -1,19 +1,19 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * hr_timesheet_invoice +# * hr_timesheet_invoice # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 12:56+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 09:48+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:11+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet_invoice @@ -111,7 +111,7 @@ msgstr "" #. module: hr_timesheet_invoice #: wizard_button:hr.timesheet.invoice.create,init,create:0 msgid "Create Invoices" -msgstr "" +msgstr "Создать счета" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 @@ -141,7 +141,7 @@ msgstr "Нужна ли детализация по уаждой позиции #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Date or Code" -msgstr "" +msgstr "Дата или Код" #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree @@ -201,7 +201,7 @@ msgstr "" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Printing date" -msgstr "" +msgstr "Дата печати" #. module: hr_timesheet_invoice #: constraint:ir.ui.view:0 @@ -223,7 +223,7 @@ msgstr "Теоретическая" #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced_my #: model:ir.ui.menu,name:hr_timesheet_invoice.menu_hr_analytic_timesheet_tree_invoiced_my msgid "My Uninvoiced Entries" -msgstr "" +msgstr "Мои необработанные записи" #. module: hr_timesheet_invoice #: wizard_field:hr.timesheet.final.invoice.create,init,name:0 @@ -239,7 +239,7 @@ msgstr "" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Currency" -msgstr "" +msgstr "Валюта" #. module: hr_timesheet_invoice #: help:hr.timesheet.invoice.create,init,product:0 @@ -277,17 +277,17 @@ msgstr "От" #. module: hr_timesheet_invoice #: help:account.analytic.account,amount_invoiced:0 msgid "Total invoiced" -msgstr "" +msgstr "Сумма счета" #. module: hr_timesheet_invoice #: view:account.analytic.account:0 msgid "Status" -msgstr "" +msgstr "Состояние" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Period to" -msgstr "" +msgstr "Период по" #. module: hr_timesheet_invoice #: help:hr.timesheet.final.invoice.create,init,balance_product:0 @@ -330,7 +330,7 @@ msgstr "Счета аналитики" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 msgid "Total:" -msgstr "" +msgstr "Всего:" #. module: hr_timesheet_invoice #: rml:hr.timesheet.invoice.account.analytic.account.cost_ledger:0 @@ -355,7 +355,7 @@ msgstr "" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "Totals:" -msgstr "" +msgstr "Итоги:" #. module: hr_timesheet_invoice #: wizard_field:account.analytic.profit,init,date_to:0 @@ -426,7 +426,7 @@ msgstr "Продукция" #. module: hr_timesheet_invoice #: rml:account.analytic.profit:0 msgid "%" -msgstr "" +msgstr "%" #. module: hr_timesheet_invoice #: field:hr_timesheet_invoice.factor,name:0 @@ -499,7 +499,7 @@ msgid "Max. Quantity" msgstr "Макс. кол-во" #. module: hr_timesheet_invoice -#: field:report.account.analytic.line.to.invoice,account_id:0 +#: field:report.analytic.account.close,name:0 msgid "Analytic account" msgstr "Счет аналитики" @@ -516,7 +516,7 @@ msgstr "Срок" #. module: hr_timesheet_invoice #: model:ir.module.module,shortdesc:hr_timesheet_invoice.module_meta_information msgid "Analytic Account Reporting" -msgstr "" +msgstr "Отчет аналитического профиля" #. module: hr_timesheet_invoice #: field:report.analytic.account.close,partner_id:0 @@ -565,7 +565,7 @@ msgstr "Месяц" #. module: hr_timesheet_invoice #: field:report.account.analytic.line.to.invoice,amount:0 msgid "Amount" -msgstr "Сумма" +msgstr "Количество" #. module: hr_timesheet_invoice #: model:ir.model,name:hr_timesheet_invoice.model_report_account_analytic_line_to_invoice @@ -575,7 +575,7 @@ msgstr "Отчет по позициям аналитики к выставле #. module: hr_timesheet_invoice #: field:report.account.analytic.line.to.invoice,product_uom_id:0 msgid "UoM" -msgstr "Ед. изм." +msgstr "Ед-ца изм." #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_date_stat_my @@ -646,7 +646,7 @@ msgstr "Дневной табель по счетам" #. module: hr_timesheet_invoice #: field:random.timesheet.lines,name:0 field:report.random.timesheet,name:0 msgid "Description" -msgstr "" +msgstr "Описание" #. module: hr_timesheet_invoice #: model:ir.model,name:report_timesheet_invoice.model_report_timesheet_account @@ -667,7 +667,7 @@ msgstr "Табели по счетам" #. module: hr_timesheet_invoice #: model:ir.ui.menu,name:report_timesheet_invoice.next_id_69 msgid "This Month" -msgstr "Данный месяц" +msgstr "Этот месяц" #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_account_stat_my @@ -767,12 +767,12 @@ msgstr "" #: field:report_timesheet.account,account_id:0 #: field:report_timesheet.account.date,account_id:0 msgid "Analytic Account" -msgstr "Счет аналитики" +msgstr "Счет аналитического учета" #. module: hr_timesheet_invoice #: field:report_timesheet.invoice,manager_id:0 msgid "Manager" -msgstr "Начальник" +msgstr "Менеджер" #. module: hr_timesheet_invoice #: model:ir.actions.act_window,name:report_timesheet_invoice.action_timesheet_user_stat diff --git a/addons/hr_timesheet_sheet/i18n/ru.po b/addons/hr_timesheet_sheet/i18n/ru.po index 5a44abd65d7..442be817098 100644 --- a/addons/hr_timesheet_sheet/i18n/ru.po +++ b/addons/hr_timesheet_sheet/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 11:45+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:44+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: hr_timesheet_sheet @@ -39,7 +39,7 @@ msgstr "Табель" #. module: hr_timesheet_sheet #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,total_attendance:0 @@ -311,7 +311,7 @@ msgstr "Перейти к:" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_phonecall0 msgid "Phone call" -msgstr "" +msgstr "Телефонный звонок" #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,total_timesheet:0 @@ -344,7 +344,7 @@ msgstr "" #: model:process.node,name:hr_timesheet_sheet.process_node_review0 #: model:process.transition.action,name:hr_timesheet_sheet.process_transition_action_reviewtimesheet0 msgid "Review" -msgstr "" +msgstr "Обзор" #. module: hr_timesheet_sheet #: selection:hr_timesheet_sheet.sheet,state:0 @@ -447,7 +447,7 @@ msgstr "" #. module: hr_timesheet_sheet #: model:process.node,name:hr_timesheet_sheet.process_node_timesheetline0 msgid "Timesheet Line" -msgstr "" +msgstr "Строка табеля" #. module: hr_timesheet_sheet #: view:hr_timesheet_sheet.sheet.account:0 diff --git a/addons/l10n_be/i18n/ru.po b/addons/l10n_be/i18n/ru.po index ef6920dff64..7df2c4bf12e 100644 --- a/addons/l10n_be/i18n/ru.po +++ b/addons/l10n_be/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-11-17 06:56+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 09:51+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:12+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: l10n_be @@ -31,7 +31,7 @@ msgstr "" #: wizard_view:vat.intra.xml,go:0 #: wizard_view:wizard.account.xml.vat.declaration,go:0 msgid "Notification" -msgstr "" +msgstr "Уведомления" #. module: l10n_be #: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_1 @@ -51,7 +51,7 @@ msgstr "" #. module: l10n_be #: model:account.account.type,name:l10n_be.user_type_charge msgid "Charge" -msgstr "" +msgstr "Затраты" #. module: l10n_be #: model:account.fiscal.position.template,name:l10n_be.fiscal_position_template_3 @@ -68,14 +68,14 @@ msgstr "Создать XML" #. module: l10n_be #: model:account.account.type,name:l10n_be.user_type_capitaux msgid "Capital" -msgstr "" +msgstr "Столица" #. module: l10n_be #: wizard_field:list.vat.detail,go,msg:0 #: wizard_field:vat.intra.xml,go,msg:0 #: wizard_field:wizard.account.xml.vat.declaration,go,msg:0 msgid "File created" -msgstr "" +msgstr "Файл создан" #. module: l10n_be #: selection:vat.intra.xml,init,trimester:0 @@ -102,7 +102,7 @@ msgstr "" #: wizard_field:vat.intra.xml,go,file_save:0 #: wizard_field:wizard.account.xml.vat.declaration,go,file_save:0 msgid "Save File" -msgstr "" +msgstr "Сохранить файл" #. module: l10n_be #: wizard_view:vat.intra.xml,init:0 @@ -165,7 +165,7 @@ msgstr "" #: wizard_button:vat.intra.xml,go,end:0 #: wizard_button:wizard.account.xml.vat.declaration,go,end:0 msgid "Ok" -msgstr "" +msgstr "Ок" #. module: l10n_be #: wizard_view:list.vat.detail,init:0 @@ -189,7 +189,7 @@ msgstr "" #: wizard_field:list.vat.detail,init,fyear:0 #: wizard_field:vat.intra.xml,init,fyear:0 msgid "Fiscal Year" -msgstr "" +msgstr "Финансовый год" #. module: l10n_be #: wizard_view:wizard.account.xml.vat.declaration,go:0 @@ -233,23 +233,23 @@ msgstr "" #. module: l10n_be #: model:account.account.type,name:l10n_be.user_type_tax msgid "Tax" -msgstr "" +msgstr "Налог" #. module: l10n_be #: wizard_field:wizard.account.xml.vat.declaration,init,period:0 msgid "Period" -msgstr "" +msgstr "Период" #. module: l10n_be #: wizard_view:vat.intra.xml,init:0 #: wizard_field:vat.intra.xml,init,country_ids:0 msgid "European Countries" -msgstr "" +msgstr "Европейские страны" #. module: l10n_be #: wizard_view:vat.intra.xml,init:0 msgid "General Information" -msgstr "" +msgstr "Общая информация" #. module: l10n_be #: wizard_view:list.vat.detail,go:0 @@ -267,7 +267,7 @@ msgstr "Финансист" #: wizard_button:vat.intra.xml,init,end:0 #: wizard_button:wizard.account.xml.vat.declaration,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: l10n_be #: model:ir.actions.wizard,name:l10n_be.partner_vat_intra diff --git a/addons/l10n_ch/i18n/ru.po b/addons/l10n_ch/i18n/ru.po index 9c92af3de7f..dc85c49dd0c 100644 --- a/addons/l10n_ch/i18n/ru.po +++ b/addons/l10n_ch/i18n/ru.po @@ -7,24 +7,24 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-10 14:25+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:54+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Invoice Date:" -msgstr "" +msgstr "Дата счета:" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "-" -msgstr "" +msgstr "-" #. module: l10n_ch #: field:account.journal.todo,name:0 @@ -34,7 +34,7 @@ msgstr "" #. module: l10n_ch #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: l10n_ch #: model:res.partner.bank.type,name:l10n_ch.bvrpost @@ -45,7 +45,7 @@ msgstr "" #: rml:l10n_ch.bvr:0 #: rml:l10n_ch.invoice.bvr:0 msgid "Mail:" -msgstr "" +msgstr "Mail:" #. module: l10n_ch #: model:ir.actions.wizard,name:l10n_ch.wizard_bvr_import @@ -56,12 +56,12 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.bvr:0 msgid "Thanks," -msgstr "" +msgstr "Благодарю," #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Base" -msgstr "" +msgstr "Базовый" #. module: l10n_ch #: model:ir.actions.report.xml,name:l10n_ch.account_invoice_bvr @@ -71,7 +71,7 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Refund" -msgstr "" +msgstr "Возвраты" #. module: l10n_ch #: model:res.partner.title,name:l10n_ch.res_c_partner_title_mlle @@ -87,7 +87,7 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Amount" -msgstr "" +msgstr "Количество" #. module: l10n_ch #: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvbank @@ -96,7 +96,7 @@ msgstr "" #: model:res.partner.bank.type.field,name:l10n_ch.bank_field_bvrpost #: model:res.partner.bank.type.field,name:l10n_ch.bank_field_iban msgid "bank" -msgstr "" +msgstr "банк" #. module: l10n_ch #: model:ir.actions.wizard,name:l10n_ch.wizard_bvr_check_report @@ -106,7 +106,7 @@ msgstr "" #. module: l10n_ch #: wizard_button:account.dta_create,init,end:0 msgid "OK" -msgstr "" +msgstr "Ок" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 @@ -116,7 +116,7 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Tax" -msgstr "" +msgstr "Налог" #. module: l10n_ch #: field:res.partner.bank,bvr_number:0 @@ -146,7 +146,7 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Disc. (%)" -msgstr "" +msgstr "Скидка (%)" #. module: l10n_ch #: help:account.journal.todo,name:0 @@ -156,12 +156,12 @@ msgstr "" #. module: l10n_ch #: view:account.journal.todo:0 msgid "Next" -msgstr "" +msgstr "Далее" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Supplier Invoice" -msgstr "" +msgstr "Счета поставщиков" #. module: l10n_ch #: constraint:res.partner:0 @@ -183,7 +183,7 @@ msgstr "" #: rml:l10n_ch.bvr:0 #: rml:l10n_ch.invoice.bvr:0 msgid "+" -msgstr "" +msgstr "+" #. module: l10n_ch #: model:ir.actions.act_window,name:l10n_ch.action_config_journal @@ -204,7 +204,7 @@ msgstr "" #. module: l10n_ch #: view:account.journal.todo:0 msgid "Account Journal" -msgstr "" +msgstr "Журнал счета" #. module: l10n_ch #: constraint:ir.ui.view:0 @@ -225,12 +225,12 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Draft Invoice" -msgstr "" +msgstr "Черновик счета" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "VAT :" -msgstr "" +msgstr "НДС :" #. module: l10n_ch #: model:ir.actions.wizard,name:l10n_ch.wizard_invoice_bvr_check_report @@ -250,17 +250,17 @@ msgstr "" #. module: l10n_ch #: constraint:res.partner:0 msgid "Error ! You can not create recursive associated members." -msgstr "" +msgstr "Ошибка! Вы не можете создать рекурсивных связанных участников." #. module: l10n_ch #: wizard_button:l10n_ch.bvr_import,init,import:0 msgid "Import" -msgstr "" +msgstr "Импорт" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "PRO-FORMA" -msgstr "" +msgstr "Проформа" #. module: l10n_ch #: field:res.partner.bank,bvr_adherent_num:0 @@ -271,7 +271,7 @@ msgstr "" #: rml:l10n_ch.bvr:0 #: rml:l10n_ch.invoice.bvr:0 msgid "Phone:" -msgstr "" +msgstr "Телефон:" #. module: l10n_ch #: rml:l10n_ch.bvr:0 @@ -296,13 +296,13 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Condition" -msgstr "" +msgstr "Условие" #. module: l10n_ch #: rml:l10n_ch.bvr:0 #: rml:l10n_ch.invoice.bvr:0 msgid ">" -msgstr "" +msgstr ">" #. module: l10n_ch #: rml:l10n_ch.bvr:0 @@ -334,7 +334,7 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.bvr:0 msgid "Subject:" -msgstr "" +msgstr "Тема:" #. module: l10n_ch #: model:res.partner.title,name:l10n_ch.res_c_partner_title_societe @@ -345,7 +345,7 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Quantity" -msgstr "" +msgstr "Количество" #. module: l10n_ch #: field:res.partner.bank,dta_code:0 @@ -365,7 +365,7 @@ msgstr "" #. module: l10n_ch #: field:account.journal.todo,default_debit_account_id:0 msgid "Default Debit Account" -msgstr "" +msgstr "Дебетовый счет по умолчанию" #. module: l10n_ch #: help:account.journal.todo,default_credit_account_id:0 @@ -395,13 +395,13 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Invoice" -msgstr "" +msgstr "Счет" #. module: l10n_ch #: view:account.journal.todo:0 #: wizard_button:l10n_ch.bvr_import,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: l10n_ch #: model:res.partner.bank.type.field,name:l10n_ch.post_field_bvpost @@ -419,32 +419,32 @@ msgstr "" #. module: l10n_ch #: field:account.journal.todo,default_credit_account_id:0 msgid "Default Credit Account" -msgstr "" +msgstr "Счет по кредиту по умолчанию" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Unit Price" -msgstr "" +msgstr "Цена за ед." #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "(incl. taxes):" -msgstr "" +msgstr "(в т.ч. налоги)" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Taxes:" -msgstr "" +msgstr "Налоги:" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Description" -msgstr "" +msgstr "Описание" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Price" -msgstr "" +msgstr "Цена" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 @@ -475,7 +475,7 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Total (excl. taxes):" -msgstr "" +msgstr "Всего (до налогов)" #. module: l10n_ch #: help:res.company,bvr_delta_vert:0 @@ -524,9 +524,9 @@ msgstr "" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Supplier Refund" -msgstr "" +msgstr "Возврат средств от поставщика" #. module: l10n_ch #: rml:l10n_ch.invoice.bvr:0 msgid "Total" -msgstr "" +msgstr "Итого" diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po b/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po index 7ae1cb16c0a..a4afbb3479c 100644 --- a/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po +++ b/addons/l10n_ch_chart_c2c_pcg/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-10 14:25+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:56+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:19+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: l10n_ch_chart_c2c_pcg @@ -49,7 +49,7 @@ msgstr "" #. module: l10n_ch_chart_c2c_pcg #: view:account.tax.template.todo:0 msgid "Next" -msgstr "" +msgstr "Далее" #. module: l10n_ch_chart_c2c_pcg #: field:account.tax.template.todo,name:0 @@ -59,7 +59,7 @@ msgstr "" #. module: l10n_ch_chart_c2c_pcg #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: l10n_ch_chart_c2c_pcg #: model:account.account.type,name:l10n_ch_chart_c2c_pcg.account_type_financial_asset @@ -208,7 +208,7 @@ msgstr "" #. module: l10n_ch_chart_c2c_pcg #: field:account.tax.template.todo,account_collected_id:0 msgid "Invoice Tax Account" -msgstr "" +msgstr "Счет налога по счету" #. module: l10n_ch_chart_c2c_pcg #: model:account.account.type,name:l10n_ch_chart_c2c_pcg.account_type_depreciation @@ -260,7 +260,7 @@ msgstr "" #. module: l10n_ch_chart_c2c_pcg #: view:account.tax.template.todo:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: l10n_ch_chart_c2c_pcg #: model:account.account.type,name:l10n_ch_chart_c2c_pcg.account_type_inventory diff --git a/addons/l10n_in/i18n/ru.po b/addons/l10n_in/i18n/ru.po new file mode 100644 index 00000000000..ea63b12ec31 --- /dev/null +++ b/addons/l10n_in/i18n/ru.po @@ -0,0 +1,88 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-25 15:28+0000\n" +"PO-Revision-Date: 2010-07-11 09:56+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: l10n_chart_in +#: model:ir.module.module,description:l10n_chart_in.module_meta_information +msgid "" +"\n" +" Indian Accounting : chart of Account\n" +" " +msgstr "" + +#. module: l10n_chart_in +#: constraint:account.account.template:0 +msgid "Error ! You can not create recursive account templates." +msgstr "" + +#. module: l10n_chart_in +#: model:account.journal,name:l10n_chart_in.opening_journal +msgid "Opening Journal" +msgstr "" + +#. module: l10n_chart_in +#: model:ir.actions.todo,note:l10n_chart_in.config_call_account_template_in_minimal +msgid "" +"Generate Chart of Accounts from a Chart Template. You will be asked to pass " +"the name of the company, the chart template to follow, the no. of digits to " +"generate the code for your accounts and Bank account, currency to create " +"Journals. Thus,the pure copy of chart Template is generated.\n" +"\tThis is the same wizard that runs from Financial " +"Management/Configuration/Financial Accounting/Financial Accounts/Generate " +"Chart of Accounts from a Chart Template." +msgstr "" + +#. module: l10n_chart_in +#: model:account.account.type,name:l10n_chart_in.account_type_liability1 +msgid "Liability" +msgstr "Обязательства" + +#. module: l10n_chart_in +#: model:account.account.type,name:l10n_chart_in.account_type_asset1 +msgid "Asset" +msgstr "Оборудование" + +#. module: l10n_chart_in +#: model:account.account.type,name:l10n_chart_in.account_type_closed1 +msgid "Closed" +msgstr "Закрытый" + +#. module: l10n_chart_in +#: model:account.account.type,name:l10n_chart_in.account_type_income1 +msgid "Income" +msgstr "Доход" + +#. module: l10n_chart_in +#: constraint:account.tax.code.template:0 +msgid "Error ! You can not create recursive Tax Codes." +msgstr "" + +#. module: l10n_chart_in +#: model:account.account.type,name:l10n_chart_in.account_type_expense1 +msgid "Expense" +msgstr "Расход" + +#. module: l10n_chart_in +#: model:ir.module.module,shortdesc:l10n_chart_in.module_meta_information +msgid "Indian Chart of Account" +msgstr "" + +#. module: l10n_chart_in +#: model:account.account.type,name:l10n_chart_in.account_type_root_ind1 +msgid "View" +msgstr "Просмотр" diff --git a/addons/l10n_lu/i18n/ru.po b/addons/l10n_lu/i18n/ru.po index a7c0b125c2f..af4150934e9 100644 --- a/addons/l10n_lu/i18n/ru.po +++ b/addons/l10n_lu/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-04-10 09:32+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:57+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: l10n_lu @@ -34,7 +34,7 @@ msgstr "" #. module: l10n_lu #: wizard_field:l10n_lu.tax.report.wizard,init,tax_code_id:0 msgid "Company" -msgstr "" +msgstr "Компания" #. module: l10n_lu #: model:account.account.type,name:l10n_lu.account_type_income @@ -66,12 +66,12 @@ msgstr "" #. module: l10n_lu #: model:account.account.type,name:l10n_lu.account_type_liability msgid "Liability" -msgstr "" +msgstr "Обязательства" #. module: l10n_lu #: model:ir.ui.menu,name:l10n_lu.legal_lu msgid "Luxembourg" -msgstr "" +msgstr "Люксембург" #. module: l10n_lu #: model:ir.actions.wizard,name:l10n_lu.wizard_print_vat @@ -82,7 +82,7 @@ msgstr "Декларация НДС" #. module: l10n_lu #: wizard_field:l10n_lu.tax.report.wizard,init,period_id:0 msgid "Period" -msgstr "" +msgstr "Период" #. module: l10n_lu #: model:account.account.type,name:l10n_lu.account_type_asset @@ -97,7 +97,7 @@ msgstr "Собственные средства" #. module: l10n_lu #: wizard_button:l10n_lu.tax.report.wizard,init,end:0 msgid "Cancel" -msgstr "" +msgstr "Отмена" #. module: l10n_lu #: constraint:account.tax.code.template:0 diff --git a/addons/process/i18n/ru.po b/addons/process/i18n/ru.po index 7ff78a0f303..eddf41fe16a 100644 --- a/addons/process/i18n/ru.po +++ b/addons/process/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-10-30 16:38+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-10 20:07+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:02+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: process @@ -33,7 +33,7 @@ msgstr "" #. module: process #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: process #: view:process.node:0 @@ -64,12 +64,12 @@ msgstr "Состояние" #: view:process.process:0 #: view:process.transition:0 msgid "Details" -msgstr "" +msgstr "Детали" #. module: process #: field:process.node,help_url:0 msgid "Help URL" -msgstr "" +msgstr "Адрес справки" #. module: process #: model:ir.actions.act_window,name:process.action_process_node_form @@ -84,7 +84,7 @@ msgstr "" #: view:process.process:0 #: field:process.process,node_ids:0 msgid "Nodes" -msgstr "" +msgstr "Узлы" #. module: process #: view:process.node:0 @@ -96,7 +96,7 @@ msgstr "" #. module: process #: field:process.condition,node_id:0 msgid "Node" -msgstr "" +msgstr "Узел" #. module: process #: selection:process.transition.action,state:0 @@ -145,12 +145,12 @@ msgstr "" #: view:process.node:0 #: view:process.process:0 msgid "Condition" -msgstr "" +msgstr "Условие" #. module: process #: selection:process.transition.action,state:0 msgid "Dummy" -msgstr "" +msgstr "Заглушка" #. module: process #: constraint:ir.ui.view:0 @@ -164,12 +164,12 @@ msgstr "Неправильный XML для просмотра архитект #: field:process.transition,name:0 #: field:process.transition.action,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: process #: field:process.transition,role_ids:0 msgid "Roles" -msgstr "" +msgstr "Роли" #. module: process #: field:process.node,transition_in:0 @@ -188,7 +188,7 @@ msgstr "Примечания" #: view:process.process:0 #: field:process.transition.action,transition_id:0 msgid "Transition" -msgstr "" +msgstr "Переход" #. module: process #: view:process.node:0 @@ -207,7 +207,7 @@ msgstr "Доп. информация" #: selection:process.node,kind:0 #: field:process.node,subflow_id:0 msgid "Subflow" -msgstr "" +msgstr "Подпроцесс" #. module: process #: field:process.process,active:0 @@ -227,7 +227,7 @@ msgstr "" #. module: process #: field:process.condition,model_states:0 msgid "Expression" -msgstr "" +msgstr "Выражение" #. module: process #: field:process.transition.action,state:0 @@ -246,7 +246,7 @@ msgstr "" #: field:process.node,process_id:0 #: view:process.process:0 msgid "Process" -msgstr "" +msgstr "Процесс" #. module: process #: model:ir.module.module,shortdesc:process.module_meta_information @@ -286,7 +286,7 @@ msgstr "" #: view:process.node:0 #: view:process.process:0 msgid "Outgoing Transitions" -msgstr "" +msgstr "Исходящее перемещение" #. module: process #: model:ir.ui.menu,name:process.menu_process @@ -297,7 +297,7 @@ msgstr "" #: view:process.node:0 #: view:process.process:0 msgid "Transitions" -msgstr "" +msgstr "Перемещении" #. module: process #: selection:process.transition.action,state:0 diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index b098d279d78..34a5c029d51 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -228,7 +228,14 @@ class procurement_order(osv.osv): return False def check_produce_service(self, cr, uid, procurement, context=[]): - return True + """ Checks project_mrp install or not. + @return: True or False""" + obj_module = self.pool.get('ir.module.module') + module_id = obj_module.search(cr, uid, [('name', '=', 'project_mrp'),('state', '=', 'installed')]) + if module_id: + return True + cr.execute('update procurement_order set message=%s where id=%s', (_('Project_mrp module not installed !'), procurement.id)) + return False def check_produce_product(self, cr, uid, procurement, context=[]): """ Finds BoM of a product if not found writes exception message. @@ -344,6 +351,10 @@ class procurement_order(osv.osv): return True def _check_make_to_stock_service(self, cr, uid, procurement, context={}): + """ + This method may be overrided by objects that override procurement.order + for computing their own purpose + @return: True""" return True def _check_make_to_stock_product(self, cr, uid, procurement, context={}): diff --git a/addons/product/product.py b/addons/product/product.py index b4dc56df950..aa916fb5b5c 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -227,7 +227,7 @@ class product_template(osv.osv): _columns = { 'name': fields.char('Name', size=128, required=True, translate=True, select=True), - 'product_manager': fields.many2one('res.users','Product Manager'), + 'product_manager': fields.many2one('res.users','Product Manager',help="This is use as task responsible"), 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), diff --git a/addons/product_manufacturer/i18n/ru.po b/addons/product_manufacturer/i18n/ru.po new file mode 100644 index 00000000000..c98a3370070 --- /dev/null +++ b/addons/product_manufacturer/i18n/ru.po @@ -0,0 +1,107 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-25 13:27+0000\n" +"PO-Revision-Date: 2010-07-10 20:09+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: product_electronic +#: model:ir.module.module,description:product_electronic.module_meta_information +msgid "A module that add manufacturers and attributes on the product form" +msgstr "" + +#. module: product_electronic +#: field:product.product,manufacturer_pref:0 +msgid "Manufacturer product code" +msgstr "" + +#. module: product_electronic +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра структуры!" + +#. module: product_electronic +#: view:product.electronic.attribute:0 +msgid "Product Template Name" +msgstr "" + +#. module: product_electronic +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: product_electronic +#: model:ir.model,name:product_electronic.model_product_electronic_attribute +msgid "Product attributes" +msgstr "" + +#. module: product_electronic +#: view:product.product:0 +msgid "Manufacturing data" +msgstr "" + +#. module: product_electronic +#: view:product.product:0 +msgid "Product reference" +msgstr "" + +#. module: product_electronic +#: field:product.electronic.attribute,name:0 +msgid "Attribute" +msgstr "Атрибут" + +#. module: product_electronic +#: field:product.electronic.attribute,product_id:0 +msgid "Product" +msgstr "Продукция" + +#. module: product_electronic +#: field:product.electronic.attribute,value:0 +msgid "Value" +msgstr "Значение" + +#. module: product_electronic +#: view:product.product:0 +msgid "Manufacturing Data" +msgstr "" + +#. module: product_electronic +#: view:product.product:0 +msgid "Product name" +msgstr "Название продукта" + +#. module: product_electronic +#: view:product.product:0 +#: field:product.product,attribute_ids:0 +msgid "Attributes" +msgstr "Атрибуты" + +#. module: product_electronic +#: model:ir.module.module,shortdesc:product_electronic.module_meta_information +msgid "Products Attributes & Manufacturers" +msgstr "" + +#. module: product_electronic +#: field:product.product,manufacturer_pname:0 +msgid "Manufacturer product name" +msgstr "" + +#. module: product_electronic +#: field:product.product,manufacturer:0 +msgid "Manufacturer" +msgstr "Производитель" diff --git a/addons/product_margin/i18n/ru.po b/addons/product_margin/i18n/ru.po index 12dc76d040b..f36e66dffc1 100644 --- a/addons/product_margin/i18n/ru.po +++ b/addons/product_margin/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 17:43+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 09:58+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:17+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: product_margin @@ -24,7 +24,7 @@ msgstr "" #. module: product_margin #: wizard_field:product.margins,init,from_date:0 msgid "From" -msgstr "" +msgstr "От" #. module: product_margin #: help:product.product,sale_expected:0 @@ -35,7 +35,7 @@ msgstr "" #. module: product_margin #: wizard_field:product.margins,init,to_date:0 msgid "To" -msgstr "" +msgstr "Кому" #. module: product_margin #: field:product.product,date_to:0 @@ -84,7 +84,7 @@ msgstr "" #: selection:product.margins,init,invoice_state:0 #: selection:product.product,invoice_state:0 msgid "Paid" -msgstr "" +msgstr "Оплачено" #. module: product_margin #: help:product.product,sales_gap:0 @@ -99,7 +99,7 @@ msgstr "" #. module: product_margin #: view:product.product:0 msgid "Standard Price" -msgstr "" +msgstr "Стандартная цена" #. module: product_margin #: help:product.product,purchase_num_invoiced:0 diff --git a/addons/product_visible_discount/i18n/ru.po b/addons/product_visible_discount/i18n/ru.po new file mode 100644 index 00000000000..a580fa21893 --- /dev/null +++ b/addons/product_visible_discount/i18n/ru.po @@ -0,0 +1,47 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-03-25 12:11+0000\n" +"PO-Revision-Date: 2010-07-10 12:40+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: product_visible_discount +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра структуры!" + +#. module: product_visible_discount +#: model:ir.module.module,description:product_visible_discount.module_name_translation +msgid "" +"\n" +" This module lets you calculate discounts on Sale Order lines and Invoice " +"lines base on the partner's pricelist.\n" +" To this end, a new check box named \"Visible Discount\" is added to the " +"pricelist form.\n" +" Example:\n" +" For the product PC1 and the partner \"Asustek\": if listprice=450, " +"and the price calculated using Asustek's pricelist is 225\n" +" If the check box is checked, we will have on the sale order line: " +"Unit price=450, Discount=50,00, Net price=225\n" +" If the check box is unchecked, we will have on Sale Order and " +"Invoice lines: Unit price=225, Discount=0,00, Net price=225\n" +" " +msgstr "" + +#. module: product_visible_discount +#: model:ir.module.module,shortdesc:product_visible_discount.module_name_translation +#: field:product.pricelist,visible_discount:0 +msgid "Visible Discount" +msgstr "" diff --git a/addons/profile_accounting/i18n/ru.po b/addons/profile_accounting/i18n/ru.po index cfc8b1a6b28..c1bffd110b9 100644 --- a/addons/profile_accounting/i18n/ru.po +++ b/addons/profile_accounting/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-04 05:51+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-10 20:38+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: profile_accounting @@ -49,7 +49,7 @@ msgstr "" #. module: profile_accounting #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: profile_accounting #: view:profile.accounting.config.install_modules_wizard:0 @@ -99,12 +99,12 @@ msgstr "Неправильный XML для просмотра архитект #. module: profile_accounting #: field:profile.accounting.config.install_modules_wizard,name:0 msgid "Name" -msgstr "" +msgstr "Название" #. module: profile_accounting #: field:profile.accounting.config.install_modules_wizard,account_budget:0 msgid "Budgets" -msgstr "" +msgstr "Бюджеты" #. module: profile_accounting #: view:profile.accounting.config.install_modules_wizard:0 @@ -124,12 +124,12 @@ msgstr "" #. module: profile_accounting #: field:profile.accounting.config.install_modules_wizard,account_analytic_analysis:0 msgid "Analytic Accounting" -msgstr "" +msgstr "Бухг. аналитика" #. module: profile_accounting #: field:profile.accounting.config.install_modules_wizard,board_document:0 msgid "Document Management" -msgstr "" +msgstr "Управление документами" #. module: profile_accounting #: model:ir.model,name:profile_accounting.model_profile_accounting_config_install_modules_wizard diff --git a/addons/profile_manufacturing/i18n/ru.po b/addons/profile_manufacturing/i18n/ru.po index 87151cc881a..3349054aa71 100644 --- a/addons/profile_manufacturing/i18n/ru.po +++ b/addons/profile_manufacturing/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 12:07+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 08:59+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:14+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: profile_manufacturing @@ -74,7 +74,7 @@ msgstr "" #. module: profile_manufacturing #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: profile_manufacturing #: model:ir.actions.act_window,name:profile_manufacturing.action_config_install_module @@ -101,12 +101,12 @@ msgstr "" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,board_document:0 msgid "Document Management" -msgstr "" +msgstr "Управление документами" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,portal:0 msgid "Portal" -msgstr "" +msgstr "Портал" #. module: profile_manufacturing #: view:profile.manufacturing.config.install_modules_wizard:0 @@ -169,7 +169,7 @@ msgstr "" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,mrp_repair:0 msgid "Repair" -msgstr "" +msgstr "Восстановление" #. module: profile_manufacturing #: help:profile.manufacturing.config.install_modules_wizard,sale_margin:0 @@ -193,12 +193,12 @@ msgstr "" #. module: profile_manufacturing #: view:profile.manufacturing.config.install_modules_wizard:0 msgid "Sales Management" -msgstr "" +msgstr "Управление продажами" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,warning:0 msgid "Warning" -msgstr "" +msgstr "Внимание" #. module: profile_manufacturing #: field:profile.manufacturing.config.install_modules_wizard,sale_margin:0 diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po index 74ed7f47706..2a94c2f98bd 100644 --- a/addons/project/i18n/ru.po +++ b/addons/project/i18n/ru.po @@ -1,19 +1,19 @@ # Translation of OpenERP Server. # This file contains the translation of the following modules: -# * project +# * project # msgid "" msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-13 05:53+0000\n" -"Last-Translator: grisha <Unknown>\n" +"PO-Revision-Date: 2010-07-10 20:47+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:53+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: project @@ -89,7 +89,7 @@ msgstr "Участники проекта" #. module: project #: model:process.node,name:project.process_node_taskbydelegate0 msgid "Task by delegate" -msgstr "" +msgstr "Задание поручено" #. module: project #: model:ir.actions.act_window,name:project.open_view_my_project_my_run @@ -100,7 +100,7 @@ msgstr "Мои текущие проекты" #. module: project #: field:project.task,child_ids:0 msgid "Delegated Tasks" -msgstr "Делегированные задания" +msgstr "Порученные задания" #. module: project #: help:project.project,warn_header:0 @@ -174,12 +174,15 @@ msgid "" "works done on tasks, eso. It is able to render planning, order tasks, eso.\n" " " msgstr "" +"Модуль управления проектами позволяет вести многоуровневые проекты, задачи, " +"выполнение задач и т.д. Планирование, очередность задач и т.д.\n" +" " #. module: project #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog msgid "My Tasks in Progress" -msgstr "Мои выполняемые задания" +msgstr "Мои начатые задачи" #. module: project #: view:project.project:0 @@ -207,7 +210,9 @@ msgstr "" "выполненной пользователем, которому было поручено это задание." #. module: project -#: view:project.project:0 field:project.project,notes:0 view:project.task:0 +#: view:project.project:0 +#: field:project.project,notes:0 +#: view:project.task:0 #: field:project.task,notes:0 msgid "Notes" msgstr "Записи" @@ -223,7 +228,8 @@ msgid "Analysis" msgstr "Анализ" #. module: project -#: model:ir.model,name:project.model_project_project view:project.project:0 +#: model:ir.model,name:project.model_project_project +#: view:project.project:0 #: field:project.task,project_id:0 #: model:res.request.link,name:project.req_link_project msgid "Project" @@ -249,12 +255,14 @@ msgstr "" "самое написание." #. module: project -#: selection:project.project,state:0 selection:project.task,state:0 +#: selection:project.project,state:0 +#: selection:project.task,state:0 msgid "Cancelled" msgstr "Отменено" #. module: project -#: view:project.project:0 field:project.project,warn_header:0 +#: view:project.project:0 +#: field:project.project,warn_header:0 msgid "Mail Header" msgstr "Заголовок письма" @@ -321,7 +329,8 @@ msgid "Extra Info" msgstr "Доп. информация" #. module: project -#: field:project.project,partner_id:0 field:project.task,partner_id:0 +#: field:project.project,partner_id:0 +#: field:project.task,partner_id:0 msgid "Partner" msgstr "Партнер" @@ -402,7 +411,8 @@ msgid "Computed as: Time Spent + Remaining Time." msgstr "Вычисляется по формуле: Затраченное время + Оставшееся время." #. module: project -#: field:project.task,type:0 field:project.task.type,name:0 +#: field:project.task,type:0 +#: field:project.task.type,name:0 msgid "Type" msgstr "Тип" @@ -446,7 +456,8 @@ msgid "Planned Time" msgstr "Запланированное время" #. module: project -#: model:ir.model,name:project.model_project_task_work view:project.task:0 +#: model:ir.model,name:project.model_project_task_work +#: view:project.task:0 #: view:project.task.work:0 msgid "Task Work" msgstr "Работа по заданию" @@ -499,17 +510,20 @@ msgid "Template" msgstr "Шаблон" #. module: project -#: model:ir.ui.menu,name:project.menu_definitions view:res.company:0 +#: model:ir.ui.menu,name:project.menu_definitions +#: view:res.company:0 msgid "Configuration" msgstr "Конфигурация" #. module: project -#: field:project.project,date_start:0 field:project.task,date_start:0 +#: field:project.project,date_start:0 +#: field:project.task,date_start:0 msgid "Starting Date" msgstr "Дата начала" #. module: project -#: model:ir.ui.menu,name:project.menu_all_project view:project.project:0 +#: model:ir.ui.menu,name:project.menu_all_project +#: view:project.project:0 msgid "Projects" msgstr "Проекты" @@ -531,7 +545,7 @@ msgstr "Триггер счета" #. module: project #: model:process.transition,name:project.process_transition_draftopentask0 msgid "Draft Open task" -msgstr "" +msgstr "Открыть черновик задания" #. module: project #: view:project.project:0 @@ -561,17 +575,20 @@ msgstr "Неправильный XML для просмотра архитект #. module: project #: model:ir.module.module,shortdesc:project.module_meta_information -#: model:ir.ui.menu,name:project.menu_main view:res.company:0 +#: model:ir.ui.menu,name:project.menu_main +#: view:res.company:0 msgid "Project Management" msgstr "Управление проектами" #. module: project -#: field:project.project,effective_hours:0 field:project.task.work,hours:0 +#: field:project.project,effective_hours:0 +#: field:project.task.work,hours:0 msgid "Time Spent" msgstr "Затраченное время" #. module: project -#: model:ir.ui.menu,name:project.menu_tasks view:project.task:0 +#: model:ir.ui.menu,name:project.menu_tasks +#: view:project.task:0 msgid "Tasks" msgstr "Задания" @@ -589,7 +606,7 @@ msgstr "Новое задание" #. module: project #: help:project.project,timesheet_id:0 msgid "Timetable working hours to adjust the gantt diagram report" -msgstr "" +msgstr "Расписание работы для настройки отчета диаграммы Ганта" #. module: project #: view:project.project:0 @@ -599,7 +616,7 @@ msgstr "Участники проекта" #. module: project #: model:process.transition,note:project.process_transition_taskinvoice0 msgid "After task is completed, Create its invoice." -msgstr "" +msgstr "После выполнения задания, создать счет." #. module: project #: help:project.task,progress:0 @@ -659,7 +676,8 @@ msgstr "" #. module: project #: model:process.transition.action,name:project.process_transition_action_opendrafttask0 -#: view:project.task:0 selection:project.task,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 msgid "Draft" msgstr "Черновик" @@ -674,8 +692,10 @@ msgid "Project Manager" msgstr "Руководитель проекта" #. module: project -#: view:project.project:0 selection:project.project,state:0 -#: view:project.task:0 selection:project.task,state:0 +#: view:project.project:0 +#: selection:project.project,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 #: selection:project.task.delegate,init,state:0 msgid "Pending" msgstr "В ожидании" @@ -691,14 +711,17 @@ msgid "" "New state of your own task. Pending will be reopened automatically when the " "delegated task is closed." msgstr "" +"Ваши собственные задания перешли в состояние ожидания. И будут в этом " +"состоянии пока Вы не выполните порученное задание." #. module: project #: field:res.company,project_time_mode:0 msgid "Project Time Unit" -msgstr "" +msgstr "Единица времени в проекте" #. module: project -#: field:project.project,complete_name:0 field:project.project,name:0 +#: field:project.project,complete_name:0 +#: field:project.project,name:0 msgid "Project Name" msgstr "Наименование проекта" @@ -794,7 +817,7 @@ msgstr "Срочно" #. module: project #: wizard_view:project.task.delegate,init:0 msgid "Delegate this task to a user" -msgstr "Делегировать данное задание пользоватею" +msgstr "Поручить данное задание пользователю" #. module: project #: field:project.task,delegated_user_id:0 @@ -858,12 +881,12 @@ msgstr "Диаграмма Гантта" #. module: project #: field:project.project,warn_customer:0 msgid "Warn Partner" -msgstr "" +msgstr "Предупредить Партнера" #. module: project #: field:project.project,state:0 msgid "State" -msgstr "" +msgstr "Состояние" #. module: project #: field:project.task,name:0 @@ -884,8 +907,10 @@ msgid "" msgstr "" #. module: project -#: view:project.project:0 selection:project.project,state:0 -#: view:project.task:0 selection:project.task,state:0 +#: view:project.project:0 +#: selection:project.project,state:0 +#: view:project.task:0 +#: selection:project.task,state:0 #: selection:project.task.delegate,init,state:0 msgid "Done" msgstr "Выполнено" @@ -894,7 +919,8 @@ msgstr "Выполнено" #: view:config.compute.remaining:0 #: model:process.transition.action,name:project.process_transition_action_draftcanceltask0 #: model:process.transition.action,name:project.process_transition_action_opencanceltask0 -#: view:project.project:0 view:project.task:0 +#: view:project.project:0 +#: view:project.task:0 #: wizard_button:project.task.close,mail_ask,end:0 #: wizard_button:project.task.delegate,init,end:0 msgid "Cancel" @@ -903,7 +929,7 @@ msgstr "Отменить" #. module: project #: model:ir.actions.act_window,name:project.act_project_project_2_project_task_new msgid "Create a Task" -msgstr "" +msgstr "Создать задание" #. module: project #: model:process.transition.action,name:project.process_transition_action_draftopentask0 @@ -918,7 +944,7 @@ msgstr "ID: %(task_id)s" #. module: project #: selection:project.task,state:0 msgid "In Progress" -msgstr "" +msgstr "В работе" #. module: project #: constraint:ir.model:0 @@ -931,12 +957,12 @@ msgstr "" #. module: project #: view:project.task:0 msgid "Reactivate" -msgstr "" +msgstr "Возобновить" #. module: project #: field:project.task,parent_id:0 msgid "Parent Task" -msgstr "Задание-предок" +msgstr "Основное задание" #. module: project #: view:project.task:0 @@ -951,12 +977,12 @@ msgstr "Очень низкий" #. module: project #: wizard_view:project.task.close,mail_ask:0 msgid "Send mail to customer" -msgstr "Отправить почту клиенту" +msgstr "Отправить письмо клиенту" #. module: project #: field:project.project,warn_manager:0 msgid "Warn Manager" -msgstr "" +msgstr "Предупредить руководителя" #. module: project #: model:ir.model,name:project.model_config_compute_remaining @@ -972,11 +998,12 @@ msgstr "Молча закрыть" #: help:project.task.delegate,init,prefix:0 msgid "New title of your own task to validate the work done." msgstr "" +"Новое название Вашей собственной задачи для подтверждения выполненной работы." #. module: project #: field:project.task,progress:0 msgid "Progress (%)" -msgstr "" +msgstr "Выполнение (%)" #. module: project #: field:project.task,description:0 @@ -994,7 +1021,7 @@ msgstr "Счёт этого задания" #: model:ir.actions.act_window,name:project.open_view_my_project_open #: model:ir.ui.menu,name:project.menu_open_view_my_project_open msgid "Projects Structure" -msgstr "" +msgstr "Структура проектов" #. module: project #: wizard_view:project.task.delegate,init:0 @@ -1009,7 +1036,7 @@ msgstr "Работа выполнена" #. module: project #: selection:project.project,state:0 msgid "Running" -msgstr "" +msgstr "Выполняется" #. module: project #: help:project.project,parent_id:0 @@ -1023,7 +1050,7 @@ msgstr "" #. module: project #: model:ir.actions.wizard,name:project.wizard_delegate_task msgid "Delegate Task" -msgstr "Делегировать задание" +msgstr "Поручить задание" #. module: project #: field:project.project,tasks:0 @@ -1047,12 +1074,12 @@ msgstr "Новая Функция" #. module: project #: model:process.node,note:project.process_node_opentask0 msgid "Encode your working hours." -msgstr "" +msgstr "Расшифруйте ваши рабочие часы" #. module: project #: wizard_field:project.task.delegate,init,prefix:0 msgid "Your Task Title" -msgstr "" +msgstr "Название вашего задания" #. module: project #: model:res.request.link,name:project.req_link_task @@ -1067,16 +1094,17 @@ msgstr "Затраченное время" #. module: project #: field:project.task,total_hours:0 msgid "Total Hours" -msgstr "" +msgstr "Общее время" #. module: project #: model:ir.actions.act_window,name:project.open_view_template_project #: model:ir.ui.menu,name:project.menu_template_project msgid "Template of Projects" -msgstr "" +msgstr "Шаблоны проектов" #. module: project -#: field:project.project,priority:0 field:project.task,sequence:0 +#: field:project.project,priority:0 +#: field:project.task,sequence:0 msgid "Sequence" msgstr "Последовательность" @@ -1107,7 +1135,7 @@ msgstr "Состояние проверки" #. module: project #: constraint:project.project:0 msgid "Error ! You can not create recursive projects." -msgstr "" +msgstr "Ошибка! Вы не можете создать взаимное подчинение проектов!" #. module: project #: field:project.task,date_deadline:0 @@ -1140,7 +1168,8 @@ msgid "Delegate your task to the other user" msgstr "Поручить ваше задание другому пользователю" #. module: project -#: view:project.project:0 field:project.project,warn_footer:0 +#: view:project.project:0 +#: field:project.project,warn_footer:0 msgid "Mail Footer" msgstr "Нижняя часть письма" @@ -1153,97 +1182,98 @@ msgstr "Запущенные проекты" #. module: project #: view:board.board:0 msgid "My project's planning" -msgstr "Мои планируемые проекты" +msgstr "" #. module: project #: view:hr_timesheet_sheet.sheet:0 #: model:ir.actions.act_window,name:project.act_hr_timesheet_sheet msgid "Timesheets" -msgstr "Табели" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.action_view_task_tree_deadline msgid "My Task's Deadlines" -msgstr "Мои сроки заданий" +msgstr "" #. module: project #: view:board.board:0 #: model:ir.actions.act_window,name:project.action_view_board_note_tree msgid "Public Notes" -msgstr "Общедоступные примечания" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.open_board_project #: model:ir.ui.menu,name:project.menu_board_project msgid "Project Dashboard" -msgstr "Панель аналитики проекта" +msgstr "" #. module: project #: model:ir.module.module,shortdesc:project.module_meta_information msgid "Board for project users" -msgstr "Панель для пользователей проекта" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.action_project_pipeline_user msgid "Pipeline of tasks" -msgstr "Конвейер заданий" +msgstr "" #. module: project #: view:board.board:0 msgid "My Planning" -msgstr "Мой план" +msgstr "" #. module: project -#: view:board.board:0 model:ir.actions.act_window,name:project.act_my_account +#: view:board.board:0 +#: model:ir.actions.act_window,name:project.act_my_account msgid "My accounts to invoice" -msgstr "Мои счета к выставлению" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.open_board_project_manager #: model:ir.ui.menu,name:project.menu_board_project_manager msgid "Project Manager Dashboard" -msgstr "Паналь аналитики руководителя проекта" +msgstr "" #. module: project #: view:board.board:0 msgid "My Deadlines" -msgstr "Мои сроки" +msgstr "" #. module: project #: view:board.board:0 msgid "User's timesheets" -msgstr "Табели пользователей" +msgstr "" #. module: project #: view:board.board:0 msgid "Project manager board" -msgstr "Панель руководителя проекта" +msgstr "" #. module: project #: view:board.board:0 #: model:ir.actions.act_window,name:project.action_view_task_tree msgid "My Open Tasks" -msgstr "Мои открытые задания" +msgstr "" #. module: project #: view:board.board:0 msgid "My Board" -msgstr "Моя панель" +msgstr "" #. module: project #: view:board.board:0 msgid "My tasks board" -msgstr "Моя панель заданий" +msgstr "" #. module: project #: view:board.board:0 msgid "My user's pipeline" -msgstr "Мои конвейеры пользователей" +msgstr "" #. module: project #: view:board.board:0 msgid "My Timesheet" -msgstr "Мой табель" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.action_project_task_tree_month @@ -1255,7 +1285,7 @@ msgstr "" #: model:ir.actions.act_window,name:project.action_project_task_user_tree #: model:ir.ui.menu,name:project.menu_project_task_user_tree msgid "Tasks Closed by Project and User" -msgstr "Закрытые задания по проектам и пользователям" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.action_project_task_user_tree_month @@ -1267,23 +1297,23 @@ msgstr "" #: field:report.project.task,hours_effective:0 #: field:report.project.task.user,hours_effective:0 msgid "Effective Hours" -msgstr "Эффективных часов" +msgstr "" #. module: project #: model:ir.model,name:project.model_report_project_task_user msgid "Tasks by user and project" -msgstr "Задания по пользователям и проектам" +msgstr "" #. module: project #: field:report.project.task,task_closed:0 #: field:report.project.task.user,task_closed:0 msgid "Task Closed" -msgstr "Закрытое задание" +msgstr "" #. module: project #: view:report.project.task:0 msgid "Tasks by Project" -msgstr "Задания по проектам" +msgstr "" #. module: project #: model:ir.module.module,shortdesc:project.module_meta_information @@ -1293,51 +1323,51 @@ msgstr "" #. module: project #: field:report.project.task.user,user_id:0 msgid "User" -msgstr "Пользователь" +msgstr "" #. module: project #: view:report.project.task.user:0 msgid "Tasks by Project and User" -msgstr "Задания по проектам и пользователям" +msgstr "" #. module: project #: model:ir.ui.menu,name:project.next_id_63 msgid "This Month" -msgstr "Данный месяц" +msgstr "" #. module: project #: view:report.project.task.user:0 msgid "Tasks by projects and users" -msgstr "Задания по проектам и пользоватлеям" +msgstr "" #. module: project #: field:report.project.task,closing_days:0 #: field:report.project.task.user,closing_days:0 msgid "Avg Closing Delay" -msgstr "Ср. задержка закрытия" +msgstr "" #. module: project #: model:ir.model,name:project.model_report_project_task #: view:report.project.task:0 msgid "Tasks by project" -msgstr "Задания по проектам" +msgstr "" #. module: project #: field:report.project.task,hours_delay:0 #: field:report.project.task.user,hours_delay:0 msgid "Avg. Plan.-Eff." -msgstr "Ср. план.-эфф." +msgstr "" #. module: project #: field:report.project.task,name:0 field:report.project.task.user,name:0 msgid "Month" -msgstr "Месяц" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.action_project_task_tree #: model:ir.ui.menu,name:project.menu_project_task_tree msgid "Tasks Closed by Project" -msgstr "Закрытые задания по проектам" +msgstr "" #. module: project #: model:ir.actions.act_window,name:project.action_project_task @@ -1370,7 +1400,7 @@ msgstr "" #. module: project #: model:ir.ui.menu,name:project.next_id_57 msgid "Reporting" -msgstr "Отчетность" +msgstr "" #. module: project #: model:ir.module.module,description:project.module_meta_information diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py index 766b70ff911..c2ef40bbb1e 100644 --- a/addons/project_mrp/__init__.py +++ b/addons/project_mrp/__init__.py @@ -18,6 +18,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## -import mrp +import project_procurement import project_mrp # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py index d946e2c2fd6..d5a76812a2d 100644 --- a/addons/project_mrp/project_mrp.py +++ b/addons/project_mrp/project_mrp.py @@ -51,7 +51,6 @@ project_task() class product_product(osv.osv): _inherit = "product.product" _columns = { - 'user_id': fields.many2one('res.users', 'Responsible', ondelete='set null',help='Project Manager'), 'project_id': fields.many2one('project.project', 'Project', ondelete='set null',) } product_product() diff --git a/addons/project_mrp/project_mrp_view.xml b/addons/project_mrp/project_mrp_view.xml index 5d0c1d71381..726e95d1c9b 100644 --- a/addons/project_mrp/project_mrp_view.xml +++ b/addons/project_mrp/project_mrp_view.xml @@ -20,7 +20,6 @@ <field name="inherit_id" ref="product.product_normal_form_view"/> <field name="arch" type="xml"> <field name="company_id" position="after"> - <field name="user_id" attrs="{'readonly':[('type','!=','service')]}"/> <field name="project_id" attrs="{'readonly':[('type','!=','service')]}" /> </field> </field> diff --git a/addons/project_mrp/mrp.py b/addons/project_mrp/project_procurement.py index b8eff3c8fa8..d4f703b4eae 100644 --- a/addons/project_mrp/mrp.py +++ b/addons/project_mrp/project_procurement.py @@ -64,9 +64,10 @@ class procurement_order(osv.osv): # Creating a project for task.Project is created from Procurement. project_obj = self.pool.get('project.project') proj_name = tools.ustr(so_ref) + product_project_id =procurement.product_id.project_id and procurement.product_id.project_id.id or False proj_exist_id = project_obj.search(cr, uid, [('name', '=', proj_name)], context=context) if not proj_exist_id: - project_id = project_obj.create(cr, uid, {'name': proj_name, 'partner_id': partner_id}) + project_id = project_obj.create(cr, uid, {'name': proj_name, 'partner_id': partner_id,'parent_id':product_project_id}) else: project_id = proj_exist_id[0] @@ -99,7 +100,7 @@ class procurement_order(osv.osv): 'project_id': project_id, },context=context) self.write(cr, uid, [procurement.id],{'task_id':task_id}) - product_obj.write(cr,uid,[procurement.product_id.id],{'user_id':uid,'project_id':project_id}) + product_obj.write(cr,uid,[procurement.product_id.id],{'project_id':project_id}) return task_id procurement_order() diff --git a/addons/project_retro_planning/test/deadline_change.yml b/addons/project_retro_planning/test/deadline_change.yml index 717dccd5d97..8b1f316c6ae 100644 --- a/addons/project_retro_planning/test/deadline_change.yml +++ b/addons/project_retro_planning/test/deadline_change.yml @@ -3,10 +3,9 @@ - !record {model: project.project, id: project_project_retroplanning0}: company_id: base.main_company - date: '2010-06-10' + date: !eval time.strftime('%Y-%m-%d') name: Retro Planning - - Create task 'Plan all projects' - @@ -19,12 +18,11 @@ project_id: project_project_retroplanning0 remaining_hours: 24.0 state: draft - - Check if task deadline_date and start_date changes upon changing its project's end_date - !python {model: project.project}: | - from datetime import datetime, date + from datetime import datetime, date, timedelta import time data_project = self.browse(cr,uid,[ref("project_project_retroplanning0")]) prj = data_project[0] @@ -32,17 +30,18 @@ if prj.date: old_end_date = date(*time.strptime(prj.date,'%Y-%m-%d')[:3]) if old_end_date: - new_end_date = date(*time.strptime('2010-06-10','%Y-%m-%d')[:3]) + new_end_date = date.today()+timedelta(1) res={} for task in prj.tasks: start_dt = (datetime(*time.strptime(task.date_start,'%Y-%m-%d %H:%M:%S')[:6])+(new_end_date-old_end_date)).strftime('%Y-%m-%d %H:%M:%S') deadline_dt='' if task.date_deadline: - deadline_dt = (datetime(*time.strptime(task.date_deadline,'%Y-%m-%d')[:6])+(new_end_date-old_end_date)).strftime('%Y-%m-%d') + deadline_dt = (datetime(*time.strptime(task.date_deadline,'%Y-%m-%d')[:6])+(new_end_date-old_end_date)).strftime('%Y-%m-%d') res[task.id]=[start_dt,deadline_dt] - self.write(cr, uid, [ref("project_project_retroplanning0")], {'date':'2010-06-10'}) + self.write(cr, uid, [ref("project_project_retroplanning0")], {'date' : (datetime.now()+timedelta(1)).strftime('%Y-%m-%d')}) data_project = self.browse(cr,uid,[ref("project_project_retroplanning0")]) prj = data_project[0] + for task in prj.tasks: assert task.date_start == res[task.id][0], "task start date differs, expected %s, got %s"%(res[task.id][0], task.date_start) assert task.date_deadline == res[task.id][1], "task deadline date differs, expected %s, got %s"%(res[task.id][1], task.date_deadline)
\ No newline at end of file diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 471f5213b12..479155f0932 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -58,7 +58,8 @@ 'test/purchase_from_order.yml', 'test/purchase_from_manual.yml', # 'test/purchase_from_picking.yml', - 'purchase_unit_test.xml' + 'purchase_unit_test.xml', + 'test/procurement_buy.yml', ], 'demo': ['purchase_demo.xml'], 'installable': True, diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po index d304b399bfd..942caface24 100644 --- a/addons/purchase/i18n/ru.po +++ b/addons/purchase/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-05-06 12:53+0000\n" -"Last-Translator: g0nz1k12 <Unknown>\n" +"PO-Revision-Date: 2010-07-10 21:16+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: purchase @@ -39,7 +39,7 @@ msgstr "" #. module: purchase #: rml:purchase.order:0 msgid "Validated By" -msgstr "" +msgstr "Утверждено" #. module: purchase #: constraint:ir.actions.act_window:0 @@ -103,7 +103,7 @@ msgstr "Факс :" #. module: purchase #: model:process.transition,note:purchase.process_transition_productrecept0 msgid "Create invoice from product recept" -msgstr "" +msgstr "Создать счет из принятого товара" #. module: purchase #: help:purchase.order,pricelist_id:0 @@ -117,7 +117,7 @@ msgstr "" #. module: purchase #: model:process.process,name:purchase.process_process_purchaseprocess0 msgid "Purchase Process" -msgstr "" +msgstr "Процесс заказа" #. module: purchase #: model:process.transition,name:purchase.process_transition_invoicefrompackinglist0 @@ -210,7 +210,7 @@ msgstr "Происхождение" #. module: purchase #: model:process.node,name:purchase.process_node_packinglist0 msgid "Incoming Products" -msgstr "" +msgstr "Поступающие товары" #. module: purchase #: rml:purchase.order:0 @@ -221,7 +221,7 @@ msgstr "Кол-во" #. module: purchase #: view:purchase.order:0 msgid "Manually Corrected" -msgstr "" +msgstr "Изменено вручную" #. module: purchase #: view:purchase.order:0 @@ -343,7 +343,7 @@ msgstr "Сумма до налогов" #. module: purchase #: rml:purchase.quotation:0 msgid "Expected Date" -msgstr "" +msgstr "Ожидаемая дата" #. module: purchase #: rml:purchase.order:0 @@ -359,7 +359,7 @@ msgstr "Каталог закупок" #. module: purchase #: field:purchase.order,minimum_planned_date:0 msgid "Planned Date" -msgstr "" +msgstr "Планируемая дата" #. module: purchase #: view:purchase.order:0 @@ -414,7 +414,7 @@ msgstr "" #. module: purchase #: model:process.transition,name:purchase.process_transition_invoicefrompurchase0 msgid "Invoice from Purchase" -msgstr "" +msgstr "Счет из заказа" #. module: purchase #: model:process.node,note:purchase.process_node_packinglist0 @@ -429,7 +429,7 @@ msgstr "Вручную" #. module: purchase #: model:process.transition,name:purchase.process_transition_confirmingpurchaseorder1 msgid "Confirming Purchase" -msgstr "" +msgstr "Подтверждение заказа" #. module: purchase #: model:process.transition,note:purchase.process_transition_approvingpurchaseorder0 @@ -444,7 +444,7 @@ msgstr "Исключительная ситуация поставки" #. module: purchase #: model:process.node,note:purchase.process_node_draftpurchaseorder1 msgid "Encoded manually by the user." -msgstr "" +msgstr "Зашифровано вручную пользователем" #. module: purchase #: help:purchase.order,minimum_planned_date:0 @@ -469,7 +469,7 @@ msgstr "" #. module: purchase #: rml:purchase.quotation:0 msgid "Request for Quotation :" -msgstr "" +msgstr "Запрос на расценки" #. module: purchase #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0 @@ -501,7 +501,7 @@ msgstr "Ссылка на партнера" #. module: purchase #: rml:purchase.order:0 msgid "Taxes :" -msgstr "" +msgstr "Налоги :" #. module: purchase #: field:purchase.order,invoiced_rate:0 @@ -669,7 +669,7 @@ msgstr "" #. module: purchase #: rml:purchase.order:0 msgid "Request for Quotation N°" -msgstr "" +msgstr "Запрос на расценки №" #. module: purchase #: field:purchase.order,invoice_id:0 @@ -686,7 +686,7 @@ msgstr "Отмена" #. module: purchase #: view:res.partner:0 msgid "Purchases Properties" -msgstr "" +msgstr "Свойства заказов" #. module: purchase #: field:purchase.order.line,order_id:0 @@ -799,7 +799,7 @@ msgstr "Ед.изм. продукции" #. module: purchase #: field:purchase.order.line,move_ids:0 msgid "Reservation" -msgstr "" +msgstr "Резервирование" #. module: purchase #: model:process.node,note:purchase.process_node_confirmpurchaseorder0 diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index a194cd16713..d14530e5f48 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -103,6 +103,7 @@ <record id="trans_confirmed_router" model="workflow.transition"> <field name="act_from" ref="act_confirmed"/> <field name="act_to" ref="act_router"/> + <field name="signal">purchase_approve</field> </record> <record id="trans_router_picking" model="workflow.transition"> <field name="act_from" ref="act_router"/> diff --git a/addons/purchase/test/procurement_buy.yml b/addons/purchase/test/procurement_buy.yml new file mode 100644 index 00000000000..011e70d0cdc --- /dev/null +++ b/addons/purchase/test/procurement_buy.yml @@ -0,0 +1,109 @@ +- + In order to test the procurement with product type buy in OpenERP, I will create product + and then I will create procurement for this product. +- + I create product. +- + !record {model: product.product, id: product_product_cddrive0}: + categ_id: product.product_category_3 + cost_method: standard + mes_type: fixed + name: CD drive + procure_method: make_to_order + supply_method: buy + type: product + uom_id: product.product_uom_unit + uom_po_id: product.product_uom_unit + valuation: manual_periodic + volume: 0.0 + warranty: 0.0 + weight: 0.0 + weight_net: 0.0 + seller_ids: + - delay: 1 + name: base.res_partner_asus + qty: 5.0 +- + I create procurement order. +- + !record {model: procurement.order, id: procurement_order_testcase0}: + company_id: base.main_company + date_planned: '2010-07-07 15:38:53' + location_id: stock.stock_location_stock + name: Test Case + priority: '1' + procure_method: make_to_order + product_id: product_product_cddrive0 + product_qty: 5.0 + product_uom: product.product_uom_unit + product_uos: product.product_uom_unit + product_uos_qty: 0.0 + state: draft +- + I confirm on procurement order. +- + !workflow {model: procurement.order, action: button_confirm, ref: procurement_order_testcase0} +- + I run the scheduler. +- + !workflow {model: procurement.order, action: button_check, ref: procurement_order_testcase0} +- + I check that purchase order is generated. +- + !python {model: procurement.order}: | + from tools.translate import _ + proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + assert(proc_ids.purchase_id), _('Purchase Order is not Created!') +- + I check the state is running. +- + !python {model: procurement.order}: | + from tools.translate import _ + proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + assert(proc_ids.state == 'running'), _('Exception') +- + I confirm and Approve the purchase order. +- + !python {model: purchase.order}: | + procurement_obj = self.pool.get('procurement.order') + proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + import netsvc + wf_service = netsvc.LocalService("workflow") + wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_confirm', cr) + wf_service.trg_validate(uid, 'purchase.order',proc_ids.purchase_id.id,'purchase_approve', cr) +- + I receive the order of the supplier ASUStek from the Incoming Shipments menu. +- + !python {model: stock.picking }: | + import time + procurement_obj = self.pool.get('procurement.order') + proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + picking_id = self.search(cr, uid, [('origin', '=', proc_ids.purchase_id.name)]) + if picking_id: + pick=self.browse(cr,uid,picking_id[0]) + move =pick.move_lines[0] + partial_datas = { + 'partner_id':pick.address_id.partner_id.id, + 'address_id': pick.address_id.id, + 'delivery_date' : time.strftime('%Y-%m-%d') + } + partial_datas['move%s'%(move.id)]= { + 'product_id': move.product_id, + 'product_qty': move.product_qty, + 'product_uom': move.product_uom.id, + } + self.do_partial(cr, uid, picking_id,partial_datas) +- + I confirm the Reservation. +- + !python {model: stock.move }: | + procurement_obj = self.pool.get('procurement.order') + proc_ids = procurement_obj.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + self.action_done(cr,uid,[proc_ids.move_id.id]) +- + I check the state is Done. +- + !python {model: procurement.order}: | + from tools.translate import _ + proc_ids = self.browse(cr, uid, [ref('procurement_order_testcase0')])[0] + assert(proc_ids.state == 'done'), _('Order is not in done state') diff --git a/addons/report_intrastat/i18n/ru.po b/addons/report_intrastat/i18n/ru.po index 7259462186a..901a93c1520 100644 --- a/addons/report_intrastat/i18n/ru.po +++ b/addons/report_intrastat/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-11-03 05:15+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 08:55+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:07+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: report_intrastat @@ -27,12 +27,12 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Canceled Invoice" -msgstr "" +msgstr "Отмененный счет" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Disc. (%)" -msgstr "" +msgstr "Скидка (%)" #. module: report_intrastat #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree @@ -43,22 +43,22 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Supplier Invoice" -msgstr "" +msgstr "Счета поставщиков" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Unit Price" -msgstr "" +msgstr "Цена за ед." #. module: report_intrastat #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: report_intrastat #: field:report.intrastat,name:0 msgid "Period" -msgstr "" +msgstr "Период" #. module: report_intrastat #: model:ir.ui.menu,name:report_intrastat.next_id_90 @@ -78,17 +78,17 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Document" -msgstr "" +msgstr "Документ" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "PRO-FORMA" -msgstr "" +msgstr "Проформа" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Taxes:" -msgstr "" +msgstr "Налоги:" #. module: report_intrastat #: rml:account.invoice.intrastat:0 @@ -109,7 +109,7 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Invoice Date" -msgstr "" +msgstr "Дата счета-фактуры" #. module: report_intrastat #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information @@ -119,17 +119,17 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Tel. :" -msgstr "" +msgstr "тел.:" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Base" -msgstr "" +msgstr "База" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Quantity" -msgstr "" +msgstr "Количество" #. module: report_intrastat #: model:ir.ui.menu,name:report_intrastat.next_id_89 @@ -139,7 +139,7 @@ msgstr "Данный месяц" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Partner Ref." -msgstr "" +msgstr "Ссылка на партнера" #. module: report_intrastat #: rml:account.invoice.intrastat:0 @@ -149,7 +149,7 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Refund" -msgstr "" +msgstr "Возвраты" #. module: report_intrastat #: constraint:ir.ui.view:0 @@ -164,17 +164,17 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Invoice" -msgstr "" +msgstr "Счет" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Taxes" -msgstr "" +msgstr "Налоги" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Amount" -msgstr "" +msgstr "Количество" #. module: report_intrastat #: view:report.intrastat:0 @@ -196,7 +196,7 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Draft Invoice" -msgstr "" +msgstr "Черновик счета" #. module: report_intrastat #: field:report.intrastat,supply_units:0 @@ -214,7 +214,7 @@ msgstr "" #. module: report_intrastat #: field:report.intrastat,ref:0 msgid "Origin" -msgstr "" +msgstr "Источник" #. module: report_intrastat #: rml:account.invoice.intrastat:0 @@ -230,7 +230,7 @@ msgstr "" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Tax" -msgstr "" +msgstr "Налог" #. module: report_intrastat #: field:report.intrastat,code:0 @@ -250,22 +250,22 @@ msgstr "Экспорт" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Fax :" -msgstr "" +msgstr "Факс :" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Supplier Refund" -msgstr "" +msgstr "Возврат средств от поставщика" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Total (excl. taxes):" -msgstr "" +msgstr "Всего (до налогов)" #. module: report_intrastat #: rml:account.invoice.intrastat:0 msgid "Price" -msgstr "" +msgstr "Цена" #. module: report_intrastat #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py index 82a5f1c2d16..19c23eca13f 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.py +++ b/addons/sale/wizard/sale_make_invoice_advance.py @@ -64,7 +64,7 @@ class sale_advance_payment_inv(osv.osv_memory): _("You cannot make an advance on a sale order \ that is defined as 'Automatic Invoice after delivery'.")) val = obj_lines.product_id_change(cr, uid, [], sale_adv_obj.product_id.id, - uom = False, partner_id = sale.partner_id.id, fiscal_position = sale.fiscal_position.id) + uom = False, partner_id = sale.partner_id.id, fposition_id = sale.fiscal_position.id) line_id =obj_lines.create(cr, uid, { 'name': val['value']['name'], 'account_id': val['value']['account_id'], diff --git a/addons/sale_analytic_plans/i18n/ru.po b/addons/sale_analytic_plans/i18n/ru.po index b2c5c19cf80..8c1c62fafa5 100644 --- a/addons/sale_analytic_plans/i18n/ru.po +++ b/addons/sale_analytic_plans/i18n/ru.po @@ -7,19 +7,19 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-11-05 12:44+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 08:32+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_analytic_plans #: field:sale.order.line,analytics_id:0 msgid "Analytic Distribution" -msgstr "" +msgstr "Аналитическое распределение" #. module: sale_analytic_plans #: constraint:ir.ui.view:0 diff --git a/addons/sale_crm/i18n/ru.po b/addons/sale_crm/i18n/ru.po index d682f394d2e..c6070b60991 100644 --- a/addons/sale_crm/i18n/ru.po +++ b/addons/sale_crm/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 20:36+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 08:34+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:01+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_crm @@ -39,7 +39,7 @@ msgstr "Создать" #. module: sale_crm #: selection:crm.case.make_order,init,picking_policy:0 msgid "All at once" -msgstr "" +msgstr "Все сразу" #. module: sale_crm #: constraint:ir.ui.view:0 @@ -99,7 +99,7 @@ msgstr "" #. module: sale_crm #: selection:crm.case.make_order,init,picking_policy:0 msgid "Direct Delivery" -msgstr "" +msgstr "Прямая доставка" #. module: sale_crm #: model:process.transition,name:sale_crm.process_transition_opportunityquotation0 @@ -125,7 +125,7 @@ msgstr "" #. module: sale_crm #: wizard_field:crm.case.make_order,init,partner_id:0 msgid "Customer" -msgstr "" +msgstr "Покупатель" #. module: sale_crm #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0 @@ -181,13 +181,13 @@ msgstr "" #. module: sale_crm #: wizard_field:sale_crm.make_case,init,name:0 msgid "Case Description" -msgstr "" +msgstr "Описание вопроса" #. module: sale_crm #: wizard_field:crm.case.make_order,init,analytic_account:0 #: model:process.transition,note:sale_crm.process_transition_opportunityanalytic0 msgid "Analytic Account" -msgstr "" +msgstr "Счет аналитического учета" #. module: sale_crm #: model:ir.actions.wizard,name:sale_crm.sale_crm_wizard @@ -203,4 +203,4 @@ msgstr "Отмена" #. module: sale_crm #: wizard_field:sale_crm.make_case,init,section:0 msgid "Case Section" -msgstr "" +msgstr "Секция вопроса" diff --git a/addons/sale_journal/i18n/ru.po b/addons/sale_journal/i18n/ru.po index 8defd23eb82..3e1f5157b6f 100644 --- a/addons/sale_journal/i18n/ru.po +++ b/addons/sale_journal/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 12:07+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 08:30+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:10+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: sale_journal @@ -36,7 +36,7 @@ msgstr "назначено" #. module: sale_journal #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: sale_journal #: selection:sale_journal.sale.stats,state:0 @@ -190,7 +190,7 @@ msgstr "" #. module: sale_journal #: view:sale_journal.picking.journal:0 msgid "Packing" -msgstr "" +msgstr "Упаковка" #. module: sale_journal #: help:res.partner,property_invoice_type:0 @@ -358,7 +358,7 @@ msgstr "Код" #: view:sale_journal.picking.journal:0 #: view:sale_journal.sale.journal:0 msgid "Open Journal" -msgstr "" +msgstr "Открыть журнал" #. module: sale_journal #: view:sale_journal.sale.journal:0 diff --git a/addons/sale_margin/i18n/ru.po b/addons/sale_margin/i18n/ru.po new file mode 100644 index 00000000000..c5ac983085a --- /dev/null +++ b/addons/sale_margin/i18n/ru.po @@ -0,0 +1,371 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-25 14:28+0000\n" +"PO-Revision-Date: 2010-07-10 21:13+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: sale_margin +#: selection:report.account.invoice,type:0 +#: selection:report.account.invoice.category,type:0 +#: selection:report.account.invoice.partner,type:0 +#: selection:report.account.invoice.partner.product,type:0 +#: selection:report.account.invoice.product,type:0 +msgid "Customer Refund" +msgstr "Возврат денег клиенту" + +#. module: sale_margin +#: model:ir.model,name:sale_margin.model_report_account_invoice_product +msgid "report.account.invoice.product" +msgstr "" + +#. module: sale_margin +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_product +#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_product +msgid "Invoices by Product" +msgstr "" + +#. module: sale_margin +#: selection:report.account.invoice,type:0 +#: selection:report.account.invoice.category,type:0 +#: selection:report.account.invoice.partner,type:0 +#: selection:report.account.invoice.partner.product,type:0 +#: selection:report.account.invoice.product,type:0 +msgid "Customer Invoice" +msgstr "Счета клиентам" + +#. module: sale_margin +#: wizard_view:stock.invoice_onshipping,init:0 +msgid "Create invoices" +msgstr "Создать счета" + +#. module: sale_margin +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра структуры!" + +#. module: sale_margin +#: model:ir.model,name:sale_margin.model_report_account_invoice_partner_product +msgid "report.account.invoice.partner.product" +msgstr "" + +#. module: sale_margin +#: selection:report.account.invoice,type:0 +#: selection:report.account.invoice.category,type:0 +#: selection:report.account.invoice.partner,type:0 +#: selection:report.account.invoice.partner.product,type:0 +#: selection:report.account.invoice.product,type:0 +msgid "Supplier Invoice" +msgstr "Счета поставщиков" + +#. module: sale_margin +#: field:report.account.invoice,state:0 +#: field:report.account.invoice.category,state:0 +#: field:report.account.invoice.partner,state:0 +#: field:report.account.invoice.partner.product,state:0 +#: field:report.account.invoice.product,state:0 +msgid "State" +msgstr "Состояние" + +#. module: sale_margin +#: view:stock.picking:0 +msgid "Create Invoice" +msgstr "Создать счет" + +#. module: sale_margin +#: selection:report.account.invoice,state:0 +#: selection:report.account.invoice.category,state:0 +#: selection:report.account.invoice.partner,state:0 +#: selection:report.account.invoice.partner.product,state:0 +#: selection:report.account.invoice.product,state:0 +msgid "Draft" +msgstr "Черновик" + +#. module: sale_margin +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_month_product +msgid "All Months" +msgstr "Все месяцы" + +#. module: sale_margin +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_product_tree_all +msgid "report.account.invoice.partner.product.tree" +msgstr "" + +#. module: sale_margin +#: field:report.account.invoice,type:0 +#: field:report.account.invoice.category,type:0 +#: field:report.account.invoice.partner,type:0 +#: field:report.account.invoice.partner.product,type:0 +#: field:report.account.invoice.product,type:0 +#: wizard_field:stock.invoice_onshipping,init,type:0 +msgid "Type" +msgstr "Тип" + +#. module: sale_margin +#: wizard_field:stock.invoice_onshipping,init,journal_id:0 +msgid "Destination Journal" +msgstr "" + +#. module: sale_margin +#: view:stock.picking:0 +msgid "Supplier Invoices" +msgstr "Счета поставщиков" + +#. module: sale_margin +#: field:report.account.invoice.partner.product,product_id:0 +#: field:report.account.invoice.product,product_id:0 +msgid "Product" +msgstr "Продукция" + +#. module: sale_margin +#: view:report.account.invoice.partner:0 +msgid "Invoices by partner" +msgstr "" + +#. module: sale_margin +#: view:report.account.invoice.category:0 +msgid "Invoices by category" +msgstr "" + +#. module: sale_margin +#: selection:report.account.invoice,state:0 +#: selection:report.account.invoice.category,state:0 +#: selection:report.account.invoice.partner,state:0 +#: selection:report.account.invoice.partner.product,state:0 +#: selection:report.account.invoice.product,state:0 +msgid "Paid" +msgstr "Оплачено" + +#. module: sale_margin +#: model:ir.actions.wizard,name:sale_margin.wizard_picking_invoice_create +#: wizard_button:stock.invoice_onshipping,init,create_invoice:0 +msgid "Create invoice" +msgstr "Создать счет" + +#. module: sale_margin +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_category_tree_all +msgid "report.account.invoice.category.tree" +msgstr "" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner_product +#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner_product +msgid "Invoices by Partner and Product" +msgstr "" + +#. module: sale_margin +#: model:ir.model,name:sale_margin.model_report_account_invoice_category +msgid "report.account.invoice.category" +msgstr "" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_this_month_product +msgid "This Month" +msgstr "Этот месяц" + +#. module: sale_margin +#: field:report.account.invoice.category,categ_id:0 +msgid "Categories" +msgstr "Категории" + +#. module: sale_margin +#: field:account.invoice.line,cost_price:0 +#: field:report.account.invoice,cost_price:0 +#: field:report.account.invoice.category,cost_price:0 +#: field:report.account.invoice.partner,cost_price:0 +#: field:report.account.invoice.partner.product,cost_price:0 +#: field:report.account.invoice.product,cost_price:0 +#: field:sale.order.line,purchase_price:0 +msgid "Cost Price" +msgstr "Себестоимость" + +#. module: sale_margin +#: wizard_field:stock.invoice_onshipping,init,group:0 +msgid "Group by partner" +msgstr "Группировать по партнерам" + +#. module: sale_margin +#: model:ir.model,name:sale_margin.model_report_account_invoice_partner +msgid "report.account.invoice.partner" +msgstr "" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_partner +#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_partner +msgid "Invoices by Partner" +msgstr "" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_category +#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_category +msgid "Invoices by Category" +msgstr "" + +#. module: sale_margin +#: view:report.account.invoice.partner.product:0 +msgid "Invoices by partner and product" +msgstr "" + +#. module: sale_margin +#: field:report.account.invoice,amount:0 +#: field:report.account.invoice.category,amount:0 +#: field:report.account.invoice.partner,amount:0 +#: field:report.account.invoice.partner.product,amount:0 +#: field:report.account.invoice.product,amount:0 +msgid "Amount" +msgstr "Количество" + +#. module: sale_margin +#: wizard_field:stock.invoice_onshipping,init,invoice_date:0 +msgid "Invoiced date" +msgstr "" + +#. module: sale_margin +#: selection:report.account.invoice,type:0 +#: selection:report.account.invoice.category,type:0 +#: selection:report.account.invoice.partner,type:0 +#: selection:report.account.invoice.partner.product,type:0 +#: selection:report.account.invoice.product,type:0 +msgid "Supplier Refund" +msgstr "Возврат средств от поставщика" + +#. module: sale_margin +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_partner_tree_all +msgid "report.account.invoice.partner.tree" +msgstr "" + +#. module: sale_margin +#: field:report.account.invoice,margin:0 +#: field:report.account.invoice.category,margin:0 +#: field:report.account.invoice.partner,margin:0 +#: field:report.account.invoice.partner.product,margin:0 +#: field:report.account.invoice.product,margin:0 +#: field:sale.order,margin:0 +#: field:sale.order.line,margin:0 +msgid "Margin" +msgstr "Отступ" + +#. module: sale_margin +#: field:report.account.invoice,quantity:0 +#: field:report.account.invoice.category,quantity:0 +#: field:report.account.invoice.partner,quantity:0 +#: field:report.account.invoice.partner.product,quantity:0 +#: field:report.account.invoice.product,quantity:0 +msgid "Quantity" +msgstr "Количество" + +#. module: sale_margin +#: view:report.account.invoice.product:0 +msgid "Invoices by product" +msgstr "" + +#. module: sale_margin +#: model:ir.module.module,shortdesc:sale_margin.module_meta_information +msgid "Margins in Sale Orders" +msgstr "" + +#. module: sale_margin +#: model:ir.model,name:sale_margin.model_report_account_invoice +msgid "report.account.invoice" +msgstr "" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_all_invoice_by_invoices +#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_by_invoices +#: view:report.account.invoice:0 +#: view:stock.picking:0 +#: field:stock.picking,invoice_ids:0 +msgid "Invoices" +msgstr "Счета-фактуры" + +#. module: sale_margin +#: selection:report.account.invoice,state:0 +#: selection:report.account.invoice.category,state:0 +#: selection:report.account.invoice.partner,state:0 +#: selection:report.account.invoice.partner.product,state:0 +#: selection:report.account.invoice.product,state:0 +msgid "Pro-forma" +msgstr "Проформа" + +#. module: sale_margin +#: field:report.account.invoice,name:0 +#: field:report.account.invoice.category,name:0 +#: field:report.account.invoice.partner,name:0 +#: field:report.account.invoice.partner.product,name:0 +#: field:report.account.invoice.product,name:0 +msgid "Month" +msgstr "Месяц" + +#. module: sale_margin +#: selection:report.account.invoice,state:0 +#: selection:report.account.invoice.category,state:0 +#: selection:report.account.invoice.partner,state:0 +#: selection:report.account.invoice.partner.product,state:0 +#: selection:report.account.invoice.product,state:0 +msgid "Canceled" +msgstr "Отменено" + +#. module: sale_margin +#: model:ir.ui.menu,name:sale_margin.menu_report_account_invoice_product +msgid "Invoice" +msgstr "Счет" + +#. module: sale_margin +#: wizard_button:stock.invoice_onshipping,init,end:0 +msgid "Cancel" +msgstr "Отмена" + +#. module: sale_margin +#: field:report.account.invoice.partner,partner_id:0 +#: field:report.account.invoice.partner.product,partner_id:0 +msgid "Partner" +msgstr "Партнер" + +#. module: sale_margin +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_tree_all +msgid "report.account.invoice.tree" +msgstr "" + +#. module: sale_margin +#: selection:report.account.invoice,state:0 +#: selection:report.account.invoice.category,state:0 +#: selection:report.account.invoice.partner,state:0 +#: selection:report.account.invoice.partner.product,state:0 +#: selection:report.account.invoice.product,state:0 +msgid "Open" +msgstr "Открыть" + +#. module: sale_margin +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree +#: model:ir.actions.act_window,name:sale_margin.action_report_account_invoice_product_tree_all +msgid "report.account.invoice.product.tree" +msgstr "" diff --git a/addons/scrum/i18n/ru.po b/addons/scrum/i18n/ru.po index 71acca6aa1c..44bbc963615 100644 --- a/addons/scrum/i18n/ru.po +++ b/addons/scrum/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-11-04 18:22+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 08:27+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:57+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: scrum @@ -51,7 +51,7 @@ msgstr "" #. module: scrum #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: scrum #: model:ir.module.module,shortdesc:scrum.module_meta_information @@ -69,6 +69,8 @@ msgid "" "Total remaining time, can be re-estimated periodically by the assignee of " "the task." msgstr "" +"Общее количество оставшегося времени может быть переодически переоценено " +"тем, кто отвечает за это задание." #. module: scrum #: field:scrum.project,child_id:0 @@ -88,7 +90,7 @@ msgstr "Являются ли оценки ваших задолженносте #. module: scrum #: field:scrum.project,members:0 msgid "Project Members" -msgstr "" +msgstr "Участники проекта" #. module: scrum #: view:scrum.project:0 @@ -106,6 +108,8 @@ msgid "" "Header added at the beginning of the email for the warning message sent to " "the customer when a task is closed." msgstr "" +"Заголовок, добавляемый в начало электронного письма для предупреждения, " +"отправляемого заказчику при закрытии задачи." #. module: scrum #: field:scrum.task,priority:0 @@ -127,6 +131,8 @@ msgstr "Просмотреть задолженноси проекта" msgid "" "Project's member. Not used in any computation, just for information purpose." msgstr "" +"Участников проекта. Не использовать в расчетах, только в информационных " +"целях." #. module: scrum #: selection:scrum.product.backlog,priority:0 @@ -150,6 +156,9 @@ msgid "" "Estimated time to do the task, usually set by the project manager when the " "task is in draft state." msgstr "" +"Предположительное время, необходимое для завершения задания. Обычно " +"устанавливается руководителем проекта, когда задание находится в статусе " +"\"Черновик\"." #. module: scrum #: field:scrum.project,notes:0 @@ -175,6 +184,8 @@ msgid "" "If you check this field, the project manager will receive a request each " "time a task is completed by his team." msgstr "" +"Если вы выберете эту опцию, руководитель проекта каждый раз при завершении " +"задания его командой будет получать запрос." #. module: scrum #: selection:scrum.project,state:0 @@ -190,7 +201,7 @@ msgstr "Название команды" #. module: scrum #: field:scrum.project,warn_header:0 msgid "Mail Header" -msgstr "" +msgstr "Заголовок письма" #. module: scrum #: field:scrum.project,sprint_size:0 @@ -205,7 +216,7 @@ msgstr "Дата окончания" #. module: scrum #: help:scrum.task,effective_hours:0 msgid "Computed using the sum of the task work done." -msgstr "" +msgstr "Рассчитывается на основе объёма выполненных заданий." #. module: scrum #: help:scrum.project,warn_customer:0 @@ -213,6 +224,9 @@ msgid "" "If you check this, the user will have a popup when closing a task that " "propose a message to send by email to the customer." msgstr "" +"Если вы выберете эту опцию, то при закрытии задания пользователь будет " +"получать сообщение с предложением послать клиенту письмо по электронной " +"почте." #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_task_open @@ -239,7 +253,7 @@ msgstr "Срок" #: field:scrum.project,partner_id:0 #: field:scrum.task,partner_id:0 msgid "Partner" -msgstr "" +msgstr "Партнер" #. module: scrum #: field:scrum.product.backlog,planned_hours:0 @@ -251,7 +265,7 @@ msgstr "Запланированные часы" #. module: scrum #: selection:scrum.project,state:0 msgid "Template" -msgstr "" +msgstr "Шаблон" #. module: scrum #: field:scrum.product.backlog,priority:0 @@ -267,12 +281,12 @@ msgstr "Состояние" #. module: scrum #: help:scrum.project,progress_rate:0 msgid "Percent of tasks closed according to the total of tasks todo." -msgstr "" +msgstr "Процент закрытых заданий в соответствии с общем количеством заданий." #. module: scrum #: help:scrum.project,notes:0 msgid "Internal description of the project." -msgstr "" +msgstr "Внутреннее описание проекта." #. module: scrum #: field:scrum.sprint,meetings_id:0 @@ -282,7 +296,7 @@ msgstr "Ежедневный Scrum" #. module: scrum #: help:scrum.task,total_hours:0 msgid "Computed as: Time Spent + Remaining Time." -msgstr "" +msgstr "Вычисляется по формуле: Затраченное время + Оставшееся время." #. module: scrum #: field:scrum.task,type:0 @@ -303,7 +317,7 @@ msgstr "Средний" #. module: scrum #: field:scrum.project,total_hours:0 msgid "Total Time" -msgstr "" +msgstr "Всего времени" #. module: scrum #: model:ir.ui.menu,name:scrum.next_id_67 @@ -313,7 +327,7 @@ msgstr "Scrum" #. module: scrum #: field:scrum.project,planned_hours:0 msgid "Planned Time" -msgstr "" +msgstr "Запланированное время" #. module: scrum #: field:scrum.meeting,question_today:0 @@ -356,7 +370,7 @@ msgstr "Показать задания проекта" #. module: scrum #: field:scrum.task,delay_hours:0 msgid "Delay Hours" -msgstr "" +msgstr "Время отсрочки" #. module: scrum #: field:scrum.project,contact_id:0 @@ -392,12 +406,12 @@ msgstr "Создать задания" #. module: scrum #: field:scrum.task,progress:0 msgid "Progress (%)" -msgstr "" +msgstr "Выполнение (%)" #. module: scrum #: help:scrum.task,progress:0 msgid "Computed as: Time Spent / Total Time." -msgstr "" +msgstr "Вычисляется по формуле: Затраченное время / Общее время." #. module: scrum #: field:scrum.project,scrum:0 @@ -435,7 +449,7 @@ msgstr "Необязательная информация" #. module: scrum #: help:scrum.project,total_hours:0 msgid "Sum of total hours of all tasks related to this project." -msgstr "" +msgstr "Общее время всех заданий, связанных с этим проектом." #. module: scrum #: model:ir.model,name:scrum.model_scrum_sprint @@ -482,7 +496,7 @@ msgstr "Мои открытые задания" #. module: scrum #: field:scrum.project,manager:0 msgid "Project Manager" -msgstr "" +msgstr "Руководитель проекта" #. module: scrum #: selection:scrum.project,state:0 @@ -511,13 +525,13 @@ msgstr "Открытые Sprint-ы" #. module: scrum #: field:scrum.project,effective_hours:0 msgid "Time Spent" -msgstr "" +msgstr "Затрачено времени" #. module: scrum #: field:scrum.project,complete_name:0 #: field:scrum.project,name:0 msgid "Project Name" -msgstr "" +msgstr "Название проекта" #. module: scrum #: field:scrum.project,product_owner_id:0 @@ -561,11 +575,15 @@ msgid "" "Computed as: Total Time - Estimated Time. It gives the difference of the " "time estimated by the project manager and the real time to close the task." msgstr "" +"Вычисляется по формуле: Общее время - Предположительное время. Позволяет " +"увидеть разницу между предположительной оценкой необходимого времени, " +"сделанной руководителем проекта, и реальным временем, затраченным на " +"завершение задания." #. module: scrum #: field:scrum.task,timebox_id:0 msgid "Timebox" -msgstr "" +msgstr "Период" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree2 @@ -576,7 +594,7 @@ msgstr "Черновики Sprint-ов" #. module: scrum #: field:scrum.project,timesheet_id:0 msgid "Working Time" -msgstr "" +msgstr "Время работы" #. module: scrum #: field:scrum.task,work_ids:0 @@ -591,7 +609,7 @@ msgstr "Просмотреть задолженности по Sptint-у" #. module: scrum #: field:scrum.task,delegated_user_id:0 msgid "Delegated To" -msgstr "" +msgstr "Поручено" #. module: scrum #: field:scrum.task,date_close:0 @@ -612,6 +630,8 @@ msgstr "Точность задолженности" #: help:scrum.project,effective_hours:0 msgid "Sum of spent hours of all tasks related to this project." msgstr "" +"Общее количество времени, затраченного на все задания, связанные с этим " +"проектом." #. module: scrum #: help:scrum.task,project_id:0 @@ -619,16 +639,20 @@ msgid "" "If you have [?] in the project name, it means there are no analytic account " "linked to this project." msgstr "" +"Если рядом с названием проекта стоит знак [?], значит этот проект не связан " +"ни с одним аналитическим отчётом." #. module: scrum #: help:scrum.project,planned_hours:0 msgid "Sum of planned hours of all tasks related to this project." msgstr "" +"Общее количество времени, запланированного для выполнения всех заданий, " +"связанных с этим проектом." #. module: scrum #: field:scrum.project,warn_customer:0 msgid "Warn Partner" -msgstr "" +msgstr "Предупредить Партнера" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree4 @@ -648,6 +672,10 @@ msgid "" "projects. It enables you to connect projects with budgets, planning, cost " "and revenue analysis, timesheets on projects, etc." msgstr "" +"Свяжите этот проект с аналитическим счетом, если Вы нуждаетесь в управлении " +"финансовой деятельностью на проектах. Это позволяет Вам соединить проект с " +"бюджетами, планированием, стоимостью и анализом дохода, табели на проектах, " +"и т.д." #. module: scrum #: selection:scrum.product.backlog,state:0 @@ -680,12 +708,12 @@ msgstr "Эффективные часы" #. module: scrum #: field:scrum.project,warn_manager:0 msgid "Warn Manager" -msgstr "" +msgstr "Предупредить руководителя" #. module: scrum #: selection:scrum.task,state:0 msgid "In Progress" -msgstr "" +msgstr "В работе" #. module: scrum #: field:scrum.sprint,review:0 @@ -703,7 +731,7 @@ msgstr "" #. module: scrum #: field:scrum.task,remaining_hours:0 msgid "Remaining Hours" -msgstr "" +msgstr "Оставшиеся часы" #. module: scrum #: field:scrum.task,parent_id:0 @@ -724,7 +752,7 @@ msgstr "Очень низкий" #. module: scrum #: help:scrum.project,timesheet_id:0 msgid "Timetable working hours to adjust the gantt diagram report" -msgstr "" +msgstr "Расписание работы для настройки отчета диаграммы Ганта" #. module: scrum #: model:ir.actions.act_window,name:scrum.action_sprint_open_tree3 @@ -782,7 +810,7 @@ msgstr "Над чем вы сегодня работаете?" #. module: scrum #: selection:scrum.project,state:0 msgid "Running" -msgstr "" +msgstr "Выполняется" #. module: scrum #: field:scrum.product.backlog,progress:0 @@ -824,7 +852,7 @@ msgstr "Описание заданий" #. module: scrum #: field:scrum.task,effective_hours:0 msgid "Hours Spent" -msgstr "" +msgstr "Затраченное время" #. module: scrum #: field:scrum.task,context_id:0 @@ -834,7 +862,7 @@ msgstr "Контекст" #. module: scrum #: field:scrum.task,total_hours:0 msgid "Total Hours" -msgstr "" +msgstr "Всего часов" #. module: scrum #: field:scrum.team,users_id:0 @@ -854,6 +882,8 @@ msgid "" "Footer added at the beginning of the email for the warning message sent to " "the customer when a task is closed." msgstr "" +"В начало письма добавлена сноска, чтобы при завершении задания клиент " +"получал предупреждение." #. module: scrum #: model:ir.actions.act_window,name:scrum.action_product_backlog_form_open @@ -869,7 +899,7 @@ msgstr "Созданные задания" #. module: scrum #: constraint:scrum.project:0 msgid "Error ! You can not create recursive projects." -msgstr "" +msgstr "Ошибка! Вы не можете создать взаимное подчинение проектов!" #. module: scrum #: wizard_field:scrum.product.backlog.task.create,init,user_id:0 @@ -887,9 +917,9 @@ msgstr "Sprint" #. module: scrum #: field:scrum.project,date_end:0 msgid "Expected End" -msgstr "" +msgstr "Предположительное окончание" #. module: scrum #: field:scrum.project,warn_footer:0 msgid "Mail Footer" -msgstr "" +msgstr "Нижняя часть письма" diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po index 476dda37935..3bde9f2f4eb 100644 --- a/addons/stock/i18n/ru.po +++ b/addons/stock/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-04-19 05:33+0000\n" -"Last-Translator: grisha <Unknown>\n" +"PO-Revision-Date: 2010-07-11 08:18+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:54+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock @@ -109,7 +109,7 @@ msgstr "Упаковочный лист" #: rml:lot.stock.overview:0 #: rml:lot.stock.overview_all:0 msgid "Amount" -msgstr "" +msgstr "Количество" #. module: stock #: view:stock.picking:0 @@ -120,7 +120,7 @@ msgstr "Получено изделий" #: model:ir.actions.act_window,name:stock.action_picking_tree4 #: model:ir.ui.menu,name:stock.menu_action_picking_tree4 msgid "Incoming Products" -msgstr "" +msgstr "Поступающие товары" #. module: stock #: field:stock.picking,name:0 @@ -236,7 +236,7 @@ msgstr "" #. module: stock #: field:stock.location,usage:0 msgid "Location Type" -msgstr "" +msgstr "Тип месторасположения" #. module: stock #: selection:stock.location,icon:0 @@ -251,7 +251,7 @@ msgstr "" #. module: stock #: rml:stock.picking.list:0 msgid "[" -msgstr "" +msgstr "[" #. module: stock #: view:stock.picking:0 @@ -295,7 +295,7 @@ msgstr "Дополнительная информация" #. module: stock #: selection:stock.invoice_onshipping,init,type:0 msgid "Customer Refund" -msgstr "" +msgstr "Возврат денег клиенту" #. module: stock #: selection:stock.location,icon:0 @@ -354,7 +354,7 @@ msgstr "" #. module: stock #: view:stock.picking.move.wizard:0 msgid "Move Lines" -msgstr "" +msgstr "Строки финансового документа" #. module: stock #: wizard_field:stock.fill_inventory,init,recursive:0 @@ -414,7 +414,7 @@ msgstr "Количество" #. module: stock #: view:stock.picking:0 msgid "Process Now" -msgstr "" +msgstr "Выполнить сейчас" #. module: stock #: field:stock.location,address_id:0 @@ -480,7 +480,7 @@ msgstr "Продажи и закупки" #. module: stock #: selection:stock.invoice_onshipping,init,type:0 msgid "Customer Invoice" -msgstr "" +msgstr "Счета клиентам" #. module: stock #: field:product.template,property_stock_inventory:0 @@ -550,7 +550,7 @@ msgstr "" #. module: stock #: field:stock.location,stock_virtual:0 msgid "Virtual Stock" -msgstr "" +msgstr "Виртуальные запасы" #. module: stock #: selection:stock.location,usage:0 @@ -710,7 +710,7 @@ msgstr "" #. module: stock #: view:stock.picking:0 msgid "Calendar View" -msgstr "" +msgstr "Вид календаря" #. module: stock #: wizard_field:stock.location.products,init,from_date:0 @@ -730,7 +730,7 @@ msgstr "" #. module: stock #: view:stock.picking:0 msgid "Invoice Control" -msgstr "" +msgstr "Управление счетами" #. module: stock #: model:ir.model,name:stock.model_stock_production_lot_revision @@ -807,7 +807,7 @@ msgstr "" #: model:ir.ui.menu,name:stock.menu_action_picking_all #: wizard_field:stock.picking.make,init,pickings:0 msgid "Packing" -msgstr "" +msgstr "Упаковка" #. module: stock #: selection:stock.location,icon:0 @@ -1050,7 +1050,7 @@ msgstr "Разделить партию по отдельным серийным #: field:stock.inventory.line,inventory_id:0 #: selection:stock.location,usage:0 msgid "Inventory" -msgstr "" +msgstr "Инвентаризация" #. module: stock #: view:product.template:0 @@ -1143,7 +1143,7 @@ msgstr "" #. module: stock #: rml:stock.picking.list:0 msgid "]" -msgstr "" +msgstr "]" #. module: stock #: view:stock.picking:0 @@ -1164,7 +1164,7 @@ msgstr "" #. module: stock #: selection:stock.invoice_onshipping,init,type:0 msgid "Supplier Refund" -msgstr "" +msgstr "Возврат средств от поставщика" #. module: stock #: model:ir.model,name:stock.model_stock_move @@ -1782,7 +1782,7 @@ msgstr "Ед.изм. продукции" #: rml:lot.stock.overview:0 #: rml:lot.stock.overview_all:0 msgid "Variants" -msgstr "" +msgstr "Варианты" #. module: stock #: field:stock.location,posx:0 diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po index 9b050fab928..709b8e92762 100644 --- a/addons/stock_location/i18n/ru.po +++ b/addons/stock_location/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 12:01+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 08:08+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock_location @@ -53,12 +53,12 @@ msgstr "" #. module: stock_location #: field:stock.location.path,location_from_id:0 msgid "Source Location" -msgstr "" +msgstr "Местоположение источника" #. module: stock_location #: field:stock.location.path,location_dest_id:0 msgid "Destination Location" -msgstr "" +msgstr "Место назначения" #. module: stock_location #: field:stock.location.path,auto:0 @@ -69,12 +69,12 @@ msgstr "" #. module: stock_location #: field:stock.location.path,product_id:0 msgid "Products" -msgstr "" +msgstr "Продукция" #. module: stock_location #: selection:stock.location.path,auto:0 msgid "Manual Operation" -msgstr "" +msgstr "Ручное управление" #. module: stock_location #: model:ir.model,name:stock_location.model_stock_location_path @@ -95,7 +95,7 @@ msgstr "" #. module: stock_location #: field:stock.location.path,name:0 msgid "Operation" -msgstr "" +msgstr "Операция" #. module: stock_location #: view:product.product:0 diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po index 4ef691ef436..256fedb5875 100644 --- a/addons/stock_no_autopicking/i18n/ru.po +++ b/addons/stock_no_autopicking/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-02-03 10:09+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-11 08:06+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:16+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:47+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: stock_no_autopicking @@ -24,7 +24,7 @@ msgstr "Неправильный XML для просмотра архитект #. module: stock_no_autopicking #: field:product.product,auto_pick:0 msgid "Auto Picking" -msgstr "" +msgstr "Авто выбор" #. module: stock_no_autopicking #: help:product.product,auto_pick:0 diff --git a/addons/subscription/i18n/ru.po b/addons/subscription/i18n/ru.po index 26abd098328..7e2ebbf3085 100644 --- a/addons/subscription/i18n/ru.po +++ b/addons/subscription/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2008-10-29 17:32+0000\n" -"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n" +"PO-Revision-Date: 2010-07-11 08:06+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 03:55+0000\n" +"X-Launchpad-Export-Date: 2010-07-12 03:46+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: subscription @@ -63,7 +63,7 @@ msgstr "Текущая дата" #. module: subscription #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: subscription #: selection:subscription.subscription,interval_type:0 diff --git a/addons/survey/i18n/ru.po b/addons/survey/i18n/ru.po new file mode 100644 index 00000000000..19a78a8793f --- /dev/null +++ b/addons/survey/i18n/ru.po @@ -0,0 +1,697 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-26 06:01+0000\n" +"PO-Revision-Date: 2010-07-10 21:03+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: survey +#: model:ir.ui.menu,name:survey.menu_survey_form +msgid "Surveys" +msgstr "Опросы" + +#. module: survey +#: model:ir.actions.report.xml,name:survey.survey +msgid "Survey Analysis Report" +msgstr "" + +#. module: survey +#: model:ir.actions.act_window,name:survey.act_survey_page_question +#: model:ir.ui.menu,name:survey.menu_survey_question_form1 +msgid "Survey Questions" +msgstr "Вопросы опросника" + +#. module: survey +#: view:survey:0 +#: view:survey.response:0 +msgid "Set to draft" +msgstr "Установить в 'Черновик'" + +#. module: survey +#: constraint:ir.actions.act_window:0 +msgid "Invalid model name in the action definition." +msgstr "Недопустимое имя модели в определении действия." + +#. module: survey +#: field:survey.history,date:0 +msgid "Date started" +msgstr "Дата начала" + +#. module: survey +#: field:survey,history:0 +msgid "History Lines" +msgstr "" + +#. module: survey +#: wizard_field:wizard.send.invitation,init,mail:0 +msgid "Body" +msgstr "Содержимое" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_view_survey_name +#: model:ir.ui.menu,name:survey.menu_run_survey_form +msgid "Give Survey Response" +msgstr "" + +#. module: survey +#: model:ir.actions.act_window,name:survey.act_survey_question +msgid "All Questions" +msgstr "" + +#. module: survey +#: field:survey,date_open:0 +msgid "Survey Open Date" +msgstr "Дата открытия опроса" + +#. module: survey +#: model:ir.model,name:survey.model_survey_name_wiz +msgid "survey.name.wiz" +msgstr "" + +#. module: survey +#: view:survey:0 +msgid "Users Details" +msgstr "Информация о пользователе" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_view_survey_question_message +#: model:ir.model,name:survey.model_survey_question +#: view:survey:0 +#: view:survey.page:0 +#: view:survey.question:0 +msgid "Survey Question" +msgstr "" + +#. module: survey +#: help:survey,response_user:0 +msgid "Set to one if you require only one response per user" +msgstr "" + +#. module: survey +#: field:survey.page,title:0 +msgid "Page Title" +msgstr "Заголовок страницы" + +#. module: survey +#: model:ir.model,name:survey.model_survey_history +msgid "Survey History" +msgstr "История опроса" + +#. module: survey +#: field:survey.response,comment:0 +#: field:survey.response.answer,comment:0 +msgid "Notes" +msgstr "Примечания" + +#. module: survey +#: field:survey.question,tot_resp:0 +msgid "Total Response" +msgstr "" + +#. module: survey +#: view:survey.question.wiz:0 +msgid "Your Messages" +msgstr "Ваше сообщение" + +#. module: survey +#: selection:survey,state:0 +msgid "Cancelled" +msgstr "Отменено" + +#. module: survey +#: field:survey.question,allow_comment:0 +msgid "Allow Comment Field" +msgstr "" + +#. module: survey +#: code:addons/survey/survey.py:0 +#, python-format +msgid "Warning !" +msgstr "Внимание!" + +#. module: survey +#: wizard_view:wizard.send.invitation,init:0 +#: wizard_field:wizard.send.invitation,init,send_mail_existing:0 +msgid "Send reminder for existing user" +msgstr "" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_new_survey_question_form +#: model:ir.ui.menu,name:survey.menu_new_survey_question_form1 +msgid "New Survey Question" +msgstr "" + +#. module: survey +#: view:survey.response:0 +msgid "Skip" +msgstr "Пропустить" + +#. module: survey +#: wizard_field:wizard.send.invitation,init,partner_ids:0 +msgid "Partner" +msgstr "Партнер" + +#. module: survey +#: wizard_field:wizard.send.invitation,init,mail_subject:0 +#: wizard_field:wizard.send.invitation,init,mail_subject_existing:0 +msgid "Subject" +msgstr "Тема" + +#. module: survey +#: field:survey,max_response_limit:0 +msgid "Maximum Response Limit" +msgstr "" + +#. module: survey +#: wizard_field:wizard.send.invitation,init,mail_from:0 +msgid "From" +msgstr "От" + +#. module: survey +#: field:survey.response,response_type:0 +msgid "Response Type" +msgstr "" + +#. module: survey +#: field:survey.name.wiz,transfer:0 +msgid "Page Transfer" +msgstr "" + +#. module: survey +#: field:survey.answer,question_id:0 +#: field:survey.page,question_ids:0 +#: field:survey.question,question:0 +#: field:survey.response,question_id:0 +msgid "Question" +msgstr "Вопрос" + +#. module: survey +#: wizard_button:wizard.send.invitation,init,send:0 +msgid "Send" +msgstr "Отправить" + +#. module: survey +#: field:survey.answer,response:0 +msgid "#Response" +msgstr "" + +#. module: survey +#: field:survey.response,response_answer_ids:0 +msgid "Response Answer" +msgstr "" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Response Summary" +msgstr "" + +#. module: survey +#: wizard_view:wizard.send.invitation,init:0 +#: wizard_field:wizard.send.invitation,init,send_mail:0 +msgid "Send mail for new user" +msgstr "" + +#. module: survey +#: code:addons/survey/survey.py:0 +#, python-format +msgid "Error !" +msgstr "Ошибка !" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Skipped Question" +msgstr "" + +#. module: survey +#: wizard_button:wizard.send.invitation,send,end:0 +msgid "_Ok" +msgstr "_Ok" + +#. module: survey +#: selection:survey.response,response_type:0 +msgid "Link" +msgstr "Ссылка" + +#. module: survey +#: model:ir.ui.menu,name:survey.menu_survey_config +msgid "Configuration" +msgstr "Конфигурация" + +#. module: survey +#: model:ir.model,name:survey.model_survey_question_wiz +msgid "survey.question.wiz" +msgstr "" + +#. module: survey +#: constraint:ir.ui.view:0 +msgid "Invalid XML for View Architecture!" +msgstr "Неправильный XML для просмотра структуры!" + +#. module: survey +#: model:ir.model,name:survey.model_survey_response_answer +#: view:survey.response.answer:0 +msgid "Survey Response Answer" +msgstr "" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Page :-" +msgstr "" + +#. module: survey +#: field:survey,response_user:0 +msgid "Maximum Response per User" +msgstr "" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Total Started Survey :-" +msgstr "" + +#. module: survey +#: view:survey.response:0 +msgid "Comment" +msgstr "Комментарий" + +#. module: survey +#: field:survey.response,date_modify:0 +msgid "Modify Date" +msgstr "" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Answered Question" +msgstr "" + +#. module: survey +#: code:addons/survey/survey.py:0 +#, python-format +msgid "You can not give response for this survey more than %s times" +msgstr "" + +#. module: survey +#: selection:survey.response,response_type:0 +msgid "Manually" +msgstr "Вручную" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_survey_form1 +msgid "All Surveys" +msgstr "" + +#. module: survey +#: view:survey:0 +#: field:survey,users:0 +msgid "Users" +msgstr "Пользователи" + +#. module: survey +#: wizard_view:wizard.send.invitation,init:0 +msgid "Message" +msgstr "Сообщение" + +#. module: survey +#: field:survey.name.wiz,page_no:0 +msgid "Page Number" +msgstr "Номер страницы" + +#. module: survey +#: wizard_field:wizard.send.invitation,send,note:0 +msgid "Log" +msgstr "Журнал" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_survey_question_form +msgid "All Survey Questions" +msgstr "" + +#. module: survey +#: field:survey,date_close:0 +msgid "Survey Close Date" +msgstr "" + +#. module: survey +#: view:survey.name.wiz:0 +msgid "Start" +msgstr "Начать" + +#. module: survey +#: selection:survey,state:0 +#: selection:survey.response,state:0 +msgid "Draft" +msgstr "Черновик" + +#. module: survey +#: selection:survey,state:0 +msgid "Closed" +msgstr "Закрытый" + +#. module: survey +#: view:survey:0 +#: field:survey.answer,answer:0 +#: view:survey.page:0 +#: view:survey.question:0 +#: field:survey.question,answer_choice_ids:0 +#: field:survey.response.answer,answer_id:0 +msgid "Answer" +msgstr "Ответ" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_survey_page_form +msgid "All Survey Pages" +msgstr "" + +#. module: survey +#: field:survey.name.wiz,store_ans:0 +msgid "Store Answer" +msgstr "" + +#. module: survey +#: field:survey,state:0 +#: field:survey.response,state:0 +msgid "Status" +msgstr "Состояние" + +#. module: survey +#: model:ir.module.module,shortdesc:survey.module_meta_information +msgid "Survey Module" +msgstr "" + +#. module: survey +#: model:ir.module.module,description:survey.module_meta_information +msgid "" +"\n" +" This module is used for surveing. It depends on the answers or reviews " +"of some questions by different users.\n" +" A survey may have multiple pages. Each page may contain multiple " +"questions and each question may have multiple answers.\n" +" Different users may give different answers of question and according to " +"that survey is done. \n" +" Partners are also sent mails with user name and password for the " +"invitation of the survey\n" +" " +msgstr "" + +#. module: survey +#: view:survey:0 +#: view:survey.name.wiz:0 +msgid "Survey Details" +msgstr "" + +#. module: survey +#: field:survey.question,is_require_answer:0 +msgid "Required Answer" +msgstr "" + +#. module: survey +#: field:survey.history,user_id:0 +#: field:survey.response,response_id:0 +msgid "User" +msgstr "Пользователь" + +#. module: survey +#: field:res.users,survey_id:0 +msgid "Groups" +msgstr "Группы" + +#. module: survey +#: view:survey:0 +#: view:survey.page:0 +#: view:survey.question:0 +#: field:survey.question,response_ids:0 +#: view:survey.response:0 +#: field:survey.response.answer,response_id:0 +msgid "Response" +msgstr "Ответ" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_new_survey_form1 +#: model:ir.ui.menu,name:survey.menu_new_survey_form +msgid "New Survey" +msgstr "" + +#. module: survey +#: model:ir.ui.menu,name:survey.main_menu_survey +msgid "Survey Management" +msgstr "" + +#. module: survey +#: selection:survey.response,state:0 +msgid "Skiped" +msgstr "" + +#. module: survey +#: model:ir.model,name:survey.model_survey_answer +#: view:survey.answer:0 +msgid "Survey Answer" +msgstr "Обзор ответа" + +#. module: survey +#: code:addons/survey/wizard/wizard_survey.py:0 +#, python-format +msgid "Attention!" +msgstr "Внимание!" + +#. module: survey +#: model:ir.model,name:survey.model_survey +#: view:res.users:0 +#: view:survey:0 +#: field:survey.history,survey_id:0 +#: view:survey.name.wiz:0 +#: field:survey.name.wiz,survey_id:0 +#: field:survey.page,survey_id:0 +#: field:survey.question,survey:0 +msgid "Survey" +msgstr "Опрос" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Total Completed Survey :-" +msgstr "" + +#. module: survey +#: view:survey:0 +msgid "History" +msgstr "Журнал" + +#. module: survey +#: view:survey:0 +#: view:survey.answer:0 +#: view:survey.page:0 +#: view:survey.question:0 +msgid "Seq" +msgstr "" + +#. module: survey +#: field:survey,tot_comp_survey:0 +msgid "Total Completed Survey" +msgstr "" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Response Percentage" +msgstr "" + +#. module: survey +#: field:survey.question.wiz,name:0 +msgid "Number" +msgstr "Номер" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Survey Title :-" +msgstr "" + +#. module: survey +#: view:survey.response:0 +msgid "Done" +msgstr "Готово" + +#. module: survey +#: code:addons/survey/survey.py:0 +#, python-format +msgid "'\" + que_rec[0]['question'] + \"' This question requires an answer." +msgstr "" + +#. module: survey +#: view:survey:0 +#: view:survey.name.wiz:0 +#: wizard_button:wizard.send.invitation,init,end:0 +msgid "Cancel" +msgstr "Отмена" + +#. module: survey +#: view:survey:0 +msgid "Close" +msgstr "Закрыть" + +#. module: survey +#: view:survey:0 +#: selection:survey,state:0 +msgid "Open" +msgstr "Открыть" + +#. module: survey +#: field:survey,tot_start_survey:0 +msgid "Total Started Survey" +msgstr "" + +#. module: survey +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: survey +#: model:ir.model,name:survey.model_survey_response +#: view:survey.response:0 +msgid "Survey Response" +msgstr "Ответ, полученный в ходе опроса" + +#. module: survey +#: field:survey.answer,average:0 +msgid "#Avg" +msgstr "" + +#. module: survey +#: field:survey,responsible_id:0 +msgid "Responsible" +msgstr "Ответственный" + +#. module: survey +#: selection:survey.response,state:0 +msgid "Answered" +msgstr "Отвечено" + +#. module: survey +#: view:survey:0 +msgid "Other" +msgstr "Другое" + +#. module: survey +#: model:ir.actions.wizard,name:survey.wizard_send_invitation +#: wizard_view:wizard.send.invitation,init:0 +msgid "Send Invitation" +msgstr "Отправить Приглашение" + +#. module: survey +#: field:survey,title:0 +msgid "Survey Title" +msgstr "Заголовок опроса" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "%" +msgstr "%" + +#. module: survey +#: view:survey:0 +#: field:survey,note:0 +#: field:survey.name.wiz,note:0 +#: view:survey.page:0 +#: field:survey.page,note:0 +#: view:survey.response:0 +msgid "Description" +msgstr "Описание" + +#. module: survey +#: view:survey.name.wiz:0 +msgid "Select Survey" +msgstr "" + +#. module: survey +#: model:ir.actions.act_window,name:survey.action_new_survey_page_form +#: model:ir.ui.menu,name:survey.menu_new_survey_page_form1 +msgid "New Survey Page" +msgstr "" + +#. module: survey +#: view:survey:0 +#: view:survey.page:0 +#: field:survey.question,page_id:0 +msgid "Survey Page" +msgstr "" + +#. module: survey +#: model:ir.actions.act_window,name:survey.act_survey_answer +msgid "Survey Answers" +msgstr "" + +#. module: survey +#: view:survey.page:0 +msgid "#Questions" +msgstr "" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Que:" +msgstr "" + +#. module: survey +#: field:survey,page_ids:0 +msgid "Page" +msgstr "Страница" + +#. module: survey +#: wizard_view:wizard.send.invitation,send:0 +msgid "User creation" +msgstr "" + +#. module: survey +#: field:survey.answer,sequence:0 +#: field:survey.page,sequence:0 +#: field:survey.question,sequence:0 +msgid "Sequence" +msgstr "Нумерация" + +#. module: survey +#: wizard_view:wizard.send.invitation,send:0 +msgid "Results :" +msgstr "Результаты:" + +#. module: survey +#: code:addons/survey/wizard/wizard_survey.py:0 +#, python-format +msgid "%sSurvey is not in open state" +msgstr "" + +#. module: survey +#: wizard_view:wizard.send.invitation,init:0 +msgid "Select Partner" +msgstr "" + +#. module: survey +#: field:survey.response,date_create:0 +msgid "Create Date" +msgstr "Дата Создания" + +#. module: survey +#: model:ir.actions.act_window,name:survey.act_survey_pages +#: model:ir.model,name:survey.model_survey_page +#: model:ir.ui.menu,name:survey.menu_survey_page_form1 +msgid "Survey Pages" +msgstr "" + +#. module: survey +#: rml:survey_analysis_report:0 +msgid "Response Count" +msgstr "" + +#. module: survey +#: field:survey.name.wiz,page:0 +msgid "Page Position" +msgstr "" diff --git a/addons/thunderbird/i18n/ru.po b/addons/thunderbird/i18n/ru.po new file mode 100644 index 00000000000..f99c2bc8f8f --- /dev/null +++ b/addons/thunderbird/i18n/ru.po @@ -0,0 +1,87 @@ +# Russian translation for openobject-addons +# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2009-11-26 06:05+0000\n" +"PO-Revision-Date: 2010-07-10 21:06+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" +"X-Generator: Launchpad (build Unknown)\n" + +#. module: thunderbird +#: field:tinythunderbird.partner,copy_to:0 +msgid "Copy To" +msgstr "Копировать в" + +#. module: thunderbird +#: constraint:ir.model:0 +msgid "" +"The Object name must start with x_ and not contain any special character !" +msgstr "" +"Название объекта должно начинаться с x_ и не должно содержать специальных " +"символов !" + +#. module: thunderbird +#: field:tinythunderbird.partner,description:0 +msgid "Description" +msgstr "Описание" + +#. module: thunderbird +#: field:tinythunderbird.partner,reference:0 +msgid "Reference" +msgstr "Поля и параметры" + +#. module: thunderbird +#: model:ir.model,name:thunderbird.model_tinythunderbird_partner +msgid "Thunderbid mails" +msgstr "Письма Thunderbid" + +#. module: thunderbird +#: field:tinythunderbird.partner,attachments:0 +msgid "Attached Files" +msgstr "Вложенные файлы" + +#. module: thunderbird +#: field:tinythunderbird.partner,res_user_id:0 +msgid "User" +msgstr "Пользователь" + +#. module: thunderbird +#: field:tinythunderbird.partner,receiver:0 +msgid "Receiver" +msgstr "Получатель" + +#. module: thunderbird +#: field:tinythunderbird.partner,date:0 +msgid "Date" +msgstr "Дата" + +#. module: thunderbird +#: field:tinythunderbird.partner,title:0 +msgid "Subject" +msgstr "Тема" + +#. module: thunderbird +#: code:addons/thunderbird/partner/partner.py:0 +#, python-format +msgid "Archive" +msgstr "Архив" + +#. module: thunderbird +#: model:ir.module.module,shortdesc:thunderbird.module_meta_information +msgid "Thunderbird Interface" +msgstr "Интерфейс Thunderbid" + +#. module: thunderbird +#: field:tinythunderbird.partner,sender:0 +msgid "Sender" +msgstr "Отправитель" diff --git a/addons/warning/i18n/ru.po b/addons/warning/i18n/ru.po index b02486c43cf..dced53ede5a 100644 --- a/addons/warning/i18n/ru.po +++ b/addons/warning/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.0\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2009-09-08 16:47+0000\n" -"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" +"PO-Revision-Date: 2010-07-10 20:49+0000\n" +"Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-06-22 04:18+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: warning @@ -24,17 +24,17 @@ msgstr "" #. module: warning #: field:product.product,sale_line_warn_msg:0 msgid "Message for Sale Order Line" -msgstr "" +msgstr "Сообщение о продаже позиции в заказе" #. module: warning #: field:product.product,purchase_line_warn_msg:0 msgid "Message for Purchase Order Line" -msgstr "" +msgstr "Сообщение о покупке позиции в заказе" #. module: warning #: field:product.product,sale_line_warn:0 msgid "Sale Order Line" -msgstr "" +msgstr "Позиция заказа" #. module: warning #: view:product.product:0 @@ -45,7 +45,7 @@ msgstr "" #: view:product.product:0 #: view:res.partner:0 msgid "Warnings" -msgstr "" +msgstr "Предупреждения" #. module: warning #: selection:product.product,sale_line_warn:0 @@ -69,7 +69,7 @@ msgstr "" #: selection:res.partner,purchase_warn:0 #: selection:res.partner,sale_warn:0 msgid "No Message" -msgstr "" +msgstr "Не предупреждать" #. module: warning #: constraint:ir.ui.view:0 @@ -79,7 +79,7 @@ msgstr "Неправильный XML для просмотра архитект #. module: warning #: field:res.partner,invoice_warn:0 msgid "Invoice" -msgstr "" +msgstr "Счет" #. module: warning #: model:ir.module.module,shortdesc:warning.module_meta_information @@ -94,7 +94,7 @@ msgstr "" #. module: warning #: field:res.partner,sale_warn:0 msgid "Sale Order" -msgstr "" +msgstr "Заказ" #. module: warning #: field:res.partner,picking_warn:0 @@ -104,7 +104,7 @@ msgstr "" #. module: warning #: field:res.partner,purchase_warn:0 msgid "Purchase Order" -msgstr "" +msgstr "Заказ на поставку" #. module: warning #: field:res.partner,sale_warn_msg:0 @@ -162,7 +162,7 @@ msgstr "" #: selection:res.partner,purchase_warn:0 #: selection:res.partner,sale_warn:0 msgid "Warning" -msgstr "" +msgstr "Внимание" #. module: warning #: field:res.partner,picking_warn_msg:0 diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py index 1b65dd4d92b..d5c5cc16b30 100644 --- a/addons/wiki/__openerp__.py +++ b/addons/wiki/__openerp__.py @@ -31,6 +31,7 @@ keep track for the wiki groups, pages, and history 'author': 'Tiny & Axelor', 'website': 'http://openerp.com', 'depends': ['knowledge'], + 'web_depends': ['widget_wiki'], 'init_xml': [], 'update_xml': [ 'wizard/wiki_wiki_page_open_view.xml', diff --git a/addons/wiki/i18n/ru.po b/addons/wiki/i18n/ru.po index ff219776722..802bf1020ff 100644 --- a/addons/wiki/i18n/ru.po +++ b/addons/wiki/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2009-08-28 16:01+0000\n" -"PO-Revision-Date: 2010-07-07 22:45+0000\n" +"PO-Revision-Date: 2010-07-10 20:40+0000\n" "Last-Translator: Pomazan Bogdan <Unknown>\n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-07-09 03:56+0000\n" +"X-Launchpad-Export-Date: 2010-07-11 03:41+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. module: wiki @@ -90,7 +90,7 @@ msgstr "Настройка Wiki" #. module: wiki #: constraint:ir.actions.act_window:0 msgid "Invalid model name in the action definition." -msgstr "" +msgstr "Недопустимое имя модели в определении действия." #. module: wiki #: field:wiki.groups,name:0 |