[tryton-debian-vcs] tryton-modules-purchase-shipment-cost branch debian-jessie-3.0 updated. debian/3.0.0-3-8-ga61943d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:43:52 UTC 2015
The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase-shipment-cost.git;a=commitdiff;h=debian/3.0.0-3-8-ga61943d
commit a61943d230f8722a54d2bac10efb35eca34959de
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:50:07 2015 +0100
Releasing debian version 3.0.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 50aafc9..9567435 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+tryton-modules-purchase-shipment-cost (3.0.1-1) unstable; urgency=medium
+
+ * Removing LC_ALL=C.UTF-8 as build environment.
+ * Setting the branch in the watch file to the fixed version 3.0.
+ * Updating signing key while using now plain .asc files instead of .pgp
+ binaries.
+ * Adding actual upstream signing key.
+ * Adding actual upstream signing key.
+ * Merging upstream version 3.0.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 Feb 2015 19:50:06 +0100
+
tryton-modules-purchase-shipment-cost (3.0.0-3) unstable; urgency=medium
* Updating year in debian copyright.
commit 2daf1d7f2ebd68341e62cab14116903d84199ae5
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:50:05 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 05d0a4c..b9f8e2c 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 3592711f2f94f197892d3a143a70ee2215f5cc4b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:50:05 2015 +0100
Merging upstream version 3.0.1.
diff --git a/CHANGELOG b/CHANGELOG
index 8258af5..2b78b3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2015-02-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.0 - 2013-10-21
* 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 374da64..477d232 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase_shipment_cost
-Version: 3.0.0
+Version: 3.0.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 9ba663c..6745337 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 8d2148f..9e7bd08 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.0.0
+version=3.0.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 bc3f49d..50d8454 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.0.0
+Version: 3.0.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
More information about the tryton-debian-vcs
mailing list