[tryton-debian-vcs] tryton-modules-sale branch debian updated. debian/4.4.1-4-3-gd8f52d2
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Sep 5 13:23:59 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-sale.git;a=commitdiff;h=debian/4.4.1-4-3-gd8f52d2
commit d8f52d28a07694e67eebfc496a9cf67171128488
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 13:53:53 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 70e3f60..687f3ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-sale (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 13:53:53 +0200
+
tryton-modules-sale (4.4.1-4) unstable; urgency=medium
* Switch to Python3.
commit 13328811a03e346490add5a34ab3167f2fc58d7f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Sep 5 13:53:53 2017 +0200
Merging upstream version 4.4.2.
diff --git a/CHANGELOG b/CHANGELOG
index 0d5605f..cce0258 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 4289a81..c36c542 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 4.4.1
+Version: 4.4.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index fa895cf..be7c0bc 100644
--- a/sale.py
+++ b/sale.py
@@ -482,7 +482,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):
@@ -925,6 +926,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 640f395..d68c82e 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_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 794ea26..046dd4f 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.4.1
+Version: 4.4.2
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
commit cbc2deb0b22dd853916bc6c8bd999a1f1fe0aa6c
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 f151c04..c47bc4b 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-sale.git
Vcs-Git: https://anonscm.debian.org/cgit/tryton/tryton-modules-sale.git
--
tryton-modules-sale
More information about the tryton-debian-vcs
mailing list