[tryton-debian-vcs] tryton-modules-account-asset branch upstream updated. upstream/3.6.1-1-gdfcc68f
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Mon Sep 21 12:25:09 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-asset.git;a=commitdiff;h=upstream/3.6.1-1-gdfcc68f
commit dfcc68f606d695cca727e5a9b550f01119ef9a0a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Sep 20 20:33:32 2015 +0200
Adding upstream version 3.6.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 14231ba..154a4af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2015-09-19
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.1 - 2015-07-13
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 3907e0b..21e743f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_asset
-Version: 3.6.1
+Version: 3.6.2
Summary: Tryton module for assets management
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/asset.py b/asset.py
index a7a96b0..bcb38b8 100644
--- a/asset.py
+++ b/asset.py
@@ -851,30 +851,27 @@ class AssetDepreciationTable(CompanyReport):
def __init__(self, key, depreciations):
self.product = key
self.depreciations = depreciations
- for attr_name in self.grouped_attributes():
- setattr(self, attr_name,
- cached_property(self.adder(attr_name)))
-
- def adder(self, attr_name):
- def _sum(self):
- return sum(getattr(d, attr_name)
- for d in self.depreciations if getattr(d, attr_name))
- return _sum
-
- @staticmethod
- def grouped_attributes():
- return {
- 'start_fixed_value',
- 'value_increase',
- 'value_decrease',
- 'end_fixed_value',
- 'start_value',
- 'amortization_increase',
- 'amortization_decrease',
- 'end_value',
- 'actual_value',
- 'closing_value',
- }
+
+ def adder(attr_name):
+ def _sum(self):
+ return sum(getattr(d, attr_name)
+ for d in self.depreciations if getattr(d, attr_name))
+ return _sum
+
+ grouped_attributes = {
+ 'start_fixed_value',
+ 'value_increase',
+ 'value_decrease',
+ 'end_fixed_value',
+ 'start_value',
+ 'amortization_increase',
+ 'amortization_decrease',
+ 'end_value',
+ 'actual_value',
+ 'closing_value',
+ }
+ for attr_name in grouped_attributes:
+ setattr(Grouper, attr_name, cached_property(adder(attr_name)))
return Grouper
diff --git a/asset_table.odt b/asset_table.odt
index 2ae979e..0d8139c 100644
Binary files a/asset_table.odt and b/asset_table.odt differ
diff --git a/tryton.cfg b/tryton.cfg
index 2b2f577..d3d73db 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.1
+version=3.6.2
depends:
ir
res
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index fe5821a..2e9c1cb 100644
--- a/trytond_account_asset.egg-info/PKG-INFO
+++ b/trytond_account_asset.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-account-asset
-Version: 3.6.1
+Version: 3.6.2
Summary: Tryton module for assets management
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-account-asset
More information about the tryton-debian-vcs
mailing list