[tryton-debian-vcs] tryton-modules-stock branch upstream-2.6 updated. upstream/2.6.8-1-ga9d0713

[Mathias Behrle]

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

commit a9d0713f3cbd03306c70cc442f77baee1d14923d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 13:23:32 2014 +0200

    Adding upstream version 2.6.9.

diff --git a/CHANGELOG b/CHANGELOG
index 8b149a4..85046fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.9 - 2014-08-03
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.8 - 2014-07-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index e28f91a..217a53b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 2.6.8
+Version: 2.6.9
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/shipment.py b/shipment.py
index 6299aa0..00b7d48 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1740,7 +1740,8 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
                 | ~Eval('from_location') | ~Eval('to_location')),
             },
         domain=[
-            ('from_location', '=', Eval('from_location')),
+            ('from_location', 'child_of', [Eval('from_location', -1)],
+                'parent'),
             ('to_location', '=', Eval('to_location')),
             ('company', '=', Eval('company')),
             ],
diff --git a/tryton.cfg b/tryton.cfg
index 32474b4..5dcc366 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.8
+version=2.6.9
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 33b4e45..1c8eaf2 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock
-Version: 2.6.8
+Version: 2.6.9
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock