[tryton-debian-vcs] tryton-modules-stock branch upstream-3.8 updated. upstream/3.8.1-1-g4ec6b4a

[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-stock.git;a=commitdiff;h=upstream/3.8.1-1-g4ec6b4a

commit 4ec6b4a8ff5c6135d27a1a1564b818ed9e170c0c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:41:36 2016 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index ee24571..7054a91 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.8.2 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.8.1 - 2016-02-06
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index f9748f1..dd84169 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.8.1
+Version: 3.8.2
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/shipment.py b/shipment.py
index 9a62f3b..8ea9064 100644
--- a/shipment.py
+++ b/shipment.py
@@ -519,8 +519,15 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
                 & Eval('to_location')),
             },
         domain=[
-            ('from_location', '=', Eval('from_location')),
-            ('to_location', '=', Eval('to_location')),
+            If(Eval('state') == 'draft', [
+                    ('from_location', '=', Eval('from_location')),
+                    ('to_location', '=', Eval('to_location')),
+                    ], [
+                    ('from_location', 'child_of', [Eval('from_location', -1)],
+                        'parent'),
+                    ('to_location', 'child_of', [Eval('to_location', -1)],
+                        'parent'),
+                    ]),
             ('company', '=', Eval('company')),
             ],
         depends=['state', 'from_location', 'to_location', 'company'])
@@ -695,6 +702,13 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
         Move = Pool().get('stock.move')
         Move.draft([m for s in shipments for m in s.moves
                 if m.state != 'staging'])
+        for shipment in shipments:
+            Move.write([m for m in shipment.moves
+                    if m.state != 'done'], {
+                    'from_location': shipment.from_location.id,
+                    'to_location': shipment.to_location.id,
+                    'planned_date': shipment.planned_date,
+                    })
 
     @classmethod
     @ModelView.button
diff --git a/tryton.cfg b/tryton.cfg
index 3076f98..8847166 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.8.1
+version=3.8.2
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index dfbfd29..60a5c14 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.8.1
+Version: 3.8.2
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock.egg-info/requires.txt b/trytond_stock.egg-info/requires.txt
index f2e4f30..a28dfd5 100644
--- a/trytond_stock.egg-info/requires.txt
+++ b/trytond_stock.egg-info/requires.txt
@@ -3,4 +3,4 @@ trytond_company >= 3.8, < 3.9
 trytond_currency >= 3.8, < 3.9
 trytond_party >= 3.8, < 3.9
 trytond_product >= 3.8, < 3.9
-trytond >= 3.8, < 3.9
\ No newline at end of file
+trytond >= 3.8, < 3.9
-- 
tryton-modules-stock