From 5b01342a4b2ee8a41ea7506cde93bd2a5b300316 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Feb 2009 18:15:31 +0100
Subject: [PATCH] bugfix
bzr revid: fp@tinyerp.com-20090205171531-7ys5vn8mq5az1v7q
---
bin/addons/base/ir/ir.xml | 2 +-
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 7b9b6f4ba135..6f55a5cdb6ed 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 470367872117..bd1fc41f2a54 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:
--
GitLab