[tryton-debian-vcs] tryton-modules-stock branch upstream updated. upstream/3.2.1-1-g58ee624

[Mathias Behrle]

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

commit 58ee6241830f5cba4cf592d4bbebe826ab4f36a8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 13:20:48 2014 +0200

    Adding upstream version 3.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 15115bc..f5b967b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-08-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.1 - 2014-07-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 4ede28d..9359491 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.2.1
+Version: 3.2.2
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index 057da67..f2019cb 100644
--- a/move.py
+++ b/move.py
@@ -895,8 +895,6 @@ class Move(Workflow, ModelSQL, ModelView):
         assert grouping_filter is None or len(grouping_filter) == len(grouping)
 
         move_rule_query = Rule.domain_get('stock.move')
-        if move_rule_query is None:
-            move_rule_query = Literal(True)
 
         PeriodCache = Period.get_cache(grouping)
         period = None
@@ -1081,7 +1079,8 @@ class Move(Workflow, ModelSQL, ModelView):
             where=state_date_clause
             & where
             & move.to_location.in_(location_query)
-            & move.id.in_(move_rule_query)
+            & (move.id.in_(move_rule_query) if move_rule_query
+                else Literal(True))
             & dest_clause_from,
             group_by=[move.to_location] + move_keys)
         query = Union(query, from_.select(move.from_location.as_('location'),
@@ -1090,7 +1089,8 @@ class Move(Workflow, ModelSQL, ModelView):
                 where=state_date_clause
                 & where
                 & move.from_location.in_(location_query)
-                & move.id.in_(move_rule_query)
+                & (move.id.in_(move_rule_query) if move_rule_query
+                    else Literal(True))
                 & dest_clause_to,
                 group_by=[move.from_location] + move_keys),
             all_=True)
diff --git a/product.py b/product.py
index d4cdfed..dd8352f 100644
--- a/product.py
+++ b/product.py
@@ -75,7 +75,7 @@ class Template:
             actions = iter(args)
             for templates, values in zip(actions, actions):
                 for field, error in cls._modify_no_move:
-                    if values.get(field):
+                    if field in values:
                         cls.check_no_move(templates, error)
                         break
         super(Template, cls).write(*args)
diff --git a/shipment.py b/shipment.py
index 47a3b38..6525882 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1810,7 +1810,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 04de374..7c0619c 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.1
+version=3.2.2
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 4654365..5461fb6 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.2.1
+Version: 3.2.2
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock