[tryton-debian-vcs] tryton-modules-purchase branch debian updated. debian/3.4.0-1-5-g076a0e0
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:43:20 UTC 2015
The following commit has been merged in the debian branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-purchase.git;a=commitdiff;h=debian/3.4.0-1-5-g076a0e0
commit 076a0e06752a0434e02518c1536237109239b35a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:33:38 2015 +0100
Releasing debian version 3.4.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 22ce535..fdf7d65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-purchase (3.4.1-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Improving boilerplate in d/control (Closes: #771722).
+ * Merging upstream version 3.4.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 Feb 2015 19:33:38 +0100
+
tryton-modules-purchase (3.4.0-1) unstable; urgency=medium
* Updating signing key while using now plain .asc files instead of .pgp
commit 3f5baf70c773363b0138e278bce3c0dfe200e6d1
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:33:37 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 75eceed..7783fc6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
-Copyright: 2008-2014 Cédric Krier
+Copyright: 2008-2015 Cédric Krier
2008-2013 Bertrand Chenal
- 2008-2014 B2CK SPRL
+ 2008-2015 B2CK SPRL
2004-2008 Tiny SPRL
License: GPL-3+
commit 3835637bdbe74cb9a2beeb4b3a8781eeed174c66
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:33:37 2015 +0100
Merging upstream version 3.4.1.
diff --git a/CHANGELOG b/CHANGELOG
index 6697de8..bca2d1b 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)
* Confirmed state split into Confirmed and Processing
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 a2fb331..9e0f509 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_purchase
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/TODO b/TODO
deleted file mode 100644
index c720b5a..0000000
--- a/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Add historization of quotation
-- Allow to customize purchase.product_supplier to handle delivery_time depending of quantity
-- Cancel draft moves and draft invoices when canceling purchase order
diff --git a/purchase.py b/purchase.py
index de74312..02ad88c 100644
--- a/purchase.py
+++ b/purchase.py
@@ -1292,7 +1292,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/tests/test_purchase.py b/tests/test_purchase.py
index 01f2b25..9fa0e0f 100644
--- a/tests/test_purchase.py
+++ b/tests/test_purchase.py
@@ -116,7 +116,7 @@ def suite():
suite = trytond.tests.test_tryton.suite()
from trytond.modules.company.tests import test_company
for test in test_company.suite():
- if test not in suite:
+ if test not in suite and not isinstance(test, doctest.DocTestCase):
suite.addTest(test)
from trytond.modules.account.tests import test_account
for test in test_account.suite():
diff --git a/tryton.cfg b/tryton.cfg
index 1e2b20b..d735d64 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.0
+version=3.4.1
depends:
account
account_invoice
diff --git a/trytond_purchase.egg-info/PKG-INFO b/trytond_purchase.egg-info/PKG-INFO
index 672faf5..6bf3106 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.4.0
+Version: 3.4.1
Summary: Tryton module for purchase
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_purchase.egg-info/SOURCES.txt b/trytond_purchase.egg-info/SOURCES.txt
index 2a23236..2eddac9 100644
--- a/trytond_purchase.egg-info/SOURCES.txt
+++ b/trytond_purchase.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-TODO
configuration.xml
party.xml
product.xml
--
tryton-modules-purchase
More information about the tryton-debian-vcs
mailing list