[tryton-debian-vcs] tryton-modules-stock-supply branch debian-jessie-3.0 updated. debian/3.0.4-1-4-g58396b9

[Mathias Behrle]

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

commit 58396b9702ce0bdbc4b1ed99fd0105ee8fe85aeb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:18:35 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index ddf36d1..3a6b13b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-stock-supply (3.0.5-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 3.0.5.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 11 Jul 2016 20:18:35 +0200
+
 tryton-modules-stock-supply (3.0.4-1) unstable; urgency=medium
 
   * Adding actual upstream signing key.
commit 592878b24bc247e0f94d871567b5cf92de44adc8
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:18:34 2016 +0200

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 7366afb..399fda8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
 Copyright: 2013-2014 NaN-tic
-           2008-2015 Cédric Krier
+           2008-2016 Cédric Krier
            2008-2013 Bertrand Chenal
-           2008-2015 B2CK SPRL
+           2008-2016 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 4d7de8d53db4fc9654b2a415d3e50968f63c47b2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 11 20:18:34 2016 +0200

    Merging upstream version 3.0.5.

diff --git a/CHANGELOG b/CHANGELOG
index e636bf8..99b527c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.5 - 2016-07-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.4 - 2015-02-17
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index d66ec79..582a93b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 Copyright (C) 2013-2014 NaN-tic.
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
 Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 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 5928c0d..be764cc 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock_supply
-Version: 3.0.4
+Version: 3.0.5
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/purchase_request.py b/purchase_request.py
index 0b2f5f9..6044e49 100644
--- a/purchase_request.py
+++ b/purchase_request.py
@@ -5,6 +5,7 @@ import operator
 from itertools import groupby
 from functools import partial
 from decimal import Decimal
+from collections import defaultdict
 from trytond.model import ModelView, ModelSQL, fields
 from trytond.wizard import Wizard, StateView, StateAction, StateTransition, \
     Button
@@ -196,8 +197,9 @@ class PurchaseRequest(ModelSQL, ModelView):
                     pbl = Product.products_by_location(warehouse_ids,
                         product_ids, with_childs=True)
                 for warehouse_id in warehouse_ids:
-                    min_date_qties = dict((x, pbl.pop((warehouse_id, x), 0))
-                        for x in product_ids)
+                    min_date_qties = defaultdict(lambda: 0,
+                        ((x, pbl.pop((warehouse_id, x), 0))
+                            for x in product_ids))
                     # Search for shortage between min-max
                     shortages = cls.get_shortage(warehouse_id, product_ids,
                         min_date, max_date, min_date_qties=min_date_qties,
@@ -255,8 +257,8 @@ class PurchaseRequest(ModelSQL, ModelView):
         for request in requests:
             pline = request.purchase_line
             # Skip incoherent request
-            if request.product.id != pline.product.id or \
-                    request.warehouse.id != pline.purchase.warehouse.id:
+            if (request.product != pline.product
+                    or request.warehouse != pline.purchase.warehouse):
                 continue
             # Take smallest amount between request and purchase line
             req_qty = Uom.compute_qty(request.uom, request.quantity,
diff --git a/tryton.cfg b/tryton.cfg
index 64e7b7d..da911f0 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.0.4
+version=3.0.5
 depends:
     account
     ir
diff --git a/trytond_stock_supply.egg-info/PKG-INFO b/trytond_stock_supply.egg-info/PKG-INFO
index 8f502cc..b95863c 100644
--- a/trytond_stock_supply.egg-info/PKG-INFO
+++ b/trytond_stock_supply.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-stock-supply
-Version: 3.0.4
+Version: 3.0.5
 Summary: Tryton module for stock supply
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_stock_supply.egg-info/requires.txt b/trytond_stock_supply.egg-info/requires.txt
index 32963a6..a9b2b9a 100644
--- a/trytond_stock_supply.egg-info/requires.txt
+++ b/trytond_stock_supply.egg-info/requires.txt
@@ -4,4 +4,4 @@ trytond_party >= 3.0, < 3.1
 trytond_product >= 3.0, < 3.1
 trytond_purchase >= 3.0, < 3.1
 trytond_stock >= 3.0, < 3.1
-trytond >= 3.0, < 3.1
\ No newline at end of file
+trytond >= 3.0, < 3.1
-- 
tryton-modules-stock-supply