From 9419ac2b6610fc19d160ed2b91813af5dff1cab8 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Tue, 6 Mar 2012 15:43:09 +0530 Subject: [PATCH] [IMP] analytic: remove res.partner.address bzr revid: kjo@tinyerp.com-20120306101309-8yikjimzo38d1okr --- addons/account/project/project_view.xml | 1 - addons/analytic/analytic.py | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 9f9aca2c8fb..2998ea72e34 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -93,7 +93,6 @@ - diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 6241b6e06f0..8f988bea148 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -165,7 +165,6 @@ class account_analytic_account(osv.osv): 'quantity': fields.function(_debit_credit_bal_qtty, type='float', string='Quantity', multi='debit_credit_bal_qtty'), 'quantity_max': fields.float('Maximum Time', help='Sets the higher limit of time to work on the contract.'), 'partner_id': fields.many2one('res.partner', 'Partner'), - 'contact_id': fields.many2one('res.partner.address', 'Contact'), 'user_id': fields.many2one('res.users', 'Account Manager'), 'date_start': fields.date('Date Start'), 'date': fields.date('Date End', select=True), @@ -199,7 +198,6 @@ class account_analytic_account(osv.osv): 'state': 'open', 'user_id': lambda self, cr, uid, ctx: uid, 'partner_id': lambda self, cr, uid, ctx: ctx.get('partner_id', False), - 'contact_id': lambda self, cr, uid, ctx: ctx.get('contact_id', False), 'date_start': lambda *a: time.strftime('%Y-%m-%d'), 'currency_id': _get_default_currency, } @@ -221,9 +219,9 @@ class account_analytic_account(osv.osv): def on_change_partner_id(self, cr, uid, id, partner_id, context={}): if not partner_id: - return {'value': {'contact_id': False}} + return {'value': {'partner_id': False}} addr = self.pool.get('res.partner').address_get(cr, uid, [partner_id], ['invoice']) - return {'value': {'contact_id': addr.get('invoice', False)}} + return {'value': {'partner_id': addr.get('invoice', False)}} def on_change_company(self, cr, uid, id, company_id): if not company_id: @@ -247,9 +245,9 @@ class account_analytic_account(osv.osv): def onchange_partner_id(self, cr, uid, ids, partner, context=None): partner_obj = self.pool.get('res.partner') if not partner: - return {'value':{'contact_id': False}} + return {'value':{'partner_id': False}} address = partner_obj.address_get(cr, uid, [partner], ['contact']) - return {'value':{'contact_id': address['contact']}} + return {'value':{'partner_id': address['contact']}} def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100): if not args: