[tryton-debian-vcs] tryton-modules-sale-supply branch upstream-4.2 updated. upstream/4.2.0-1-g39c1551

[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-sale-supply.git;a=commitdiff;h=upstream/4.2.0-1-g39c1551

commit 39c155184574237b385743dedce4ef41a72e15bd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:06:48 2017 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 4436934..25510f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 93ef5be..4f1c2b0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2016 Cédric Krier.
-Copyright (C) 2011-2016 B2CK SPRL.
+Copyright (C) 2011-2017 Cédric Krier.
+Copyright (C) 2011-2017 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 25fec31..bc86968 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for sale supply
 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/stock.py b/stock.py
index 0be650a..98f209a 100644
--- a/stock.py
+++ b/stock.py
@@ -1,5 +1,7 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
+from collections import defaultdict
+
 from trytond.model import ModelView, Workflow
 from trytond.pool import Pool, PoolMeta
 
@@ -27,11 +29,8 @@ class ShipmentIn:
                         'in', move_ids),
                     ('purchase_request.origin', 'like', 'sale.sale,%'),
                     ])
-            pbl = {}
+            pbl = defaultdict(lambda: defaultdict(lambda: 0))
             for move in shipment.inventory_moves:
-                pbl.setdefault(move.product, {}).setdefault(
-                    move.to_location, 0.0)
-                pbl[move.product][move.to_location] += \
-                    move.internal_quantity
+                pbl[move.product][move.to_location] += move.internal_quantity
             for sale_line in sale_lines:
                 sale_line.assign_supplied(pbl[sale_line.product])
diff --git a/tryton.cfg b/tryton.cfg
index 03fdcec..3a3a1b8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     purchase
diff --git a/trytond_sale_supply.egg-info/PKG-INFO b/trytond_sale_supply.egg-info/PKG-INFO
index 7a103ae..8388900 100644
--- a/trytond_sale_supply.egg-info/PKG-INFO
+++ b/trytond_sale_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-sale-supply
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module for sale supply
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-sale-supply