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.git;a=commitdiff;h=upstream/3.2.1-1-g0ecfa79
commit 0ecfa798f4dc27c967fb77805f8e462af2389602
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:37:11 2015 +0100
Adding upstream version 3.2.2.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 2a4e5ed..56a0cbc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2015-02-21
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.1 - 2014-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 77715d8..3a28212 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2014 Cédric Krier.
+Copyright (C) 2008-2015 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/INSTALL b/INSTALL
index f07f4fa..ca4cf87 100644
--- a/INSTALL
+++ b/INSTALL
@@ -13,6 +13,7 @@ Prerequisites
* trytond_account (http://www.tryton.org/)
* trytond_product (http://www.tryton.org/)
* trytond_account_invoice (http://www.tryton.org/)
+ * trytond_account_invoice_stock (http://www.tryton.org/)
* trytond_currency (http://www.tryton.org/)
* trytond_account_product (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 0a8597d..04288d0 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 3.2.1
+Version: 3.2.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 0c9ddd2..2a1b374 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1217,7 +1217,7 @@ class PurchaseLine(ModelSQL, ModelView):
quantity -= Uom.compute_qty(old_invoice_line.unit,
old_invoice_line.quantity, self.unit)
- rounding = self.unit.rounding if self.unit else 0
+ rounding = self.unit.rounding if self.unit else 0.01
invoice_line.quantity = Uom.round(quantity, rounding)
if invoice_line.quantity <= 0:
return []
diff --git a/setup.py b/setup.py
index ac8919c..85157a3 100644
--- a/setup.py
+++ b/setup.py
@@ -47,6 +47,12 @@ for dep in info.get('depends', []):
requires.append(get_require_version('trytond_%s' % dep))
requires.append(get_require_version('trytond'))
+tests_require = [get_require_version('proteus')]
+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,
description='Tryton module for purchase',
@@ -91,6 +97,7 @@ setup(name=name,
],
license='GPL-3',
install_requires=requires,
+ dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]
@@ -98,4 +105,5 @@ setup(name=name,
""",
test_suite='tests',
test_loader='trytond.test_loader:Loader',
+ tests_require=tests_require,
)
diff --git a/tryton.cfg b/tryton.cfg
index 28a0972..d570a54 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.1
+version=3.2.2
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 06ee2ee..220ec7b 100644
--- a/trytond_purchase.egg-info/PKG-INFO
+++ b/trytond_purchase.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-purchase
-Version: 3.2.1
+Version: 3.2.2
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-purchase