[MERGE]merge with trunk addons

bzr revid: sgo@tinyerp.com-20120808052023-i87gopbxesqwfm0q

1 files changed, 10 insertions, 1 deletions

diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 4c973eed068..7911135f5f1 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -542,6 +542,9 @@ project_issue()
 class project(osv.osv):
     _inherit = "project.project"
 
+    def _get_alias_models(self, cr, uid, context=None):
+        return [('project.task', "Tasks"), ("project.issue", "Issues")]
+        
     def _issue_count(self, cr, uid, ids, field_name, arg, context=None):
         res = dict.fromkeys(ids, 0)
         issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)])
@@ -551,7 +554,6 @@ class project(osv.osv):
 
     _columns = {
         'project_escalation_id' : fields.many2one('project.project','Project Escalation', help='If any issue is escalated from the current Project, it will be listed under the project selected here.', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}),
-        'reply_to' : fields.char('Reply-To Email Address', size=256),
         'issue_count': fields.function(_issue_count, type='integer'),
     }
 
@@ -565,6 +567,7 @@ class project(osv.osv):
     _constraints = [
         (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id'])
     ]
+    
 project()
 
 class account_analytic_account(osv.osv):
@@ -588,4 +591,10 @@ class account_analytic_account(osv.osv):
 
 account_analytic_account()
 
+class project_project(osv.osv):
+    _inherit = 'project.project'
+    _defaults = {
+        'use_issues': True
+    }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: