diff --git a/addons/account/wizard/account_report_common.py b/addons/account/wizard/account_report_common.py index 79cfa7236b6..b7d143eb740 100644 --- a/addons/account/wizard/account_report_common.py +++ b/addons/account/wizard/account_report_common.py @@ -110,7 +110,8 @@ class account_common_report(osv.osv_memory): return res def _get_account(self, cr, uid, context=None): - accounts = self.pool.get('account.account').search(cr, uid, [('parent_id', '=', False)], limit=1) + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + accounts = self.pool.get('account.account').search(cr, uid, [('parent_id', '=', False), ('company_id', '=', user.company_id.id)], limit=1) return accounts and accounts[0] or False def _get_fiscalyear(self, cr, uid, context=None): diff --git a/addons/account/wizard/account_vat.py b/addons/account/wizard/account_vat.py index 0770cbe246c..85fce5de000 100644 --- a/addons/account/wizard/account_vat.py +++ b/addons/account/wizard/account_vat.py @@ -34,7 +34,8 @@ class account_vat_declaration(osv.osv_memory): } def _get_tax(self, cr, uid, context=None): - taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False)], limit=1) + user = self.pool.get('res.users').browse(cr, uid, uid, context=context) + taxes = self.pool.get('account.tax.code').search(cr, uid, [('parent_id', '=', False), ('company_id', '=', user.company_id.id)], limit=1) return taxes and taxes[0] or False _defaults = {