[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch upstream-2.8 updated. upstream/2.8.0-1-g033b49d
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-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-shipment-cost.git;a=commitdiff;h=upstream/2.8.0-1-g033b49d
commit 033b49d952889c909166febc4c7812d4e479835d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:49:12 2015 +0100
Adding upstream version 2.8.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 79c1c2d..82d096c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.1 - 2015-02-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* 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 7047bad..47616fd 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase_shipment_cost
-Version: 2.8.0
+Version: 2.8.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 99c8284..e8fbb92 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 3dc7b1d..404453f 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 e34e2f8..2bfaf70 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=2.8.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 424a2cc..c207fdf 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.8.0
+Version: 2.8.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 ec86511..bc1e00b 100644
--- a/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
+++ b/trytond_purchase_shipment_cost.egg-info/SOURCES.txt
@@ -10,9 +10,27 @@ 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/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
More information about the tryton-debian-vcs
mailing list