diff options
| author | Harry (Open ERP) <hmo@tinyerp.com> | 2010-04-02 17:32:16 +0530 |
|---|---|---|
| committer | Harry (Open ERP) <hmo@tinyerp.com> | 2010-04-02 17:32:16 +0530 |
| commit | fc904594952c19dd914c74d146ecd241e054a6da (patch) | |
| tree | 055dc89546d46314f56105e08c935c31847a1443 | |
| parent | 34e10e65a1224d78863c036a8a49a4822c96cbed (diff) | |
| parent | e44f1818d51f872684994c0889b7620f12b9888b (diff) | |
[MERGE]
bzr revid: hmo@tinyerp.com-20100402120216-rhjcihck33zefoi4
| -rw-r--r-- | addons/crm/crm.py | 1 | ||||
| -rw-r--r-- | addons/crm/crm_opportunity.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 6ad45e57987..e2e3ddc6f36 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -428,7 +428,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 407df221340..1625d39fdde 100644 --- a/addons/crm/crm_opportunity.py +++ b/addons/crm/crm_opportunity.py @@ -106,6 +106,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\'.\ |