[tryton-debian-vcs] tryton-modules-sale branch upstream-3.8 updated. upstream/3.8.1-1-g01825c6

[Mathias Behrle]

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

commit 01825c61e7c1474e7e88bbdaefb0df19fe2eac35
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 19:46:04 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 295496c..b561e7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.2 - 2016-07-05
+* Bug fixes (see mercurial logs for details)
+
 Version 3.8.1 - 2016-04-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 79341b4..1467710 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale
-Version: 3.8.1
+Version: 3.8.2
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 39700ed..0af3c2e 100644
--- a/sale.py
+++ b/sale.py
@@ -321,8 +321,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)
@@ -577,7 +577,11 @@ class Sale(Workflow, ModelSQL, ModelView, TaxableMixin):
         Search on shipments or returns
         '''
         def method(self, name, clause):
-            return [('lines.moves.shipment',) + 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)
 
@@ -1298,8 +1302,12 @@ class SaleLine(ModelSQL, ModelView):
     @fields.depends('product', 'quantity', 'moves', '_parent_sale.sale_date')
     def on_change_with_delivery_date(self, name=None):
         if self.moves:
-            return min(m.effective_date if m.effective_date else m.planned_date
-                for m in self.moves)
+            dates = filter(
+                None, (m.effective_date or m.planned_date for m in self.moves))
+            if dates:
+                return min(dates)
+            else:
+                return
         if self.product and self.quantity > 0:
             date = self.sale.sale_date if self.sale else None
             return self.product.compute_delivery_date(date=date)
diff --git a/tryton.cfg b/tryton.cfg
index 5794383..be3a238 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.1
+version=3.8.2
 depends:
     account
     account_invoice
diff --git a/trytond_sale.egg-info/PKG-INFO b/trytond_sale.egg-info/PKG-INFO
index c467db1..7a1a913 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.8.1
+Version: 3.8.2
 Summary: Tryton module for sale
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale