[IMP] account: find() method of account.fiscalyear will now filter correctly on company_id if needed
bzr revid: qdp-launchpad@openerp.com-20111025162001-6um2vm5f277bf0n2
This commit is contained in:
parent
d835e13905
commit
6c1525d849
|
@ -901,9 +901,16 @@ class account_fiscalyear(osv.osv):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def find(self, cr, uid, dt=None, exception=True, context=None):
|
def find(self, cr, uid, dt=None, exception=True, context=None):
|
||||||
|
if context is None: context = {}
|
||||||
if not dt:
|
if not dt:
|
||||||
dt = time.strftime('%Y-%m-%d')
|
dt = time.strftime('%Y-%m-%d')
|
||||||
ids = self.search(cr, uid, [('date_start', '<=', dt), ('date_stop', '>=', dt)])
|
args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)]
|
||||||
|
if context.get('company_id', False):
|
||||||
|
args.append(('company_id', '=', context['company_id']))
|
||||||
|
else:
|
||||||
|
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
|
||||||
|
args.append(('company_id', '=', company_id))
|
||||||
|
ids = self.search(cr, uid, args, context=context)
|
||||||
if not ids:
|
if not ids:
|
||||||
if exception:
|
if exception:
|
||||||
raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one.'))
|
raise osv.except_osv(_('Error !'), _('No fiscal year defined for this date !\nPlease create one.'))
|
||||||
|
|
Loading…
Reference in New Issue