[tryton-debian-vcs] tryton-modules-sale-supply branch upstream-3.6 updated. upstream/3.6.0-1-g2cd4681
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Oct 5 12:27:27 UTC 2017
The following commit has been merged in the upstream-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-sale-supply.git;a=commitdiff;h=upstream/3.6.0-1-g2cd4681
commit 2cd4681e614fdedf211c60fadc7e080dc79ce071
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Thu Oct 5 12:01:35 2017 +0200
Adding upstream version 3.6.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
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