merged

bzr revid: hda@tinyerp.com-20091009100304-ypn2f3ivhfg8s8pq

diff --cc addons/account/account_view.xml
Simple merge

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

diff --cc addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
Simple merge

diff --cc addons/hr_timesheet/hr_timesheet_view.xml
Simple merge

diff --cc addons/project/project_view.xml
index 5177fce,029e7c4..e51112c
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -671,11 -492,9 +671,11 @@@
              <field name="res_model">project.task</field>
              <field name="view_type">form</field>
              <field name="view_mode">tree,form,calendar,graph,gantt</field>
-             <field name="domain">[('state', '=', 'progress')]</field>
 +            <field name="filter" eval="True"/>
 +            <field name="search_view_id" ref="view_task_search_form"/>            
+             <field name="domain">[('state','=','open')]</field>
          </record>
 -        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task"/>
 +        <menuitem action="action_view_task6_prog" id="menu_action_view_task6_prog" parent="project.menu_action_view_task" groups="base.group_extended_menu"/>
  
          <record id="action_view_task7" model="ir.actions.act_window">
              <field name="name">Unassigned Tasks</field>

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

diff --cc addons/purchase/purchase_view.xml
Simple merge

diff --cc addons/purchase/wizard/wizard_group.py
Simple merge

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

diff --cc addons/stock/stock_view.xml
Simple merge