← Back to branch summary

~unifield-team/unifield-wm/wm-2418-rw-fix

« back to all changes in this revision

Viewing changes to analytic_distribution/account_move_line.py

  • Committer: pierre-marie
  • Date: 2012-07-25 15:04:47 UTC
  • mfrom: (1038 unifield-wm)
  • mto: This revision was merged to the branch mainline in revision 1059.
  • Revision ID: pierre-marie@pierre-marie-laptop-20120725150447-namc1a6lqi455ez2
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
analytic_distribution/account_move_line.py
42
42
            if obj_line.analytic_distribution_id and obj_line.account_id.user_type_code == 'expense':
43
43
                ana_state = self.pool.get('analytic.distribution')._get_distribution_state(cr, uid, obj_line.analytic_distribution_id.id, {}, obj_line.account_id.id)
44
44
                if ana_state == 'invalid':
45
 
                    ana_content = self.pool.get('analytic.distribution')._get_lines_count(cr, uid, obj_line.analytic_distribution_id.id)
46
 
                    raise osv.except_osv(_('Warning'), _('Analytic distribution seems to be not valid. State: %s. Content: %s.') % (ana_state, ana_content,))
 
45
                    raise osv.except_osv(_('Warning'), _('Invalid analytic distribution.'))
47
46
                if not obj_line.journal_id.analytic_journal_id:
48
47
                    raise osv.except_osv(_('Warning'),_("No Analytic Journal! You have to define an analytic journal on the '%s' journal!") % (obj_line.journal_id.name, ))
49
48
                distrib_obj = self.pool.get('analytic.distribution').browse(cr, uid, obj_line.analytic_distribution_id.id, context=context)