[tryton-debian-vcs] tryton-modules-sale branch debian-stretch-4.2 updated. debian/4.2.1-1-4-g891058a
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:24:00 UTC 2017
The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=debian/4.2.1-1-4-g891058a
commit 891058a0e75734ace540ab4a247dadee6d280ab4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:00:57 2017 +0200
Releasing debian version 4.2.2-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index c1e86f7..b5a9533 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-sale (4.2.2-1) unstable; urgency=medium
+
+ * Use the preferred https URL format in the copyright file.
+ * Bump the Standards-Version to 4.0.1.
+ * Merging upstream version 4.2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 05 Sep 2017 14:00:57 +0200
+
tryton-modules-sale (4.2.1-1) unstable; urgency=medium
* Add the actual upstream maintainer key to signing-key.asc.
commit 2de1c55a0b58a8f45de64a2488702c2a45f4e772
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 14:00:57 2017 +0200
Merging upstream version 4.2.2.
diff --git a/CHANGELOG b/CHANGELOG
index bbcff62..1ae01e2 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-06-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 7ce6d45..b485ba2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 4.2.1
+Version: 4.2.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 76fc6ea..c92caa3 100644
--- a/sale.py
+++ b/sale.py
@@ -481,7 +481,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):
@@ -923,6 +924,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 50dece3..24ffda0 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_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index c9203b6..2a1aea4 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.2.1
+Version: 4.2.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-sale
More information about the tryton-debian-vcs
mailing list