[tryton-debian-vcs] tryton-modules-account-asset branch debian-jessie-3.2 updated. debian/3.2.1-1-6-g04f2dcf
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Nov 12 13:48:51 UTC 2014
The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-account-asset.git;a=commitdiff;h=debian/3.2.1-1-6-g04f2dcf
commit 04f2dcfded4ecf0dbf78a736ab0104fcd1744ebc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:07:25 2014 +0100
Releasing debian version 3.2.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 69993a4..d631dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tryton-modules-account-asset (3.2.2-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Updating to Standards-Version: 3.9.6, no changes needed.
+ * Setting the branch in the watch file to the fixed version 3.2.
+ * Merging upstream version 3.2.2.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 12 Nov 2014 13:07:25 +0100
+
tryton-modules-account-asset (3.2.1-1) unstable; urgency=medium
* Updating signing key while using now plain .asc files instead of .pgp
commit 956da03ace3c429dc48e290f670783492ee4ae75
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:07:24 2014 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 0cc18e7..628dd6e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2012 Nicolas Évrard
+Copyright: 2012-2014 Nicolas Évrard
2012-2014 Cédric Krier
2012-2013 Bertrand Chenal
2012-2014 B2CK SPRL
commit 61f997181f2a13e86ea27ff314be92ef0831f5e1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Nov 12 13:07:24 2014 +0100
Merging upstream version 3.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index 36c79db..e79ce3c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.1 - 2014-08-03
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index f5633cb..f3f7030 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright (C) 2012 Nicolas Évrard.
+Copyright (C) 2012-2014 Nicolas Évrard.
Copyright (C) 2012-2014 Cédric Krier.
Copyright (C) 2012-2013 Bertrand Chenal.
Copyright (C) 2012-2014 B2CK SPRL.
diff --git a/PKG-INFO b/PKG-INFO
index 4953f87..0bcaba2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_account_asset
-Version: 3.2.1
+Version: 3.2.2
Summary: Tryton module for assets management
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/asset.py b/asset.py
index 684f642..f1b8a82 100644
--- a/asset.py
+++ b/asset.py
@@ -302,7 +302,7 @@ class Asset(Workflow, ModelSQL, ModelView):
# dateutil >= 2.0 has replace __nonzero__ by __bool__ which doesn't
# work in Python < 3
if delta == relativedelta.relativedelta():
- return []
+ return [self.end_date]
if self.frequency == 'monthly':
rule = rrule.rrule(rrule.MONTHLY, dtstart=self.start_date,
bymonthday=-1)
@@ -326,7 +326,10 @@ class Asset(Workflow, ModelSQL, ModelView):
- relativedelta.relativedelta(days=1)]
+ [l.date for l in self.lines])
first_delta = dates[0] - start_date
- last_delta = dates[-1] - dates[-2]
+ if len(dates) > 1:
+ last_delta = dates[-1] - dates[-2]
+ else:
+ last_delta = first_delta
if self.frequency == 'monthly':
_, first_ndays = calendar.monthrange(
dates[0].year, dates[0].month)
diff --git a/invoice.py b/invoice.py
index d2fc606..3e342e5 100644
--- a/invoice.py
+++ b/invoice.py
@@ -32,14 +32,17 @@ class InvoiceLine:
'Asset can be used only once on invoice line!'),
]
- @fields.depends('product', 'invoice')
+ @fields.depends('product', 'invoice', 'invoice_type')
def on_change_product(self):
new_values = super(InvoiceLine, self).on_change_product()
- if (not self.product
- or self.invoice.type not in ('in_invoice', 'in_credit_note')):
- return new_values
+ if self.invoice and self.invoice.type:
+ type_ = self.invoice.type
+ else:
+ type_ = self.invoice_type
- if self.product.type == 'assets' and self.product.depreciable:
+ if (self.product and type_ in ('in_invoice', 'in_credit_note')
+ and self.product.type == 'assets'
+ and self.product.depreciable):
new_values['account'] = self.product.account_asset_used.id
new_values['account.rec_name'] = \
self.product.account_asset_used.rec_name
diff --git a/tryton.cfg b/tryton.cfg
index 82f1661..fd97bbe 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.2.2
depends:
ir
res
diff --git a/trytond_account_asset.egg-info/PKG-INFO b/trytond_account_asset.egg-info/PKG-INFO
index fa65d44..5515cfa 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.2.1
+Version: 3.2.2
Summary: Tryton module for assets management
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_account_asset.egg-info/SOURCES.txt b/trytond_account_asset.egg-info/SOURCES.txt
index 887f0e3..14c1a37 100644
--- a/trytond_account_asset.egg-info/SOURCES.txt
+++ b/trytond_account_asset.egg-info/SOURCES.txt
@@ -12,12 +12,36 @@ setup.py
tryton.cfg
./__init__.py
./account.py
+./account.xml
./asset.py
+./asset.xml
./invoice.py
+./invoice.xml
./product.py
+./product.xml
./purchase.py
+./tryton.cfg
+./locale/ca_ES.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/sl_SI.po
./tests/__init__.py
+./tests/scenario_account_asset.rst
./tests/test_account_asset.py
+./view/asset_create_moves_start_form.xml
+./view/asset_form.xml
+./view/asset_line_form.xml
+./view/asset_line_tree.xml
+./view/asset_tree.xml
+./view/asset_update_show_depreciation_form.xml
+./view/asset_update_start_form.xml
+./view/category_form.xml
+./view/configuration_form.xml
+./view/invoice_line_form.xml
+./view/template_form.xml
doc/index.rst
locale/ca_ES.po
locale/de_DE.po
--
tryton-modules-account-asset
More information about the tryton-debian-vcs
mailing list