[tryton-debian-vcs] tryton-modules-stock branch debian-stretch-3.6 updated. debian/3.6.1-1-4-g70b2173

[Mathias Behrle]

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

commit 70b2173dc42dd0b178890e05a09453d0ff3aef8f
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:40:11 2016 +0200

    Releasing debian version 3.6.2-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 1a54eaa..8d3d315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock (3.6.2-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 3.6.2.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 11 Jul 2016 20:40:11 +0200
+
 tryton-modules-stock (3.6.1-1) unstable; urgency=medium
 
   * Updating year of debian copyright.
commit 01028340fa5189487d27d6a71f5c4e71a319a265
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:40:11 2016 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 11c0ee4..043d89f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2012 Openlabs Technologies & Consulting (P) LTD
-           2008-2015 Cédric Krier
+           2008-2016 Cédric Krier
            2008-2013 Bertrand Chenal
-           2008-2015 B2CK SPRL
+           2008-2016 B2CK SPRL
            2004-2008 Tiny SPRL
 License: GPL-3+
 
commit 30271b75f0874294c960645fa840837502599525
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:40:11 2016 +0200

    Merging upstream version 3.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 94372f7..f3b6c3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.2 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.1 - 2015-12-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 3a91df4..f5434dd 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2012 Openlabs Technologies & Consulting (P) LTD.
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 B2CK SPRL.
 Copyright (C) 2004-2008 Tiny SPRL.
 
 This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 2b87a96..ef315f5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.6.1
+Version: 3.6.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 cd1dedf..2a6699c 100644
--- a/shipment.py
+++ b/shipment.py
@@ -521,8 +521,15 @@ class ShipmentInReturn(Workflow, ModelSQL, ModelView):
                 Bool(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'])
@@ -697,6 +704,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 5745e8a..1f574bf 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.1
+version=3.6.2
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 100d178..bd89e22 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.6.1
+Version: 3.6.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 7b48706..8322853 100644
--- a/trytond_stock.egg-info/requires.txt
+++ b/trytond_stock.egg-info/requires.txt
@@ -3,4 +3,4 @@ trytond_company >= 3.6, < 3.7
 trytond_currency >= 3.6, < 3.7
 trytond_party >= 3.6, < 3.7
 trytond_product >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond >= 3.6, < 3.7
-- 
tryton-modules-stock