[MERGE] Merge with main trunk addons branch

bzr revid: mra@tinyerp.com-20100527030635-qd7ugz2oceezloe3

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

diff --cc addons/hr_holidays/report/available_holidays_view.xml
index bd9df6f,3652762..34f1427
--- 1/addons/hr_holidays/report/available_holidays_view.xml
--- 2/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@@ -103,9 -95,8 +103,8 @@@
              <field name="res_model">available.holidays.report</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,graph</field>
 -            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
 +            <field name="context">{'search_default_month':1,'search_default_User':1,'group_by':[], "search_default_user_id": uid}</field>
              <field name="view_id" ref="view_hr_available_holidays_report_search"/>
- 
          </record>
  
          <record model="ir.actions.act_window.view" id="action_hr_available_holidays_report_tree">

diff --cc addons/hr_holidays/report/hr_holidays_report_view.xml
index ad8f833,dce4c67..b6afe32
--- 1/addons/hr_holidays/report/hr_holidays_report_view.xml
--- 2/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@@ -1,6 -1,7 +1,7 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
- <data>
+       <data>
 -      
++
      <record id="view_hr_holidays_report_tree" model="ir.ui.view">
          <field name="name">hr.holidays.report.tree</field>
          <field name="model">hr.holidays.report</field>
@@@ -152,5 -150,6 +153,6 @@@
              </graph>
          </field>
      </record>
-             </data>
- </openerp>
 -    
++
+     </data>
+ </openerp>

diff --cc addons/project/report/project_report_view.xml
Simple merge