[tryton-debian-vcs] tryton-modules-company branch upstream-3.6 updated. upstream/3.6.1-1-gfbc544c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Sep 4 16:57:14 UTC 2016
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-company.git;a=commitdiff;h=upstream/3.6.1-1-gfbc544c
commit fbc544c3bb7524a02582f436cd46264536e6e387
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 20:37:17 2016 +0200
Adding upstream version 3.6.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 7f6bf1d..de7614c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.1 - 2015-12-22
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 4c7ddcd..fcc5eeb 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 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 38efaf5..a84cdb9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 3.6.1
+Version: 3.6.2
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/company.py b/company.py
index c97b60a..d23029c 100644
--- a/company.py
+++ b/company.py
@@ -379,4 +379,5 @@ class Rule:
key = super(Rule, cls)._get_cache_key()
# XXX Use company from context instead of browse to prevent infinite
# loop, but the cache is cleared when User is written.
- return key + (Transaction().context.get('company'),)
+ return key + (Transaction().context.get('company'),
+ Transaction().context.get('employee'))
diff --git a/tryton.cfg b/tryton.cfg
index bb8dbf0..85882f9 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.1
+version=3.6.2
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 36eab59..5a7a57b 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-company
-Version: 3.6.1
+Version: 3.6.2
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_company.egg-info/requires.txt b/trytond_company.egg-info/requires.txt
index 2dc024c..ac04583 100644
--- a/trytond_company.egg-info/requires.txt
+++ b/trytond_company.egg-info/requires.txt
@@ -3,4 +3,4 @@ trytond_party >= 3.6, < 3.7
trytond >= 3.6, < 3.7
[timezone]
-pytz
\ No newline at end of file
+pytz
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list