[tryton-debian-vcs] tryton-modules-stock branch upstream-4.2 updated. upstream/4.2.1-1-g9b40f70

[Mathias Behrle]

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

commit 9b40f70a5ea518a5760eec3ddb08c3ecfe845e5b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Jul 2 17:14:18 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index f17bb98..38ac6d4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.2 - 2017-07-01
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.1 - 2017-03-10
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index d003179..6b1d805 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 4.2.1
+Version: 4.2.2
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..8bfd5a1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
 [egg_info]
 tag_build = 
 tag_date = 0
-tag_svn_revision = 0
 
diff --git a/shipment.py b/shipment.py
index ad29c3a..caf0ac8 100644
--- a/shipment.py
+++ b/shipment.py
@@ -2272,6 +2272,7 @@ class ShipmentInternal(Workflow, ModelSQL, ModelView):
         pass
 
     @classmethod
+    @ModelView.button
     @Workflow.transition('shipped')
     def ship(cls, shipments):
         pool = Pool()
diff --git a/tryton.cfg b/tryton.cfg
index 3753c69..9799ab7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.1
+version=4.2.2
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 2c5f27d..08480da 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: 4.2.1
+Version: 4.2.2
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock