[tryton-debian-vcs] tryton-modules-sale branch debian-stretch-4.2 updated. debian/4.2.3-1-2-g18f95a1
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 13 10:40:32 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.3-1-2-g18f95a1
commit 18f95a143ceff3a6d53ffbd48ea00521178775b4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 18:59:39 2017 +0100
Releasing debian version 4.2.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 44bb646..1dc49d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-sale (4.2.4-1) unstable; urgency=medium
+
+ * Merging upstream version 4.2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 12 Dec 2017 18:59:39 +0100
+
tryton-modules-sale (4.2.3-1) unstable; urgency=medium
* Merging upstream version 4.2.3.
commit 6f85d9cbcd3b23178340dbb74ddec32bc0bdccc1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Dec 12 18:59:39 2017 +0100
Merging upstream version 4.2.4.
diff --git a/CHANGELOG b/CHANGELOG
index 2ea3621..2af3a4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.4 - 2017-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 4.2.3 - 2017-11-07
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 08e350e..46f39f3 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 4.2.3
+Version: 4.2.4
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 9dd0758..215006c 100644
--- a/sale.py
+++ b/sale.py
@@ -590,7 +590,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 c4b2eb9..f6ed0cb 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.2.3
+version=4.2.4
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index dd678e5..c55a399 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.3
+Version: 4.2.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