From b6735a8442871ed49ecf233d8656b9fd02730c5a Mon Sep 17 00:00:00 2001 From: Chris Biersbach Date: Mon, 24 Sep 2012 15:56:35 +0200 Subject: [PATCH] UNdoing changes that should not be in this branch bzr revid: cbi@openerp.com-20120924135635-nohqubjlt0g0jpu4 --- addons/account/account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 1da45c51d14..72ce11f05ea 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1097,8 +1097,8 @@ class account_period(osv.osv): raise osv.except_osv(_('Error'), _('Start period should be smaller then End period')) #for period from = january, we want to exclude the opening period (but it has same date_from, so we have to check if period_from is special or not to include that clause or not in the search). if period_from.special: - return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop)]) - return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('special', '=', False)]) + return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id)]) + return self.search(cr, uid, [('date_start', '>=', period_date_start), ('date_stop', '<=', period_date_stop), ('company_id', '=', company1_id), ('special', '=', False)]) account_period()