From: Thibault Delavallée <tde@openerp.com>
Date: Mon, 26 Aug 2013 08:54:10 +0000 (+0200)
Subject: [MERGE] Sync with trunk
X-Git-Tag: InsPy_master01~954^2~42
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=21d57f5e9dd02f539c108b2d60020b5bda8f1ef8;p=odoo%2Fodoo.git

[MERGE] Sync with trunk

bzr revid: tde@openerp.com-20130826085410-qngwkw6eyxol4192
---

21d57f5e9dd02f539c108b2d60020b5bda8f1ef8
diff --cc addons/crm/crm_lead.py
index 52987de,c4e2cbd..6e8e966
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@@ -269,14 -251,10 +251,12 @@@ class crm_lead(format_address, osv.osv)
                                  multi='day_open', type="float", store=True),
          'day_close': fields.function(_compute_day, string='Days to Close', \
                                  multi='day_close', type="float", store=True),
-         'state': fields.related('stage_id', 'state', type="selection", store=True,
-                 selection=crm.AVAILABLE_STATES, string="Status", readonly=True,
-                 help='The Status is set to \'Draft\', when a case is created. If the case is in progress the Status is set to \'Open\'. When the case is over, the Status is set to \'Done\'. If the case needs to be reviewed then the Status is  set to \'Pending\'.'),
+         'date_last_stage_update': fields.datetime('Last Stage Update', select=True),
  
 +        # Messaging and marketing
 +        'message_bounce': fields.integer('Bounce'),
          # Only used for type opportunity
-         'probability': fields.float('Success Rate (%)',group_operator="avg"),
+         'probability': fields.float('Success Rate (%)', group_operator="avg"),
          'planned_revenue': fields.float('Expected Revenue', track_visibility='always'),
          'ref': fields.reference('Reference', selection=crm._links_get, size=128),
          'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
diff --cc addons/crm/crm_lead_view.xml
index 113355e,849ceca..acbec84
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@@ -173,18 -169,17 +169,19 @@@
                          <field name="description"/>
                      </page>
                      <page string="Extra Info">
 -                        <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
 -                            <field name="company_id"
 -                                groups="base.group_multi_company"
 -                                widget="selection" colspan="2"/>
 -                        </group>
 -                        <group string="Mailings">
 -                            <field name="opt_out"/>
 -                        </group>
 -                        <group string="Misc">
 -                            <group>
 +                        <group>
 +                            <group string="Categorization" groups="base.group_multi_company,base.group_no_one" name="categorization">
 +                                <field name="company_id"
 +                                    groups="base.group_multi_company"
 +                                    widget="selection" colspan="2"/>
 +                                <field name="state" groups="base.group_no_one"/>
 +                            </group>
 +                            <group string="Mailings">
 +                                <field name="opt_out"/>
 +                                <field name="message_bounce"/>
 +                            </group>
 +                            <group string="Misc">
+                                 <field name="probability" groups="base.group_no_one"/>
                                  <field name="active"/>
                                  <field name="referred"/>
                              </group>