[IMP] crm deadlines

bzr revid: fp@tinyerp.com-20100402075140-0ih2h9m3pd017s0c

diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index a6baed4..da3de28 100644 (file)
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -271,7 +271,6 @@ class crm_case(osv.osv):
         'partner_address_id': _get_default_partner_address,
         'email_from': _get_default_email,
         'state': lambda *a: 'draft',
-        'date_deadline': lambda *a:(datetime.today() + timedelta(days=3)).strftime('%Y-%m-%d %H:%M:%S'),
         'section_id': _get_section,
         'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.case', context=c),
     }

diff --git a/addons/crm/crm_opportunity.py b/addons/crm/crm_opportunity.py
index ea70e85..b33fce2 100644 (file)
--- a/addons/crm/crm_opportunity.py
+++ b/addons/crm/crm_opportunity.py
@@ -47,6 +47,7 @@ class crm_opportunity(osv.osv):
         'date_closed': fields.datetime('Closed', readonly=True),
         'user_id': fields.many2one('res.users', 'Salesman'),
         'phone': fields.char("Phone", size=64),
+        'date_deadline': fields.date('Expected Closing'),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True,
                                   help='The state is set to \'Draft\', when a case is created.\
                                   \nIf the case is in progress the state is set to \'Open\'.\