[tryton-debian-vcs] tryton-modules-sale-supply branch debian-stretch-3.6 updated. debian/3.6.0-1-9-g58d9cd7

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Oct 5 12:27:23 UTC 2017 

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

commit 58d9cd7cf73c05e55693661d9ea6d420fe5a536c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:01:37 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index d5e193f..43dc9c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-sale-supply (3.6.1-1) unstable; urgency=medium
+
+  * Updating year of debian copyright.
+  * Adapting section naming in gbp.conf to current git-buildpackage.
+  * Improving description why we can not run the module test suites.
+  * Setting the branch in the watch file to the fixed version 3.6.
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Add the actual upstream maintainer key to signing-key.asc.
+  * Merging upstream version 3.6.1.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 05 Oct 2017 12:01:36 +0200
+
 tryton-modules-sale-supply (3.6.0-1) unstable; urgency=medium
 
   * Wrapping and sorting control files (wrap-and-sort -bts).
commit 5e7666627c7a20a5f62be93ed95db73924abdad2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:01:35 2017 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 3e86df4..778af0c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2015 Cédric Krier
-           2011-2015 B2CK SPRL
+Copyright: 2011-2017 Cédric Krier
+           2011-2017 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit eb393a7f2d83c16d9c9d6d6aad516a0257517ace
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 5 12:01:35 2017 +0200

    Merging upstream version 3.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index f8bb98d..756d328 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2017-10-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 * Add support for PyPy
diff --git a/COPYRIGHT b/COPYRIGHT
index 196a420..4f1c2b0 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2011-2015 Cédric Krier.
-Copyright (C) 2011-2015 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 777b19f..a728cae 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_sale_supply
-Version: 3.6.0
+Version: 3.6.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 3739cc4..7dfaef8 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 063c58d..991a0a1 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.6.0
+version=3.6.1
 depends:
     ir
     purchase
diff --git a/trytond_sale_supply.egg-info/PKG-INFO b/trytond_sale_supply.egg-info/PKG-INFO
index 18ccedc..dc8ad02 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: 3.6.0
+Version: 3.6.1
 Summary: Tryton module for sale supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_sale_supply.egg-info/requires.txt b/trytond_sale_supply.egg-info/requires.txt
index 0ee268a..7af2125 100644
--- a/trytond_sale_supply.egg-info/requires.txt
+++ b/trytond_sale_supply.egg-info/requires.txt
@@ -2,4 +2,4 @@ trytond_purchase >= 3.6, < 3.7
 trytond_sale >= 3.6, < 3.7
 trytond_stock >= 3.6, < 3.7
 trytond_stock_supply >= 3.6, < 3.7
-trytond >= 3.6, < 3.7
\ No newline at end of file
+trytond >= 3.6, < 3.7
-- 
tryton-modules-sale-supply

More information about the tryton-debian-vcs mailing list