diff options
| author | Stephane Wirtel <stephane@tinyerp.com> | 2009-02-06 00:52:45 +0100 |
|---|---|---|
| committer | Stephane Wirtel <stephane@tinyerp.com> | 2009-02-06 00:52:45 +0100 |
| commit | c7149c13df3e7cfa78d3d09b4a2ec99d0e64a9fb (patch) | |
| tree | da82aaa269f578c3e55f6d366507d1ab9a4e1919 | |
| parent | 736c26758bf2cc6de157ac765e23de884344ee3c (diff) | |
| parent | 5b01342a4b2ee8a41ea7506cde93bd2a5b300316 (diff) | |
[MERGE]
bzr revid: stephane@tinyerp.com-20090205235245-rntfr79m5wk6h690
| -rw-r--r-- | bin/addons/base/ir/ir.xml | 2 | ||||
| -rw-r--r-- | bin/osv/orm.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index 7b9b6f4ba13..6f55a5cdb6e 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -172,7 +172,7 @@ <field name="arch" type="xml"> <form string="Sequence Type"> <field name="name" select="1"/> - <field name="code" readonly="1"/> + <field name="code"/> </form> </field> </record> diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 47036787211..bd1fc41f2a5 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -2286,7 +2286,7 @@ class orm(orm_template): else: for id in ids: if vals[self._parent_name]: - cr.execute('select parent_left,parent_right,id from '+self._table+' where parent_id=%s order by '+(self._parent_order or self._order), (vals[self._parent_name],)) + cr.execute('select parent_left,parent_right,id from '+self._table+' where '+self._parent_name+'=%s order by '+(self._parent_order or self._order), (vals[self._parent_name],)) pleft_old = pright_old = None result_p = cr.fetchall() for (pleft,pright,pid) in result_p: @@ -2456,7 +2456,7 @@ class orm(orm_template): else: parent = vals.get(self._parent_name, False) if parent: - cr.execute('select parent_right from '+self._table+' where parent_id=%s order by '+(self._parent_order or self._order), (parent,)) + cr.execute('select parent_right from '+self._table+' where '+self._parent_name+'=%s order by '+(self._parent_order or self._order), (parent,)) pleft_old = None result_p = cr.fetchall() for (pleft,) in result_p: |