From de8fa767097fb8ea1393ac2ed6657e60897187dd Mon Sep 17 00:00:00 2001 From: "Amit Parmar (OpenERP)" Date: Tue, 26 Jul 2011 12:21:24 +0530 Subject: [PATCH] [IMP] remerege onchange_partner_set_invoice_task_work bzr revid: aar@tinyerp.com-20110726065124-a069g9op9gw6u0jl --- addons/project/project.py | 8 ++------ addons/project_timesheet/project_timesheet.py | 7 +++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/addons/project/project.py b/addons/project/project.py index 782767d78f8..830d40a4634 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -78,12 +78,8 @@ class project(osv.osv): addr = partner_obj.address_get(cr, uid, [part], ['contact']) pricelist = partner_obj.read(cr, uid, part, ['property_product_pricelist'], context=context) pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False - if not res: - return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}} - else: - return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id, 'to_invoice': res}} - - + return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}} + def _progress_rate(self, cr, uid, ids, names, arg, context=None): res = {}.fromkeys(ids, 0.0) if not ids: diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 36768b07793..0d6843497c8 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -30,8 +30,11 @@ class project_project(osv.osv): _inherit = 'project.project' def onchange_partner_id(self, cr, uid, ids, part=False, context=None): obj = self.pool.get('hr_timesheet_invoice.factor') - factor_ids = obj.search(cr, uid, [('customer_name','=','100%')]) - return super(project_project, self).onchange_partner_id(cr, uid, ids, part, factor_ids, context=context) + res = super(project_project, self).onchange_partner_id(cr, uid, ids, part, context) + if res and ('value' in res): + factor_ids = obj.search(cr, uid, [('customer_name','=','100%')]) + res['value'].update({'to_invoice': factor_ids}) + return res project_project() class project_work(osv.osv):