diff --git a/addons/account/account.py b/addons/account/account.py index 4016e06546c..ed95ca80332 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -982,7 +982,6 @@ class account_move(osv.osv): l[2]['period_id'] = default_period context['period_id'] = default_period - accnt_journal = self.pool.get('account.journal').browse(cr, uid, vals['journal_id']) if 'line_id' in vals: c = context.copy() c['novalidate'] = True diff --git a/addons/account/invoice.py b/addons/account/invoice.py index d0b0933983d..bfb389445ea 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -350,7 +350,8 @@ class account_invoice(osv.osv): # res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice']) # return [{}] def onchange_partner_id(self, cr, uid, ids, type, partner_id, - date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False): + date_invoice=False, payment_term=False, partner_bank=False, company_id=False): + print "onchange_partner_id::::::::::: 354::::" invoice_addr_id = False contact_addr_id = False partner_payment_term = False @@ -415,7 +416,7 @@ class account_invoice(osv.osv): else: result['value']['date_due'] = False - if partner_bank_id != bank_id: + if partner_bank != bank_id: to_update = self.onchange_partner_bank(cr, uid, ids, bank_id) result['value'].update(to_update['value']) return result @@ -450,7 +451,7 @@ class account_invoice(osv.osv): def onchange_invoice_line(self, cr, uid, ids, lines): return {} - def onchange_partner_bank(self, cursor, user, ids, partner_bank_id): + def onchange_partner_bank(self, cursor, user, ids, partner_bank): return {'value': {}} def onchange_company_id(self, cr, uid, ids, company_id, part_id, type, invoice_line, currency_id): diff --git a/addons/warning/warning.py b/addons/warning/warning.py index 466283702c6..41642fc9aca 100644 --- a/addons/warning/warning.py +++ b/addons/warning/warning.py @@ -114,8 +114,8 @@ purchase_order() class account_invoice(osv.osv): _inherit = 'account.invoice' def onchange_partner_id(self, cr, uid, ids, type, partner_id, - date_invoice=False, payment_term=False, partner_bank_id=False): - + date_invoice=False, payment_term=False, partner_bank=False, company_id=False): + print "onchange_partner_id:::::::::::: 118" if not partner_id: return {'value': { 'address_contact_id': False , @@ -139,7 +139,7 @@ class account_invoice(osv.osv): 'message': message } result = super(account_invoice, self).onchange_partner_id(cr, uid, ids, type, partner_id, - date_invoice=False, payment_term=False, partner_bank_id=False) + date_invoice=False, payment_term=False, partner_bank=False) if result.get('warning',False): warning['title'] = title and title +' & '+ result['warning']['title'] or result['warning']['title']