[tryton-debian-vcs] tryton-modules-stock-product-location branch upstream-2.8 updated. upstream/2.8.1-1-g69977cb
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Sun Jan 19 20:13:12 UTC 2014
The following commit has been merged in the upstream-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-product-location.git;a=commitdiff;h=upstream/2.8.1-1-g69977cb
commit 69977cb8824823dacb029a139f14f91cf89a0085
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Jan 19 20:54:59 2014 +0100
Adding upstream version 2.8.2.
diff --git a/CHANGELOG b/CHANGELOG
index 1cadb73..1e3c675 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.2 - 2014-01-18
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.1 - 2013-10-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index fcd418d..aa0db9f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_product_location
-Version: 2.8.1
+Version: 2.8.2
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/location.py b/location.py
index 6397762..59e4513 100644
--- a/location.py
+++ b/location.py
@@ -52,11 +52,12 @@ class ShipmentIn:
@classmethod
def _get_inventory_moves(cls, incoming_move):
move = super(ShipmentIn, cls)._get_inventory_moves(incoming_move)
- for product_location in incoming_move.product.locations:
- if product_location.warehouse.id != \
- incoming_move.shipment.warehouse.id:
- continue
- move.to_location = product_location.location
+ if move:
+ for product_location in incoming_move.product.locations:
+ if product_location.warehouse.id != \
+ incoming_move.shipment.warehouse.id:
+ continue
+ move.to_location = product_location.location
return move
@@ -67,8 +68,9 @@ class ShipmentOutReturn:
def _get_inventory_moves(cls, incoming_move):
move = super(ShipmentOutReturn, cls)._get_inventory_moves(
incoming_move)
- for product_location in incoming_move.product.locations:
- if (product_location.warehouse
- == incoming_move.shipment.warehouse):
- move.to_location = product_location.location
+ if move:
+ for product_location in incoming_move.product.locations:
+ if (product_location.warehouse
+ == incoming_move.shipment.warehouse):
+ move.to_location = product_location.location
return move
diff --git a/tryton.cfg b/tryton.cfg
index c3ef6ee..d734cc5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=2.8.2
depends:
ir
product
diff --git a/trytond_stock_product_location.egg-info/PKG-INFO b/trytond_stock_product_location.egg-info/PKG-INFO
index f510cff..f9a1e97 100644
--- a/trytond_stock_product_location.egg-info/PKG-INFO
+++ b/trytond_stock_product_location.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-product-location
-Version: 2.8.1
+Version: 2.8.2
Summary: Tryton module to add default location on product
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock-product-location
More information about the tryton-debian-vcs
mailing list