[tryton-debian-vcs] tryton-modules-sale branch upstream-4.4 updated. upstream/4.4.3-1-g9ce93fb
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 13 10:40:35 UTC 2017
The following commit has been merged in the upstream-4.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=upstream/4.4.3-1-g9ce93fb
commit 9ce93fb7583a68b86fd3520d97bb456437ba9f60
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 19:01:16 2017 +0100
Adding upstream version 4.4.4.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 104d84f..4a55f88 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.4.4 - 2017-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.4.3 - 2017-11-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index fd70977..5049469 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 4.4.3
+Version: 4.4.4
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index 3d1247a..7331f26 100644
--- a/product.py
+++ b/product.py
@@ -104,7 +104,7 @@ class Product:
@classmethod
def get_sale_price_uom(cls, products, name):
- quantity = Transaction().context.get('quantity', 0)
+ quantity = Transaction().context.get('quantity') or 0
return cls.get_sale_price(products, quantity=quantity)
@staticmethod
diff --git a/sale.py b/sale.py
index d3687fa..5f35d7f 100644
--- a/sale.py
+++ b/sale.py
@@ -591,7 +591,12 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
return [('lines.moves.shipment' + nested,)
+ tuple(clause[1:3]) + (model_name,) + tuple(clause[3:])]
else:
- return [('lines.moves.shipment',) + tuple(clause[1:3])]
+ if isinstance(clause[2], basestring):
+ target = 'rec_name'
+ else:
+ target = 'id'
+ return [('lines.moves.shipment.' + target,)
+ + tuple(clause[1:3]) + (model_name,)]
return classmethod(method)
search_shipments = search_shipments_returns('stock.shipment.out')
diff --git a/tryton.cfg b/tryton.cfg
index c41e5d3..36ffb2b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.4.3
+version=4.4.4
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 777f8d3..1c278fe 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.3
+Version: 4.4.4
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