[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120712044249-z0xy8j6ueloi2bqs
bzr revid: mdi@tinyerp.com-20120713043610-i5370isy4gb0jevv
bzr revid: mdi@tinyerp.com-20120716044613-pstjqy53b8v5kwf1

diff --cc addons/project_issue/project_issue_view.xml
index e785eee,e730805..cc63576
--- 1/addons/project_issue/project_issue_view.xml
--- 2/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@@ -130,19 -124,30 +128,30 @@@
                              <field name="user_id"/>
                              <field name="partner_id"  on_change="onchange_partner_id(partner_id, email_from)"/>
                              <field name="email_from"/>
-                         </group><group>
-                             <field name="task_id" on_change="onchange_task_id(task_id)" context="{'default_project_id':project_id}"/>
-                             <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
-                             <field name="version_id" widget="selection"/>
+                         </group>
+                         <group>
                              <field name="priority"/>
-                             <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
-                             <field name="state" groups="base.group_no_one"/>
 -                            <field name="project_id" required="True" on_change="on_change_project(project_id)"/>
++                            <field name="project_id" required="True" on_change="on_change_project(project_id)" context="{'default_use_issues':1}"/>
+                             <label for="task_id"/>
+                             <div>
 -                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline"/>
++                                <field name="task_id" on_change="onchange_task_id(task_id)" class="oe_inline" context="{'default_project_id':project_id}"/>
+                                 <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}" class="oe_inline"/>
+                             </div>
                          </group>
                      </group>
-                     <field name="description" placeholder="Add a description..."/>
- 
-                     <notebook groups="base.group_no_one">
-                         <page string="Extra Info">
+                     <notebook>
+                         <page string="Description">
+                             <group>
+                                 <group>
+                                     <field name="categ_id" widget="selection" domain="[('object_id.model', '=', 'project.issue')]"/>
+                                 </group>
+                                 <group>
+                                     <field name="version_id" widget="selection"/>
+                                 </group>
+                             </group>
+                             <field name="description" placeholder="Add a description..."/>
+                         </page>
+                         <page string="Extra Info" groups="base.group_no_one">
                              <group col="4" colspan="4">
                                  <separator string="Statistics" colspan="4" col="4"/>
                                  <field name="day_open"/>