diff -Nru tryton-modules-stock-4.6.0/CHANGELOG tryton-modules-stock-4.6.2/CHANGELOG --- tryton-modules-stock-4.6.0/CHANGELOG 2017-10-30 14:08:59.000000000 +0000 +++ tryton-modules-stock-4.6.2/CHANGELOG 2018-04-03 16:17:06.000000000 +0000 @@ -1,3 +1,9 @@ +Version 4.6.2 - 2018-04-03 +* Bug fixes (see mercurial logs for details) + +Version 4.6.1 - 2018-03-01 +* Bug fixes (see mercurial logs for details) + Version 4.6.0 - 2017-10-30 * Bug fixes (see mercurial logs for details) * Add flat children option on location diff -Nru tryton-modules-stock-4.6.0/COPYRIGHT tryton-modules-stock-4.6.2/COPYRIGHT --- tryton-modules-stock-4.6.0/COPYRIGHT 2017-10-30 14:08:58.000000000 +0000 +++ tryton-modules-stock-4.6.2/COPYRIGHT 2018-04-03 16:17:06.000000000 +0000 @@ -1,7 +1,7 @@ Copyright (C) 2012 Openlabs Technologies & Consulting (P) LTD. -Copyright (C) 2008-2017 Cédric Krier. +Copyright (C) 2008-2018 Cédric Krier. Copyright (C) 2008-2013 Bertrand Chenal. -Copyright (C) 2008-2017 B2CK SPRL. +Copyright (C) 2008-2018 B2CK SPRL. Copyright (C) 2004-2008 Tiny SPRL. This program is free software: you can redistribute it and/or modify diff -Nru tryton-modules-stock-4.6.0/debian/changelog tryton-modules-stock-4.6.2/debian/changelog --- tryton-modules-stock-4.6.0/debian/changelog 2017-11-07 09:20:35.000000000 +0000 +++ tryton-modules-stock-4.6.2/debian/changelog 2018-04-04 17:01:12.000000000 +0000 @@ -1,3 +1,25 @@ +tryton-modules-stock (4.6.2-1) unstable; urgency=medium + + * Merging upstream version 4.6.2. + + -- Mathias Behrle Wed, 04 Apr 2018 19:01:12 +0200 + +tryton-modules-stock (4.6.1-1) unstable; urgency=medium + + * Merging upstream version 4.6.1. + * Updating copyright file. + + -- Mathias Behrle Fri, 30 Mar 2018 00:34:20 +0200 + +tryton-modules-stock (4.6.0-2) unstable; urgency=medium + + * Update year of debian copyright. + * Updating to standards version 4.1.3, no changes needed. + * control: update Vcs-Browser and Vcs-Git + * Set the Maintainer address to team+tryton-team@tracker.debian.org. + + -- Mathias Behrle Thu, 29 Mar 2018 21:15:11 +0200 + tryton-modules-stock (4.6.0-1) unstable; urgency=medium * Bump the Standards-Version to 4.1.1, no changes needed. diff -Nru tryton-modules-stock-4.6.0/debian/control tryton-modules-stock-4.6.2/debian/control --- tryton-modules-stock-4.6.0/debian/control 2017-11-06 13:41:22.000000000 +0000 +++ tryton-modules-stock-4.6.2/debian/control 2018-04-04 17:01:11.000000000 +0000 @@ -1,30 +1,28 @@ Source: tryton-modules-stock +Maintainer: Debian Tryton Maintainers +Uploaders: Mathias Behrle Section: python Priority: optional -Maintainer: Debian Tryton Maintainers -Uploaders: Mathias Behrle -Build-Depends: - debhelper (>= 9), - dh-python, - python3, - python3-setuptools, -Standards-Version: 4.1.1 +Build-Depends: debhelper (>= 9), + dh-python, + python3, + python3-setuptools +Standards-Version: 4.1.3 +Vcs-Browser: https://salsa.debian.org/tryton-team/tryton-modules-stock +Vcs-Git: https://salsa.debian.org/tryton-team/tryton-modules-stock.git Homepage: http://www.tryton.org/ -Vcs-Browser: https://anonscm.debian.org/cgit/tryton/tryton-modules-stock.git -Vcs-Git: https://anonscm.debian.org/cgit/tryton/tryton-modules-stock.git Package: tryton-modules-stock Architecture: all -Depends: - python3-pkg-resources, - python3-sql, - tryton-modules-company (>= ${version:major}), - tryton-modules-currency (>= ${version:major}), - tryton-modules-party (>= ${version:major}), - tryton-modules-product (>= ${version:major}), - tryton-server (>= ${version:major}), - ${misc:Depends}, - ${python3:Depends}, +Depends: python3-pkg-resources, + python3-sql, + tryton-modules-company (>= ${version:major}), + tryton-modules-currency (>= ${version:major}), + tryton-modules-party (>= ${version:major}), + tryton-modules-product (>= ${version:major}), + tryton-server (>= ${version:major}), + ${misc:Depends}, + ${python3:Depends} Description: Tryton Application Platform (Stock Module) Tryton is a high-level general purpose application platform. It is the base of a complete business solution as well as a comprehensive health and hospital diff -Nru tryton-modules-stock-4.6.0/debian/copyright tryton-modules-stock-4.6.2/debian/copyright --- tryton-modules-stock-4.6.0/debian/copyright 2017-11-06 13:47:14.000000000 +0000 +++ tryton-modules-stock-4.6.2/debian/copyright 2018-04-04 17:01:11.000000000 +0000 @@ -2,9 +2,9 @@ Files: * Copyright: 2012 Openlabs Technologies & Consulting (P) LTD - 2008-2017 Cédric Krier + 2008-2018 Cédric Krier 2008-2013 Bertrand Chenal - 2008-2017 B2CK SPRL + 2008-2018 B2CK SPRL 2004-2008 Tiny SPRL License: GPL-3+ @@ -15,7 +15,7 @@ Files: debian/* Copyright: 2009-2012 Daniel Baumann - 2011-2017 Mathias Behrle + 2011-2018 Mathias Behrle License: GPL-3+ License: GPL-3+ diff -Nru tryton-modules-stock-4.6.0/.hgtags tryton-modules-stock-4.6.2/.hgtags --- tryton-modules-stock-4.6.0/.hgtags 2017-10-30 14:08:59.000000000 +0000 +++ tryton-modules-stock-4.6.2/.hgtags 2018-04-03 16:17:06.000000000 +0000 @@ -17,3 +17,5 @@ ba22e15da88bf5736b49a85f12d8d4c864f4bd3f 4.2.0 03dc7be46d80699cc35528ffe1416d972868d830 4.4.0 e987bc41694de75a4a74235c12d7a576083c24ba 4.6.0 +7c6db39cea5e9f7cf2d7aec65a4054fb8a2f5533 4.6.1 +8e763eb7a57ae23ea3291c639da555a7335a22a1 4.6.2 diff -Nru tryton-modules-stock-4.6.0/inventory.py tryton-modules-stock-4.6.2/inventory.py --- tryton-modules-stock-4.6.0/inventory.py 2017-09-27 16:51:48.000000000 +0000 +++ tryton-modules-stock-4.6.2/inventory.py 2018-03-25 00:40:28.000000000 +0000 @@ -227,8 +227,7 @@ # Update existing lines for line in inventory.lines: - if not (line.product.active and - line.product.type == 'goods' + if not (line.product.type == 'goods' and not line.product.consumable): Line.delete([line]) continue diff -Nru tryton-modules-stock-4.6.0/location.py tryton-modules-stock-4.6.2/location.py --- tryton-modules-stock-4.6.0/location.py 2017-10-02 14:04:36.000000000 +0000 +++ tryton-modules-stock-4.6.2/location.py 2018-03-25 00:40:28.000000000 +0000 @@ -318,7 +318,7 @@ context = {} if (name == 'quantity' - and Transaction().context.get('stock_date_end') > + and Transaction().context.get('stock_date_end', datetime.date.max) > Date_.today()): context['stock_date_end'] = Date_.today() diff -Nru tryton-modules-stock-4.6.0/PKG-INFO tryton-modules-stock-4.6.2/PKG-INFO --- tryton-modules-stock-4.6.0/PKG-INFO 2017-10-30 14:09:01.000000000 +0000 +++ tryton-modules-stock-4.6.2/PKG-INFO 2018-04-03 16:17:07.000000000 +0000 @@ -1,12 +1,13 @@ Metadata-Version: 1.1 Name: trytond_stock -Version: 4.6.0 +Version: 4.6.2 Summary: Tryton module for stock and inventory Home-page: http://www.tryton.org/ Author: Tryton Author-email: issue_tracker@tryton.org License: GPL-3 Download-URL: http://downloads.tryton.org/4.6/ +Description-Content-Type: UNKNOWN Description: trytond_stock ============= diff -Nru tryton-modules-stock-4.6.0/product.py tryton-modules-stock-4.6.2/product.py --- tryton-modules-stock-4.6.0/product.py 2017-09-25 23:36:47.000000000 +0000 +++ tryton-modules-stock-4.6.2/product.py 2018-03-25 00:40:28.000000000 +0000 @@ -122,7 +122,7 @@ context['_datetime'] = datetime.datetime.combine( trans_context['stock_date_end'], datetime.time.max) with Transaction().set_context(context): - for product in products: + for product in cls.browse(products): # The date could be before the product creation if not isinstance(product.cost_price, Decimal): cost_values[product.id] = None diff -Nru tryton-modules-stock-4.6.0/tryton.cfg tryton-modules-stock-4.6.2/tryton.cfg --- tryton-modules-stock-4.6.0/tryton.cfg 2017-10-30 14:08:57.000000000 +0000 +++ tryton-modules-stock-4.6.2/tryton.cfg 2018-03-25 00:40:28.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=4.6.0 +version=4.6.2 depends: company currency diff -Nru tryton-modules-stock-4.6.0/trytond_stock.egg-info/PKG-INFO tryton-modules-stock-4.6.2/trytond_stock.egg-info/PKG-INFO --- tryton-modules-stock-4.6.0/trytond_stock.egg-info/PKG-INFO 2017-10-30 14:09:00.000000000 +0000 +++ tryton-modules-stock-4.6.2/trytond_stock.egg-info/PKG-INFO 2018-04-03 16:17:07.000000000 +0000 @@ -1,12 +1,13 @@ Metadata-Version: 1.1 Name: trytond-stock -Version: 4.6.0 +Version: 4.6.2 Summary: Tryton module for stock and inventory Home-page: http://www.tryton.org/ Author: Tryton Author-email: issue_tracker@tryton.org License: GPL-3 Download-URL: http://downloads.tryton.org/4.6/ +Description-Content-Type: UNKNOWN Description: trytond_stock ============= diff -Nru tryton-modules-stock-4.6.0/trytond_stock.egg-info/requires.txt tryton-modules-stock-4.6.2/trytond_stock.egg-info/requires.txt --- tryton-modules-stock-4.6.0/trytond_stock.egg-info/requires.txt 2017-10-30 14:09:00.000000000 +0000 +++ tryton-modules-stock-4.6.2/trytond_stock.egg-info/requires.txt 2018-04-03 16:17:07.000000000 +0000 @@ -1,6 +1,6 @@ -python-sql >= 0.4 -trytond_company >= 4.6, < 4.7 -trytond_currency >= 4.6, < 4.7 -trytond_party >= 4.6, < 4.7 -trytond_product >= 4.6, < 4.7 -trytond >= 4.6, < 4.7 +python-sql>=0.4 +trytond_company<4.7,>=4.6 +trytond_currency<4.7,>=4.6 +trytond_party<4.7,>=4.6 +trytond_product<4.7,>=4.6 +trytond<4.7,>=4.6