[tryton-debian-vcs] tryton-server branch upstream-3.2 updated. upstream/3.2.4-1-g1f5087d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:07:27 UTC 2015
The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/3.2.4-1-g1f5087d
commit 1f5087dbac3c33d0d8ce9806918eb223730ec375
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:38:49 2015 +0100
Adding upstream version 3.2.5.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 63fa37d..238e82a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.5 - 2015-02-16
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.4 - 2014-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 56848fa..16cc09a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2007-2014 Cédric Krier.
+Copyright (C) 2007-2015 Cédric Krier.
Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 B2CK SPRL.
Copyright (C) 2011 Openlabs Technologies & Consulting (P) Ltd.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 096e74b..d894482 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 3.2.4
+Version: 3.2.5
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 096e74b..d894482 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 3.2.4
+Version: 3.2.5
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond/backend/postgresql/database.py b/trytond/backend/postgresql/database.py
index ca444cd..02d89d8 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -179,7 +179,7 @@ class Database(DatabaseInterface):
res = Database._list_cache
if res and abs(Database._list_cache_timestamp - now) < timeout:
return res
- db_user = CONFIG['db_user']
+ db_user = CONFIG['db_user'] or os.environ.get('PGUSER')
if not db_user and os.name == 'posix':
db_user = pwd.getpwuid(os.getuid())[0]
if not db_user:
@@ -353,7 +353,7 @@ class Cursor(CursorInterface):
return self.cursor.fetchone()[0]
def lock(self, table):
- self.cursor.execute('LOCK "%s" IN EXCLUSIVE MODE' % table)
+ self.cursor.execute('LOCK "%s" IN EXCLUSIVE MODE NOWAIT' % table)
def has_constraint(self):
return True
diff --git a/trytond/backend/sqlite/database.py b/trytond/backend/sqlite/database.py
index 9f132a0..7601c45 100644
--- a/trytond/backend/sqlite/database.py
+++ b/trytond/backend/sqlite/database.py
@@ -8,7 +8,6 @@ import datetime
import time
import sys
import threading
-import math
_FIX_ROWCOUNT = False
try:
@@ -134,7 +133,12 @@ class SQLiteOverlay(Function):
def sign(value):
- return math.copysign(1, value)
+ if value > 0:
+ return 1
+ elif value < 0:
+ return -1
+ else:
+ return value
MAPPING = {
diff --git a/trytond/model/fields/one2one.py b/trytond/model/fields/one2one.py
index 7e29afd..4e6fe87 100644
--- a/trytond/model/fields/one2one.py
+++ b/trytond/model/fields/one2one.py
@@ -25,7 +25,7 @@ class One2One(Many2Many):
'''
res = super(One2One, self).get(ids, model, name, values=values)
for i, vals in res.iteritems():
- res[i] = vals[0] if vals else False
+ res[i] = vals[0] if vals else None
return res
def set(self, Model, name, ids, value, *args):
@@ -43,7 +43,6 @@ class One2One(Many2Many):
])
to_delete.extend(relations)
if value:
- to_create = []
for record_id in ids:
to_create.append({
self.origin: record_id,
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 4847a4e..fd74399 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -334,7 +334,8 @@ class ModelView(Model):
fields_def.setdefault(field_children, {'name': field_children})
if field_children in cls._fields:
field = cls._fields[field_children]
- fields_def.setdefault(field.field, {'name': field.field})
+ if hasattr(field, 'field'):
+ fields_def.setdefault(field.field, {'name': field.field})
for field_name in fields_def.keys():
if field_name in cls._fields:
diff --git a/trytond/pyson.py b/trytond/pyson.py
index bab351c..28979fd 100644
--- a/trytond/pyson.py
+++ b/trytond/pyson.py
@@ -594,4 +594,5 @@ CONTEXT = {
'Date': Date,
'DateTime': DateTime,
'Len': Len,
+ 'Id': Id,
}
diff --git a/trytond/version.py b/trytond/version.py
index edb38b1..3174281 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
#This file is part of Tryton. The COPYRIGHT file at the top level of
#this repository contains the full copyright notices and license terms.
PACKAGE = "trytond"
-VERSION = "3.2.4"
+VERSION = "3.2.5"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-server
More information about the tryton-debian-vcs
mailing list