[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch upstream-3.2 updated. upstream/3.2.0-1-gb990e73

[Mathias Behrle]

The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-shipment-cost.git;a=commitdiff;h=upstream/3.2.0-1-gb990e73

commit b990e7333525cb8e2494b6c6d8ab7f2ce1186eea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 19:51:04 2015 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 6811c91..45fb675 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.1 - 2015-02-21
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.0 - 2014-04-21
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 3731ce2..61e9a99 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2014 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2014 B2CK SPRL.
+Copyright (C) 2011-2015 Nicolas Évrard.
+Copyright (C) 2011-2015 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 b4cdc6d..bcfac5d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase_shipment_cost
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.py b/setup.py
index 2aaa9ae..48fd850 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,9 @@ for dep in info.get('extras_depend', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         extras_require[dep] = get_require_version('trytond_%s' % dep)
 
-tests_require = [get_require_version('proteus')]
+tests_require = [get_require_version('proteus'),
+    get_require_version('trytond_account_stock_continental'),
+    get_require_version('trytond_account_stock_anglo_saxon')]
 
 setup(name=name,
     version=version,
diff --git a/stock.py b/stock.py
index d2b454a..67cc628 100644
--- a/stock.py
+++ b/stock.py
@@ -92,7 +92,10 @@ class ShipmentIn:
         difference = cost
         for move in moves:
             quantity = Decimal(str(move.quantity))
-            move_cost = cost * quantity * unit_prices[move.id] / sum_value
+            if not sum_value:
+                move_cost = cost / Decimal(len(moves))
+            else:
+                move_cost = cost * quantity * unit_prices[move.id] / sum_value
             unit_shipment_cost = (move_cost / quantity).quantize(exp,
                 rounding=ROUND_DOWN)
             costs.append({
diff --git a/tryton.cfg b/tryton.cfg
index 8206b49..2070fb5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=3.2.0
+version=3.2.1
 depends:
     carrier
     currency
diff --git a/trytond_purchase_shipment_cost.egg-info/PKG-INFO b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
index 7d29bdb..8bf123a 100644
--- a/trytond_purchase_shipment_cost.egg-info/PKG-INFO
+++ b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-purchase-shipment-cost
-Version: 3.2.0
+Version: 3.2.1
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
index 03e67c0..6a18a8f 100644
--- a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
@@ -10,9 +10,28 @@ stock.xml
 tryton.cfg
 ./__init__.py
 ./carrier.py
+./carrier.xml
 ./stock.py
+./stock.xml
+./tryton.cfg
+./locale/bg_BG.po
+./locale/ca_ES.po
+./locale/cs_CZ.po
+./locale/de_DE.po
+./locale/es_AR.po
+./locale/es_CO.po
+./locale/es_ES.po
+./locale/fr_FR.po
+./locale/nl_NL.po
+./locale/ru_RU.po
+./locale/sl_SI.po
 ./tests/__init__.py
+./tests/scenario_purchase_shipment_cost.rst
+./tests/scenario_purchase_shipment_cost_with_account_stock.rst
+./tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
 ./tests/test_purchase_shipment_cost.py
+./view/carrier_form.xml
+./view/shipment_in_form.xml
 doc/index.rst
 locale/bg_BG.po
 locale/ca_ES.po
-- 
tryton-modules-purchase-shipment-cost