[tryton-debian-vcs] tryton-modules-stock branch upstream updated. upstream/3.4.0-1-g6b8b703
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 25 00:45:51 UTC 2015
The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=upstream/3.4.0-1-g6b8b703
commit 6b8b70332f684a150dc5837d42adef472ec61ad9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Tue Feb 24 19:52:03 2015 +0100
Adding upstream version 3.4.1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index 71227fc..7643166 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.4.1 - 2015-02-19
+* Bug fixes (see mercurial logs for details)
+
Version 3.4.0 - 2014-10-20
* Bug fixes (see mercurial logs for details)
* Always succeed assignation from lost and found on internal shipments
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 72cdd89..e28c6d1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_stock
-Version: 3.4.0
+Version: 3.4.1
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/TODO b/TODO
deleted file mode 100644
index 617e1d9..0000000
--- a/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Add an indexed period on move with automatic creation and default duration
- defined on company
-
diff --git a/location.py b/location.py
index e4df3ba..8374c47 100644
--- a/location.py
+++ b/location.py
@@ -209,7 +209,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 f0e8fdf..daccac9 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/tests/test_stock.py b/tests/test_stock.py
index 950b128..e59f6c8 100644
--- a/tests/test_stock.py
+++ b/tests/test_stock.py
@@ -665,7 +665,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)
suite.addTests(unittest.TestLoader().loadTestsFromTestCase(StockTestCase))
suite.addTests(doctest.DocFileSuite('scenario_stock_shipment_out.rst',
diff --git a/tryton.cfg b/tryton.cfg
index 031f30a..24b710d 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=3.4.0
+version=3.4.1
depends:
company
currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index b384c4d..70a4d9f 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.4.0
+Version: 3.4.1
Summary: Tryton module for stock and inventory
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/trytond_stock.egg-info/SOURCES.txt b/trytond_stock.egg-info/SOURCES.txt
index beae5d2..e19e7bb 100644
--- a/trytond_stock.egg-info/SOURCES.txt
+++ b/trytond_stock.egg-info/SOURCES.txt
@@ -4,7 +4,6 @@ INSTALL
LICENSE
MANIFEST.in
README
-TODO
configuration.xml
customer_return_restocking_list.odt
delivery_note.odt
--
tryton-modules-stock
More information about the tryton-debian-vcs
mailing list