[MERGE] bzr merge -r 1856..1857 lp:openobject-server . rev #1857 we merge here consists in a fix by Tiny because they didn't applied the etree conversion properly weeks back (the 2 previous merges here); part
was already better merged on our side (2 commits back) because we resolved the conflicts more carefully. lp bug: https://launchpad.net/bugs/429519 fixed bzr revid: rvalyi@gmail.com-20091028201254-oxcmetgpxbp2oelp
This commit is contained in:
parent
ece8b2918a
commit
2686991976
|
@ -1090,7 +1090,7 @@ class orm_template(object):
|
|||
INNER JOIN wkf_transition t ON (t.act_to = a.id)
|
||||
WHERE wkf.osv = %s
|
||||
AND t.signal = %s
|
||||
""", (self._name, button.getAttribute('name'),))
|
||||
""", (self._name, button.get('name'),))
|
||||
roles = cr.fetchall()
|
||||
|
||||
# draft -> valid = signal_next (role X)
|
||||
|
|
Loading…
Reference in New Issue