[tryton-debian-vcs] tryton-server branch upstream-2.6 updated. upstream/2.6.15-1-gadc4bb6

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/2.6.15-1-gadc4bb6

commit adc4bb6b9a93999a0c88818ac949784a5efb8a82
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Feb 18 10:35:30 2015 +0100

    Adding upstream version 2.6.16.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 3375985..5e007b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.16 - 2015-02-16
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.15 - 2014-11-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 35cf27a..edeb112 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-2012 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 0af8b00..e1553e6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.15
+Version: 2.6.16
 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 0af8b00..e1553e6 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.15
+Version: 2.6.16
 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 2714405..b08bb83 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -173,7 +173,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:
@@ -394,7 +394,7 @@ class Cursor(CursorInterface):
         return self.cursor.fetchone()[0]
 
     def lock(self, table):
-        self.cursor.execute('LOCK "%s"' % table)
+        self.cursor.execute('LOCK "%s" NOWAIT' % table)
 
     def has_constraint(self):
         return True
diff --git a/trytond/model/fields/one2one.py b/trytond/model/fields/one2one.py
index e01cfc7..7feefeb 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, ids, model, name, value):
diff --git a/trytond/pyson.py b/trytond/pyson.py
index e10ffcb..b930715 100644
--- a/trytond/pyson.py
+++ b/trytond/pyson.py
@@ -567,4 +567,5 @@ CONTEXT = {
     'In': In,
     'Date': Date,
     'DateTime': DateTime,
+    'Id': Id,
 }
diff --git a/trytond/version.py b/trytond/version.py
index a6802e4..5f6383b 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 = "2.6.15"
+VERSION = "2.6.16"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server