[MERGE] merge with latest trunk

bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf

diff --cc addons/account/account.py
Simple merge

diff --cc addons/account/account_invoice.py
Simple merge

diff --cc addons/account/account_move_line.py
Simple merge

diff --cc addons/account_analytic_analysis/account_analytic_analysis.py
Simple merge

diff --cc addons/account_voucher/account_voucher.py
Simple merge

diff --cc addons/anonymization/anonymization.py
Simple merge

diff --cc addons/auth_openid/i18n/ru.po
index 6041300,68b3662..809589e
--- 1/addons/auth_openid/i18n/ru.po
--- 2/addons/auth_openid/i18n/ru.po
+++ b/addons/auth_openid/i18n/ru.po
@@@ -8,14 -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: 2013-03-23 11:37+0000\n"
- "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 -"PO-Revision-Date: 2013-05-28 06:19+0000\n"
++"PO-Revision-Date: 2013-05-27 12:13+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-Launchpad-Export-Date: 2013-05-28 05:17+0000\n"
+ "X-Generator: Launchpad (build 16640)\n"
  
  #. module: auth_openid
  #. openerp-web

diff --cc addons/project/i18n/ru.po
index 1743d66,b64662f..ad0085c
--- 1/addons/project/i18n/ru.po
--- 2/addons/project/i18n/ru.po
+++ b/addons/project/i18n/ru.po
@@@ -7,14 -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"
++"PO-Revision-Date: 2013-05-27 13:00+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-Launchpad-Export-Date: 2013-05-28 05:16+0000\n"
+ "X-Generator: Launchpad (build 16640)\n"
  
  #. module: project
  #: view:project.project:0

diff --cc addons/project/project.py
Simple merge

diff --cc addons/stock/stock.py
Simple merge