Unifield Server

Merge lp:~fabien-morin/unifield-server/fm-us-1796 into lp:unifield-server

  1. fm-us-1796
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4292
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-1796
Merge into: lp:unifield-server
Diff against target: 16 lines (+3/-3)
1 file modified
bin/addons/account_hq_entries/wizard/hq_entries_import.py (+3/-3)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-1796
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+318498@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jeff Allen (jr.allen) wrote :

Is this a common pattern? Could there be other examples of this? How would we be able to tell and fix them now instead of later?

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account_hq_entries/wizard/hq_entries_import.py'
2--- bin/addons/account_hq_entries/wizard/hq_entries_import.py 2016-11-18 11:07:47 +0000
3+++ bin/addons/account_hq_entries/wizard/hq_entries_import.py 2017-02-28 16:08:03 +0000
4@@ -265,10 +265,10 @@
5 " %s (posting) / %s (account) / %s (amount) / %s (3rd party) /" \
6 " %s (%s)")
7 raise osv.except_osv(_('Error'), pattern % (
8- description, reference, document_date, date,
9- account_description, booking_amount,
10+ ustr(description), ustr(reference), document_date, date,
11+ ustr(account_description), booking_amount,
12 ustr(third_party),
13- emp_cc_id and emp_cc_id.name or cost_center,
14+ emp_cc_id and ustr(emp_cc_id.name) or ustr(cost_center),
15 emp_cc_id and 'Emp default CC' or 'CC'
16 ))
17

Subscribers

People subscribed via source and target branches