From e3f6b6a3d16ec35b5fbe35a3a74f78a1ddaf8609 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Thu, 6 Jan 2011 14:44:03 +0100 Subject: [PATCH 1/4] [FIX] project_timesheet : yes (100 %) remove by default when choose a partner bzr revid: tfr@openerp.com-20110106134403-fgkaax17gngxouds --- addons/project_timesheet/project_timesheet.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 00a28ce2b50..141b5756271 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -28,16 +28,7 @@ from tools.translate import _ class project_project(osv.osv): _inherit = 'project.project' - def onchange_partner_id(self, cr, uid, ids, part=False, context=None): - result = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context=context) - if result.get('value', False): - try: - d = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'hr_timesheet_invoice', 'timesheet_invoice_factor1') - if d: - result['value']['to_invoice'] = d[1] - except ValueError, e: - pass - return result + project_project() class project_work(osv.osv): From 93edbe8824ecd87b4186b2bb4e3c7f5a05db926e Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Thu, 6 Jan 2011 14:54:08 +0100 Subject: [PATCH 2/4] [FIX] project_timesheet : to Invoice required if partner is present bzr revid: tfr@openerp.com-20110106135408-wu9ihf7qn2xwwox6 --- addons/project_timesheet/project_timesheet_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index f8c25f4cb33..56dfa068b21 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -11,7 +11,7 @@ - + From af1e98ef758d924849c3f39f018333c624d135a1 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Thu, 6 Jan 2011 16:42:02 +0100 Subject: [PATCH 3/4] [IMP] project : add task to a project where you're member bzr revid: tfr@openerp.com-20110106154202-rku7hq91hc9o9u3c --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 24e8e6fb4a1..3be1c4c1f32 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -223,7 +223,7 @@
- + From a9476d60a5c3c8a09ebe0f66a0d73b1998800619 Mon Sep 17 00:00:00 2001 From: Thibault Francois Date: Thu, 6 Jan 2011 16:45:24 +0100 Subject: [PATCH 4/4] [IMP] project : change members tooltip bzr revid: tfr@openerp.com-20110106154524-64ini2043q7zgk3u --- addons/project/project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index c30ddce74e9..68b987451a6 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -128,7 +128,7 @@ class project(osv.osv): 'analytic_account_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.", ondelete="cascade", required=True), 'priority': fields.integer('Sequence', help="Gives the sequence order when displaying the list of projects"), '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.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), - '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.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), + '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, but a user has to be member of a project to add a the to this project.", states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'parent_id': fields.many2one('project.project', 'Parent Project'), 'tasks': fields.one2many('project.task', 'project_id', "Project tasks"), 'planned_hours': fields.function(_progress_rate, multi="progress", method=True, string='Planned Time', help="Sum of planned hours of all tasks related to this project and its child projects.",