[tryton-debian-vcs] tryton-modules-sale-supply-drop-shipment branch upstream-3.6 updated. upstream/3.6.0-1-geaefee0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 23 16:54:43 UTC 2015
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply-drop-shipment.git;a=commitdiff;h=upstream/3.6.0-1-geaefee0
commit eaefee0e8ac24ded9d3835448152199b54b18ff4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 23 15:28:21 2015 +0100
Adding upstream version 3.6.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 58b5c1d..4d3a7eb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-12-22
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Add support for PyPy
diff --git a/PKG-INFO b/PKG-INFO
index a269ee1..0b265f2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_sale_supply_drop_shipment
-Version: 3.6.0
+Version: 3.6.1
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/stock.py b/stock.py
index 4dde6fb..79051aa 100644
--- a/stock.py
+++ b/stock.py
@@ -240,7 +240,8 @@ class ShipmentDrop(Workflow, ModelSQL, ModelView):
if (move.state == 'cancel'
and isinstance(move.origin, (PurchaseLine, SaleLine))):
cls.raise_user_error('reset_move', (move.rec_name,))
- Move.draft([m for s in shipments for m in s.moves])
+ Move.draft([m for s in shipments for m in s.moves
+ if m.state != 'staging'])
@classmethod
@ModelView.button
diff --git a/tryton.cfg b/tryton.cfg
index 9c24fd7..89a84d8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.0
+version=3.6.1
depends:
company
ir
diff --git a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
index 9a2a287..bf55274 100644
--- a/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
+++ b/trytond_sale_supply_drop_shipment.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-sale-supply-drop-shipment
-Version: 3.6.0
+Version: 3.6.1
Summary: Tryton module for sale supply drop shipment
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-sale-supply-drop-shipment
More information about the tryton-debian-vcs
mailing list