[MERGE] Merged BDE's branch for crm improvements

bzr revid: pso@tinyerp.com-20120829101601-3ybhdms6qqkq5nzx

diff --cc addons/base_calendar/crm_meeting.py
index cb96ff2,cb96ff2..1e9eff5
--- 1/addons/base_calendar/crm_meeting.py
--- 2/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@@ -53,7 -53,7 +53,7 @@@ class crm_meeting(base_state, osv.Model
          'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id','partner_id',
              string='Attendees', states={'done': [('readonly', True)]}),
          'state': fields.selection(
--                    [('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')],
++                    [('draft', 'Unconfirmed'), ('open', 'Confirmed')],
                      string='Status', size=16, readonly=True),
          # Meeting fields
          'name': fields.char('Meeting Subject', size=128, required=True, states={'done': [('readonly', True)]}),

diff --cc addons/base_calendar/crm_meeting_view.xml
index 6009251,84385f9..388629d
--- 1/addons/base_calendar/crm_meeting_view.xml
--- 2/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@@ -70,7 -70,7 +70,7 @@@
          <field name="arch" type="xml">
              <form string="Meetings" version="7.0">
                  <header>
--                    <field name="state" invisible="True"/>
++                    <field name="state" widget="statusbar"/>
                  </header>
                  <sheet>
                      <div class="oe_title">