UNdoing changes that should not be in this branch

bzr revid: cbi@openerp.com-20120924135635-nohqubjlt0g0jpu4
This commit is contained in:
Chris Biersbach
2012-09-24 15:56:35 +02:00
parent 90b189fa22
commit b6735a8442
+2 -2
View File
@@ -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()