[tryton-debian-vcs] tryton-modules-stock branch debian-jessie-3.2 updated. debian/3.2.3-1-5-g143c541
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:45:48 UTC 2015
The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/3.2.3-1-5-g143c541
commit 143c54188dcfdd511f90c6ada3d3fcc23265c245
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:55:51 2015 +0100
Releasing debian version 3.2.4-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 041e5ec..a9bf531 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-stock (3.2.4-1) unstable; urgency=medium
+
+ * Setting the branch in the watch file to the fixed version 3.2.
+ * Adding actual upstream signing key.
+ * Merging upstream version 3.2.4.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Tue, 24 Feb 2015 19:55:51 +0100
+
tryton-modules-stock (3.2.3-1) unstable; urgency=medium
* Adding actual upstream signing key.
commit e5c4760e0ae9d618aa66ca36cb35558f1a3ea152
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:55:50 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index b9b85af..9128ae2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2012 Openlabs Technologies & Consulting (P) LTD
- 2008-2014 Cédric Krier
+ 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 5239c1b869a5093505ee4cb83da73f12958c671a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:55:50 2015 +0100
Merging upstream version 3.2.4.
diff --git a/CHANGELOG b/CHANGELOG
index 88cf09b..4340449 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.4 - 2015-02-19
+* Bug fixes (see mercurial logs for details)
+
Version 3.2.3 - 2014-09-29
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 06390fa..3a91df4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
Copyright (C) 2012 Openlabs Technologies & Consulting (P) LTD.
-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/PKG-INFO b/PKG-INFO
index 98ada6b..c0bd804 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.2.3
+Version: 3.2.4
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/location.py b/location.py
index 4613081..1c5926b 100644
--- a/location.py
+++ b/location.py
@@ -205,7 +205,9 @@ class Location(ModelSQL, ModelView):
return dict((l.id, None) for l in locations)
cost_values, context = {}, {}
if 'stock_date_end' in trans_context:
- context['_datetime'] = trans_context['stock_date_end']
+ # Use the last cost_price of the day
+ context['_datetime'] = datetime.datetime.combine(
+ trans_context['stock_date_end'], datetime.time.max)
with Transaction().set_context(context):
product = Product(product_id)
for location in locations:
diff --git a/product.py b/product.py
index dd8352f..5d82b46 100644
--- a/product.py
+++ b/product.py
@@ -107,7 +107,9 @@ class Product(object, StockMixin):
context = {}
trans_context = Transaction().context
if trans_context.get('stock_date_end'):
- context['_datetime'] = trans_context['stock_date_end']
+ # Use the last cost_price of the day
+ context['_datetime'] = datetime.datetime.combine(
+ trans_context['stock_date_end'], datetime.time.max)
with Transaction().set_context(context):
for product in products:
# The date could be before the product creation
diff --git a/setup.py b/setup.py
index 433d031..064a3de 100644
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,12 @@ for dep in info.get('depends', []):
if not re.match(r'(ir|res|webdav)(\W|$)', dep):
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,
@@ -92,6 +97,7 @@ setup(name=name,
],
license='GPL-3',
install_requires=requires,
+ dependency_links=dependency_links,
zip_safe=False,
entry_points="""
[trytond.modules]
diff --git a/tryton.cfg b/tryton.cfg
index 2134be0..c998b03 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.2.3
+version=3.2.4
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 10db825..e925d94 100644
--- a/trytond_stock.egg-info/PKG-INFO
+++ b/trytond_stock.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond-stock
-Version: 3.2.3
+Version: 3.2.4
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-stock
More information about the tryton-debian-vcs
mailing list