[tryton-debian-vcs] tryton-modules-purchase branch upstream-4.2 updated. upstream/4.2.1-1-gb606c04

[Mathias Behrle]

The following commit has been merged in the upstream-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=upstream/4.2.1-1-gb606c04

commit b606c04542fc1ef72ab425985491584b6dda447a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:17:05 2017 +0200

    Adding upstream version 4.2.2.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 243ec77..3526902 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.2 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.1 - 2017-03-10
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 0aad33a..d19edce 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase
-Version: 4.2.1
+Version: 4.2.2
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/purchase.py b/purchase.py
index 1b3f177..c4e1083 100644
--- a/purchase.py
+++ b/purchase.py
@@ -446,7 +446,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):
@@ -818,7 +818,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 cf8add7..90b3c27 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.1
+version=4.2.2
 depends:
     account
     account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 1bdff14..4c84831 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.2.1
+Version: 4.2.2
 Summary: Tryton module for purchase
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-purchase