[tryton-debian-vcs] tryton-modules-purchase branch debian updated. debian/4.4.1-4-3-g9899383
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:23:29 UTC 2017
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=debian/4.4.1-4-3-g9899383
commit 989938383404610d97f7915c7ee892bce4b5d782
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:10:04 2017 +0200
Releasing debian version 4.4.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index bd3ee60..75942a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-purchase (4.4.2-1) unstable; urgency=medium
+
+ * Bump the Standards-Version to 4.1.0, no changes needed.
+ * Merging upstream version 4.4.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 05 Sep 2017 14:10:04 +0200
+
tryton-modules-purchase (4.4.1-4) unstable; urgency=medium
* Switch to Python3.
commit a46a2a21d983f10f38c4dc63f8396c3b6de0b028
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:10:03 2017 +0200
Merging upstream version 4.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 79d598f..24a3203 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.2 - 2017-09-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.1 - 2017-06-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index e641fb4..94b7bab 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 4.4.1
+Version: 4.4.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 523ae9b..4c9cdf7 100644
--- a/purchase.py
+++ b/purchase.py
@@ -454,7 +454,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):
@@ -825,7 +825,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/tryton.cfg b/tryton.cfg
index 81ea733..327a29e 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.1
+version=4.4.2
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 60b0ec9..c1dedfe 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.4.1
+Version: 4.4.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
commit 1f69f62423b5b788fcdb123e5cd2512ccb70a070
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 13:27:13 2017 +0200
Bump the Standards-Version to 4.1.0, no changes needed.
diff --git a/debian/control b/debian/control
index 0063ac3..dba8d82 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
dh-python,
python3,
python3-setuptools,
-Standards-Version: 4.0.1
+Standards-Version: 4.1.0
Homepage: http://www.tryton.org/
Vcs-Browser: https://anonscm.debian.org/cgit/tryton/tryton-modules-purchase.git
Vcs-Git: https://anonscm.debian.org/cgit/tryton/tryton-modules-purchase.git
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list