[tryton-debian-vcs] tryton-modules-company branch debian-jessie-3.4 updated. debian/3.4.2-1-4-gf2f547f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Sep 4 16:57:12 UTC 2016
The following commit has been merged in the debian-jessie-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-company.git;a=commitdiff;h=debian/3.4.2-1-4-gf2f547f
commit f2f547f32c9c406a19cda7772d888c837e8920cd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 20:36:09 2016 +0200
Releasing debian version 3.4.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 423dfbb..52075a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company (3.4.3-1) unstable; urgency=medium
+
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 3.4.3.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Sat, 03 Sep 2016 20:36:09 +0200
+
tryton-modules-company (3.4.2-1) unstable; urgency=medium
* Wrapping and sorting control files (wrap-and-sort -bts).
commit 0b97fe7b842dec8bd9bffd29f8ab86366bf3f09f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 20:36:09 2016 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index c7771ff..eac57c4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
commit fc18ae4a14201d05d81f74f9aa85a2ec4aed420b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sat Sep 3 20:36:09 2016 +0200
Merging upstream version 3.4.3.
diff --git a/CHANGELOG b/CHANGELOG
index 1b36fb6..ec2528d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.3 - 2016-09-03
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.2 - 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 f2ca221..00319af 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 3.4.2
+Version: 3.4.3
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/company.py b/company.py
index 9396e28..f866f74 100644
--- a/company.py
+++ b/company.py
@@ -385,4 +385,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 b7fafb5..fc15a92 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.2
+version=3.4.3
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index a2cff2e..54e060a 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.4.2
+Version: 3.4.3
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 716f86c..6f3fa3f 100644
--- a/trytond_company.egg-info/requires.txt
+++ b/trytond_company.egg-info/requires.txt
@@ -3,4 +3,4 @@ trytond_party >= 3.4, < 3.5
trytond >= 3.4, < 3.5
[timezone]
-pytz
\ No newline at end of file
+pytz
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list