diff --git a/addons/project/project.py b/addons/project/project.py index 61720675f49..d511757c8dc 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -123,7 +123,7 @@ class project(osv.osv): 'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the project without removing it."), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of Projects."), 'category_id': fields.many2one('account.analytic.account','Analytic Account', help="Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."), - 'priority': fields.integer('Sequence'), + 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying a list of task"), 'warn_manager': fields.boolean('Warn Manager', help="If you check this field, the project manager will receive a request each time a task is completed by his team."), 'members': fields.many2many('res.users', 'project_user_rel', 'project_id', 'uid', 'Project Members', help="Project's member. Not used in any computation, just for information purpose."), 'tasks': fields.one2many('project.task', 'project_id', "Project tasks"), @@ -150,14 +150,14 @@ class project(osv.osv): if leave['date_start'] > leave['date']: return False return True - + def _check_escalation(self, cr, uid, ids): project_obj = self.browse(cr, uid, ids[0]) if project_obj.project_escalation_id: if project_obj.project_escalation_id.id == project_obj.id: return False - return True - + return True + _constraints = [ (_check_dates, 'Error! project start-date must be lower then project end-date.', ['date_start', 'date']), (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id']) diff --git a/addons/scrum/scrum.py b/addons/scrum/scrum.py index 2e3a0ca3fcb..698b490f1a2 100644 --- a/addons/scrum/scrum.py +++ b/addons/scrum/scrum.py @@ -28,8 +28,8 @@ import re class scrum_project(osv.osv): _inherit = 'project.project' _columns = { - 'product_owner_id': fields.many2one('res.users', 'Product Owner'), - 'sprint_size': fields.integer('Sprint Days',help="Number of days allocated for sprint"), + 'product_owner_id': fields.many2one('res.users', 'Product Owner', help="The person who is responsible for the product"), + 'sprint_size': fields.integer('Sprint Days', help="Number of days allocated for sprint"), 'scrum': fields.integer('Is a Scrum Project'), } _defaults = {