[tryton-debian-vcs] tryton-modules-purchase branch upstream-3.6 updated. upstream/3.6.3-1-gdcc98d4
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.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=upstream/3.6.3-1-gdcc98d4
commit dcc98d4c6f1e7fe0d5f2950ed3c25c428bbf1cf7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:11:50 2017 +0200
Adding upstream version 3.6.4.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 176b425..0795681 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.4 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.3 - 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 6f88531..3b55639 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 3.6.3
+Version: 3.6.4
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 442213f..5abc666 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):
@@ -824,7 +824,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 da87313..6848263 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.3
+version=3.6.4
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index ee9c78d..c7899cb 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.6.3
+Version: 3.6.4
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