[tryton-debian-vcs] tryton-modules-stock branch debian-jessie-3.0 updated. debian/3.0.3-1-2-gaac298e

[Mathias Behrle]

The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/3.0.3-1-2-gaac298e

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

    Releasing debian version 3.0.4-1.

diff --git a/debian/changelog b/debian/changelog
index 76da44f..8d907a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (3.0.4-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 26 Aug 2014 13:29:22 +0200
+
 tryton-modules-stock (3.0.3-1) unstable; urgency=medium
 
   * Merging upstream version 3.0.3.
commit d0d8af02cf4a7509396aa79d80fdc00b785b9294
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 13:29:20 2014 +0200

    Merging upstream version 3.0.4.

diff --git a/CHANGELOG b/CHANGELOG
index 03d8fed..0be4f8e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.4 - 2014-08-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.3 - 2014-07-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 8220a42..43b736b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.0.3
+Version: 3.0.4
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/shipment.py b/shipment.py
index 80c0be1..e90d1c4 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1792,7 +1792,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 ef8fb7c..5782b76 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.3
+version=3.0.4
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 4764f6b..d2e3730 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: 3.0.3
+Version: 3.0.4
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock