[tryton-debian-vcs] tryton-modules-stock branch upstream-3.0 updated. upstream/3.0.4-1-g875e4ad

[Mathias Behrle]

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

commit 875e4ad8f3e1784553f6ad7dc8e27b7556399bd0
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Oct 8 13:34:18 2014 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 0be4f8e..fc4b5d6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.5 - 2014-09-29
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.4 - 2014-08-03
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 43b736b..d4bd60b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 3.0.4
+Version: 3.0.5
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/move.py b/move.py
index 2d4749c..db8c9bf 100644
--- a/move.py
+++ b/move.py
@@ -611,22 +611,7 @@ class Move(Workflow, ModelSQL, ModelView):
     @ModelView.button
     @Workflow.transition('cancel')
     def cancel(cls, moves):
-        pool = Pool()
-        Date = pool.get('ir.date')
-
-        today = Date.today()
-        for move in moves:
-            move.effective_date = today
-            if (move.from_location.type in ('supplier', 'production')
-                    and move.to_location.type == 'storage'
-                    and move.product.cost_price_method == 'average'):
-                move._update_product_cost_price('out')
-            elif (move.to_location.type == 'supplier'
-                    and move.from_location.type == 'storage'
-                    and move.product.cost_price_method == 'average'):
-                move._update_product_cost_price('in')
-            move.effective_date = None
-            move.save()
+        pass
 
     @classmethod
     def create(cls, vlist):
diff --git a/shipment.py b/shipment.py
index e90d1c4..72cb754 100644
--- a/shipment.py
+++ b/shipment.py
@@ -1408,7 +1408,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 5782b76..239aed1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.4
+version=3.0.5
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index d2e3730..5444099 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.0.4
+Version: 3.0.5
 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 2acd70d..d07e426 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -23,14 +23,81 @@ 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
+./locale/sl_SI.po
 ./tests/__init__.py
+./tests/scenario_stock_average_cost_price.rst
+./tests/scenario_stock_shipment_out.rst
 ./tests/test_stock.py
+./view/configuration_form.xml
+./view/inventory_form.xml
+./view/inventory_line_form.xml
+./view/inventory_line_tree.xml
+./view/inventory_tree.xml
+./view/location_form.xml
+./view/location_list.xml
+./view/location_quantity_tree.xml
+./view/location_tree.xml
+./view/move_form.xml
+./view/move_tree.xml
+./view/move_tree_simple.xml
+./view/party_address_form.xml
+./view/party_address_tree.xml
+./view/party_form.xml
+./view/period_cache_form.xml
+./view/period_cache_list.xml
+./view/period_form.xml
+./view/period_list.xml
+./view/product_by_location_start_form.xml
+./view/product_quantities_warehouse_graph.xml
+./view/product_quantities_warehouse_list.xml
+./view/product_quantities_warehouse_start_form.xml
+./view/product_tree_qty.xml
+./view/products_by_locations_start_form.xml
+./view/shipment_in_form.xml
+./view/shipment_in_return_assign_failed_form.xml
+./view/shipment_in_return_form.xml
+./view/shipment_in_return_tree.xml
+./view/shipment_in_tree.xml
+./view/shipment_internal_assign_failed_form.xml
+./view/shipment_internal_form.xml
+./view/shipment_internal_tree.xml
+./view/shipment_out_assign_failed_form.xml
+./view/shipment_out_form.xml
+./view/shipment_out_return_form.xml
+./view/shipment_out_return_tree.xml
+./view/shipment_out_tree.xml
 doc/index.rst
 icons/tryton-inventory.svg
 locale/bg_BG.po
-- 
tryton-modules-stock