pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: stephane@tinyerp.com-20090205235245-rntfr79m5wk6h690
This commit is contained in:
Stephane Wirtel
2009-02-06 00:52:45 +01:00
parent 736c26758b 5b01342a4b
commit c7149c13df
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/ir/ir.xml
+1 -1
View File
@@ -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>
bin/osv/orm.py
+2 -2
View File
@@ -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: