Unifield Server

Merge lp:~unifield-team/unifield-server/us-2042 into lp:unifield-server

  1. us-2042
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4097
Proposed branch: lp:~unifield-team/unifield-server/us-2042
Merge into: lp:unifield-server
Diff against target: 24 lines (+2/-1)
2 files modified
bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py (+1/-1)
setup.py (+1/-0)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2042
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+312441@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/msf_doc_import/wizard/wizard_po_simulation_screen.py'
2--- bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2016-11-25 09:37:52 +0000
3+++ bin/addons/msf_doc_import/wizard/wizard_po_simulation_screen.py 2016-12-05 08:34:57 +0000
4@@ -1412,7 +1412,7 @@
5 if tools.ustr(uom_value) == line.in_uom.name:
6 write_vals['imp_uom'] = line.in_uom.id
7 else:
8- uom_id = UOM_NAME_ID.get(str(uom_value))
9+ uom_id = UOM_NAME_ID.get(tools.ustr(uom_value))
10 if not uom_id:
11 uom_ids = uom_obj.search(cr, uid, [('name', '=', tools.ustr(uom_value))], context=context)
12 if uom_ids:
13
14=== modified file 'setup.py'
15--- setup.py 2016-11-21 11:03:12 +0000
16+++ setup.py 2016-12-05 08:34:57 +0000
17@@ -140,6 +140,7 @@
18 if os.name == 'nt':
19 files.append(('.', [join('bin', 'histogram.py')]))
20 files.append(('.', [join('bin', 'unifield-version.txt')]))
21+ files.append(('tools', [join('bin', 'tools', 'import_po.dtd')]))
22 os.chdir('bin')
23 for (dp, dn, names) in os.walk('addons'):
24 files.append((dp, map(lambda x: join('bin', dp, x), names)))

Subscribers

People subscribed via source and target branches

to all changes: