pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge with main branch

Browse Source 
bzr revid: mra@tinyerp.com-20100312112058-5axab5ghox3dwosg
This commit is contained in:
mra (Open ERP)
2010-03-12 16:50:58 +05:30
parent d1aef7e638 14e0a4ed89
commit ca1368fca3
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account_analytic_plans/account_analytic_plans.py
+5 -2
View File
@@ -85,7 +85,7 @@ class account_analytic_plan_instance(osv.osv):
_columns={
'name':fields.char('Analytic Distribution',size=64),
'code':fields.char('Distribution Code',size=16),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal' ),
'account_ids':fields.one2many('account.analytic.plan.instance.line','plan_id','Account Id'),
'account1_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account1 Id'),
'account2_ids':one2many_mod2('account.analytic.plan.instance.line','plan_id','Account2 Id'),
@@ -284,6 +284,9 @@ class account_move_line(osv.osv):
super(account_move_line, self).create_analytic_lines(cr, uid, ids, context)
for line in self.browse(cr, uid, ids, context):
if line.analytics_id:
if not line.journal_id.analytic_journal_id:
raise osv.except_osv(_('No Analytic Journal !'),_("You have to define an analytic journal on the '%s' journal!") % (line.journal_id.name,))
toremove = self.pool.get('account.analytic.line').search(cr, uid, [('move_id','=',line.id)], context=context)
if toremove:
line.unlink(cr, uid, toremove, context=context)
@@ -300,7 +303,7 @@ class account_move_line(osv.osv):
'amount': amt,
'general_account_id': line.account_id.id,
'move_id': line.id,
'journal_id': line.analytics_id.journal_id.id,
'journal_id': line.journal_id.analytic_journal_id.id,
'ref': line.ref,
}
ali_id=self.pool.get('account.analytic.line').create(cr,uid,al_vals)