From aed3bca9ba2520c51a0f43fed72ef5d241aa50ef Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 27 Oct 2008 13:37:57 +0100 Subject: [PATCH 1/7] improve_wizard_config bzr revid: fp@tinyerp.com-20081027123757-xuun2ctpjdo4p62y --- addons/account/account.py | 1 - addons/profile_service/__terp__.py | 1 - addons/project/project.py | 10 +++++----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 11f537d68fc..5d4910b11ea 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1576,7 +1576,6 @@ class account_config_wizard(osv.osv_memory): 'date1': lambda *a: time.strftime('%Y-01-01'), 'date2': lambda *a: time.strftime('%Y-12-31'), 'period':lambda *a:'month', - 'charts': lambda *a: -1, } def action_cancel(self,cr,uid,ids,conect=None): return { diff --git a/addons/profile_service/__terp__.py b/addons/profile_service/__terp__.py index 906b583fc66..08021bca61c 100644 --- a/addons/profile_service/__terp__.py +++ b/addons/profile_service/__terp__.py @@ -33,7 +33,6 @@ "category":"Profile", "depends":[ "hr", - "crm", "project", "board_project", "account_analytic_analysis" diff --git a/addons/project/project.py b/addons/project/project.py index 33843b70bbc..3bb08ed8a89 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -116,7 +116,7 @@ class project(osv.osv): 'priority': fields.integer('Sequence'), 'manager': fields.many2one('res.users', 'Project Manager'), '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'), + '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"), 'parent_id': fields.many2one('project.project', 'Parent Project'), 'child_id': fields.one2many('project.project', 'parent_id', 'Subproject'), @@ -127,10 +127,10 @@ class project(osv.osv): 'date_end': fields.date('Expected End'), 'partner_id': fields.many2one('res.partner', 'Partner'), 'contact_id': fields.many2one('res.partner.address', 'Contact'), - 'warn_customer': fields.boolean('Warn Partner'), - 'warn_header': fields.text('Mail header'), - 'warn_footer': fields.text('Mail footer'), - 'notes': fields.text('Notes'), + 'warn_customer': fields.boolean('Warn Partner', help="If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."), + 'warn_header': fields.text('Mail Header', help="Header added at the beginning of the email for the warning message sent to the customer when a task is closed."), + 'warn_footer': fields.text('Mail Footer', help="Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."), + 'notes': fields.text('Notes', help="Internal description of the project."), 'timesheet_id': fields.many2one('hr.timesheet.group', 'Working Time', help="Timetable working hours to adjust the gantt diagram report"), 'state': fields.selection([('template', 'Template'), ('open', 'Open'), ('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', required=True, readonly=True), } From b04f8c89e1b46ffc0a8808fa93c7a06a9fbdff65 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 27 Oct 2008 13:42:53 +0100 Subject: [PATCH 2/7] improve_view bzr revid: fp@tinyerp.com-20081027124253-kyzu2m0jzuynx6ja --- addons/hr_timesheet/hr_timesheet_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 73d6e26e1d5..48f0ad7b400 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -48,7 +48,7 @@ form - + My Working Hours From 22a16e1b13e95e727e013ff0019d9f1744ec9a18 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 27 Oct 2008 14:01:18 +0100 Subject: [PATCH 3/7] improve bzr revid: fp@tinyerp.com-20081027130118-7v9shbf2ihi3xxx7 --- addons/project/project_view.xml | 9 +++++---- addons/project/wizard/task_delegate.py | 25 ++++++++++++------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 45a0256c05a..e44da1979e6 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -34,11 +34,12 @@