[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130531101916-81xwtv4t58krnfaw
2013-05-31 12:19:16 +02:00 · 2013-05-31 12:19:16 +02:00 · 71df2e6f7d
parent 4e7b20dfb6 c40010d9a3
commit 71df2e6f7d
62 changed files with 1017 additions and 496 deletions
--- a/addons/account/html/index.html
+++ b/addons/account/html/index.html
@ -171,7 +171,7 @@ Get direct access to key information with dynamic and customizable dashboards. A
        </div>
    </div>
 </section>
-<section class="oe_container">
+<section class="oe_container oe_dark">
    <div class="oe_row">
        <div class="oe_span12">
            <h2 class="oe_slogan">Many companies already enjoy it</h2>
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-14 06:41+0000\n"
+"PO-Revision-Date: 2013-05-29 13:04+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:17+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-30 05:45+0000\n"
+"X-Generator: Launchpad (build 16652)\n"

 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@ -7386,7 +7386,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Управление платежами заказчиков"

 #. module: account
 #: help:report.invoice.created,origin:0
@ -7415,7 +7415,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
-msgstr "Счета клиенту"
+msgstr "Счета заказчику"

 #. module: account
 #: view:account.tax:0
@ -10543,7 +10543,7 @@ msgstr "Состояние счета - сделано"
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Управление напоминаниями заказчикам об оплатах"

 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@ -11037,7 +11037,7 @@ msgstr "Счет расходов по шаблону ТМЦ"
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Срок платежа заказчика"

 #. module: account
 #: help:accounting.report,label_filter:0
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@ -338,4 +338,10 @@ class account_config_settings(osv.osv_memory):
        dp = self.pool.get('ir.model.data').get_object(cr, uid, 'product','decimal_account')
        dp.write({'digits': config.decimal_precision})

+    def onchange_analytic_accounting(self, cr, uid, ids, analytic_accounting, context=None):
+        if analytic_accounting:
+            return {'value': {
+                'module_account_accountant': True,
+                }}
+        return {}
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@ -130,7 +130,7 @@
                                <label for="module_account_accountant"/>
                            </div>
                            <div>
-                                <field name="group_analytic_accounting" class="oe_inline"/>
+                                <field name="group_analytic_accounting" class="oe_inline" on_change="onchange_analytic_accounting(group_analytic_accounting, context)"/>
                                <label for="group_analytic_accounting"/>
                            </div>
                            <div>
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@ -478,7 +478,7 @@ class account_analytic_account(osv.osv):
        'remaining_hours': fields.function(_remaining_hours_calc, type='float', string='Remaining Time',
            help="Computed using the formula: Maximum Time - Total Worked Time"),
        'remaining_hours_to_invoice': fields.function(_remaining_hours_to_invoice_calc, type='float', string='Remaining Time',
-            help="Computed using the formula: Maximum Time - Total Invoiced Time"),
+            help="Computed using the formula: Expected on timesheets - Total invoiced on timesheets"),
        'fix_price_to_invoice': fields.function(_fix_price_to_invoice_calc, type='float', string='Remaining Time',
            help="Sum of quotations for this contract."),
        'timesheet_ca_invoiced': fields.function(_timesheet_ca_invoiced_calc, type='float', string='Remaining Time',
--- a/addons/account_voucher/html/account_illu_01.png
+++ b/addons/account_voucher/html/account_illu_01.png
--- a/addons/account_voucher/html/account_sc_00.png
+++ b/addons/account_voucher/html/account_sc_00.png
--- a/addons/account_voucher/html/account_sc_02.png
+++ b/addons/account_voucher/html/account_sc_02.png
--- a/addons/account_voucher/html/account_sc_03.png
+++ b/addons/account_voucher/html/account_sc_03.png
--- a/addons/account_voucher/html/account_sc_04.png
+++ b/addons/account_voucher/html/account_sc_04.png
--- a/addons/account_voucher/html/account_sc_06.png
+++ b/addons/account_voucher/html/account_sc_06.png
--- a/addons/account_voucher/html/bazile.png
+++ b/addons/account_voucher/html/bazile.png
--- a/addons/account_voucher/html/index.html
+++ b/addons/account_voucher/html/index.html
@ -0,0 +1,141 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Invoicing Made Easy</h2>
+        <h3 class="oe_slogan">Send professional invoices &amp; get paid online</h3>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=account">
+                    <img src="account_sc_00.png" alt="Online Demo">
+                </a>
+                <span class="oe_demo_play">&nbsp;</span>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Create and send professional looking invoices &amp; get paid
+                online. It automatically integrates with other apps to bill
+                automatically based on your activities.
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <h2 class="oe_slogan">Send Invoices With No Effort</h2>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+                Send invoices directly to your clients in just a click. The
+                invoice is automatically attached to the email as a PDF file.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_03.png">
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <h2 class="oe_slogan">Get Paid Faster</h2>
+    <h3 class="oe_slogan">Electronic invoicing and automated follow-ups</h3>
+    <div class="oe_row">
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_02.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get paid online with paypal or other payment processing service. Get rid of
+the stress of having to constantly remind your debtors. Simply set-up and
+automate follow-ups to get paid quickly.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Connect Your Bank Accounts</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Import your bank statements and reconcile them in just a few clicks. Prepare
+payment orders based on your supplier invoices and payment terms.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture" src="account_illu_01.png">
+        </div>
+
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Analyse Your Sales &amp; Costs</h2>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_06.png">
+        </div>
+        <div class="oe_span6">
+            <p class='oe_mt32'>
+Get direct access to key information with dynamic and customizable dashboards.
+Analyse your invoicing by product, customer, salesperson, etc.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+       <h2 class="oe_slogan">Integration With Other Apps</h2>
+       <div class="oe_span6">
+            <p class='oe_mt32'>
+Bill automatically based on sales orders, delivery orders, contracts or on time and
+material. Define recurrencies to produce recurring invoice automatically.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <img class="oe_picture oe_screenshot" src="account_sc_04.png">
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    OpenERP allowed us to automate sending 10.000 invoices per month.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="bazile.png">
+                    <div class="oe_author">Yves Morel</div>
+                    <div class="oe_job">Director of <a href="http://www.bazile.fr" target="_blank">Bazile Telecom</a>.</div>
+                </cite>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+                    We have found invoicing module of OpenERP to be user
+                    friendly and highly customizable.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="testimonial_sunil.jpg">
+                    <div class="oe_author">Col. Sunil Prem.</div>
+                    <div class="oe_job">Director of <a href="http://www.navyuginfo.com" target="_blank">Navyug Infosolutions Pvt. Ltd</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
--- a/addons/account_voucher/html/testimonial_sunil.jpg
+++ b/addons/account_voucher/html/testimonial_sunil.jpg
--- a/addons/account_voucher/i18n/ru.po
+++ b/addons/account_voucher/i18n/ru.po
@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-05-10 17:46+0000\n"
+"PO-Revision-Date: 2013-05-29 13:17+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:33+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-30 05:45+0000\n"
+"X-Generator: Launchpad (build 16652)\n"

 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0
 msgid "Reconciliation"
-msgstr ""
+msgstr "Сверка"

 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"

 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:369
@ -45,7 +45,7 @@ msgstr "Общая сумма"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Customer Journal Entries"
-msgstr ""
+msgstr "Открыть записи журнала по заказчику"

 #. module: account_voucher
 #: view:account.voucher:0
@ -63,7 +63,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(Update)"
-msgstr ""
+msgstr "(Обновить)"

 #. module: account_voucher
 #: view:account.voucher:0
@ -90,7 +90,7 @@ msgstr "Март"
 #. module: account_voucher
 #: field:account.voucher,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"

 #. module: account_voucher
 #: view:account.voucher:0
@ -115,13 +115,13 @@ msgstr "Номер транзакции."
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Группировать по году в дате счета"

 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,user_id:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"

 #. module: account_voucher
 #: view:account.voucher:0
@ -135,6 +135,8 @@ msgid ""
 "You can not change the journal as you already reconciled some statement "
 "lines!"
 msgstr ""
+"Вы не можете изменить журнал, так как вы уже сверили некоторые позиции "
+"документа!"

 #. module: account_voucher
 #: view:account.voucher:0
@ -145,7 +147,7 @@ msgstr "Утвердить"
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_payment
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_payment
 msgid "Supplier Payments"
-msgstr ""
+msgstr "Оплаты поставщикам"

 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt
@ -167,7 +169,7 @@ msgstr "Искать ваучеры"
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "Корреспондирующий счет"

 #. module: account_voucher
 #: field:account.voucher,account_id:0
@ -189,7 +191,7 @@ msgstr "OK"
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "Полная сверка"

 #. module: account_voucher
 #: field:account.voucher,date_due:0
@ -207,7 +209,7 @@ msgstr "Примечания"
 #. module: account_voucher
 #: field:account.voucher,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"

 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
@ -225,7 +227,7 @@ msgstr "Элемент журнала"
 #: code:addons/account_voucher/account_voucher.py:981
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка!"

 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@ -235,7 +237,7 @@ msgstr "Суммма"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Options"
-msgstr ""
+msgstr "Варианты оплаты"

 #. module: account_voucher
 #: view:account.voucher:0
@ -254,6 +256,8 @@ msgstr "Отменено"
 msgid ""
 "You have to configure account base code and account tax code on the '%s' tax!"
 msgstr ""
+"Вы должны настроить код базового счета и код налогового счета для налога "
+"'%s'!"

 #. module: account_voucher
 #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt
@ -271,7 +275,7 @@ msgstr ""
 #. module: account_voucher
 #: help:account.voucher,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."

 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_bank_statement_line
@ -294,12 +298,12 @@ msgstr "Налог"
 #: code:addons/account_voucher/account_voucher.py:879
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"

 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "Корреспондирующий коментарий"

 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@ -312,6 +316,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"

 #. module: account_voucher
 #: view:account.voucher:0
@ -326,7 +332,7 @@ msgstr "Информация о платеже"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "(update)"
-msgstr ""
+msgstr "(обновить)"

 #. module: account_voucher
 #: view:account.voucher:0
@ -395,7 +401,7 @@ msgstr "Ваучер поставщика"
 #. module: account_voucher
 #: field:account.voucher,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"

 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@ -406,7 +412,7 @@ msgstr "Дебет"
 #: code:addons/account_voucher/account_voucher.py:1547
 #, python-format
 msgid "Unable to change journal !"
-msgstr ""
+msgstr "Невозможно изменить журнал!"

 #. module: account_voucher
 #: view:sale.receipt.report:0
@ -446,7 +452,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Open Supplier Journal Entries"
-msgstr ""
+msgstr "Открыть журнал проводок по поставщику"

 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_review_voucher_list
@ -461,7 +467,7 @@ msgstr "Памятка"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "Вы уверены, что надо отменить сверку и саму запись ?"

 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
@ -494,13 +500,13 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "Сумма разницы"

 #. module: account_voucher
 #: view:sale.receipt.report:0
 #: field:sale.receipt.report,due_delay:0
 msgid "Avg. Due Delay"
-msgstr ""
+msgstr "Средн. задержка"

 #. module: account_voucher
 #: code:addons/account_voucher/invoice.py:34
@ -554,7 +560,7 @@ msgstr "Оплаченная сумма"
 #. module: account_voucher
 #: field:account.voucher,payment_option:0
 msgid "Payment Difference"
-msgstr ""
+msgstr "Оплата разницы"

 #. module: account_voucher
 #: view:account.voucher:0
@ -568,7 +574,7 @@ msgstr "Для проверки"
 #: code:addons/account_voucher/account_voucher.py:1194
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "изменить"

 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1014
@ -599,7 +605,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.invoice:0
 msgid "Register Payment"
-msgstr ""
+msgstr "Регистрация оплаты"

 #. module: account_voucher
 #: field:account.statement.from.invoice.lines,line_ids:0
@ -614,7 +620,7 @@ msgstr "декабрём"
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Группировать по месяцу даты счета"

 #. module: account_voucher
 #: view:sale.receipt.report:0
@ -647,7 +653,7 @@ msgstr ""
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile this record?"
-msgstr ""
+msgstr "Вы уверены в отмене сверки"

 #. module: account_voucher
 #: field:account.voucher,company_id:0
@ -665,13 +671,13 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "Сверка платежного баланса"

 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:975
 #, python-format
 msgid "Configuration Error !"
-msgstr ""
+msgstr "Ошибка конфигурации !"

 #. module: account_voucher
 #: view:account.voucher:0
@ -695,18 +701,18 @@ msgstr ""
 #: field:account.voucher,state:0
 #: view:sale.receipt.report:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"

 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr ""
+msgstr "Распределение"

 #. module: account_voucher
 #: view:account.statement.from.invoice.lines:0
 #: view:account.voucher:0
 msgid "or"
-msgstr ""
+msgstr "или"

 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@ -716,7 +722,7 @@ msgstr "Август"
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Validate Payment"
-msgstr ""
+msgstr "Утвердить оплату"

 #. module: account_voucher
 #: help:account.voucher,audit:0
@ -724,6 +730,8 @@ msgid ""
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Отметьте, если вы не уверены в этой проводке журнала и хотите отметить её "
+"\"для проверки\" опытному бухгалтеру."

 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@ -734,7 +742,7 @@ msgstr "Октябрь"
 #: code:addons/account_voucher/account_voucher.py:976
 #, python-format
 msgid "Please activate the sequence of selected journal !"
-msgstr ""
+msgstr "Пожалуйста, включите нумерацию выбранного журнала!"

 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@ -749,7 +757,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "Оплачено"

 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt
@ -760,7 +768,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"

 #. module: account_voucher
 #: field:account.voucher,analytic_id:0
@ -787,7 +795,7 @@ msgstr "Расширенные фильтры..."
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "Оплаченная сумма в валюте компании"

 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@ -814,7 +822,7 @@ msgstr "Предыдущие платежи ?"
 #: code:addons/account_voucher/account_voucher.py:1112
 #, python-format
 msgid "The invoice you are willing to pay is not valid anymore."
-msgstr ""
+msgstr "Счет, который вы готовы платить, уже не актуален ."

 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@ -830,30 +838,30 @@ msgstr "Журнал ваучеров"
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Компании"

 #. module: account_voucher
 #: field:account.voucher,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"

 #. module: account_voucher
 #: field:account.voucher,active:0
 msgid "Active"
-msgstr ""
+msgstr "Активно"

 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:982
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Пожалуйста, определите нумерацию журнала."

 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_pay_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_vendor_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_vendor_receipt
 msgid "Customer Payments"
-msgstr ""
+msgstr "Платежи клиентов"

 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_sale_receipt_report_all
@ -865,7 +873,7 @@ msgstr ""
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Группировать по дате счета"

 #. module: account_voucher
 #: view:account.voucher:0
--- a/addons/auth_openid/i18n/ru.po
+++ b/addons/auth_openid/i18n/ru.po
@ -8,21 +8,21 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-03-23 11:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-28 06:19+0000\n"
+"Last-Translator: Глория Хрусталёва <gloriya@hushmail.com>\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: 2013-03-24 04:45+0000\n"
-"X-Generator: Launchpad (build 16540)\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
+"X-Generator: Launchpad (build 16640)\n"

 #. module: auth_openid
 #. openerp-web
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:24
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"

 #. module: auth_openid
 #. openerp-web
@ -30,7 +30,7 @@ msgstr ""
 #: view:res.users:0
 #, python-format
 msgid "OpenID"
-msgstr ""
+msgstr "OpenID"

 #. module: auth_openid
 #. openerp-web
@ -46,14 +46,14 @@ msgstr ""
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
 #, python-format
 msgid "Google"
-msgstr ""
+msgstr "Google"

 #. module: auth_openid
 #. openerp-web
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:11
 #, python-format
 msgid "Launchpad"
-msgstr ""
+msgstr "Launchpad"

 #. module: auth_openid
 #: help:res.users,openid_email:0
@ -82,7 +82,7 @@ msgstr ""
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:8
 #, python-format
 msgid "Password"
-msgstr ""
+msgstr "Пароль"

 #. module: auth_openid
 #. openerp-web
@ -94,4 +94,4 @@ msgstr ""
 #. module: auth_openid
 #: model:ir.model,name:auth_openid.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"
--- a/addons/auth_signup/i18n/ru.po
+++ b/addons/auth_signup/i18n/ru.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-11 06:59+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-05-27 12:12+0000\n"
+"Last-Translator: Глория Хрусталёва <gloriya@hushmail.com>\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: 2013-03-16 05:52+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"

 #. module: auth_signup
 #: field:res.partner,signup_type:0
@ -25,25 +25,25 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_uninvited:0
 msgid "Allow external users to sign up"
-msgstr ""
+msgstr "Разрешить регистрацию внешним пользователям"

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:16
 #, python-format
 msgid "Confirm Password"
-msgstr ""
+msgstr "Подтвердите пароль"

 #. module: auth_signup
 #: help:base.config.settings,auth_signup_uninvited:0
 msgid "If unchecked, only invited users may sign up."
 msgstr ""
-"Если отмечено, только приглашенные пользователи могут зарегистрироваться"
+"Если не отмечено, только приглашенные пользователи могут зарегистрироваться"

 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"

 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:265
@ -57,17 +57,17 @@ msgstr "Невозможно отправить письмо: у пользов
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:28
 #, python-format
 msgid "Reset password"
-msgstr ""
+msgstr "Сброс пароля"

 #. module: auth_signup
 #: field:base.config.settings,auth_signup_template_user_id:0
 msgid "Template user for new users created through signup"
-msgstr ""
+msgstr "Шаблон новых пользователей, созданных в процессе регистрации"

 #. module: auth_signup
 #: model:email.template,subject:auth_signup.reset_password_email
 msgid "Password reset"
-msgstr ""
+msgstr "Сброс пароля"

 #. module: auth_signup
 #. openerp-web
@ -88,12 +88,12 @@ msgstr ""
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:26
 #, python-format
 msgid "Sign Up"
-msgstr ""
+msgstr "Регистрация"

 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "New"
-msgstr ""
+msgstr "Новый"

 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:258
@ -104,7 +104,7 @@ msgstr ""
 #. module: auth_signup
 #: field:res.users,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"

 #. module: auth_signup
 #: model:email.template,body_html:auth_signup.reset_password_email
@ -118,18 +118,27 @@ msgid ""
 "\n"
 "<p>Note: If you do not expect this, you can safely ignore this email.</p>"
 msgstr ""
+"\n"
+"<p>Был запрошен сброс пароля для аккаунта OpenERP  связанного с этим адресом "
+"эл.почты</p>\n"
+"\n"
+"<p>Вы можете сменить пароль, проследовав по <a "
+"href=\"${object.signup_url}\">ссылке</a>.</p>\n"
+"\n"
+"<p>Примечание: если вы не запрашивали сброс пароля, просто проигнорируйте "
+"данное письмо</p>"

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:111
 #, python-format
 msgid "Please enter a name."
-msgstr ""
+msgstr "Пожалуйста, введите имя"

 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_users
 msgid "Users"
-msgstr ""
+msgstr "Пользователи"

 #. module: auth_signup
 #: field:res.partner,signup_url:0
@ -146,7 +155,7 @@ msgstr "Пожалуйста, введите имя пользователя."
 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Active"
-msgstr ""
+msgstr "Активен"

 #. module: auth_signup
 #: code:addons/auth_signup/res_users.py:269
@ -155,39 +164,41 @@ msgid ""
 "Cannot send email: no outgoing email server configured.\n"
 "You can configure it under Settings/General Settings."
 msgstr ""
+"Невозможно отправить email: не настроены сервера исходящей почты.\n"
+"Вы можете настроить их в меню Настройки/Общие настройки"

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:12
 #, python-format
 msgid "Username"
-msgstr ""
+msgstr "Имя пользователя"

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:8
 #, python-format
 msgid "Name"
-msgstr ""
+msgstr "Имя"

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "Please enter a username or email address."
-msgstr ""
+msgstr "Пожалуйста, введите имя пользователя или адрес эл. почты."

 #. module: auth_signup
 #: selection:res.users,state:0
 msgid "Resetting Password"
-msgstr ""
+msgstr "Переустановка пароля"

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:13
 #, python-format
 msgid "Username (Email)"
-msgstr ""
+msgstr "Имя пользователя (Email)"

 #. module: auth_signup
 #: field:res.partner,signup_expiration:0
@ -198,13 +209,15 @@ msgstr ""
 #: help:base.config.settings,auth_signup_reset_password:0
 msgid "This allows users to trigger a password reset from the Login page."
 msgstr ""
+"Это позволяет пользователям запросить сброс пароля со страницы входа в "
+"систему."

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:22
 #, python-format
 msgid "Log in"
-msgstr ""
+msgstr "Вход"

 #. module: auth_signup
 #: field:res.partner,signup_valid:0
@ -222,7 +235,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:170
 #, python-format
 msgid "Login"
-msgstr ""
+msgstr "Вход"

 #. module: auth_signup
 #. openerp-web
@ -236,7 +249,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:120
 #, python-format
 msgid "Passwords do not match; please retype them."
-msgstr ""
+msgstr "Пароли не совпадают; пожалуйста, введите их заново."

 #. module: auth_signup
 #. openerp-web
@ -244,7 +257,7 @@ msgstr ""
 #: code:addons/auth_signup/static/src/js/auth_signup.js:167
 #, python-format
 msgid "No database selected !"
-msgstr ""
+msgstr "Не выбрана база данных!"

 #. module: auth_signup
 #: view:res.users:0
@ -254,14 +267,14 @@ msgstr ""
 #. module: auth_signup
 #: field:base.config.settings,auth_signup_reset_password:0
 msgid "Enable password reset from Login page"
-msgstr ""
+msgstr "Включить сброс пароля со страницы входа"

 #. module: auth_signup
 #. openerp-web
 #: code:addons/auth_signup/static/src/xml/auth_signup.xml:27
 #, python-format
 msgid "Back to Login"
-msgstr ""
+msgstr "Вернуться к странице входа"

 #. module: auth_signup
 #. openerp-web
@ -273,7 +286,7 @@ msgstr ""
 #. module: auth_signup
 #: model:ir.model,name:auth_signup.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Партнер"

 #. module: auth_signup
 #: field:res.partner,signup_token:0
--- a/addons/base_setup/i18n/ru.po
+++ b/addons/base_setup/i18n/ru.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-28 10:09+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2013-05-27 12:19+0000\n"
+"Last-Translator: leksei <lirgus@gmail.com>\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: 2013-03-16 05:12+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"

 #. module: base_setup
 #: view:sale.config.settings:0
@ -41,6 +41,8 @@ msgstr "base.config.settings"
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Использовать внешние сервисы аутентификации, например, вход через google, "
+"facebook, ..."

 #. module: base_setup
 #: view:sale.config.settings:0
@ -68,7 +70,7 @@ msgstr "Участник"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Доступ к порталу"

 #. module: base_setup
 #: view:base.config.settings:0
@ -192,6 +194,9 @@ msgid ""
 "When you create a new contact (person or company), you will be able to load "
 "all the data from LinkedIn (photos, address, etc)."
 msgstr ""
+"Когда вы создаете новый контакт (человека или компанию), у вас есть "
+"возможность загрузить из LinkedIn всю информацию о нем (адреса, фотографии и "
+"т.д.)"

 #. module: base_setup
 #: help:base.config.settings,module_multi_company:0
@ -200,6 +205,9 @@ msgid ""
 "companies.\n"
 "                This installs the module multi_company."
 msgstr ""
+"Работать в режиме Мульти-компании, с соответствующими правами доступа между "
+"компаниями.\n"
+"                Будет установлен модуль multi_company."

 #. module: base_setup
 #: view:base.config.settings:0
@ -208,6 +216,9 @@ msgid ""
 "You can\n"
 "                                    launch the OpenERP Server with the option"
 msgstr ""
+"Публичный портал доступен только при использовании одной базы данных. Вы "
+"можете\n"
+"                                    запустить сервер OpenERP с этой опцией"

 #. module: base_setup
 #: view:base.config.settings:0
@ -215,6 +226,8 @@ msgid ""
 "You will find more options in your company details: address for the header "
 "and footer, overdue payments texts, etc."
 msgstr ""
+"Больше опций вы можете найти в настройках компании: адреса для "
+"верхнего/нижнего колонтитула, тексты для просроченных платежей и т.д."

 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
@ -238,6 +251,14 @@ msgid ""
 "projects,\n"
 "                                    etc."
 msgstr ""
+"Когда вы отправляете заказчику документы\n"
+"                                    (прайсы, счета), для их получения он "
+"сможет\n"
+"                                    войти на портал, где так же сможет "
+"прочитать\n"
+"                                    новости вашей компании, узнать "
+"обновления по\n"
+"                                    его проектам и т.д."

 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_setup_terminology
@ -252,7 +273,7 @@ msgstr "Клиент"
 #. module: base_setup
 #: help:base.config.settings,module_portal_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "Включая публичную часть, openerp становится общедоступным сайтом."

 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@ -274,13 +295,13 @@ msgstr "Контрагент"
 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form
 msgid "Use another word to say \"Customer\""
-msgstr ""
+msgstr "Использовать другое слово вместо \"Заказчик\""

 #. module: base_setup
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Настройки продаж"

 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@ -297,12 +318,12 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Настройки"

 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer portal"
-msgstr ""
+msgstr "Включить клиентский портал"

 #. module: base_setup
 #: view:base.config.settings:0
@ -315,32 +336,32 @@ msgstr ""
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Разрешить совместный доступ к документам"

 #. module: base_setup
 #: view:base.config.settings:0
 msgid "(company news, jobs, contact form, etc.)"
-msgstr ""
+msgstr "(новости компании, вакансии, форма обратной связи т.д.)"

 #. module: base_setup
 #: field:base.config.settings,module_portal_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Включить публичный портал"

 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure outgoing email servers"
-msgstr ""
+msgstr "Настроить сервер(а) исходящей почты"

 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Интеграция с социальными сетями"

 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give your customers access to their documents."
-msgstr ""
+msgstr "Разрешить заказчикам доступ к своим документам"

 #. module: base_setup
 #: view:base.config.settings:0
@ -352,23 +373,23 @@ msgstr "Отмена"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Применить"

 #. module: base_setup
 #: view:base.setup.terminology:0
 msgid "Specify Your Terminology"
-msgstr ""
+msgstr "Определить терминологию"

 #. module: base_setup
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "или"

 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Настроить информацию о компании"

 #~ msgid "City"
 #~ msgstr "Город"
--- a/addons/claim_from_delivery/i18n/ru.po
+++ b/addons/claim_from_delivery/i18n/ru.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2010-09-30 06:47+0000\n"
+"PO-Revision-Date: 2013-05-27 12:19+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:41+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+"X-Generator: Launchpad (build 16640)\n"

 #. module: claim_from_delivery
 #: view:stock.picking.out:0
@ -25,7 +25,7 @@ msgstr ""
 #. module: claim_from_delivery
 #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery
 msgid "Delivery Order"
-msgstr ""
+msgstr "Заказ доставки"

 #. module: claim_from_delivery
 #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery
--- a/addons/crm/base_partner_merge.py
+++ b/addons/crm/base_partner_merge.py
@ -13,6 +13,7 @@ from openerp.tools import mute_logger
 # Validation Library https://pypi.python.org/pypi/validate_email/1.1
 from .validate_email import validate_email

+import openerp
 from openerp.osv import osv, orm
 from openerp.osv import fields
 from openerp.osv.orm import browse_record
@ -101,14 +102,26 @@ class MergePartnerAutomatic(osv.TransientModel):
        'current_line_id': fields.many2one('base.partner.merge.line', 'Current Line'),
        'line_ids': fields.one2many('base.partner.merge.line', 'wizard_id', 'Lines'),
        'partner_ids': fields.many2many('res.partner', string='Contacts'),
+        'dst_partner_id': fields.many2one('res.partner', string='Destination Contact'),

        'exclude_contact': fields.boolean('A user associated to the contact'),
        'exclude_journal_item': fields.boolean('Journal Items associated to the contact'),
        'maximum_group': fields.integer("Maximum of Group of Contacts"),
    }

+    def default_get(self, cr, uid, fields, context=None):
+        if context is None:
+            context = {}
+        res = super(MergePartnerAutomatic, self).default_get(cr, uid, fields, context)
+        if context.get('active_model') == 'res.partner' and context.get('active_ids'):
+            partner_ids = context['active_ids']
+            res['state'] = 'selection'
+            res['partner_ids'] = partner_ids
+            res['dst_partner_id'] = self._get_ordered_partner(cr, uid, partner_ids, context=context)[-1].id
+        return res
+
    _defaults = {
-        'state': 'option',
+        'state': 'option'
    }

    def get_fk_on(self, cr, table):
@ -204,8 +217,8 @@ class MergePartnerAutomatic(osv.TransientModel):
            if proxy is None:
                return
            domain = [(field_model, '=', 'res.partner'), (field_id, '=', src.id)]
-            ids = proxy.search(cr, uid, domain, context=context)
-            return proxy.write(cr, uid, ids, {field_id: dst_partner.id}, context=context)
+            ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)
+            return proxy.write(cr, openerp.SUPERUSER_ID, ids, {field_id: dst_partner.id}, context=context)

        update_records = functools.partial(update_records, context=context)

@ -219,9 +232,9 @@ class MergePartnerAutomatic(osv.TransientModel):

        proxy = self.pool['ir.model.fields']
        domain = [('ttype', '=', 'reference')]
-        record_ids = proxy.search(cr, uid, domain, context=context)
+        record_ids = proxy.search(cr, openerp.SUPERUSER_ID, domain, context=context)

-        for record in proxy.browse(cr, uid, record_ids, context=context):
+        for record in proxy.browse(cr, openerp.SUPERUSER_ID, record_ids, context=context):
            proxy_model = self.pool[record.model]

            field_type = proxy_model._columns.get(record.name).__class__._type
@ -233,11 +246,11 @@ class MergePartnerAutomatic(osv.TransientModel):
                domain = [
                    (record.name, '=', 'res.partner,%d' % partner.id)
                ]
-                model_ids = proxy_model.search(cr, uid, domain, context=context)
+                model_ids = proxy_model.search(cr, openerp.SUPERUSER_ID, domain, context=context)
                values = {
                    record.name: 'res.partner,%d' % dst_partner.id,
                }
-                proxy_model.write(cr, uid, model_ids, values, context=context)
+                proxy_model.write(cr, openerp.SUPERUSER_ID, model_ids, values, context=context)

    def _update_values(self, cr, uid, src_partners, dst_partner, context=None):
        _logger.debug('_update_values for dst_partner: %s for src_partners: %r', dst_partner.id, list(map(operator.attrgetter('id'), src_partners)))
@ -266,22 +279,31 @@ class MergePartnerAutomatic(osv.TransientModel):
                _logger.info('Skip recursive partner hierarchies for parent_id %s of partner: %s', parent_id, dst_partner.id)

    @mute_logger('openerp.osv.expression', 'openerp.osv.orm')
-    def _merge(self, cr, uid, partner_ids, context=None):
+    def _merge(self, cr, uid, partner_ids, dst_partner=None, context=None):
        proxy = self.pool.get('res.partner')

        partner_ids = proxy.exists(cr, uid, list(partner_ids), context=context)
        if len(partner_ids) < 2:
            return

-        partners = proxy.browse(cr, uid, list(partner_ids), context=context)
-        ordered_partners = sorted(sorted(partners,
-                                key=operator.attrgetter('create_date'), reverse=True),
-                                    key=operator.attrgetter('active'), reverse=True)
+        if len(partner_ids) > 3:
+            raise osv.except_osv(_('Error'), _("For safety reasons, you cannot merge more than 3 contacts together. You can re-open the wizard several times if needed."))

-        dst_partner = ordered_partners[-1]
-        src_partners = ordered_partners[:-1]
+        if openerp.SUPERUSER_ID != uid and len(set(partner.email for partner in proxy.browse(cr, uid, partner_ids, context=context))) > 1:
+            raise osv.except_osv(_('Error'), _("All contacts must have the same email. Only the Administrator can merge contacts with different emails."))
+
+        if dst_partner and dst_partner.id in partner_ids:
+            src_partners = proxy.browse(cr, uid, [id for id in partner_ids if id != dst_partner.id], context=context)
+        else:
+            ordered_partners = self._get_ordered_partner(cr, uid, partner_ids, context)
+            dst_partner = ordered_partners[-1]
+            src_partners = ordered_partners[:-1]
        _logger.info("dst_partner: %s", dst_partner.id)

+        if openerp.SUPERUSER_ID != uid and self._model_is_installed(cr, uid, 'account.move.line', context=context) and \
+                self.pool.get('account.move.line').search(cr, openerp.SUPERUSER_ID, [('partner_id', 'in', [partner.id for partner in src_partners])], context=context):
+            raise osv.except_osv(_('Error'), _("Only the destination contact may be linked to existing Journal Items. Please ask the Administrator if you need to merge several contacts linked to existing Journal Items."))
+
        call_it = lambda function: function(cr, uid, src_partners, dst_partner,
                                            context=context)

@ -289,12 +311,12 @@ class MergePartnerAutomatic(osv.TransientModel):
        call_it(self._update_reference_fields)
        call_it(self._update_values)

-        _logger.info("---merged---")
-
+        _logger.info('(uid = %s) merged the partners %r with %s', uid, list(map(operator.attrgetter('id'), src_partners)), dst_partner.id)
+        dst_partner.message_post(body='%s %s'%(_("Merged with the following partners:"), ", ".join('%s<%s>(ID %s)' % (p.name, p.email or 'n/a', p.id) for p in src_partners)))
+        
        for partner in src_partners:
            partner.unlink()

-
    def clean_emails(self, cr, uid, context=None):
        """
        Clean the email address of the partner, if there is an email field with
@ -414,9 +436,16 @@ class MergePartnerAutomatic(osv.TransientModel):
        this = self.browse(cr, uid, ids[0], context=context)
        if this.current_line_id:
            this.current_line_id.unlink()
-        return self._next_screen(this)
+        return self._next_screen(cr, uid, this, context)

-    def _next_screen(self, this):
+    def _get_ordered_partner(self, cr, uid, partner_ids, context=None):
+        partners = self.pool.get('res.partner').browse(cr, uid, list(partner_ids), context=context)
+        ordered_partners = sorted(sorted(partners,
+                            key=operator.attrgetter('create_date'), reverse=True),
+                                key=operator.attrgetter('active'), reverse=True)
+        return ordered_partners
+
+    def _next_screen(self, cr, uid, this, context=None):
        this.refresh()
        values = {}
        if this.line_ids:
@ -426,6 +455,7 @@ class MergePartnerAutomatic(osv.TransientModel):
            values.update({
                'current_line_id': current_line.id,
                'partner_ids': [(6, 0, current_partner_ids)],
+                'dst_partner_id': self._get_ordered_partner(cr, uid, current_partner_ids, context)[-1].id,
                'state': 'selection',
            })
        else:
@ -525,7 +555,7 @@ class MergePartnerAutomatic(osv.TransientModel):
        query = self._generate_query(groups, this.maximum_group)
        self._process_query(cr, uid, ids, query, context=context)

-        return self._next_screen(this)
+        return self._next_screen(cr, uid, this, context)

    def automatic_process_cb(self, cr, uid, ids, context=None):
        assert is_integer_list(ids)
@ -666,7 +696,7 @@ class MergePartnerAutomatic(osv.TransientModel):
        #         p1.parent_id = p1.id
        # """)

-        return self._next_screen(this)
+        return self._next_screen(cr, uid, this, context)

    def merge_cb(self, cr, uid, ids, context=None):
        assert is_integer_list(ids)
@ -685,33 +715,12 @@ class MergePartnerAutomatic(osv.TransientModel):
                'target': 'new',
            }

-        self._merge(cr, uid, partner_ids, context=context)
+        self._merge(cr, uid, partner_ids, this.dst_partner_id, context=context)

-        this.current_line_id.unlink()
+        if this.current_line_id:
+            this.current_line_id.unlink()

-        return self._next_screen(this)
-
-    def merge_multi(self, cr, uid, ids, context=None):
-
-        active_model = context.get('active_model')
-        if active_model != 'res.partner':
-            raise osv.except_osv(
-                _('Error'),
-                _('This wizard can only used with the Partners')
-            )
-
-        partner_ids = context.get('active_ids', [])
-
-        MINIMAL_NUMBER = 2
-        if len(partner_ids) < MINIMAL_NUMBER:
-            raise osv.except_osv(
-                _('Error'),
-                _("You can't use this wizard with only one Partner")
-            )
-
-        self._merge(cr, uid, partner_ids, context=context)
-
-        return True
+        return self._next_screen(cr, uid, this, context)

    def auto_set_parent_id(self, cr, uid, ids, context=None):
        assert is_integer_list(ids)
--- a/addons/crm/base_partner_merge_view.xml
+++ b/addons/crm/base_partner_merge_view.xml
@ -68,9 +68,9 @@
                            OpenERP will propose you to merge only those having
                            all these fields in common. (not one of the fields).
                        </p>
-                        <group attrs="{'invisible': [('state', 'not in', ('selection', 'finished'))]}">
+                        <group attrs="{'invisible': ['|', ('state', 'not in', ('selection', 'finished')), ('number_group', '=', 0)]}">
                            <field name="state" invisible="1" />
-                            <field name="number_group" invisible="0" />
+                            <field name="number_group"/>
                        </group>
                        <group string="Search duplicates based on duplicated data in"
                            attrs="{'invisible': [('state', 'not in', ('option',))]}">
@ -98,15 +98,15 @@
                                redirected to the aggregated contact. You can remove
                                contacts from this list to avoid merging them.
                            </p>
+                            <field name="dst_partner_id" domain="[('id', 'in', partner_ids and partner_ids[0] and partner_ids[0][2] or False)]" attrs="{'required': [('state', '=', 'selection')]}"/>
                            <field name="partner_ids" nolabel="1">
                                <tree string="Partners">
                                    <field name="id" />
-                                    <field name="name" />
+                                    <field name="display_name" />
                                    <field name="email" />
                                    <field name="is_company" />
                                    <field name="vat" />
                                    <field name="country_id" />
-                                    <field name="parent_id" />
                                </tree>
                            </field>
                        </group>
@ -114,24 +114,9 @@
                </form>
            </field>
        </record>
-
-        <record model="ir.actions.server"
-            id="ir_actions_server_merge_automatic">
-            <field name="code">pool.get('base.partner.merge.automatic.wizard').merge_multi(cr, uid, None, context)</field>
-            <field name="condition">True</field>
-            <field name="model_id" ref="base.model_res_partner" />
-            <field name="name">Automatic Merge</field>
-            <field name="sequence" eval="5" />
-            <field name="state">code</field>
-            <field name="type">ir.actions.server</field>
-        </record>
-
-        <record model="ir.values" id="ir_open_merge_automatic">
-            <field name="key2" eval="'client_action_multi'" />
-            <field name="model">res.partner</field>
-            <field name="name">Automatic Merge</field>
-            <field name="value" eval="'ir.actions.server,%d' % ir_actions_server_merge_automatic" />
-        </record>
+        
+        <act_window id="action_partner_merge" res_model="base.partner.merge.automatic.wizard" src_model="res.partner"
+            target="new" multi="True" key2="client_action_multi" view_mode="form" name="Automatic Merge"/>

    </data>

--- a/addons/crm/html/index.html
+++ b/addons/crm/html/index.html
@ -170,7 +170,7 @@ Customize your sales cycle by configuring sales stages that perfectly fit your s
        <h3 class="oe_slogan">Get access to the right information to take smart decisions</h3>
        <div class="oe_span6">
            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="crm_sc_05.png">
+                <img class="oe_picture oe_screenshot" src="crm_sc_05.png">
            </div>
        </div>
        <div class="oe_span6">
@ -218,7 +218,7 @@ Get the insights you need to make smarter decisions. Design custom dashboards to
    </div>
 </section>

-<section class="oe_container">
+<section class="oe_container oe_dark">
    <div class="oe_row">
        <div class="oe_span12">
            <h2 class="oe_slogan">Many companies already enjoy it</h2>
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-01 11:27+0000\n"
-"Last-Translator: Антон Лаврёнов <lavrton@gmail.com>\n"
+"PO-Revision-Date: 2013-05-30 13:52+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:09+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"

 #. module: crm
 #: view:crm.lead.report:0
@ -452,7 +452,7 @@ msgstr "# Предложений"
 #, python-format
 msgid ""
 "Please select more than one element (lead or opportunity) from the list view."
-msgstr ""
+msgstr "Пожалуйста, выберите хотя бы один элемент из списка ниже."

 #. module: crm
 #: view:crm.lead:0
@ -1108,7 +1108,7 @@ msgstr "Удалить"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_create
 msgid "Opportunity created"
-msgstr ""
+msgstr "Предложение создано"

 #. module: crm
 #: view:crm.lead:0
@ -1397,7 +1397,7 @@ msgstr "Сделать"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_lost
 msgid "Opportunity lost"
-msgstr ""
+msgstr "Предложение отклонено"

 #. module: crm
 #: field:crm.lead2opportunity.partner,action:0
@ -1446,7 +1446,7 @@ msgstr "Пользователи"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_lead_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Стадия изменена"

 #. module: crm
 #: field:crm.case.stage,section_ids:0
@ -1759,7 +1759,7 @@ msgstr "Способ оплаты"
 #. module: crm
 #: model:ir.model,name:crm.model_crm_lead2opportunity_partner_mass
 msgid "Mass Lead To Opportunity Partner"
-msgstr "Массовое проведение предложений партнёру"
+msgstr "Массовое преобразование кандидатов в предложения"

 #. module: crm
 #: view:sale.config.settings:0
@ -1917,7 +1917,7 @@ msgstr "Сделать"
 #: model:mail.message.subtype,name:crm.mt_lead_convert_to_opportunity
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_opportunity
 msgid "Lead to Opportunity"
-msgstr ""
+msgstr "Кандидат в предложение"

 #. module: crm
 #: field:crm.lead,user_email:0
@ -2126,7 +2126,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Address"
-msgstr ""
+msgstr "Адрес"

 #. module: crm
 #: help:crm.case.section,alias_id:0
@ -2134,6 +2134,8 @@ msgid ""
 "The email address associated with this team. New emails received will "
 "automatically create new leads assigned to the team."
 msgstr ""
+"Адрес эл. почты связанный с этой командой. Новая полученная эл. почта будет "
+"автоматически создавать новые кандидаты связанные с командой."

 #. module: crm
 #: view:crm.lead:0
@ -2192,7 +2194,7 @@ msgstr "Продолжение процесса"
 #: selection:crm.lead2opportunity.partner.mass,name:0
 #: model:ir.actions.act_window,name:crm.action_crm_lead2opportunity_partner
 msgid "Convert to opportunity"
-msgstr "Преобразовать в возможность"
+msgstr "Преобразовать в предложение"

 #. module: crm
 #: field:crm.opportunity2phonecall,user_id:0
@ -2234,6 +2236,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."

 #. module: crm
 #: field:crm.lead.report,nbr:0
@ -2249,7 +2253,7 @@ msgstr "Отдел продаж, которому принадлежит воп
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead6
 msgid "Banner Ads"
-msgstr ""
+msgstr "Баннер"

 #. module: crm
 #: field:crm.merge.opportunity,opportunity_ids:0
@ -2279,7 +2283,7 @@ msgstr "Выполняется"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_convert_to_opportunity
 msgid "Lead converted into an opportunity"
-msgstr ""
+msgstr "Кандидат превращенный в предложение"

 #. module: crm
 #: view:crm.lead:0
@ -2289,7 +2293,7 @@ msgstr "Нераспределенные кандидаты"
 #. module: crm
 #: model:mail.message.subtype,description:crm.mt_lead_won
 msgid "Opportunity won"
-msgstr ""
+msgstr "Предложение принято"

 #. module: crm
 #: field:crm.case.categ,object_id:0
@ -2364,7 +2368,7 @@ msgstr ""
 #. module: crm
 #: field:crm.case.stage,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Связанный статус"

 #. module: crm
 #: field:crm.phonecall,name:0
@ -2410,7 +2414,7 @@ msgstr "Подтвердить"
 #. module: crm
 #: view:crm.lead:0
 msgid "Unread messages"
-msgstr ""
+msgstr "Непрочитанные сообщения"

 #. module: crm
 #: field:crm.phonecall.report,section_id:0
@ -2501,7 +2505,7 @@ msgstr "Создание предложений из кандидатов"
 #. module: crm
 #: model:crm.case.resource.type,name:crm.type_lead3
 msgid "Email Campaign - Products"
-msgstr ""
+msgstr "Кампания эл. почты - Продукция"

 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_case_categ_phone_incoming0
@ -2578,7 +2582,7 @@ msgstr "Август"
 #: model:mail.message.subtype,name:crm.mt_lead_lost
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_lost
 msgid "Opportunity Lost"
-msgstr ""
+msgstr "Предложение отклонено"

 #. module: crm
 #: field:crm.lead.report,deadline_month:0
@ -2644,7 +2648,7 @@ msgstr "Сотрудники отдела"
 #: view:crm.opportunity2phonecall:0
 #: view:crm.phonecall2phonecall:0
 msgid "Schedule/Log a Call"
-msgstr ""
+msgstr "Запланировать/Описать звонок"

 #. module: crm
 #: field:crm.lead,planned_cost:0
@ -2654,7 +2658,7 @@ msgstr "Планируемые затраты"
 #. module: crm
 #: help:crm.lead,date_deadline:0
 msgid "Estimate of the date on which the opportunity will be won."
-msgstr ""
+msgstr "Оценка даты на которую это предложение будет принято."

 #. module: crm
 #: help:crm.lead,email_cc:0
@ -2676,7 +2680,7 @@ msgstr "Описанные звонки"
 #: model:mail.message.subtype,name:crm.mt_lead_won
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_won
 msgid "Opportunity Won"
-msgstr ""
+msgstr "Предложение принято"

 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_section_act_tree
@ -2895,7 +2899,7 @@ msgstr ""
 #. module: crm
 #: view:crm.lead:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Внутренние заметки"

 #. module: crm
 #: view:crm.lead:0
@ -2960,6 +2964,7 @@ msgstr "Проиграно"
 #, python-format
 msgid "Closed/Cancelled leads cannot be converted into opportunities."
 msgstr ""
+"Закрытые/Отмененные кандидаты не могут быть конвертированы в возможности."

 #. module: crm
 #: view:crm.lead:0
@ -3050,7 +3055,7 @@ msgstr "Рассылка"
 #. module: crm
 #: model:mail.message.subtype,name:crm.mt_salesteam_lead_stage
 msgid "Opportunity Stage Changed"
-msgstr ""
+msgstr "Этап предложения изменен"

 #. module: crm
 #: model:ir.actions.act_window,help:crm.crm_lead_stage_act
--- a/addons/crm_claim/i18n/ru.po
+++ b/addons/crm_claim/i18n/ru.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:01+0000\n"
+"PO-Revision-Date: 2013-05-30 14:03+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:44+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"

 #. module: crm_claim
 #: help:crm.claim.stage,fold:0
@ -23,6 +23,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей этой стадии для отображения."

 #. module: crm_claim
 #: field:crm.claim.report,nbr:0
@ -46,11 +48,13 @@ msgid ""
 "Allows you to configure your incoming mail server, and create claims from "
 "incoming emails."
 msgstr ""
+"Позволяет настроить сервер входящей почты и создавать претензии из входящих "
+"эл. писем."

 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_crm_claim_stage
 msgid "Claim stages"
-msgstr ""
+msgstr "Этапы претензии"

 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@ -65,7 +69,7 @@ msgstr "Задержка закрытия"
 #. module: crm_claim
 #: field:crm.claim,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"

 #. module: crm_claim
 #: field:crm.claim,resolution:0
@ -100,12 +104,12 @@ msgstr "# претензий"
 #. module: crm_claim
 #: field:crm.claim.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Название этапа"

 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"

 #. module: crm_claim
 #: selection:crm.claim,priority:0
@ -149,7 +153,7 @@ msgstr "Предупредительная мера"
 #. module: crm_claim
 #: help:crm.claim,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."

 #. module: crm_claim
 #: field:crm.claim.report,date_closed:0
@ -182,6 +186,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"

 #. module: crm_claim
 #: view:crm.claim:0
@ -235,12 +241,12 @@ msgstr "Важность"
 #. module: crm_claim
 #: field:crm.claim.stage,fold:0
 msgid "Hide in Views when Empty"
-msgstr ""
+msgstr "Скрыть вид, если пусто"

 #. module: crm_claim
 #: field:crm.claim,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"

 #. module: crm_claim
 #: view:crm.claim:0
@ -254,7 +260,7 @@ msgstr "Новый"
 #. module: crm_claim
 #: field:crm.claim.stage,section_ids:0
 msgid "Sections"
-msgstr ""
+msgstr "Секции"

 #. module: crm_claim
 #: field:crm.claim,email_from:0
@ -290,7 +296,7 @@ msgstr "Предмет претензии"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim3
 msgid "Rejected"
-msgstr ""
+msgstr "Отклонено"

 #. module: crm_claim
 #: field:crm.claim,date_action_next:0
@ -344,7 +350,7 @@ msgstr ""
 #: code:addons/crm_claim/crm_claim.py:194
 #, python-format
 msgid "No Subject"
-msgstr ""
+msgstr "Без темы"

 #. module: crm_claim
 #: help:crm.claim.stage,state:0
@ -358,7 +364,7 @@ msgstr ""
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Settle"
-msgstr ""
+msgstr "Решать"

 #. module: crm_claim
 #: model:ir.ui.menu,name:crm_claim.menu_claim_stage_view
@ -384,7 +390,7 @@ msgstr "Отчет о претензиях"
 #. module: crm_claim
 #: view:sale.config.settings:0
 msgid "Configure"
-msgstr ""
+msgstr "Настроить"

 #. module: crm_claim
 #: model:crm.case.resource.type,name:crm_claim.type_claim1
@ -430,6 +436,8 @@ msgid ""
 "If you check this field, this stage will be proposed by default on each "
 "sales team. It will not assign this stage to existing teams."
 msgstr ""
+"Если вы отметите это поле, этот этап будет предложен по умолчанию каждому "
+"отделу продаж. Этот этап не будет назначен существующим отделам."

 #. module: crm_claim
 #: field:crm.claim,categ_id:0
@ -485,7 +493,7 @@ msgstr "Закрыто"
 #. module: crm_claim
 #: view:crm.claim:0
 msgid "Reject"
-msgstr ""
+msgstr "Отклонить"

 #. module: crm_claim
 #: view:res.partner:0
@ -495,7 +503,7 @@ msgstr "Претензии партнера"
 #. module: crm_claim
 #: view:crm.claim.stage:0
 msgid "Claim Stage"
-msgstr ""
+msgstr "Этап претензии"

 #. module: crm_claim
 #: view:crm.claim:0
@ -513,7 +521,7 @@ msgstr "Отложено"
 #: field:crm.claim.report,state:0
 #: field:crm.claim.stage,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"

 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@ -529,7 +537,7 @@ msgstr "Обычный"
 #. module: crm_claim
 #: help:crm.claim.stage,sequence:0
 msgid "Used to order stages. Lower is better."
-msgstr ""
+msgstr "Используется для упорядочивания этапов. Меньше - лучше."

 #. module: crm_claim
 #: selection:crm.claim.report,month:0
@ -549,7 +557,7 @@ msgstr "Телефон"
 #. module: crm_claim
 #: field:crm.claim,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"

 #. module: crm_claim
 #: field:crm.claim.report,user_id:0
@ -581,6 +589,10 @@ msgid ""
 "the case needs to be reviewed then the status is                       set "
 "to 'Pending'."
 msgstr ""
+"Статус устанавливается в \"Черновик\", при создании  дела. Если дело в "
+"процессе, то статус - «Открыт». Когда дело закончено, устанавливается статус "
+"\"Готово\". Если дело должно быть пересмотрено то статус установлен в "
+"'Ожидание'."

 #. module: crm_claim
 #: field:crm.claim,active:0
@ -628,7 +640,7 @@ msgstr "Дата претензии"
 #. module: crm_claim
 #: field:crm.claim,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"

 #. module: crm_claim
 #: model:ir.actions.act_window,name:crm_claim.crm_claim_categ_action
@ -638,7 +650,7 @@ msgstr "Категории претензий"
 #. module: crm_claim
 #: field:crm.claim.stage,case_default:0
 msgid "Common to All Teams"
-msgstr ""
+msgstr "Общее для всех отделов"

 #. module: crm_claim
 #: view:crm.claim:0
@ -677,7 +689,7 @@ msgstr "Претензия"
 #. module: crm_claim
 #: view:crm.claim.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Моя компания"

 #. module: crm_claim
 #: view:crm.claim.report:0
@ -807,7 +819,7 @@ msgstr "Февраль"
 #. module: crm_claim
 #: model:ir.model,name:crm_claim.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"

 #. module: crm_claim
 #: view:crm.claim.report:0
@ -833,22 +845,22 @@ msgstr "Мои дела"
 #. module: crm_claim
 #: model:crm.claim.stage,name:crm_claim.stage_claim2
 msgid "Settled"
-msgstr ""
+msgstr "Решено"

 #. module: crm_claim
 #: help:crm.claim,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"

 #. module: crm_claim
 #: field:sale.config.settings,fetchmail_claim:0
 msgid "Create claims from incoming mails"
-msgstr ""
+msgstr "Создать претензии из входящей почты"

 #. module: crm_claim
 #: field:crm.claim.stage,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Нумерация"

 #. module: crm_claim
 #: view:crm.claim:0
@ -883,6 +895,8 @@ msgid ""
 "Link between stages and sales teams. When set, this limitate the current "
 "stage to the selected sales teams."
 msgstr ""
+"Связь между этапами и отделами продаж. При установке, ограничивает этап для "
+"выбранного отдела продаж."

 #. module: crm_claim
 #: help:crm.claim.stage,case_refused:0
--- a/addons/crm_helpdesk/i18n/ru.po
+++ b/addons/crm_helpdesk/i18n/ru.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-10-24 05:08+0000\n"
+"PO-Revision-Date: 2013-05-30 14:09+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:46+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"

 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,delay_close:0
@ -46,7 +46,7 @@ msgstr "Март"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"

 #. module: crm_helpdesk
 #: field:crm.helpdesk,company_id:0
@ -63,7 +63,7 @@ msgstr "Адреса наблюдателей"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"

 #. module: crm_helpdesk
 #: selection:crm.helpdesk,priority:0
@ -106,7 +106,7 @@ msgstr "Отменено"
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Если отмечено, новые сообщения требуют вашего внимания."

 #. module: crm_helpdesk
 #: model:ir.actions.act_window,name:crm_helpdesk.action_report_crm_helpdesk
@ -136,6 +136,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Содержит сводку по Чаттеру (количество сообщений,...). Эта сводка в формате "
+"html для возможности использования в канбан виде"

 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@ -176,7 +178,7 @@ msgstr "Приоритет"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"

 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@ -400,7 +402,7 @@ msgstr "В ожидании"
 #: view:crm.helpdesk.report:0
 #: field:crm.helpdesk.report,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"

 #. module: crm_helpdesk
 #: selection:crm.helpdesk.report,month:0
@ -454,7 +456,7 @@ msgstr "Планируемая выручка"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Подписан"

 #. module: crm_helpdesk
 #: field:crm.helpdesk.report,user_id:0
@ -501,7 +503,7 @@ msgstr "Январь"
 #. module: crm_helpdesk
 #: field:crm.helpdesk,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Итог"

 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@ -517,7 +519,7 @@ msgstr "Прочее"
 #. module: crm_helpdesk
 #: view:crm.helpdesk.report:0
 msgid "My Company"
-msgstr ""
+msgstr "Моя компания"

 #. module: crm_helpdesk
 #: view:crm.helpdesk:0
@ -666,7 +668,7 @@ msgstr ""
 #. module: crm_helpdesk
 #: help:crm.helpdesk,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"

 #. module: crm_helpdesk
 #: model:ir.actions.act_window,help:crm_helpdesk.crm_helpdesk_categ_action
--- a/addons/crm_partner_assign/i18n/ru.po
+++ b/addons/crm_partner_assign/i18n/ru.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2011-03-23 13:46+0000\n"
+"PO-Revision-Date: 2013-05-30 14:10+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:47+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"

 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,delay_close:0
@ -25,7 +25,7 @@ msgstr "Задержка закрытия"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,author_id:0
 msgid "Author"
-msgstr ""
+msgstr "Автор"

 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,planned_revenue:0
@ -38,6 +38,9 @@ msgid ""
 "Message type: email for email message, notification for system message, "
 "comment for other messages such as user replies"
 msgstr ""
+"Тип сообщения: эл. почта - для эл. почты, уведомление - для системных "
+"сообщений, комментарий - для остальных сообщений таких как сообщения "
+"пользователя"

 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,nbr:0
@ -53,7 +56,7 @@ msgstr "Группировать по ..."
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,body:0
 msgid "Automatically sanitized HTML contents"
-msgstr ""
+msgstr "Автоматически обработанное HTML содержимое"

 #. module: crm_partner_assign
 #: view:crm.lead:0
@ -68,7 +71,7 @@ msgstr "Геолоцировать"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,starred:0
 msgid "Starred"
-msgstr ""
+msgstr "Отмеченные"

 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@ -81,6 +84,8 @@ msgid ""
 "Email address of the sender. This field is set when no matching partner is "
 "found for incoming emails."
 msgstr ""
+"Адрес эл. почты отправителя. Это поле устанавливается когда партнер не "
+"определен для входящих писем."

 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@ -111,7 +116,7 @@ msgstr "Компания"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notification_ids:0
 msgid "Notifications"
-msgstr ""
+msgstr "Уведомления"

 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_assign:0
@ -123,7 +128,7 @@ msgstr "Дата партнера"
 #: view:crm.partner.report.assign:0
 #: view:res.partner:0
 msgid "Salesperson"
-msgstr ""
+msgstr "Продавец"

 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@ -170,12 +175,12 @@ msgstr "Географическое назначение"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Мастер составления эл. почты"

 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,turnover:0
 msgid "Turnover"
-msgstr ""
+msgstr "Оборот"

 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,date_closed:0
@ -199,7 +204,7 @@ msgstr ""
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "System notification"
-msgstr ""
+msgstr "Системное уведомление"

 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@ -271,7 +276,7 @@ msgstr "Тип"
 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Email"
-msgstr ""
+msgstr "Эл. почта"

 #. module: crm_partner_assign
 #: help:crm.lead,partner_assigned_id:0
@ -286,7 +291,7 @@ msgstr "Низший"
 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
 msgid "Date Invoice"
-msgstr ""
+msgstr "Дата счета"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,template_id:0
@ -311,12 +316,12 @@ msgstr "Дата создания"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_res_partner_activation
 msgid "res.partner.activation"
-msgstr ""
+msgstr "res.partner.activation"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,parent_id:0
 msgid "Parent Message"
-msgstr ""
+msgstr "Родительское сообщение"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,res_id:0
@ -358,12 +363,12 @@ msgstr "Этап"
 #: view:crm.lead.report.assign:0
 #: field:crm.lead.report.assign,state:0
 msgid "Status"
-msgstr ""
+msgstr "Статус"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,to_read:0
 msgid "To read"
-msgstr ""
+msgstr "Прочитать"

 #. module: crm_partner_assign
 #: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:74
@ -418,12 +423,12 @@ msgstr "Количество дней, для закрытия вопроса"
 #: help:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid ""
 "Partners that have a notification pushing this message in their mailboxes"
-msgstr ""
+msgstr "Партнеры которые имеют уведомление доставляемое в их почтовые ящики"

 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,type:0
 msgid "Comment"
-msgstr ""
+msgstr "Комментарий"

 #. module: crm_partner_assign
 #: field:res.partner,partner_weight:0
@ -451,7 +456,7 @@ msgstr "Декабрь"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Users that voted for this message"
-msgstr ""
+msgstr "Пользователи, которые проголосовали за это сообщение"

 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@ -467,7 +472,7 @@ msgstr "Дата открытия"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,child_ids:0
 msgid "Child Messages"
-msgstr ""
+msgstr "Связанные сообщения"

 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_review:0
@ -483,17 +488,17 @@ msgstr "Тема"
 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
 msgid "or"
-msgstr ""
+msgstr "или"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,body:0
 msgid "Contents"
-msgstr ""
+msgstr "Содержимое"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,vote_user_ids:0
 msgid "Votes"
-msgstr ""
+msgstr "Голоса"

 #. module: crm_partner_assign
 #: view:crm.lead.report.assign:0
@ -504,6 +509,8 @@ msgstr "# Предложений"
 #: help:crm.lead.forward.to.partner,starred:0
 msgid "Current user has a starred notification linked to this message"
 msgstr ""
+"Текущий пользователь имеет отмеченное уведомление, связанное с этим "
+"сообщением"

 #. module: crm_partner_assign
 #: field:crm.partner.report.assign,date_partnership:0
@ -561,7 +568,7 @@ msgstr "Август"
 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,record_name:0
 msgid "Name get of the related document."
-msgstr ""
+msgstr "Название связанного документа."

 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,priority:0
@ -684,7 +691,7 @@ msgstr "Вложения"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,record_name:0
 msgid "Message Record Name"
-msgstr ""
+msgstr "Название записи сообщения"

 #. module: crm_partner_assign
 #: field:res.partner.activation,sequence:0
@ -724,7 +731,7 @@ msgstr "Открыто"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,subtype_id:0
 msgid "Subtype"
-msgstr ""
+msgstr "Подтип"

 #. module: crm_partner_assign
 #: field:res.partner,date_localization:0
@ -739,12 +746,12 @@ msgstr "Текущий"
 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_lead
 msgid "Lead/Opportunity"
-msgstr ""
+msgstr "Кандидат/Предложение"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,notified_partner_ids:0
 msgid "Notified partners"
-msgstr ""
+msgstr "Уведомленные партнеры"

 #. module: crm_partner_assign
 #: view:crm.lead.forward.to.partner:0
@ -775,7 +782,7 @@ msgstr "Вероятная выручка"
 #: field:res.partner,activation:0
 #: view:res.partner.activation:0
 msgid "Activation"
-msgstr ""
+msgstr "Активация"

 #. module: crm_partner_assign
 #: view:crm.lead:0
@ -792,6 +799,8 @@ msgstr ""
 #: help:crm.lead.forward.to.partner,to_read:0
 msgid "Current user has an unread notification linked to this message"
 msgstr ""
+"Текущий пользователь имеет непрочитанные уведомления, связанные с этим "
+"сообщением"

 #. module: crm_partner_assign
 #: selection:crm.lead.report.assign,type:0
@ -860,6 +869,8 @@ msgid ""
 "Technical field holding the message notifications. Use notified_partner_ids "
 "to access notified partners."
 msgstr ""
+"Техническое поле, содержащее уведомления. Используйте notified_partner_ids "
+"для доступа к оповещаемым партнерам."

 #. module: crm_partner_assign
 #: view:crm.partner.report.assign:0
@ -874,12 +885,12 @@ msgstr "CRM - отчет по кандидатам"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,composition_mode:0
 msgid "Composition mode"
-msgstr ""
+msgstr "Режим составления"

 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,model:0
 msgid "Related Document Model"
-msgstr ""
+msgstr "Модель связанного документа"

 #. module: crm_partner_assign
 #: selection:crm.lead.forward.to.partner,history_mode:0
@ -892,6 +903,8 @@ msgid ""
 "Author of the message. If not set, email_from may hold an email address that "
 "did not match any partner."
 msgstr ""
+"Автор сообщения. Если не установлен, email_from может содержать адрес почты, "
+"который не соответствует ни одному партнеру."

 #. module: crm_partner_assign
 #: model:ir.model,name:crm_partner_assign.model_crm_partner_report_assign
@ -906,12 +919,12 @@ msgstr "Высокий"
 #. module: crm_partner_assign
 #: field:crm.lead.forward.to.partner,partner_ids:0
 msgid "Additional contacts"
-msgstr ""
+msgstr "Дополнительные контакты"

 #. module: crm_partner_assign
 #: help:crm.lead.forward.to.partner,parent_id:0
 msgid "Initial thread message."
-msgstr ""
+msgstr "Первое сообщение цепочки."

 #. module: crm_partner_assign
 #: field:crm.lead.report.assign,create_date:0
--- a/addons/crm_profiling/i18n/ru.po
+++ b/addons/crm_profiling/i18n/ru.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-05-10 17:51+0000\n"
+"PO-Revision-Date: 2013-05-30 14:05+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:32+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"

 #. module: crm_profiling
 #: view:crm_profiling.questionnaire:0
@ -151,7 +151,7 @@ msgstr "Используйте правила профилирования"
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
 msgid "Error ! You cannot create recursive profiles."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать рекурсивный профиль."

 #. module: crm_profiling
 #: field:crm.segmentation,answer_yes:0
@ -200,7 +200,7 @@ msgstr "Сохранить данные"
 #. module: crm_profiling
 #: view:open.questionnaire:0
 msgid "or"
-msgstr ""
+msgstr "или"

 #~ msgid ""
 #~ "The Object name must start with x_ and not contain any special character !"
--- a/addons/edi/i18n/ru.po
+++ b/addons/edi/i18n/ru.po
@ -8,35 +8,35 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-09-10 15:12+0000\n"
+"PO-Revision-Date: 2013-05-30 13:32+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:50+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"

 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:67
 #, python-format
 msgid "Reason:"
-msgstr ""
+msgstr "Причина:"

 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:60
 #, python-format
 msgid "The document has been successfully imported!"
-msgstr ""
+msgstr "Документ был успешно импортирован!"

 #. module: edi
 #. openerp-web
 #: code:addons/edi/static/src/js/edi.js:65
 #, python-format
 msgid "Sorry, the document could not be imported."
-msgstr ""
+msgstr "Извините, документ не может быть импортирован."

 #. module: edi
 #: model:ir.model,name:edi.model_res_company
@ -53,13 +53,13 @@ msgstr "Валюта"
 #: code:addons/edi/static/src/js/edi.js:71
 #, python-format
 msgid "Document Import Notification"
-msgstr ""
+msgstr "Уведомление об импорте документа"

 #. module: edi
 #: code:addons/edi/models/edi.py:130
 #, python-format
 msgid "Missing application."
-msgstr ""
+msgstr "Отсутствующее приложение."

 #. module: edi
 #: code:addons/edi/models/edi.py:131
@ -69,12 +69,15 @@ msgid ""
 "You can install it by connecting as the administrator and opening the "
 "configuration assistant."
 msgstr ""
+"Документу, который вы пытаетесь импортировать, необходимо OpenERP приложение "
+"'%s'. Вы можете установить его, выполнив вход под администратором и открыв "
+"настройки."

 #. module: edi
 #: code:addons/edi/models/edi.py:47
 #, python-format
 msgid "'%s' is an invalid external ID"
-msgstr ""
+msgstr "'%s' это неверный внешний идентификатор"

 #. module: edi
 #: model:ir.model,name:edi.model_res_partner
@ -84,7 +87,7 @@ msgstr "Контрагент"
 #. module: edi
 #: model:ir.model,name:edi.model_edi_edi
 msgid "EDI Subsystem"
-msgstr ""
+msgstr "Подсистема электронного документооборота"

 #~ msgid "The currency code must be unique per company!"
 #~ msgstr "Код валюты должен быть уникальным в компании!"
--- a/addons/email_template/i18n/ru.po
+++ b/addons/email_template/i18n/ru.po
@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-25 12:16+0000\n"
-"Last-Translator: Olga <chikiro.spam@gmail.com>\n"
+"PO-Revision-Date: 2013-05-30 13:33+0000\n"
+"Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 05:42+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-31 05:38+0000\n"
+"X-Generator: Launchpad (build 16660)\n"

 #. module: email_template
 #: field:email.template,email_from:0
@ -37,7 +37,7 @@ msgstr "Кнопка боковой панели для открытия дей
 #. module: email_template
 #: field:res.partner,opt_out:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Без уведомлений"

 #. module: email_template
 #: field:email.template,email_to:0
@ -510,7 +510,7 @@ msgstr ""
 #. module: email_template
 #: view:email.template:0
 msgid "Contents"
-msgstr ""
+msgstr "Содержимое"

 #. module: email_template
 #: field:email.template,subject:0
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@ -6,7 +6,7 @@
            <field name="res_model">event.registration</field>
            <field name="view_type">form</field>
            <field name="name">Registrations</field>
-            <field name="view_mode">calendar,tree,form,graph</field>
+            <field name="view_mode">tree,form,calendar,graph</field>
            <field name="context">{'search_default_event_id': active_id, 'default_event_id': active_id}</field>
        </record>

@ -93,6 +93,7 @@
                                   </div>
                            </group>
                            <group>
+                                <field name="user_id"/>
                                <field name="type" on_change="onchange_event_type(type,context)" />
                                <field name="date_begin" on_change="onchange_start_date(date_begin,date_end)"/>
                                <field name="date_end"/>
@ -100,19 +101,13 @@
                            </group>
                        </group>
                        <notebook>
-                            <page string="Email Configuration" groups="base.group_no_one">
-                                <group>
+                            <page string="Event Details" groups="base.group_no_one">
+                                <group colspan="4">
                                    <field name="reply_to"/>
-                                    <group>
-                                        <field name="email_registration_id"/>
-                                    </group>
-                                    <group>
-                                        <field name="email_confirmation_id"/>
-                                    </group>
+                                    <field name="email_registration_id"/>
+                                    <field name="email_confirmation_id"/>
                                </group>
-                            </page>
-                            <page string="Event Description">
-                                <field name="note" colspan="4" nolabel="1"/>
+                                <field name="note" nolabel="1" placeholder="Event Description..."/>
                            </page>
                            <page string="Registrations">
                                <group>
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@ -70,6 +70,8 @@ class sale_order_line(osv.osv):
        '''
        create registration with sales order
        '''
+        if context is None:
+            context = {}
        registration_obj = self.pool.get('event.registration')
        sale_obj = self.pool.get('sale.order')
        for order_line in self.browse(cr, uid, ids, context=context):
@ -83,7 +85,8 @@ class sale_order_line(osv.osv):
                    'origin': order_line.order_id.name,
                    'event_id': order_line.event_id.id,
                }
+                message = _("The registration has been created for event <i>%s</i> from the Sale Order %s. ") % (order_line.event_id.name, order_line.order_id.name)
+                context.update({'mail_create_nolog': True})
                registration_id = registration_obj.create(cr, uid, dic, context=context)
-                message = _("The registration %s has been created from the Sales Order %s.") % (registration_id, order_line.order_id.name)
                registration_obj.message_post(cr, uid, [registration_id], body=message, context=context)
        return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
--- a/addons/hr/html/index.html
+++ b/addons/hr/html/index.html
@ -175,7 +175,7 @@ Inspire achievement with challenges, goals and rewards. Define clear objectives
    </div>
 </section>

-<section class="oe_container">
+<section class="oe_container oe_dark">
    <div class="oe_row">
        <div class="oe_span12">
            <h2 class="oe_slogan">Many companies already enjoy it</h2>
--- a/addons/hr_recruitment/openerp.py
+++ b/addons/hr_recruitment/openerp.py
@ -57,9 +57,9 @@ You can define the different phases of interviews and easily rate the applicant
        'board_hr_recruitment_statistical_view.xml',
        'hr_recruitment_installer_view.xml',
        'res_config_view.xml',
-        'hr_recruitment_data.xml'
+        'hr_recruitment_data.xml',
    ],
-    'demo': ['hr_recruitment_demo.yml'],
+    'demo': ['hr_recruitment_demo.xml'],
    'test': ['test/recruitment_process.yml'],
    'installable': True,
    'auto_install': False,
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@ -355,10 +355,12 @@ class hr_applicant(base_stage, osv.Model):
            This override updates the document according to the email.
        """
        if custom_values is None: custom_values = {}
+        val = msg.get('from').split('<')[0]
        desc = html2plaintext(msg.get('body')) if msg.get('body') else ''
        defaults = {
            'name':  msg.get('subject') or _("No Subject"),
            'description': desc,
+            'partner_name':val,
            'email_from': msg.get('from'),
            'email_cc': msg.get('cc'),
            'user_id': False,
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@ -485,6 +485,18 @@
        <field name="default" eval="False"/>
        <field name="description">Applicant refused</field>
    </record>
-
+    <!-- Applicant Categories(Tag) -->
+    <record id="tag_applicant_reserve" model="hr.applicant_category">
+        <field name="name">Reserve</field>
+    </record>
+    <record id="tag_applicant_manager" model="hr.applicant_category">
+        <field name="name">Manager</field>
+    </record>
+    <record id="tag_applicant_it" model="hr.applicant_category">
+        <field name="name">IT</field>
+    </record>
+    <record id="tag_applicant_sales" model="hr.applicant_category">
+        <field name="name">Sales</field>
+    </record>
 </data>
 </openerp>
--- a/addons/hr_recruitment/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/hr_recruitment_demo.xml
@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<openerp>
+  <data noupdate="1">
+    <record id="hr_case_salesman0" model="hr.applicant">
+        <field name="name">Salesperson</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_graduate"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field eval= "time.strftime('%Y-%m-01 10:35:50')" name="date"/>
+        <field name="priority">2</field>
+        <field name="partner_name">Enrique Jones</field>
+        <field name="partner_mobile">9963214587</field>
+        <field name="stage_id" ref="stage_job1"/>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_traineemca0" model="hr.applicant">
+        <field name="name">Trainee - MCA</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="priority">3</field>
+        <field name="partner_name">Marie Justine</field>
+        <field name="partner_mobile">9988774455</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6633225</field>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date_action"/>
+        <field name="title_action">Call to define real needs about training</field>
+    </record>
+    <record id="hr_case_fresher0" model="hr.applicant">
+        <field name="name">Fresher</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-10 18:15:00')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="priority">1</field>
+        <field name="partner_name">Jose</field>
+        <field name="stage_id" ref="stage_job3"/>
+        <field name="partner_phone">999666735</field>
+        <field eval="time.strftime('%Y-%m-5 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_yrsexperienceinphp0" model="hr.applicant">
+        <field name="name">Marketing Job</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_manager')])]"/>
+        <field eval="time.strftime('%Y-%m-25 16:25:52')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="partner_name">John Bruno</field>
+        <field name="stage_id" ref="stage_job5"/>
+        <field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
+        <field name="title_action">Call to define real needs about training</field>
+    </record>
+    <record id="hr_case_marketingjob0" model="hr.applicant">
+        <field name="name">More than 5 yrs Experience in PHP</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:15:32')" name="date"/>
+        <field name="user_id" ref="base.user_demo"/>
+        <field name="partner_name">Sandra Elvis</field>
+        <field name="stage_id" ref="stage_job6"/>
+        <field eval="time.strftime('%Y-%m-20 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_financejob0" model="hr.applicant">
+        <field name="name">Finance Job</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_reserve')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="priority">4</field>
+        <field name="partner_name">David Armstrong</field>
+        <field name="stage_id" ref="stage_job2"/>
+        <field name="partner_phone">33968745</field>
+        <field eval="time.strftime('%Y-%m-18 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_traineemca1" model="hr.applicant">
+        <field name="name">Trainee - MCA</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_sales')])]"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="partner_name">Tina Augustie</field>
+        <field name="partner_mobile">9898745745</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6630125</field>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_programmer" model="hr.applicant">
+        <field name="name">Programmer</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_bac5"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-12 17:49:19')" name="date"/>
+        <field name="partner_name">Shane Williams</field>
+        <field name="partner_mobile">9812398524</field>
+        <field name="stage_id" ref="stage_job4"/>
+        <field name="partner_phone">6630125</field>
+        <field name="salary_expected">11000.0</field>
+        <field eval="time.strftime('%Y-%m-24 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+    <record id="hr_case_advertisement" model="hr.applicant">
+        <field name="name">Advertisement</field>
+        <field name="job_id" ref="hr.job_developer"/>
+        <field name="type_id" ref="degree_licenced"/>
+        <field name="categ_ids" eval="[(6,0,[ref('tag_applicant_it')])]"/>
+        <field eval="time.strftime('%Y-%m-26 17:39:42')" name="date"/>
+        <field name="partner_name">David Armstrong</field>
+        <field name="partner_mobile">9988774455</field>
+        <field name="stage_id" ref="stage_job2"/>
+        <field name="salary_expected">11000.0</field>
+        <field eval="time.strftime('%Y-%m-15 18:15:00')" name="date_action"/>
+        <field name="title_action">Send mail regarding our interview</field>
+    </record>
+
+    <record id="hr.job_developer" model="hr.job">
+        <field name="survey_id" ref="survey_job_0"/>
+    </record>
+  </data>
+</openerp>
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@ -1,102 +0,0 @@
-
-  !record {model: hr.applicant, id: hr_case_salesman0}:
-    date: !eval time.strftime('%Y-%m-01 10:35:50')
-    type_id: degree_graduate
-    priority: '2'
-    partner_name: 'Enrique Jones'
-    partner_mobile: '9963214587'
-    job_id: hr.job_developer
-    stage_id: stage_job1
-    name: 'Salesperson'
-    partner_phone: '1236547890'
-
-
-  !record {model: hr.applicant, id: hr_case_traineemca0}:
-    date: !eval time.strftime('%Y-%m-10 18:15:00')
-    type_id: degree_bac5
-    priority: '3'
-    user_id: base.user_demo
-    partner_name: 'Marie Justine'
-    partner_mobile: '9988774455'
-    job_id: hr.job_developer
-    stage_id: stage_job4
-    name: 'Trainee - MCA'
-    partner_phone: '6633225'
-
-  !record {model: hr.applicant, id: hr_case_fresher0}:
-    date: !eval time.strftime('%Y-%m-15 16:10:00')
-    type_id: degree_licenced
-    priority: '1'
-    user_id: base.user_root
-    partner_name: 'Jose'
-    job_id: hr.job_developer
-    stage_id: stage_job3
-    name: 'Fresher'
-    partner_phone: '999666735'
-
-  !record {model: hr.applicant, id: hr_case_yrsexperienceinphp0}:
-    date: !eval time.strftime('%Y-%m-25 16:25:52')
-    job_id: hr.job_developer
-    type_id: degree_bac5
-    user_id: base.user_root
-    partner_name: 'Sandra Elvis'
-    stage_id: stage_job6
-    name: 'More than 5 yrs Experience in PHP'
-
-  !record {model: hr.applicant, id: hr_case_marketingjob0}:
-    date: !eval time.strftime('%Y-%m-26 17:15:32')
-    type_id: degree_licenced
-    user_id: base.user_demo
-    partner_name: 'John Bruno'
-    job_id: hr.job_developer
-    color: 5
-    stage_id: stage_job5
-    name: 'Marketing Job'
-
-  !record {model: hr.applicant, id: hr_case_financejob0}:
-    date: !eval time.strftime('%Y-%m-26 17:39:42')
-    type_id: degree_licenced
-    priority: '4'
-    partner_name: 'David Armstrong'
-    partner_mobile: '9966332214'
-    job_id: hr.job_developer
-    stage_id: stage_job2
-    name: 'Finance Job'
-    partner_phone: '33968745'
-
-  !record {model: hr.applicant, id: hr_case_traineemca1}:
-    date: !eval time.strftime('%Y-%m-12 17:49:19')
-    type_id: degree_bac5
-    partner_name: 'Tina Augustie'
-    partner_mobile: '9898745745'
-    job_id: hr.job_developer
-    stage_id: stage_job4
-    name: 'Trainee - MCA'
-    partner_phone: '6630125'
-
-
-  !record {model: hr.applicant, id: hr_case_programmer}:
-    date: !eval time.strftime('%Y-%m-12 17:49:19')
-    type_id: degree_bac5
-    partner_name: 'Shane Williams'
-    partner_mobile: '9812398524'
-    stage_id: stage_job4
-    name: 'Programmer'
-    partner_phone: '6630125'
-    job_id: hr.job_developer
-    department_id: hr.dep_rd
-    salary_expected: 11000.0
-
-
-  !record {model: hr.applicant, id: hr_case_advertisement}:
-    date: !eval time.strftime('%Y-%m-26 17:39:42')
-    type_id: degree_licenced
-    partner_name: 'David Armstrong'
-    job_id: hr.job_developer
-    stage_id: stage_job2
-    color: 4
-    name: 'Advertisement'
-    salary_expected: 11000.0
-
-  !record {model: hr.job, id: hr.job_developer}:
-    survey_id: hr_recruitment.survey_job_0
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@ -263,9 +263,14 @@
                                    <i><field name="name"/></i><br/>
                                    <field name="job_id"/><br/>
                                    <t t-if="record.partner_mobile.raw_value">Mobile: <field name="partner_mobile"/><br/></t>
-                                    <t t-if="record.title_action.raw_value"><field name="title_action"/><br/></t>
-                                    <field name="date_action"/>
                                </div>
+                                <div style="padding-left: 0.5em">
+                                    <t t-if="record.date_action.raw_value and record.date_action.raw_value lt (new Date())" t-set="red">oe_kanban_text_red</t>
+                                    <span t-attf-class="#{red || ''}"><field name="date_action"/></span>
+                                        <t t-if="record.date_action.raw_value"> : </t>
+                                        <field name="title_action"/>
+                                </div>
+                                <div style="width:240px"><field name="categ_ids"/></div>
                                <div class="oe_kanban_right">
                                    <t t-set="priority" t-value="record.priority.raw_value || 5"/>
                                    <a type="object" name="set_priority" args="['3']" t-if="priority gt 3">
@ -285,7 +290,6 @@
                                </div>
                                <div class="oe_kanban_footer_left" style="margin-top:5px;">
                                    <t t-raw="record.message_summary.raw_value"/>
-                                    <field name="categ_ids"/>
                                </div>
                            </div>
                            <div class="oe_clear"></div>
--- a/addons/hr_timesheet/openerp.py
+++ b/addons/hr_timesheet/openerp.py
@ -21,7 +21,7 @@


 {
-    'name': 'Timesheets',
+    'name': 'Time Tracking',
    'version': '1.0',
    'category': 'Human Resources',
    'sequence': 23,
--- a/addons/mail/html/index.html
+++ b/addons/mail/html/index.html
@ -0,0 +1,179 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Enterprise Social Network</h2>
+            <h3 class="oe_slogan">A private social network for your company</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=crm">
+                    <img src="mail_sc_00.png">
+                </a>
+                <span class="oe_demo_play">&nbsp;</span>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Connect with experts, follow what interests you, share documents and promote
+best practices. Get work done with effective collaboration across departments,
+geographies, documents and business applications. All of this while decreasing
+email overload.
+
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Connect with experts</h2>
+        <h3 class="oe_slogan">Get the right information, when you need it</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Next time you have a question for the marketing, sales, R&amp;D or any other
+department, don't send an email blast-post the question to OpenERP and get
+answers from the right persons.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_01.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Follow what interests you</h2>
+        <h3 class="oe_slogan">Make the information flow across your company</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture" src="mail_sc_02.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Want to get informed about new product features, hot deals, bottlenecks in projects or any other event? Just follow what interests you to get the information you need what you need; no more, no less.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Get Things Done</h2>
+        <h3 class="oe_slogan">Your inbox is a todo list</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+You can process (not only read) the inbox and easily mark messages for future actions. Start feeling the pleasure of having an empty inbox every day; no more overload of information.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_03.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Promote best practices</h2>
+        <h3 class="oe_slogan">Discussion groups at your fingertips</h3>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_04.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Cut back on meetings and email chains by working together in groups of interests. Create a group to let people share files, discuss ideas, and vote to promote best practices.
+            </p>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Improve Access to Information and Expertise</h2>
+        <h3 class="oe_slogan">Easily find the information you need</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Break down information silos. Search across your existing systems to find the answers and expertise you need to complete projects quickly.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_illustration.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Collaborate securely</h2>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_06.png">
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Set the right security policy; public, private or on invitation only -- according to the information sensitivity.
+            </p>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">A Twitter-like Network For Your Company </h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+Make every employee feel more connected and engaged with twitter-like features
+for your own company. Follow people, share best practices, 'like' top ideas, etc.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="mail_sc_07.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Trusted by millions worldwide</h2>
+        </div>
+        <div class="oe_span12">
+            <div class="oe_quote">
+                <q>
+                Emails make me waste my time. But I need them. Reading my inbox
+                is the most unproductive task I do on a daily basis. I have to
+                spend one or two full hours a day to process my emails. All the
+                junk flows in the same inbox; spams, information that doesn't
+                matter, quoted answers of quoted answers, etc. At the end of
+                the hour, only 10 emails actually requested an answer from me.
+                Since I use OpenERP, I can do the same job in only 10 minutes!
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="photo.png">
+                    <div class="oe_author">Luc de Keyser</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
--- a/addons/mail/html/mail_illustration.png
+++ b/addons/mail/html/mail_illustration.png
--- a/addons/mail/html/mail_sc_00.png
+++ b/addons/mail/html/mail_sc_00.png
--- a/addons/mail/html/mail_sc_01.png
+++ b/addons/mail/html/mail_sc_01.png
--- a/addons/mail/html/mail_sc_02.png
+++ b/addons/mail/html/mail_sc_02.png
--- a/addons/mail/html/mail_sc_03.png
+++ b/addons/mail/html/mail_sc_03.png
--- a/addons/mail/html/mail_sc_04.png
+++ b/addons/mail/html/mail_sc_04.png
--- a/addons/mail/html/mail_sc_05.png
+++ b/addons/mail/html/mail_sc_05.png
--- a/addons/mail/html/mail_sc_06.png
+++ b/addons/mail/html/mail_sc_06.png
--- a/addons/mail/html/mail_sc_07.png
+++ b/addons/mail/html/mail_sc_07.png
--- a/addons/mail/html/photo.png
+++ b/addons/mail/html/photo.png
--- a/addons/mail/mail_mail_view.xml
+++ b/addons/mail/mail_mail_view.xml
@ -6,6 +6,11 @@
            <field name="model">mail.mail</field>
            <field name="arch" type="xml">
                <form string="Email message" version="7.0">
+                    <header>
+                        <button name="send" string="Send Now" type="object" states='outgoing' class="oe_highlight"/>
+                        <button name="mark_outgoing" string="Retry" type="object" states='exception,cancel'/>
+                        <button name="cancel" string="Cancel" type="object" states='outgoing'/>
+                    </header>
                    <sheet>
                        <label for="subject" class="oe_edit_only"/>
                        <h2><field name="subject"/></h2>
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@ -27,6 +27,7 @@ from openerp import SUPERUSER_ID
 from openerp.osv import osv, orm, fields
 from openerp.tools import html_email_clean
 from openerp.tools.translate import _
+from HTMLParser import HTMLParser

 _logger = logging.getLogger(__name__)

@ -43,6 +44,19 @@ def decode(text):
        text = decode_header(text.replace('\r', ''))
        return ''.join([tools.ustr(x[0], x[1]) for x in text])

+class MLStripper(HTMLParser):
+    def __init__(self):
+        self.reset()
+        self.fed = []
+    def handle_data(self, d):
+        self.fed.append(d)
+    def get_data(self):
+        return ''.join(self.fed)
+
+def strip_tags(html):
+    s = MLStripper()
+    s.feed(html)
+    return s.get_data()

 class mail_message(osv.Model):
    """ Messages model: system notification (replacing res.log notifications),
@ -125,7 +139,7 @@ class mail_message(osv.Model):
            ids = [ids]
        res = []
        for message in self.browse(cr, uid, ids, context=context):
-            name = '%s: %s' % (message.subject or '', message.body or '')
+            name = '%s: %s' % (message.subject or '', strip_tags(message.body or '') or '')
            res.append((message.id, self._shorten_name(name.lstrip(' :'))))
        return res

--- a/addons/mrp/html/coppernic.png
+++ b/addons/mrp/html/coppernic.png
--- a/addons/mrp/html/index.html
+++ b/addons/mrp/html/index.html
@ -169,3 +169,26 @@ manufacturing operations.
        </div>
   </div>
 </section>
+
+<section class="oe_container">
+    <div class="oe_row">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Many companies already enjoy it</h2>
+            <h3 class="oe_slogan">Hear what they have to say !</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_quote">
+                <q>
+					OpenERP allowed our company to efficiently manage a growth from a turnover of 2.4m€ to 15m€ in 4 years.
+                </q>
+                <cite class="oe_cite oe_clearfix">
+                    <img class="oe_photo" src="coppernic.png">
+                    <div class="oe_author">Jacky Lecuivre</div>
+                    <div class="oe_job">President at <a href="http://coppernic.fr" target="_blank">Coppernic</a>.</div>
+                </cite>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="oe_container oe_separator">
+</section>
--- a/addons/mrp/i18n/ru.po
+++ b/addons/mrp/i18n/ru.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-09-14 07:17+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2013-05-27 12:24+0000\n"
+"Last-Translator: Pavel <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: 2013-03-16 05:01+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-28 05:16+0000\n"
+"X-Generator: Launchpad (build 16640)\n"

 #. module: mrp
 #: help:mrp.config.settings,module_mrp_repair:0
@ -131,7 +131,7 @@ msgstr "Конечный продукт"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Manufacturing Orders which are currently in production."
-msgstr ""
+msgstr "Производственные заказы, которые в настоящее время в изготовлении."

 #. module: mrp
 #: help:mrp.bom,message_summary:0
@ -156,7 +156,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Конечная продукция"

 #. module: mrp
 #: selection:mrp.bom,method:0
@ -195,7 +195,7 @@ msgstr "Для приобретенного материала"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_production_order_action
 msgid "Order Planning"
-msgstr ""
+msgstr "Планирование заказов"

 #. module: mrp
 #: field:mrp.config.settings,module_mrp_operations:0
@ -206,7 +206,7 @@ msgstr ""
 #: code:addons/mrp/mrp.py:633
 #, python-format
 msgid "Cannot cancel manufacturing order!"
-msgstr ""
+msgstr "Нельзя отменить производственый заказ!"

 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
@ -253,7 +253,7 @@ msgstr ""
 #: view:mrp.production:0
 #: field:mrp.production,move_created_ids2:0
 msgid "Produced Products"
-msgstr ""
+msgstr "Производимая продукция"

 #. module: mrp
 #: report:mrp.production.order:0
@ -268,7 +268,7 @@ msgstr "Основные данные"
 #. module: mrp
 #: field:mrp.config.settings,module_mrp_byproduct:0
 msgid "Produce several products from one manufacturing order"
-msgstr ""
+msgstr "Изготовить несколько продуктов по одному производственному заказу"

 #. module: mrp
 #: help:mrp.config.settings,group_mrp_properties:0
@ -329,7 +329,7 @@ msgstr "Производимый продукт"
 #. module: mrp
 #: constraint:mrp.bom:0
 msgid "Error ! You cannot create recursive BoM."
-msgstr ""
+msgstr "Ошибка! Вы не можете создавать рекурсивную спецификацию."

 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
@ -381,6 +381,8 @@ msgid ""
 "Fill this product to easily track your production costs in the analytic "
 "accounting."
 msgstr ""
+"Заполнив этот продукт легко отслеживать ваши производственные издержки в "
+"аналитическом учете."

 #. module: mrp
 #: field:mrp.workcenter,product_id:0
--- a/addons/note/html/index.html
+++ b/addons/note/html/index.html
@ -113,3 +113,5 @@ The real time collaborative writings on notes makes it the perfect tool to colla
        </div>
    </div>
 </section>
+<section class="oe_container oe_separator">
+</section>
--- a/addons/note/note_view.xml
+++ b/addons/note/note_view.xml
@ -175,7 +175,7 @@
      <field name="view_type">form</field>
      <field name="view_mode">kanban,tree,form</field>
      <field name="search_view_id" ref="view_note_note_filter"/>
-      <field name="context">{'search_default_open_true':True}</field>
+      <field name="context">{}</field>
      <field name="help" type="html">
          <p class="oe_view_nocontent_create">
            Click to add a personal note.
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@ -319,6 +319,14 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
                this.payment_line.set_amount(amount);
            }
        },
+        checkAmount: function(e){
+            if (e.which !== 0 && e.charCode !== 0) {
+                if(isNaN(String.fromCharCode(e.charCode))){
+                    return (String.fromCharCode(e.charCode) === "." && e.currentTarget.value.toString().split(".").length < 2)?true:false;
+                }
+            }
+            return true
+        },
        changedAmount: function() {
        	if (this.amount !== this.payment_line.get_amount()){
        		this.renderElement();
@ -328,7 +336,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
            var self = this;
            this.name =   this.payment_line.get_cashregister().get('journal_id')[1];
            this._super();
-            this.$('input').keyup(function(event){
+            this.$('input').keypress(_.bind(this.checkAmount, this))
+			.keyup(function(event){
                self.changeAmount(event);
            });
            this.$('.delete-payment-line').click(function() {
--- a/addons/project/html/index.html
+++ b/addons/project/html/index.html
@ -194,3 +194,5 @@ accurate reports on your team's performance.
        </div>
    </div>
 </section>
+<section class="oe_container oe_separator">
+</section>
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-03-14 06:44+0000\n"
+"PO-Revision-Date: 2013-05-28 06:22+0000\n"
 "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2013-03-16 04:56+0000\n"
-"X-Generator: Launchpad (build 16532)\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
+"X-Generator: Launchpad (build 16640)\n"

 #. module: project
 #: view:project.project:0
@ -27,6 +27,8 @@ msgid ""
 "If checked, this contract will be available in the project menu and you will "
 "be able to manage tasks or track issues"
 msgstr ""
+"Если выбрано, этот контракт станет активным в меню проекта, и вы сможете "
+"редактировать задачи или отслеживать проблемы"

 #. module: project
 #: field:project.project,progress_rate:0
@ -217,7 +219,7 @@ msgstr "Предложение контакта"
 #. module: project
 #: help:project.config.settings,group_time_work_estimation_tasks:0
 msgid "Allows you to compute Time Estimation on tasks."
-msgstr ""
+msgstr "Позволяет вычислить расход времени на задачи."

 #. module: project
 #: field:report.project.task.user,user_id:0
@ -913,6 +915,8 @@ msgid ""
 "Provides management of issues/bugs in projects.\n"
 "                This installs the module project_issue."
 msgstr ""
+"Обеспечивает управление проблем / ошибок в проектах.\n"
+"                 Устанавливает модуль project_issue."

 #. module: project
 #: help:project.task,kanban_state:0
@ -927,7 +931,7 @@ msgstr ""
 #. module: project
 #: view:project.task:0
 msgid "10"
-msgstr ""
+msgstr "10"

 #. module: project
 #: help:project.project,analytic_account_id:0
@ -953,7 +957,7 @@ msgstr "Отменить"
 #. module: project
 #: view:project.project:0
 msgid "Other Info"
-msgstr ""
+msgstr "Прочая информация"

 #. module: project
 #: view:project.task.delegate:0
@ -981,6 +985,8 @@ msgid ""
 "Follow this project to automatically track the events associated to tasks "
 "and issues of this project."
 msgstr ""
+"Позволяет проекту автоматически отслеживать события, связанные с задачами и "
+"проблемами этого проекта."

 #. module: project
 #: view:project.task:0
@ -990,7 +996,7 @@ msgstr "Исполнитель"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_task_stage
 msgid "Stage Changed"
-msgstr ""
+msgstr "Стадия изменена"

 #. module: project
 #: view:project.project:0
@ -1006,7 +1012,7 @@ msgstr "Важное"
 #. module: project
 #: field:project.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Название"

 #. module: project
 #: selection:report.project.task.user,month:0
@ -1033,7 +1039,7 @@ msgstr "Общие"
 #: help:project.project,message_ids:0
 #: help:project.task,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Сообщения и история общения"

 #. module: project
 #: view:project.project:0
@ -1041,6 +1047,8 @@ msgid ""
 "To invoice or setup invoicing and renewal options, go to the related "
 "contract:"
 msgstr ""
+"Для выставления счета или изменения счета и обновления вариантов, перейти к "
+"соответствующему контракту:"

 #. module: project
 #: field:project.task.delegate,state:0
@ -1097,7 +1105,7 @@ msgstr "Порученные задания"
 #: view:project.task:0
 #: field:project.task,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Непрочитанные"

 #. module: project
 #: view:project.task:0
@ -1139,7 +1147,7 @@ msgstr "Показывать только срочные задания"
 #. module: project
 #: model:project.category,name:project.project_category_04
 msgid "Usability"
-msgstr ""
+msgstr "Удобство использования"

 #. module: project
 #: view:report.project.task.user:0
@ -1156,7 +1164,7 @@ msgstr "Выполнил(а)"
 #: code:addons/project/project.py:181
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Неверное действие!"

 #. module: project
 #: help:project.task.type,state:0
@ -1165,6 +1173,9 @@ msgid ""
 "stage. For example, if a stage is related to the status 'Close', when your "
 "document reaches this stage, it is automatically closed."
 msgstr ""
+"Статус документа автоматически изменяется по выбранному этапу. Например, "
+"если стадия связана со статусом «Закрыть» , когда ваш документ достигает "
+"этой стадии, оно автоматически закрывается."

 #. module: project
 #: view:project.task:0
@ -1174,7 +1185,7 @@ msgstr "Доп. информация"
 #. module: project
 #: view:project.task:0
 msgid "Edit..."
-msgstr ""
+msgstr "Изменить..."

 #. module: project
 #: view:report.project.task.user:0
@ -1185,7 +1196,7 @@ msgstr "№ задачи"
 #. module: project
 #: field:project.project,doc_count:0
 msgid "Number of documents attached"
-msgstr ""
+msgstr "Количество прикрепленных документов"

 #. module: project
 #: field:project.task,priority:0
@ -1205,6 +1216,9 @@ msgid ""
 "automatically synchronizedwith Tasks (or optionally Issues if the Issue "
 "Tracker module is installed)."
 msgstr ""
+"Внутренние e-mail, связанный с этим проектом. Входящие письма автоматически "
+"синхронизируются с заданиями (или проблемами, если модуль Issue Tracker "
+"установлен)."

 #. module: project
 #: model:ir.actions.act_window,help:project.open_task_type_form
@ -1237,7 +1251,7 @@ msgstr "%s (копия)"
 #. module: project
 #: model:mail.message.subtype,name:project.mt_project_task_stage
 msgid "Task Stage Changed"
-msgstr ""
+msgstr "Этап задачи изменен"

 #. module: project
 #: view:project.task:0
@ -1269,12 +1283,12 @@ msgstr "Время отсрочки"
 #. module: project
 #: view:project.project:0
 msgid "Team"
-msgstr ""
+msgstr "Группа"

 #. module: project
 #: help:project.config.settings,time_unit:0
 msgid "This will set the unit of measure used in projects and tasks."
-msgstr ""
+msgstr "Установить единицу измерения, используемую в проектах и задачах."

 #. module: project
 #: selection:project.task,priority:0
@ -1328,7 +1342,7 @@ msgstr "Заголовок вашего проверочного задания"
 #. module: project
 #: field:project.config.settings,time_unit:0
 msgid "Working time unit"
-msgstr ""
+msgstr "Единица рабочего времени"

 #. module: project
 #: view:project.project:0
@ -1344,7 +1358,7 @@ msgstr "Низкий"
 #. module: project
 #: selection:project.project,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Закрыто"

 #. module: project
 #: view:project.project:0
@ -1366,7 +1380,7 @@ msgstr "В ожидании"
 #: view:project.category:0
 #: field:project.task,categ_ids:0
 msgid "Tags"
-msgstr ""
+msgstr "Теги"

 #. module: project
 #: model:ir.model,name:project.model_project_task_history
@ -1386,7 +1400,7 @@ msgstr ""
 #. module: project
 #: help:project.config.settings,group_manage_delegation_task:0
 msgid "Allows you to delegate tasks to other users."
-msgstr ""
+msgstr "Позволяет делегировать задачи другим пользователям."

 #. module: project
 #: field:project.project,active:0
@ -1415,7 +1429,7 @@ msgstr ""
 #. module: project
 #: view:project.config.settings:0
 msgid "Helpdesk & Support"
-msgstr ""
+msgstr "Поддержка"

 #. module: project
 #: help:report.project.task.user,opening_days:0
@ -1441,7 +1455,7 @@ msgstr ""
 #: code:addons/project/project.py:220
 #, python-format
 msgid "Attachments"
-msgstr ""
+msgstr "Вложения"

 #. module: project
 #: view:project.task:0
@ -1464,6 +1478,8 @@ msgid ""
 "You cannot delete a project containing tasks. You can either delete all the "
 "project's tasks and then delete the project or simply deactivate the project."
 msgstr ""
+"Вы не можете удалить проект, содержащий задачи. Вы можете либо удалить все "
+"задачи проекта, а затем удалить проект или просто сделать проект неактивным."

 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_draftopentask0
@ -1474,7 +1490,7 @@ msgstr "Открытые"
 #. module: project
 #: field:project.project,privacy_visibility:0
 msgid "Privacy / Visibility"
-msgstr ""
+msgstr "Безопасность/Видимость"

 #. module: project
 #: view:project.task:0
@ -1488,7 +1504,7 @@ msgstr "Оставшееся время"
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_stage
 msgid "Stage changed"
-msgstr ""
+msgstr "Этап изменен"

 #. module: project
 #: constraint:project.task:0
@ -1521,7 +1537,7 @@ msgstr "Общее время"
 #. module: project
 #: model:ir.model,name:project.model_project_config_settings
 msgid "project.config.settings"
-msgstr ""
+msgstr "project.config.settings"

 #. module: project
 #: model:project.task.type,name:project.project_tt_development
@ -1586,12 +1602,12 @@ msgstr "Назначить на"
 #. module: project
 #: model:res.groups,name:project.group_time_work_estimation_tasks
 msgid "Time Estimation on Tasks"
-msgstr ""
+msgstr "Оценка времени на задачи"

 #. module: project
 #: field:project.task,total_hours:0
 msgid "Total"
-msgstr ""
+msgstr "Всего"

 #. module: project
 #: model:process.node,note:project.process_node_taskbydelegate0
@ -1601,7 +1617,7 @@ msgstr "Поручить ваше задание другому пользова
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_started
 msgid "Task started"
-msgstr ""
+msgstr "Задание начато"

 #. module: project
 #: help:project.task.reevaluate,remaining_hours:0
@ -1614,6 +1630,8 @@ msgid ""
 "This stage is not visible, for example in status bar or kanban view, when "
 "there are no records in that stage to display."
 msgstr ""
+"Эта стадия не видима, например в статус-баре или виде канбан, когда нет "
+"записей на этой стадии для отображения."

 #. module: project
 #: view:project.task:0
@ -1643,7 +1661,7 @@ msgstr "Проекты в ожидании"
 #. module: project
 #: view:project.task:0
 msgid "Remaining"
-msgstr ""
+msgstr "Осталось"

 #. module: project
 #: field:project.task,progress:0
@ -1672,17 +1690,17 @@ msgstr ""
 #. module: project
 #: field:project.config.settings,module_project_issue:0
 msgid "Track issues and bugs"
-msgstr ""
+msgstr "Отслеживание проблем и ошибок"

 #. module: project
 #: field:project.config.settings,module_project_mrp:0
 msgid "Generate tasks from sale orders"
-msgstr ""
+msgstr "Создание задач из заказов"

 #. module: project
 #: model:ir.ui.menu,name:project.menu_task_types_view
 msgid "Task Stages"
-msgstr ""
+msgstr "Этапы задач"

 #. module: project
 #: model:process.node,note:project.process_node_drafttask0
@ -1693,7 +1711,7 @@ msgstr "Определить требования и установить зап
 #: field:project.project,message_ids:0
 #: field:project.task,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Сообщения"

 #. module: project
 #: field:project.project,color:0
@ -1752,17 +1770,17 @@ msgstr "Дата окончания"
 #. module: project
 #: field:project.task.type,state:0
 msgid "Related Status"
-msgstr ""
+msgstr "Связанный статус"

 #. module: project
 #: view:project.project:0
 msgid "Documents"
-msgstr ""
+msgstr "Документы"

 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_new
 msgid "Task created"
-msgstr ""
+msgstr "Задача создана"

 #. module: project
 #: view:report.project.task.user:0
@ -1774,7 +1792,7 @@ msgstr "# дней"
 #: field:project.project,message_follower_ids:0
 #: field:project.task,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Подписчики"

 #. module: project
 #: selection:project.project,state:0
@ -1812,7 +1830,7 @@ msgstr "Проверка задания"
 #. module: project
 #: field:project.config.settings,module_project_long_term:0
 msgid "Manage resources planning on gantt view"
-msgstr ""
+msgstr "Управление планированием ресурсов на диаграмме Ганта"

 #. module: project
 #: view:project.task:0
@ -1871,7 +1889,7 @@ msgstr "Проекты"
 #. module: project
 #: model:res.groups,name:project.group_tasks_work_on_tasks
 msgid "Task's Work on Tasks"
-msgstr ""
+msgstr "Задачи, работающие на задачи"

 #. module: project
 #: help:project.task.delegate,name:0
@ -1914,7 +1932,7 @@ msgstr "Декабрь"
 #: view:project.task.delegate:0
 #: view:project.task.reevaluate:0
 msgid "or"
-msgstr ""
+msgstr "или"

 #. module: project
 #: help:project.config.settings,module_project_mrp:0
@ -1938,7 +1956,7 @@ msgstr ""
 #. module: project
 #: model:project.category,name:project.project_category_03
 msgid "Experiment"
-msgstr ""
+msgstr "Эксперимент"

 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_opendrafttask0
@ -1998,7 +2016,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:project.action_config_settings
 #: view:project.config.settings:0
 msgid "Configure Project"
-msgstr ""
+msgstr "Настроить проект"

 #. module: project
 #: view:project.task.history.cumulative:0
@ -2030,7 +2048,7 @@ msgstr "Пожалуйста, сначала удалите проект, ссы
 #: model:mail.message.subtype,name:project.mt_project_task_new
 #: model:mail.message.subtype,name:project.mt_task_new
 msgid "Task Created"
-msgstr ""
+msgstr "Задание создано"

 #. module: project
 #: view:report.project.task.user:0
@ -2048,12 +2066,12 @@ msgstr "Проекты, в которых я менеджер"
 #: selection:project.task.history,kanban_state:0
 #: selection:project.task.history.cumulative,kanban_state:0
 msgid "Ready for next stage"
-msgstr ""
+msgstr "Готово к следующей стадии"

 #. module: project
 #: field:project.task.type,case_default:0
 msgid "Default for New Projects"
-msgstr ""
+msgstr "По умолчанию для нового проекта"

 #. module: project
 #: view:project.task:0
@ -2098,7 +2116,7 @@ msgstr ""
 #. module: project
 #: model:mail.message.subtype,description:project.mt_task_closed
 msgid "Task closed"
-msgstr ""
+msgstr "Задание закрыто"

 #. module: project
 #: selection:report.project.task.user,month:0
@ -2130,13 +2148,13 @@ msgstr ""
 #. module: project
 #: selection:project.project,privacy_visibility:0
 msgid "Followers Only"
-msgstr ""
+msgstr "Только для подписчиков"

 #. module: project
 #: view:board.board:0
 #: field:project.project,task_count:0
 msgid "Open Tasks"
-msgstr ""
+msgstr "Открытые задачи"

 #. module: project
 #: field:project.project,priority:0
--- a/addons/sale/html/index.html
+++ b/addons/sale/html/index.html
@ -293,3 +293,5 @@ reports that anyone can create and share.
        </div>
    </div>
 </section>
+<section class="oe_container oe_separator">
+</section>
--- a/addons/stock/html/index.html
+++ b/addons/stock/html/index.html
@ -237,3 +237,5 @@ real-time reports that anyone can create and share.
    </div>
 </section>

+<section class="oe_container oe_separator">
+</section>