[tryton-debian-vcs] tryton-modules-company branch debian-squeeze-1.8 created. e42d0ebe4af946a17c51333e2657a26bf98896ad

[Mathias Behrle]

The following commit has been merged in the debian-squeeze-1.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-company.git;a=commitdiff;h=e42d0ebe4af946a17c51333e2657a26bf98896ad
commit e42d0ebe4af946a17c51333e2657a26bf98896ad
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 11 14:41:26 2011 +0200

    Releasing debian version 1.8.1-0~60squeeze1.

diff --git a/debian/changelog b/debian/changelog
index f973340..155cf2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-company (1.8.1-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+  * Merging upstream version 1.8.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 11 Oct 2011 14:40:38 +0200
+
 tryton-modules-company (1.8.0-0~60squeeze1) squeeze-backports-1.8; urgency=low
 
   * Moving from deprecated python-support to dh_python2.
commit c77a676f2d9eb780db77ec967de2e27dde9141be
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 11 14:37:57 2011 +0200

    Merging upstream version 1.8.1.

diff --git a/CHANGELOG b/CHANGELOG
index b285d68..65662c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.1 - 2011-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 1.8.0 - 2010-11-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index cca7db9..3d2324b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 437f77b..87e13fd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_company
-Version: 1.8.0
+Version: 1.8.1
 Summary: Define company and employee.
 Add main and current company on users preferences.
 Add company on properties.
diff --git a/__tryton__.py b/__tryton__.py
index e5ab516..6742bc6 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
     'name_es_CO': 'Compañía',
     'name_es_ES': 'Empresa',
     'name_fr_FR': 'Société',
-    'version': '1.8.0',
+    'version': '1.8.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/company.py b/company.py
index adbeb6a..283e1ef 100644
--- a/company.py
+++ b/company.py
@@ -180,7 +180,10 @@ class Property(ModelSQL, ModelView):
 
     def _set_values(self, name, model, res_id, val, field_id):
         user_obj = self.pool.get('res.user')
-        user = user_obj.browse(Transaction().user)
+        user_id = Transaction().user
+        if user_id == 0:
+            user_id = Transaction().context.get('user', user_id)
+        user = user_obj.browse(user_id)
         res = super(Property, self)._set_values(name, model, res_id, val, 
                 field_id)
         if user:
@@ -188,7 +191,7 @@ class Property(ModelSQL, ModelView):
         return res
 
     def search(self, domain, offset=0, limit=None, order=None, count=False):
-        if Transaction().user == 0:
+        if Transaction().user == 0 and not 'user' in Transaction().context:
             domain = ['AND', domain[:], ('company', '=', False)]
         return super(Property, self).search(domain, offset=offset,
                 limit=limit, order=order, count=count)
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 4f5d031..48f0d3c 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-company
-Version: 1.8.0
+Version: 1.8.1
 Summary: Define company and employee.
 Add main and current company on users preferences.
 Add company on properties.
commit 14ee27c3cc4b4fcf928d46d153c2af34b0fa1be9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 20 13:08:32 2011 +0200

    Releasing debian version 1.8.0-0~60squeeze1.

diff --git a/debian/changelog b/debian/changelog
index ea67e24..f973340 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-company (1.8.0-0~60squeeze1) squeeze-backports-1.8; urgency=low
+
+  * Moving from deprecated python-support to dh_python2.
+  * Rebuilding for squeeze-backports-1.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 19 Sep 2011 19:32:02 +0200
+
 tryton-modules-company (1.8.0-2) unstable; urgency=low
 
   * Changing my email address.
-- 
tryton-modules-company