[MERGE] with trunk

bzr revid: fka@tinyerp.com-20130605071930-5412uihl6xk1v7vt

diff --cc addons/crm/crm_case_section_view.xml
index 0974498,be5611c..ce29f24
--- 1/addons/crm/crm_case_section_view.xml
--- 2/addons/crm/crm_case_section_view.xml
+++ b/addons/crm/crm_case_section_view.xml
@@@ -169,24 -185,17 +185,24 @@@
                          </div>
                          <group>
                              <group>
+                                 <field name="user_id"/>
+                                 <field name="code"/>
+                             </group>
+                             <group>
                                  <field name="parent_id"/>
-                                 <field name="resource_calendar_id"/>
+                                 <field name="change_responsible"/>
                                  <field name="active"/>
                              </group>
 +                            <group>
 +                                <field name="user_id" context="{'default_groups_ref': ['base.group_sale_salesman_all_leads']}"/>
 +                                <field name="code"/>
 +                            </group>
 +                            <group colspan="4" attrs="{'invisible': [('use_leads', '=', False)]}">
 +                                
 +                            </group>
                          </group>
                          <notebook colspan="4">
-                             <page string="Sales Team">
-                                <group>
-                                     <field name="change_responsible"/>
-                                 </group>
-                                 <separator string="Team Members"/>
+                             <page string="Team Members">
                                  <field name="member_ids" widget="many2many_kanban">
                                      <kanban quick_create="false" create="true">
                                          <field name="name"/>

diff --cc addons/crm/crm_lead_view.xml
Simple merge

diff --cc addons/crm_helpdesk/crm_helpdesk_view.xml
Simple merge

diff --cc addons/sale/sale_view.xml
Simple merge