[tryton-debian-vcs] tryton-modules-sale branch upstream-3.4 updated. upstream/3.4.3-1-g22fc87c
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Jul 12 13:05:29 UTC 2016
The following commit has been merged in the upstream-3.4 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=upstream/3.4.3-1-g22fc87c
commit 22fc87c79c256a74832f1632a32943348c43531e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Jul 11 19:43:40 2016 +0200
Adding upstream version 3.4.4.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index c1b0b53..0e4204d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.4 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.3 - 2016-04-06
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index f4d13e5..2507ee6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale
-Version: 3.4.3
+Version: 3.4.4
Summary: Tryton module for sale
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/sale.py b/sale.py
index 0d5fca5..b52a4d2 100644
--- a/sale.py
+++ b/sale.py
@@ -301,8 +301,8 @@ class Sale(Workflow, ModelSQL, ModelView):
).join(sale_line_invoice_line, 'LEFT',
condition=sale_line_invoice_line.sale_line == sale_line.id
).join(move, 'LEFT',
- condition=(move.origin == Concat(SaleLine.__name__,
- sale_line.id))
+ condition=(move.origin == Concat(
+ SaleLine.__name__ + ',', sale_line.id))
).select(sql_table.id,
where=(sql_table.state == 'confirmed')
& ((sale_line_invoice_line.id != None)
@@ -610,7 +610,11 @@ class Sale(Workflow, ModelSQL, ModelView):
Search on shipments or returns
'''
def method(self, name, clause):
- return [('lines.moves.shipment.id',) + tuple(clause[1:])
+ if isinstance(clause[2], basestring):
+ target = 'rec_name'
+ else:
+ target = 'id'
+ return [('lines.moves.shipment.' + target,) + tuple(clause[1:])
+ (model_name,)]
return classmethod(method)
diff --git a/tryton.cfg b/tryton.cfg
index 6d03554..e9d36dd 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.3
+version=3.4.4
depends:
account
account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 1490002..e67a47b 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: 3.4.3
+Version: 3.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