[tryton-debian-vcs] tryton-modules-sale branch upstream-3.6 updated. upstream/3.6.2-1-g1869582

[Mathias Behrle]

The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale.git;a=commitdiff;h=upstream/3.6.2-1-g1869582

commit 18695826b8f3d8d7e648622bfb3e56f3b1580030
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:44:52 2016 +0200

    Adding upstream version 3.6.3.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index fa1a341..71e41d3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.3 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.2 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 625fa35..aeac568 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 3.6.2
+Version: 3.6.3
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 57caf81..40b7580 100644
--- a/sale.py
+++ b/sale.py
@@ -312,8 +312,8 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
                 ).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 != Null)
@@ -558,7 +558,11 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
         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 8a349e3..8ba121a 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.2
+version=3.6.3
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index 7877521..d8310d1 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.6.2
+Version: 3.6.3
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale