Merge lp:~unifield-team/unifield-server/uf-844 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 3399
Proposed branch: lp:~unifield-team/unifield-server/uf-844
Merge into: lp:unifield-server
Diff against target: 13 lines (+2/-1)
1 file modified
bin/osv/fields.py (+2/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/uf-844
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+99786@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
=== modified file 'bin/osv/fields.py'
--- bin/osv/fields.py 2011-05-25 14:59:09 +0000
+++ bin/osv/fields.py 2012-03-28 16:44:43 +0000
@@ -663,7 +663,8 @@
663 if act[0] == 0:663 if act[0] == 0:
664 raise _('Not Implemented')664 raise _('Not Implemented')
665 elif act[0] == 1:665 elif act[0] == 1:
666 raise _('Not Implemented')666 obj = obj.pool.get(self._obj)
667 obj.write(cr, user, [act[1]], act[2], context=context)
667 elif act[0] == 2:668 elif act[0] == 2:
668 raise _('Not Implemented')669 raise _('Not Implemented')
669 elif act[0] == 3:670 elif act[0] == 3:

Subscribers

People subscribed via source and target branches

to all changes: