[tryton-debian-vcs] tryton-modules-purchase branch debian-stretch-3.8 updated. debian/3.8.2-1-4-g51cf042
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:23:30 UTC 2017
The following commit has been merged in the debian-stretch-3.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=debian/3.8.2-1-4-g51cf042
commit 51cf042fbf9fd396b2ea48d7c96faacfd05368c6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:13:39 2017 +0200
Releasing debian version 3.8.3-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 92144b5..b5c3b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-purchase (3.8.3-1) unstable; urgency=medium
+
+ * Add the actual upstream maintainer key to signing-key.asc.
+ * Merging upstream version 3.8.3.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 05 Sep 2017 14:13:39 +0200
+
tryton-modules-purchase (3.8.2-1) unstable; urgency=medium
* Setting the branch in the watch file to the fixed version 3.8.
commit 8a2fe06aee3ab59a52997bdd7b7cab2c479e4797
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:13:38 2017 +0200
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index be43cf3..64e4429 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-2016 Cédric Krier
+Copyright: 2008-2017 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2016 B2CK SPRL
+ 2008-2017 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit 8bd6dfc9a4efe597584c86b2acb52618feaab2de
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:13:38 2017 +0200
Merging upstream version 3.8.3.
diff --git a/CHANGELOG b/CHANGELOG
index f1c4570..e31a92c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.3 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
Version 3.8.2 - 2016-07-05
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 48f96af..dba4452 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 2db3f7d..ba597a8 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 3.8.2
+Version: 3.8.3
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index c6926f8..705988e 100644
--- a/purchase.py
+++ b/purchase.py
@@ -451,7 +451,7 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin):
def get_tax_amount(self):
taxes = self._get_taxes().itervalues()
- return sum(tax['amount'] for tax in taxes)
+ return sum((tax['amount'] for tax in taxes), Decimal(0))
@classmethod
def get_amount(cls, purchases, names):
@@ -822,7 +822,10 @@ class Purchase(Workflow, ModelSQL, ModelView, TaxableMixin):
purchase.create_return_shipment(return_moves)
purchase.set_shipment_state()
if purchase.is_done():
- done.append(purchase)
+ if purchase.state != 'done':
+ if purchase.state == 'confirmed':
+ process.append(purchase)
+ done.append(purchase)
elif purchase.state != 'processing':
process.append(purchase)
if process:
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 485d807..1523869 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.8.2
+version=3.8.3
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 9892b9e..b22cd15 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-purchase
-Version: 3.8.2
+Version: 3.8.3
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list