diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 6ded487f1d9..8f547c224fc 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 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
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index f1f1aee7d41..89d238b16e9 100644
--- 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:
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 7977c0fc505..ce8b41fc2da 100644
--- 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>
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index be1e0aac402..e493f364a0e 100644
--- 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',
diff --git a/addons/account_voucher/html/index.html b/addons/account_voucher/html/index.html
index 581dbb4fb96..84e90f63679 100644
--- a/addons/account_voucher/html/index.html
+++ b/addons/account_voucher/html/index.html
@@ -137,4 +137,5 @@ material. Define recurrencies to produce recurring invoice automatically.
         </div>
     </div>
 </section>
-<section class="oe_container oe_separator"/>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/account_voucher/i18n/ru.po b/addons/account_voucher/i18n/ru.po
index 63cad344ed0..ef38a07e478 100644
--- 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
diff --git a/addons/auth_openid/i18n/ru.po b/addons/auth_openid/i18n/ru.po
index 809589efd37..68b36626056 100644
--- a/addons/auth_openid/i18n/ru.po
+++ b/addons/auth_openid/i18n/ru.po
@@ -8,13 +8,13 @@ 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-05-27 12:13+0000\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-05-28 05:17+0000\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
 "X-Generator: Launchpad (build 16640)\n"
 
 #. module: auth_openid
@@ -46,7 +46,7 @@ msgstr ""
 #: code:addons/auth_openid/static/src/xml/auth_openid.xml:10
 #, python-format
 msgid "Google"
-msgstr ""
+msgstr "Google"
 
 #. module: auth_openid
 #. openerp-web
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 8efae21f676..b4ab2fe751d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -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"/>
diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py
index 00446b0ef8c..093fe79e6fd 100644
--- 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'],
     'js': [
         'static/src/js/job_position.js',
         'static/lib/justgage.js',
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 7e3ba7926eb..e6f6cce70bf 100644
--- 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,
diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index a0b16f042bc..f3f1b3e712d 100644
--- 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>
diff --git a/addons/hr_recruitment/hr_recruitment_demo.xml b/addons/hr_recruitment/hr_recruitment_demo.xml
new file mode 100644
index 00000000000..c15e0deb188
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
deleted file mode 100644
index 2554c690c15..00000000000
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ /dev/null
@@ -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
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 046dc5d9070..4de33a09a5c 100644
--- 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>
diff --git a/addons/mail/html/index.html b/addons/mail/html/index.html
index be3a04ab30c..ad7f9daf1a9 100644
--- a/addons/mail/html/index.html
+++ b/addons/mail/html/index.html
@@ -175,4 +175,5 @@ for your own company. Follow people, share best practices, 'like' top ideas, etc
         </div>
     </div>
 </section>
-<section class="oe_container oe_separator"/>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 0b6a4aebd18..c30d00f5af7 100644
--- 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
 
diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html
index 3ee973d7874..d3e7a048490 100644
--- a/addons/mrp/html/index.html
+++ b/addons/mrp/html/index.html
@@ -190,4 +190,5 @@ manufacturing operations.
         </div>
     </div>
 </section>
-<section class="oe_container oe_separator"/>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/note/html/index.html b/addons/note/html/index.html
index 97736520f2f..4e7db34df58 100644
--- a/addons/note/html/index.html
+++ b/addons/note/html/index.html
@@ -113,4 +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 class="oe_container oe_separator">
+</section>
diff --git a/addons/note/note_view.xml b/addons/note/note_view.xml
index 68ec6bfc4f7..f3b9e4669c7 100644
--- 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.
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index e4bf004c00f..a533f0a8ee6 100644
--- 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() {
diff --git a/addons/project/html/index.html b/addons/project/html/index.html
index 072f279447f..c1b6c3b966f 100644
--- a/addons/project/html/index.html
+++ b/addons/project/html/index.html
@@ -194,4 +194,5 @@ accurate reports on your team's performance.
         </div>
     </div>
 </section>
-<section class="oe_container oe_separator"/>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index ad0085c4d36..b64662f916b 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-05-27 13:00+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-05-28 05:16+0000\n"
+"X-Launchpad-Export-Date: 2013-05-29 05:37+0000\n"
 "X-Generator: Launchpad (build 16640)\n"
 
 #. module: project
@@ -1830,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
@@ -2154,7 +2154,7 @@ msgstr "Только для подписчиков"
 #: view:board.board:0
 #: field:project.project,task_count:0
 msgid "Open Tasks"
-msgstr ""
+msgstr "Открытые задачи"
 
 #. module: project
 #: field:project.project,priority:0
diff --git a/addons/sale/html/index.html b/addons/sale/html/index.html
index e10c3abb9a0..be0d9ac0f94 100644
--- a/addons/sale/html/index.html
+++ b/addons/sale/html/index.html
@@ -293,4 +293,5 @@ reports that anyone can create and share.
         </div>
     </div>
 </section>
-<section class="oe_container oe_separator"/>
+<section class="oe_container oe_separator">
+</section>
diff --git a/addons/stock/html/index.html b/addons/stock/html/index.html
index 476de95bfe5..21d2800e0dc 100644
--- a/addons/stock/html/index.html
+++ b/addons/stock/html/index.html
@@ -237,4 +237,5 @@ real-time reports that anyone can create and share.
     </div>
 </section>
 
-<section class="oe_container oe_separator"/>
+<section class="oe_container oe_separator">
+</section>