Unifield Server

Merge lp:~mallorymarcot/unifield-server/us-4487 into lp:unifield-server

  1. us-4487
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4985
Proposed branch: lp:~mallorymarcot/unifield-server/us-4487
Merge into: lp:unifield-server
Diff against target: 11 lines (+2/-0)
1 file modified
bin/addons/product_attributes/product_attributes.py (+2/-0)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4487
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+349139@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/product_attributes/product_attributes.py'
2--- bin/addons/product_attributes/product_attributes.py 2018-03-28 07:36:10 +0000
3+++ bin/addons/product_attributes/product_attributes.py 2018-07-09 08:36:10 +0000
4@@ -1110,6 +1110,8 @@
5 res, error_msg = self._test_restriction_error(cr, uid, ids, vals=vals, context=context)
6
7 if res:
8+ if isinstance(error_msg, unicode):
9+ error_msg = error_msg.encode('ascii', 'ignore')
10 raise osv.except_osv(_('Error'), error_msg)
11 return False
12

Subscribers

People subscribed via source and target branches