[MERGE]: Merge with latest trunk-addons

bzr revid: rpa@tinyerp.com-20120803045532-wsgei101ogh0o44d
bzr revid: rpa@tinyerp.com-20120806050952-xecwmyhg4p2fs4id

diff --cc addons/crm/crm_data.xml
index 80a29a3,0322f83..26fc598
--- 1/addons/crm/crm_data.xml
--- 2/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@@ -1,17 -1,30 +1,30 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
      <data noupdate="1">
+ 
+         <!-- After installation of the module, open the related menu -->
+         <record id="action_client_crm_menu" model="ir.actions.client">
+             <field name="name">Open Sale Menu</field>
+             <field name="tag">reload</field>
+             <field name="params" eval="{'menu_id': ref('base.menu_base_partner')}"/>
+         </record>
+         <record id="todo_open_crm_menu" model="ir.actions.todo">
+             <field name="action_id" ref="action_client_crm_menu"/>
+             <field name="type">automatic</field>
+             <field name="sequence">100</field>
+         </record>
+ 
 -        <record model="crm.case.channel">
 -            <field name="name">website</field>
 +        <record model="crm.case.channel" id="crm_case_channel_website">
 +            <field name="name">Website</field>
          </record>
 -        <record model="crm.case.channel">
 -            <field name="name">phone</field>
 +        <record model="crm.case.channel" id="crm_case_channel_phone">
 +            <field name="name">Phone</field>
          </record>
 -        <record model="crm.case.channel">
 -            <field name="name">direct</field>
 +        <record model="crm.case.channel" id="crm_case_channel_direct">
 +            <field name="name">Direct</field>
          </record>
 -        <record model="crm.case.channel">
 -            <field name="name">email</field>
 +        <record model="crm.case.channel" id="crm_case_channel_email">
 +            <field name="name">Email</field>
          </record>
          <record model="crm.case.section" id="section_sales_department">
              <field name="name">Sales Department</field>

diff --cc addons/hr_expense/hr_expense_data.xml
Simple merge

diff --cc addons/l10n_ch/test/l10n_ch_dta.yml
Simple merge

diff --cc addons/project/project_data.xml
Simple merge

diff --cc addons/sale/res_config.py
Simple merge

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