[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20120604085217-ntsulc7zrujp6efc
2012-06-04 14:22:17 +05:30
parent 34b530dc53 37e59e65b3
commit a5604d2cfa
141 changed files with 18427 additions and 2543 deletions
@@ -332,7 +332,7 @@
            <field name="type">search</field>
            <field name="inherit_id" ref="project.view_task_search_form"/>
            <field name="arch" type="xml">
-                <field name="name" position="after">
+                <field name="user_id" position="before">
                    <field name="phase_id" select="1"/>
                </field>
            </field>