[tryton-debian-vcs] tryton-modules-stock-supply-day branch debian-stretch-3.6 updated. debian/3.6.0-1-8-gd2f9b3d
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Tue Mar 15 20:38:04 UTC 2016
The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock-supply-day.git;a=commitdiff;h=debian/3.6.0-1-8-gd2f9b3d
commit d2f9b3d5e7d4c2540575291c1abcefb292a243ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 20:38:56 2016 +0100
Releasing debian version 3.6.1-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index b300cef..a8aacfd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+tryton-modules-stock-supply-day (3.6.1-1) unstable; urgency=medium
+
+ * Updating year of debian copyright.
+ * Adapting section naming in gbp.conf to current git-buildpackage.
+ * Improving description why we can not run the module test suites.
+ * Setting the branch in the watch file to the fixed version 3.6.
+ * Updating signing-key.asc with the actual upstream maintainer keys.
+ * Merging upstream version 3.6.1.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 15 Mar 2016 20:38:56 +0100
+
tryton-modules-stock-supply-day (3.6.0-1) unstable; urgency=medium
* Improving boilerplate in d/control (Closes: #771722).
commit 828a606fe6ed8cdfc3fdee54f7ebf5b14d8c76a6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 20:38:55 2016 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 83cfe48..1151b5f 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-2015 Cédric Krier
+Copyright: 2008-2016 Cédric Krier
2008-2012 Bertrand Chenal
- 2008-2015 B2CK SPRL
+ 2008-2016 B2CK SPRL
License: GPL-3+
Files: debian/*
commit e58ad3397e5668382f7787b46fb9e2423f6fa44b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Mar 15 20:38:55 2016 +0100
Merging upstream version 3.6.1.
diff --git a/CHANGELOG b/CHANGELOG
index 11397fa..d5eda04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+
Version 3.6.0 - 2015-04-20
* Bug fixes (see mercurial logs for details)
* Add support for PyPy
diff --git a/COPYRIGHT b/COPYRIGHT
index 34d4187..808b71b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2015 Cédric Krier.
+Copyright (C) 2008-2016 Cédric Krier.
Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2015 B2CK SPRL.
+Copyright (C) 2008-2016 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 800dcdd..9508f45 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock_supply_day
-Version: 3.6.0
+Version: 3.6.1
Summary: Tryton module to add supply weekdays
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/purchase.py b/purchase.py
index 92c128d..6b41c97 100644
--- a/purchase.py
+++ b/purchase.py
@@ -16,16 +16,17 @@ class ProductSupplier:
def compute_supply_date(self, date=None):
date = super(ProductSupplier, self).compute_supply_date(date=date)
earlier_date = None
- for day in self.weekdays:
- weekday = int(day.weekday)
- diff = weekday - date.weekday()
- if diff < 0:
- diff += 7
- new_date = date + datetime.timedelta(diff)
+ if date != datetime.date.max:
+ for day in self.weekdays:
+ weekday = int(day.weekday)
+ diff = weekday - date.weekday()
+ if diff < 0:
+ diff += 7
+ new_date = date + datetime.timedelta(diff)
- if earlier_date and earlier_date <= new_date:
- continue
- earlier_date = new_date
+ if earlier_date and earlier_date <= new_date:
+ continue
+ earlier_date = new_date
return earlier_date or date
def compute_purchase_date(self, date):
diff --git a/tests/test_stock_supply_day.py b/tests/test_stock_supply_day.py
index b8ef3f3..a7a1a3f 100644
--- a/tests/test_stock_supply_day.py
+++ b/tests/test_stock_supply_day.py
@@ -42,6 +42,7 @@ class StockSupplyDayTestCase(ModuleTestCase):
(datetime.date(2011, 12, 22), 12, 6, datetime.date(2012, 1, 8)),
(datetime.date(2011, 11, 21), 10, None,
datetime.date(2011, 12, 1)),
+ (datetime.date(2011, 11, 21), None, 0, datetime.date.max),
]
# Purchase date is Monday, 2011-11-21, the regular days to deliver is
# 10 days, which would be Wednesday 2011-12-01. But with the supplier
diff --git a/tryton.cfg b/tryton.cfg
index a378c4c..c0de6ff 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.6.0
+version=3.6.1
depends:
ir
purchase
diff --git a/trytond_stock_supply_day.egg-info/PKG-INFO b/trytond_stock_supply_day.egg-info/PKG-INFO
index ddf81d6..aed3565 100644
--- a/trytond_stock_supply_day.egg-info/PKG-INFO
+++ b/trytond_stock_supply_day.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock-supply-day
-Version: 3.6.0
+Version: 3.6.1
Summary: Tryton module to add supply weekdays
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock-supply-day
More information about the tryton-debian-vcs
mailing list