[tryton-debian-vcs] tryton-modules-account-asset branch debian-stretch-4.2 updated. debian/4.2.0-1-5-gc92b8a5
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Aug 17 12:22:23 UTC 2017
The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-asset.git;a=commitdiff;h=debian/4.2.0-1-5-gc92b8a5
commit c92b8a5e6746ac84010880054e574d4244cd18eb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Aug 17 12:34:58 2017 +0200
Releasing debian version 4.2.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 937df3c..6db5afc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-account-asset (4.2.1-1) unstable; urgency=medium
+
+ * Add the actual upstream maintainer key to signing-key.asc.
+ * Setting the branch in the watch file to the fixed version 4.2.
+ * Merging upstream version 4.2.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Thu, 17 Aug 2017 12:34:58 +0200
+
tryton-modules-account-asset (4.2.0-1) unstable; urgency=medium
* Updating to Standards-Version: 3.9.8, no changes needed.
commit 0de5e082aaec94dd5febd9ac56b29c0253a3d69a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Aug 17 12:34:58 2017 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 9b55606..76a37b0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2012-2016 Nicolas Évrard
- 2012-2016 Cédric Krier
+Copyright: 2012-2017 Nicolas Évrard
+ 2012-2017 Cédric Krier
2012-2013 Bertrand Chenal
- 2012-2016 B2CK SPRL
+ 2012-2017 B2CK SPRL
License: GPL-3+
Files: debian/*
commit 16229837eb01eeaf667cd2c7eed374df2d8f0556
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Aug 17 12:34:58 2017 +0200
Merging upstream version 4.2.1.
diff --git a/CHANGELOG b/CHANGELOG
index 1890049..2ea858c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-08-08
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.0 - 2016-11-28
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 43a5077..e6978f8 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2012-2016 Nicolas Évrard.
-Copyright (C) 2012-2016 Cédric Krier.
+Copyright (C) 2012-2017 Nicolas Évrard.
+Copyright (C) 2012-2017 Cédric Krier.
Copyright (C) 2012-2013 Bertrand Chenal.
-Copyright (C) 2012-2016 B2CK SPRL.
+Copyright (C) 2012-2017 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 d1f23b4..d4f8f28 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_asset
-Version: 4.2.0
+Version: 4.2.1
Summary: Tryton module for assets management
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index f972212..72691b9 100644
--- a/product.py
+++ b/product.py
@@ -56,13 +56,13 @@ class Template:
],
states={
'readonly': ~Eval('active', True),
- 'required': ~Eval('account_category') & Eval('depreciable'),
+ 'required': ~Eval('accounts_category') & Eval('depreciable'),
'invisible': (~Eval('depreciable')
| (Eval('type', '') != 'assets')
| ~Eval('context', {}).get('company')
- | Eval('account_category')),
+ | Eval('accounts_category')),
},
- depends=['active', 'depreciable', 'type', 'account_category']))
+ depends=['active', 'depreciable', 'type', 'accounts_category']))
account_depreciation_used = MissingFunction(
fields.Many2One('account.account', 'Account Depreciation Used'),
'missing_account', 'get_account')
@@ -74,13 +74,13 @@ class Template:
],
states={
'readonly': ~Eval('active', True),
- 'required': ~Eval('account_category') & Eval('depreciable'),
+ 'required': ~Eval('accounts_category') & Eval('depreciable'),
'invisible': (~Eval('depreciable')
| (Eval('type', '') != 'assets')
| ~Eval('context', {}).get('company')
- | Eval('account_category')),
+ | Eval('accounts_category')),
},
- depends=['active', 'depreciable', 'type', 'account_category']))
+ depends=['active', 'depreciable', 'type', 'accounts_category']))
account_asset_used = MissingFunction(
fields.Many2One('account.account', 'Account Asset Used'),
'missing_account', 'get_account')
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
[egg_info]
tag_build =
tag_date = 0
-tag_svn_revision = 0
diff --git a/tryton.cfg b/tryton.cfg
index ddc4d56..ace1591 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.0
+version=4.2.1
depends:
ir
res
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index a87ad0c..bae87e3 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: 4.2.0
+Version: 4.2.1
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