unifield-wm

Merge lp:~unifield-team/unifield-wm/UF-2187 into lp:unifield-wm

  1. UF-2187
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 1850
Proposed branch: lp:~unifield-team/unifield-wm/UF-2187
Merge into: lp:unifield-wm
Diff against target: 21 lines (+3/-1)
1 file modified
analytic_distribution/wizard/import_commitment_wizard.py (+3/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/UF-2187
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+195014@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'analytic_distribution/wizard/import_commitment_wizard.py'
2--- analytic_distribution/wizard/import_commitment_wizard.py 2013-11-07 16:49:03 +0000
3+++ analytic_distribution/wizard/import_commitment_wizard.py 2013-11-13 09:41:28 +0000
4@@ -42,7 +42,6 @@
5 journal_ids = self.pool.get('account.analytic.journal').search(cr, uid, [('code', '=', 'ENGI')], context=context)
6 to_be_deleted_ids = analytic_obj.search(cr, uid, [('imported_commitment', '=', True)], context=context)
7 functional_currency_obj = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id
8-
9
10 if len(journal_ids) > 0:
11 # read file
12@@ -166,6 +165,9 @@
13 analytic_obj.create(cr, uid, vals, context=context)
14 sequence_number += 1
15
16+ else:
17+ raise osv.except_osv(_('Error'), _('Analytic Journal ENGI doesn\'t exist!'))
18+
19 analytic_obj.unlink(cr, uid, to_be_deleted_ids, context=context)
20
21 return {'type' : 'ir.actions.act_window_close'}

Subscribers

People subscribed via source and target branches