diff --git a/addons/account/account.py b/addons/account/account.py index ab0aa51c592..6703985b423 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -584,7 +584,7 @@ class account_period(osv.osv): if obj_period.fiscalyear_id.date_stop < obj_period.date_stop or obj_period.fiscalyear_id.date_stop < obj_period.date_start or obj_period.fiscalyear_id.date_start > obj_period.date_start or obj_period.fiscalyear_id.date_start > obj_period.date_stop: return False - pids = self.search(cr, uid, [('date_stop','>=',obj_period.date_start),('date_stop','<=',obj_period.date_start),('special','=',False),('id','<>',obj_period.id)]) + pids = self.search(cr, uid, [('date_stop','>=',obj_period.date_start),('date_start','<=',obj_period.date_stop),('special','=',False),('id','<>',obj_period.id)]) for period in self.browse(cr, uid, pids): if period.fiscalyear_id.company_id.id==obj_period.fiscalyear_id.company_id.id: return False diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index a120855e73e..971a5870c48 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -25,6 +25,7 @@ + @@ -75,6 +76,7 @@ +