Unifield Server

Merge lp:~julie-w/unifield-server/US-4675 into lp:unifield-server

  1. US-4675
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4978
Proposed branch: lp:~julie-w/unifield-server/US-4675
Merge into: lp:unifield-server
Diff against target: 11 lines (+1/-1)
1 file modified
bin/addons/analytic_distribution/wizard/import_commitment_wizard.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4675
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349130@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 'bin/addons/analytic_distribution/wizard/import_commitment_wizard.py'
2--- bin/addons/analytic_distribution/wizard/import_commitment_wizard.py 2018-02-09 18:26:25 +0000
3+++ bin/addons/analytic_distribution/wizard/import_commitment_wizard.py 2018-07-09 08:35:59 +0000
4@@ -319,7 +319,7 @@
5 " compatible for entry name:'%s', ref:'%s'" \
6 " reason: '%s'")
7 raise osv.except_osv(_('Error'), msg % (
8- vals.get('name', ''), vals.get('ref', ''),
9+ tools.ustr(vals.get('name', '')), tools.ustr(vals.get('ref', '')),
10 no_compat[2] or '', )
11 )
12

Subscribers

People subscribed via source and target branches