[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch upstream updated. upstream/3.4.0-1-gcdea9a3
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:43:53 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-shipment-cost.git;a=commitdiff;h=upstream/3.4.0-1-gcdea9a3
commit cdea9a30f63e1ce7bfdee4269ccfed197717555d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:47:23 2015 +0100
Adding upstream version 3.4.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 4a5942a..f1516ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index a770c53..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-2014 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 65db756..26accf4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase_shipment_cost
-Version: 3.4.0
+Version: 3.4.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..28ea0f2 100644
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,13 @@ 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')]
+dependency_links = []
+if minor_version % 2:
+ # Add development index for testing with proteus
+ dependency_links.append('https://trydevpi.tryton.org/')
setup(name=name,
version=version,
@@ -97,6 +103,7 @@ setup(name=name,
license='GPL-3',
install_requires=requires,
extras_require=extras_require,
+ dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]
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 425009b..1892894 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.0
+version=3.4.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 b1b9a1f..4d710e7 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.4.0
+Version: 3.4.1
Summary: Tryton module for purchase shipment cost
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-purchase-shipment-cost
More information about the tryton-debian-vcs
mailing list