[IMP] account_analytic_plans: Add domain on analytic distribution on invoice and moves now it will search only journal_ids available on journal/Analytic journal

bzr revid: mra@tinyerp.com-20100315065520-ejsy9rz79k5xaco9
This commit is contained in:
mra (Open ERP)
2010-03-15 12:25:20 +05:30
parent 0d7ede69f2
commit f1db51440f
2 changed files with 14 additions and 2 deletions
@@ -95,6 +95,18 @@ class account_analytic_plan_instance(osv.osv):
'account6_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account6 Id'),
'plan_id':fields.many2one('account.analytic.plan', "Model's Plan"),
}
def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
if context.get('journal_id', False):
journal = self.pool.get('account.journal').browse(cr, user, [context['journal_id']], context=context)[0]
analytic_journal = journal.analytic_journal_id and journal.analytic_journal_id.id or False
args.append('|')
args.append(('journal_id', '=', analytic_journal))
args.append(('journal_id', '=', False))
res = super(account_analytic_plan_instance, self).search(cr, user, args, offset=offset, limit=limit, order=order,
context=context, count=count)
return res
def copy(self, cr, uid, id, default=None, context=None):
if not default:
default = {}
@@ -24,7 +24,7 @@
<field name="inherit_id" ref="account.view_move_form"/>
<field name="arch" type="xml">
<field name="analytic_account_id" position="replace">
<field name="analytics_id" />
<field name="analytics_id" context="{'journal_id':journal_id}"/>
</field>
</field>
</record>
@@ -45,7 +45,7 @@
<field name="inherit_id" ref="account.view_move_line_form"/>
<field name="arch" type="xml">
<field name="move_id" position="after">
<field name="analytics_id" />
<field name="analytics_id" context="{'journal_id':journal_id}" />
</field>
</field>
</record>