[tryton-debian-vcs] tryton-modules-purchase branch debian-stretch-4.0 updated. debian/4.0.3-1-5-g3df21bf

[Mathias Behrle]

The following commit has been merged in the debian-stretch-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=debian/4.0.3-1-5-g3df21bf

commit 3df21bfac1888f8da194ed29181d21152b30b6d9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:15:23 2017 +0200

    Releasing debian version 4.0.4-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 5170f02..db67f11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-purchase (4.0.4-1) unstable; urgency=medium
+
+  * Setting the branch in the watch file to the fixed version 4.0.
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Merging upstream version 4.0.4.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 05 Sep 2017 14:15:23 +0200
+
 tryton-modules-purchase (4.0.3-1) unstable; urgency=medium
 
   * Merging upstream version 4.0.3.
commit 5b7e2c6eeb4939515506ef68e03c5f7ddf45576f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:15:22 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 7f27de8..bcee35d 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 6a22c17bad40848ed5c978804198bc3edbe587d6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:15:22 2017 +0200

    Merging upstream version 4.0.4.

diff --git a/CHANGELOG b/CHANGELOG
index 0b7d578..f75d121 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.4 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.3 - 2016-09-03
 * 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 a6b520a..7ca45de 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase
-Version: 4.0.3
+Version: 4.0.4
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/purchase.py b/purchase.py
index a780abf..2b2f923 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):
@@ -823,7 +823,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 a5447c5..0a7d63a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.3
+version=4.0.4
 depends:
     account
     account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index e3beee0..efd85cf 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: 4.0.3
+Version: 4.0.4
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-purchase