Merge with trunk addons

bzr revid: sbh@tinyerp.com-20100119052746-ut554n3m0h7aaa2w

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

diff --cc addons/project/project_view.xml
index 8e65584,5d081b6..05cb3db
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -484,14 -475,10 +483,14 @@@
                 <search string="Task Edition">
                      <group col="8" colspan="4">
                          <filter string="Draft" domain="[('state','=','draft')]" help="Draft Tasks" icon="terp-project"/>
-                         <filter string="Open" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
+                         <filter string="In Progress" domain="[('state','=','open')]" help="Open Tasks" icon="terp-project"/>
                          <filter string="Pending" domain="[('state','=','pending')]" help="Pending Tasks" icon="terp-project"/>
 +                        <filter string="By Users" icon="terp-project" domain="[]"  context="{'group_by':'user_id'}"/>
 +                        <filter string="By Project" icon="terp-project" domain="[]" context="{'group_by':'project_id'}"/>
 +                                              <filter string="By Type" icon="terp-project" domain="[]" context="{'group_by':'type'}"/>
                          <separator orientation="vertical"/>
                          <field name="name" select="1"/>
 +                        <field name="type" select="1" widget="selection"/>
                          <field name="project_id" select="1" widget="selection">
                               <filter domain="[('manager_id','=',False)]" help="Unassigned Project" icon="terp-project"/>
                          </field>