[tryton-debian-vcs] tryton-modules-sale-supply branch debian-stretch-4.2 updated. debian/4.2.0-1-7-g407e0d9

[Mathias Behrle]

The following commit has been merged in the debian-stretch-4.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply.git;a=commitdiff;h=debian/4.2.0-1-7-g407e0d9

commit 407e0d93196314c1d6ab1c2383cfa0803f1d8ed7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:06:49 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index ccf403f..929b9a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tryton-modules-sale-supply (4.2.1-1) unstable; urgency=medium
+
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Setting the branch in the watch file to the fixed version 4.2.
+  * Use the preferred https URL format in the copyright file.
+  * Bump the Standards-Version to 4.0.1.
+  * Merging upstream version 4.2.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 05 Oct 2017 12:06:49 +0200
+
 tryton-modules-sale-supply (4.2.0-1) unstable; urgency=medium
 
   * Updating to Standards-Version: 3.9.8, no changes needed.
commit 52fcb0b8f2acbb9adb19069d1fcd45a004c37009
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:06:48 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index b5a0538..4e796be 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2016 Cédric Krier
-           2011-2016 B2CK SPRL
+Copyright: 2011-2017 Cédric Krier
+           2011-2017 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit ca862d3620a5e8bdd4a3ae8360916f5e207152eb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:06:48 2017 +0200

    Merging upstream version 4.2.1.

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