[MERGE]: Merged with addons

bzr revid: atp@tinyerp.com-20130823132627-jhyrbzgw51s6w05v

diff --cc addons/crm/crm_phonecall_view.xml
index 05188cd,41a0eb5..30c4471
--- 1/addons/crm/crm_phonecall_view.xml
--- 2/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@@ -101,12 -87,14 +87,14 @@@
  
                      <group col="4">
                          <field name="date"/>
 -                        <field name="user_id"/>
 +                        <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_salesman_all_leads']}"/>
-                         <field name="duration" widget="float_time"/>
+                         <label for="duration"/>
+                         <div>
+                               <field name="duration" widget="float_time" class="oe_inline" style="vertical-align:baseline"/> <b> min(s)</b>
+                         </div>
                          <field name="section_id" colspan="1" widget="selection"
                                  groups="base.group_multi_salesteams"/>
-                         <field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
-                         <field name="email_from" invisible="1"/> <!--not needed because of the chatter, thus invisible, but must be in the view as it's returned by onchange_partner_id()-->
+                         <field name="partner_id" on_change="on_change_partner_id(partner_id)"/>
                          <field name="categ_id" widget="selection"
                              domain="[('object_id.model', '=', 'crm.phonecall')]"/>
                          <field name="partner_mobile"/>

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

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
Simple merge

diff --cc addons/mrp/mrp_view.xml
Simple merge