[tryton-debian-vcs] tryton-modules-stock branch debian-wheezy-2.6 updated. debian/2.6.10-1-3-g5203c5b

[Mathias Behrle]

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-stock.git;a=commitdiff;h=debian/2.6.10-1-3-g5203c5b

commit 5203c5b1448902ef7df5831b316a27eb5909d861
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 19:53:04 2015 +0100

    Releasing debian version 2.6.11-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index d22f925..1b958da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-modules-stock (2.6.11-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.11.
+  * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 24 Feb 2015 19:53:04 +0100
+
 tryton-modules-stock (2.6.10-1) unstable; urgency=medium
 
   * Merging upstream version 2.6.10.
commit 8e5fa22afc176e9a354d3f96ec5b459c6fb06165
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 19:53:03 2015 +0100

    Updating copyright file.

diff --git a/debian/copyright b/debian/copyright
index 967504f..3fdc1aa 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-2012 Bertrand Chenal
-           2008-2014 B2CK SPRL
+           2008-2015 B2CK SPRL
            2004-2008 Tiny SPRL
 License: GPL-3+
 
commit 35daf135d3ce10361cf7b5f8b33599f9932a83a9
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Feb 24 19:53:03 2015 +0100

    Merging upstream version 2.6.11.

diff --git a/CHANGELOG b/CHANGELOG
index bc3b2b9..02c0a8e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.11 - 2015-02-19
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.10 - 2014-09-29
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index a89a871..a2c1ca9 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-2012 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 d8e7ef6..fbfe53a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_stock
-Version: 2.6.10
+Version: 2.6.11
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/location.py b/location.py
index 4ec8cce..36e092c 100644
--- a/location.py
+++ b/location.py
@@ -202,7 +202,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 5b37e34..b5c3c0a 100644
--- a/product.py
+++ b/product.py
@@ -161,7 +161,9 @@ class Product:
         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/tryton.cfg b/tryton.cfg
index 0059e5b..6e4d1e5 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.10
+version=2.6.11
 depends:
     company
     currency
diff --git a/trytond_stock.egg-info/PKG-INFO b/trytond_stock.egg-info/PKG-INFO
index 6d421e1..e8015cb 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: 2.6.10
+Version: 2.6.11
 Summary: Tryton module for stock and inventory
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-stock