[tryton-debian-vcs] tryton-modules-purchase branch upstream-3.8 updated. upstream/3.8.2-1-g15d4f0b

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:23:32 UTC 2017


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

commit 15d4f0b369a21c5b300d11b8772d5f3b58af7d43
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 5 14:13:38 2017 +0200

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

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