From e21a561cb19cb3b99730f4fb7970dbc202584354 Mon Sep 17 00:00:00 2001 From: skh Date: Tue, 5 Apr 2011 18:09:58 +0530 Subject: [PATCH 1/4] [FIX] payment mode - account must belong to company lp bug: https://launchpad.net/bugs/739562 fixed bzr revid: skh@tinyerp.com-20110405123958-savml2himnvrhsr3 --- addons/account_payment/account_payment.py | 11 ++++++++++- addons/account_payment/account_payment_view.xml | 5 +++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index f3259f846cc..9a089110d37 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -33,7 +33,9 @@ class payment_mode(osv.osv): required=True,help='Bank Account for the Payment Mode'), 'journal': fields.many2one('account.journal', 'Journal', required=True, domain=[('type', 'in', ('bank','cash'))], help='Bank or Cash Journal for the Payment Mode'), - 'company_id': fields.many2one('res.company', 'Company', required=True), + 'company_id': fields.many2one('res.company', 'Company',required=True), + 'partner_id':fields.related('company_id','partner_id',type='many2one',relation='res.partner',string='Partner',store=True,), + } _defaults = { 'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id @@ -49,6 +51,13 @@ class payment_mode(osv.osv): JOIN payment_mode pm ON (pm.bank_id = pb.id) WHERE pm.id = %s """, [payment_code]) return [x[0] for x in cr.fetchall()] + + def onchange_company_id (self,cr,uid,ids,company_id,context=None): + vals={} + if company_id: + partner = self.pool.get('res.company').read(cr, uid, [company_id], ['partner_id'])[0]['partner_id'] + return {'value': {'partner_id': partner}} + payment_mode() diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 56ff30e5ded..6f7acc7a367 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -79,8 +79,9 @@
- - + + + From 0e97026d171be10a9b93954a1b9cfabbb8be0312 Mon Sep 17 00:00:00 2001 From: skh Date: Tue, 5 Apr 2011 18:52:02 +0530 Subject: [PATCH 2/4] [FIX] payment mode - account must belong to company lp bug: https://launchpad.net/bugs/739562 fixed bzr revid: skh@tinyerp.com-20110405132202-sbnuwnhc9h8mrzbb --- addons/account_payment/account_payment.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 9a089110d37..ec5367150f2 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -52,11 +52,15 @@ class payment_mode(osv.osv): WHERE pm.id = %s """, [payment_code]) return [x[0] for x in cr.fetchall()] - def onchange_company_id (self,cr,uid,ids,company_id,context=None): - vals={} + def onchange_company_id (self,cr,uid,ids,company_id=False,context=None): + result={} if company_id: - partner = self.pool.get('res.company').read(cr, uid, [company_id], ['partner_id'])[0]['partner_id'] - return {'value': {'partner_id': partner}} + company = self.pool.get('res.company').browse(cr,uid,company_id) + partner = company.partner_id.id + result = {'value': + {'partner_id': partner} + } + return result payment_mode() From abc1e151124fe36e770631563b11c0e7a903609a Mon Sep 17 00:00:00 2001 From: skh Date: Tue, 5 Apr 2011 19:06:31 +0530 Subject: [PATCH 3/4] [FIX] payment mode - account must belong to company lp bug: https://launchpad.net/bugs/739562 fixed bzr revid: skh@tinyerp.com-20110405133631-53w2l2xurliqee3y --- addons/account_payment/account_payment.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index ec5367150f2..1840176519a 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -52,15 +52,12 @@ class payment_mode(osv.osv): WHERE pm.id = %s """, [payment_code]) return [x[0] for x in cr.fetchall()] - def onchange_company_id (self,cr,uid,ids,company_id=False,context=None): + def onchange_company_id (self, cr, uid, ids, company_id = False, context = None): result={} if company_id: - company = self.pool.get('res.company').browse(cr,uid,company_id) - partner = company.partner_id.id - result = {'value': - {'partner_id': partner} - } - return result + partner_id = self.pool.get('res.company').browse(cr, uid, company_id).partner_id.id + result['partner_id'] = partner_id + return {'value': result} payment_mode() From 93c75e59e6363ac006c024342c05316f7f86da24 Mon Sep 17 00:00:00 2001 From: skh Date: Wed, 6 Apr 2011 10:43:37 +0530 Subject: [PATCH 4/4] [FIX] payment mode - account must belong to company lp bug: https://launchpad.net/bugs/739562 fixed bzr revid: skh@tinyerp.com-20110406051337-852xk8bsz2feloro --- addons/account_payment/account_payment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py index 1840176519a..4119aa28e38 100644 --- a/addons/account_payment/account_payment.py +++ b/addons/account_payment/account_payment.py @@ -52,8 +52,8 @@ class payment_mode(osv.osv): WHERE pm.id = %s """, [payment_code]) return [x[0] for x in cr.fetchall()] - def onchange_company_id (self, cr, uid, ids, company_id = False, context = None): - result={} + def onchange_company_id (self, cr, uid, ids, company_id=False, context=None): + result = {} if company_id: partner_id = self.pool.get('res.company').browse(cr, uid, company_id).partner_id.id result['partner_id'] = partner_id