[tryton-debian-vcs] tryton-modules-sale branch upstream-4.0 updated. upstream/4.0.4-1-g0d07d9b

[Mathias Behrle]

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

commit 0d07d9b86a9a921cc9df680faff27ad7bc4034d5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 13:59:12 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index b324d00..d36caf1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.5 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.0.4 - 2017-06-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index a566890..edc762d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 4.0.4
+Version: 4.0.5
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 9c35384..0acb702 100644
--- a/sale.py
+++ b/sale.py
@@ -476,7 +476,8 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
         return taxable_lines
 
     def get_tax_amount(self):
-        return sum(v['amount'] for v in self._get_taxes().itervalues())
+        return sum(
+            (v['amount'] for v in self._get_taxes().itervalues()), Decimal(0))
 
     @classmethod
     def get_amount(cls, sales, names):
@@ -918,6 +919,8 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
             sale.set_shipment_state()
             if sale.is_done():
                 if sale.state != 'done':
+                    if sale.state == 'confirmed':
+                        process.append(sale)
                     done.append(sale)
             elif sale.state != 'processing':
                 process.append(sale)
diff --git a/tryton.cfg b/tryton.cfg
index 6fec402..7908d5a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.0.4
+version=4.0.5
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 482c2d9..c42b797 100644
--- a/trytond_sale.egg-info/PKG-INFO
+++ b/trytond_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale
-Version: 4.0.4
+Version: 4.0.5
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale