bzr revid: fp@tinyerp.com-20081224155429-tdcmkvn7398h163b
This commit is contained in:
Fabien Pinckaers
2008-12-24 16:54:29 +01:00
parent c245b59174
commit 81b8a4c302
2 changed files with 5 additions and 2 deletions
+4 -1
View File
@@ -2232,7 +2232,10 @@ class orm(orm_template):
if self.pool._init:
self.pool._init_parent[self._name]=True
else:
cr.execute('select parent_left,parent_right from '+self._table+' where id=%s', (vals[self._parent_name],))
if vals[self._parent_name]:
cr.execute('select parent_left,parent_right from '+self._table+' where id=%s', (vals[self._parent_name],))
else:
cr.execute('SELECT parent_left,parent_right FROM '+self._table+' WHERE id IS NULL')
res = cr.fetchone()
if res:
pleft,pright = res
+1 -1
View File
@@ -71,7 +71,7 @@ def parse_version(s):
contain them.
"""
parts = []
for part in _parse_version_parts(s.lower()):
for part in _parse_version_parts((s or '0.1').lower()):
if part.startswith('*'):
if part<'*final': # remove '-' before a prerelease tag
while parts and parts[-1]=='*final-': parts.pop()