[tryton-debian-vcs] tryton-modules-stock branch debian-wheezy-2.6 updated. debian/2.6.9-1-2-g39ad4bd

[Mathias Behrle]

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

commit 39ad4bd38bbd9b99a0040cc8358799265775811a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Oct 8 13:28:11 2014 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 38734be..d22f925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-stock (2.6.10-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.10.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 08 Oct 2014 13:28:11 +0200
+
 tryton-modules-stock (2.6.9-1) unstable; urgency=medium
 
   * Merging upstream version 2.6.9.
commit 7be73cf53828b96a4e2bd6a17c51ca9be71fcfb3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Oct 8 13:28:08 2014 +0200

    Merging upstream version 2.6.10.

diff --git a/CHANGELOG b/CHANGELOG
index 85046fc..bc3b2b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.10 - 2014-09-29
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.9 - 2014-08-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 217a53b..d8e7ef6 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 2.6.9
+Version: 2.6.10
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/shipment.py b/shipment.py
index 00b7d48..df8f7d1 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1364,7 +1364,7 @@ class ShipmentOutReturn(Workflow, ModelSQL, ModelView):
         cls._transitions |= set((
                 ('draft', 'received'),
                 ('received', 'done'),
-                ('received', 'draf'),
+                ('received', 'draft'),
                 ('draft', 'cancel'),
                 ('received', 'cancel'),
                 ('cancel', 'draft'),
diff --git a/tryton.cfg b/tryton.cfg
index 5dcc366..0059e5b 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.9
+version=2.6.10
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 1c8eaf2..6d421e1 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: 2.6.9
+Version: 2.6.10
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock.egg-info/SOURCES.txt b/trytond_stock.egg-info/SOURCES.txt
index e9badc4..276de92 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -23,13 +23,40 @@ supplier_restocking_list.odt
 tryton.cfg
 ./__init__.py
 ./configuration.py
+./configuration.xml
+./customer_return_restocking_list.odt
+./delivery_note.odt
+./internal_shipment.odt
 ./inventory.py
+./inventory.xml
 ./location.py
+./location.xml
 ./move.py
+./move.xml
+./party.xml
 ./period.py
+./period.xml
+./picking_list.odt
 ./product.py
+./product.xml
 ./shipment.py
+./shipment.xml
+./stock.xml
+./supplier_restocking_list.odt
+./tryton.cfg
+./icons/tryton-inventory.svg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
 ./tests/__init__.py
+./tests/scenario_stock_shipment_out.rst
 ./tests/test_stock.py
 doc/index.rst
 icons/tryton-inventory.svg
-- 
tryton-modules-stock