[MERGE] Merged with mail-state-tde, recently updated with trunk.

bzr revid: tde@openerp.com-20120614084127-rne5xlyhf4fu75n0

diff --cc addons/account/i18n/ja.po
index 326f0a6,786922b..ba73b87
--- 1/addons/account/i18n/ja.po
--- 2/addons/account/i18n/ja.po
+++ b/addons/account/i18n/ja.po
@@@ -14,8 -14,8 +14,8 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n"
 -"X-Launchpad-Export-Date: 2012-06-16 04:56+0000\n"
 -"X-Generator: Launchpad (build 15419)\n"
++"X-Launchpad-Export-Date: 2012-06-13 04:56+0000\n"
 +"X-Generator: Launchpad (build 15389)\n"
  
  #. module: account
  #: view:account.invoice.report:0

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

diff --cc addons/hr/hr_view.xml
Simple merge

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

diff --cc addons/hr_holidays/hr_holidays_view.xml
Simple merge

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/purchase/i18n/ja.po
index dfec215,d1a48e7..ef43041
--- 1/addons/purchase/i18n/ja.po
--- 2/addons/purchase/i18n/ja.po
+++ b/addons/purchase/i18n/ja.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-02-08 01:37+0100\n"
- "PO-Revision-Date: 2012-06-12 04:54+0000\n"
 -"PO-Revision-Date: 2012-06-14 05:06+0000\n"
++"PO-Revision-Date: 2012-06-14 04:32+0000\n"
  "Last-Translator: Akira Hiyama <Unknown>\n"
  "Language-Team: Japanese <ja@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: 2012-06-12 04:55+0000\n"
- "X-Generator: Launchpad (build 15389)\n"
 -"X-Launchpad-Export-Date: 2012-06-15 04:42+0000\n"
 -"X-Generator: Launchpad (build 15414)\n"
++"X-Launchpad-Export-Date: 2012-06-14 04:34+0000\n"
++"X-Generator: Launchpad (build 15405)\n"
  
  #. module: purchase
  #: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0