[tryton-debian-vcs] tryton-modules-company branch debian-jessie-3.4 updated. debian/3.4.1-1-4-g6f37107
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:52:23 UTC 2015
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.1-1-4-g6f37107
commit 6f371072ee687f39073153be6bb493deee26a9fd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 15:36:55 2015 +0100
Releasing debian version 3.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 2c77982..423dfbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-company (3.4.2-1) unstable; urgency=medium
+
+ * Wrapping and sorting control files (wrap-and-sort -bts).
+ * Setting the branch in the watch file to the fixed version 3.4.
+ * Merging upstream version 3.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 23 Dec 2015 15:36:55 +0100
+
tryton-modules-company (3.4.1-1) unstable; urgency=medium
* Adding actual upstream signing key.
commit 0701b6d829b3454c5ef1dd5c47a14ba94946a1c9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 15:36:54 2015 +0100
Merging upstream version 3.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 53d0aca..1b36fb6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.2 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.1 - 2015-02-28
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 12085d8..f2ca221 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_company
-Version: 3.4.1
+Version: 3.4.2
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/__init__.py b/__init__.py
index 16ad20c..b7143d0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -21,6 +21,7 @@ def register():
Cron,
CronCompany,
PartyConfiguration,
+ Rule,
module='company', type_='model')
Pool.register(
CompanyConfig,
diff --git a/company.py b/company.py
index 70eb2ca..9396e28 100644
--- a/company.py
+++ b/company.py
@@ -20,7 +20,7 @@ CursorInterface.cache_keys.update({'company', 'employee'})
__all__ = ['Company', 'Employee', 'UserEmployee', 'User', 'Property',
'Sequence', 'SequenceStrict', 'Date', 'CompanyConfigStart',
- 'CompanyConfig', 'CompanyReport', 'LetterReport']
+ 'CompanyConfig', 'CompanyReport', 'LetterReport', 'Rule']
__metaclass__ = PoolMeta
@@ -254,6 +254,14 @@ class User:
values['employee'] = employee_id
return result
+ @classmethod
+ def write(cls, *args):
+ pool = Pool()
+ Rule = pool.get('ir.rule')
+ super(User, cls).write(*args)
+ # Restart the cache on the domain_get method
+ Rule._domain_get_cache.clear()
+
class Property:
__name__ = 'ir.property'
@@ -367,3 +375,14 @@ class CompanyReport(Report):
class LetterReport(CompanyReport):
__name__ = 'party.letter'
+
+
+class Rule:
+ __name__ = 'ir.rule'
+
+ @classmethod
+ def _get_cache_key(cls):
+ 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'),)
diff --git a/tryton.cfg b/tryton.cfg
index c9e3bc8..b7fafb5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.1
+version=3.4.2
depends:
currency
ir
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index ed1446f..a2cff2e 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.1
+Version: 3.4.2
Summary: Tryton module with companies and employees
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-company
More information about the tryton-debian-vcs
mailing list