[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch debian-wheezy-2.6 updated. debian/2.6.1-1-3-gc82ed8f

[Mathias Behrle]

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

commit c82ed8faf7630168fbdb90b6650b6433fca941e5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 19:48:22 2015 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 9b87567..6571945 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-purchase-shipment-cost (2.6.2-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.2.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 24 Feb 2015 19:48:22 +0100
+
 tryton-modules-purchase-shipment-cost (2.6.1-1) experimental; urgency=low
 
   * Versioning watch file for Tryton branch 2.6.
commit 8a1b758acbdf189f4b457bd58f611b13bc3d2339
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 19:48:21 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 4413e1c..9cd4310 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
 Files: *
-Copyright: 2011-2013 Cédric Krier
+Copyright: 2011-2015 Cédric Krier
            2011-2012 Bertrand Chenal
-           2011 Nicolas Évrard
-           2011-2013 B2CK SPRL
+           2011-2015 Nicolas Évrard
+           2011-2015 B2CK SPRL
 License: GPL-3+
 
 Files: debian/*
commit 7de21fe1c8ec64f5cc5e3f205fb0740744188591
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 19:48:21 2015 +0100

    Merging upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index d05cbd4..4a23071 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2015-02-21
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2013-05-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 87a90a4..61e9a99 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
-Copyright (C) 2011-2013 Cédric Krier.
+Copyright (C) 2011-2015 Cédric Krier.
 Copyright (C) 2011-2012 Bertrand Chenal.
-Copyright (C) 2011 Nicolas Évrard.
-Copyright (C) 2011-2013 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 fb52466..23f3f41 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_purchase_shipment_cost
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module for purchase shipment cost
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/setup.py b/setup.py
index 1bad7de..834b6e2 100644
--- a/setup.py
+++ b/setup.py
@@ -38,6 +38,10 @@ for dep in info.get('extras_depend', []):
                 minor_version + 1))
 
 tests_require = ['proteus >= %s.%s, < %s.%s' %
+    (major_version, minor_version, major_version, minor_version + 1),
+    'trytond_account_stock_continental >= %s.%s, < %s.%s' %
+    (major_version, minor_version, major_version, minor_version + 1),
+    'trytond_account_stock_anglo_saxon >= %s.%s, < %s.%s' %
     (major_version, minor_version, major_version, minor_version + 1)]
 
 setup(name='trytond_purchase_shipment_cost',
diff --git a/stock.py b/stock.py
index 378a1cc..689af4c 100644
--- a/stock.py
+++ b/stock.py
@@ -101,7 +101,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 e43208a..611a682 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     carrier
     currency
diff --git a/trytond_purchase_shipment_cost.egg-info/PKG-INFO b/trytond_purchase_shipment_cost.egg-info/PKG-INFO
index 174f3ab..676e713 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: 2.6.1
+Version: 2.6.2
 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 09da398..2c5f57a 100644
--- a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
@@ -10,8 +10,23 @@ 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
 ./tests/__init__.py
+./tests/scenario_purchase_shipment_cost.rst
+./tests/scenario_purchase_shipment_cost_with_account_stock.rst
 ./tests/test_purchase_shipment_cost.py
 doc/index.rst
 locale/bg_BG.po
-- 
tryton-modules-purchase-shipment-cost