summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-08-23 09:57:00 +0200
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>2012-08-23 09:57:00 +0200
commitfd29eccaddf67ca543ebbd7657e213d31cfdb61d (patch)
tree4d09df05192f08674232bbf70a2b5cc29ef86b90
parent557cfcbc538d0506737ab0167b9cd2eab2c82408 (diff)
parent7545cc8ab4589343f80024b4a6895f720b32ec99 (diff)
[MERGE] lp:1039557. Courtesy of Paulius Sladkevičius
bzr revid: qdp-launchpad@openerp.com-20120823075700-6cguwv1dxo92f0wg
-rw-r--r--addons/account/account_invoice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 012bde42eff..7bc9ceaaf61 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1127,7 +1127,7 @@ class account_invoice(osv.osv):
return map(lambda x: (0,0,x), lines)
def refund(self, cr, uid, ids, date=None, period_id=None, description=None, journal_id=None):
- invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id'])
+ invoices = self.read(cr, uid, ids, ['name', 'type', 'number', 'reference', 'comment', 'date_due', 'partner_id', 'partner_contact', 'partner_insite', 'partner_ref', 'payment_term', 'account_id', 'currency_id', 'invoice_line', 'tax_line', 'journal_id', 'company_id'])
obj_invoice_line = self.pool.get('account.invoice.line')
obj_invoice_tax = self.pool.get('account.invoice.tax')
obj_journal = self.pool.get('account.journal')
@@ -1175,7 +1175,7 @@ class account_invoice(osv.osv):
'name': description,
})
# take the id part of the tuple returned for many2one fields
- for field in ('partner_id',
+ for field in ('partner_id', 'company_id',
'account_id', 'currency_id', 'payment_term', 'journal_id'):
invoice[field] = invoice[field] and invoice[field][0]
# create the new invoice