diff -Nru tryton-modules-stock-6.0.7/CHANGELOG tryton-modules-stock-6.0.8/CHANGELOG --- tryton-modules-stock-6.0.7/CHANGELOG 2021-09-16 21:46:50.000000000 +0000 +++ tryton-modules-stock-6.0.8/CHANGELOG 2021-11-04 23:08:08.000000000 +0000 @@ -1,3 +1,6 @@ +Version 6.0.8 - 2021-11-04 +* Bug fixes (see mercurial logs for details) + Version 6.0.7 - 2021-09-16 * Bug fixes (see mercurial logs for details) diff -Nru tryton-modules-stock-6.0.7/debian/changelog tryton-modules-stock-6.0.8/debian/changelog --- tryton-modules-stock-6.0.7/debian/changelog 2021-11-12 20:53:18.000000000 +0000 +++ tryton-modules-stock-6.0.8/debian/changelog 2021-12-18 10:30:12.000000000 +0000 @@ -1,3 +1,9 @@ +tryton-modules-stock (6.0.8-1) unstable; urgency=medium + + * Merging upstream version 6.0.8. + + -- Mathias Behrle Sat, 18 Dec 2021 11:30:12 +0100 + tryton-modules-stock (6.0.7-2) unstable; urgency=medium * Use debhelper-compat (=13). diff -Nru tryton-modules-stock-6.0.7/.hgtags tryton-modules-stock-6.0.8/.hgtags --- tryton-modules-stock-6.0.7/.hgtags 2021-09-16 21:46:51.000000000 +0000 +++ tryton-modules-stock-6.0.8/.hgtags 2021-11-04 23:08:09.000000000 +0000 @@ -31,3 +31,4 @@ a231e37aa2b8074e0a5ddc4957decd74d528268b 6.0.5 bdbcc38971c21643796423e4fe7af1d487d7abc6 6.0.6 95d6cbcf8e8e4c2661c872fbadfc031ed9294a57 6.0.7 +046cf4bde35642bf0dfd9701a4cf2fcfbd0599a7 6.0.8 diff -Nru tryton-modules-stock-6.0.7/inventory.py tryton-modules-stock-6.0.8/inventory.py --- tryton-modules-stock-6.0.7/inventory.py 2021-08-20 22:27:08.000000000 +0000 +++ tryton-modules-stock-6.0.8/inventory.py 2021-10-28 23:41:16.000000000 +0000 @@ -218,8 +218,9 @@ return inventories @classmethod - def write(cls, inventories, values): - super(Inventory, cls).write(inventories, values) + def write(cls, *args): + super().write(*args) + inventories = cls.browse(set(sum(args[::2], []))) cls.complete_lines(inventories, fill=False) @classmethod diff -Nru tryton-modules-stock-6.0.7/PKG-INFO tryton-modules-stock-6.0.8/PKG-INFO --- tryton-modules-stock-6.0.7/PKG-INFO 2021-09-16 21:46:52.612249600 +0000 +++ tryton-modules-stock-6.0.8/PKG-INFO 2021-11-04 23:08:10.636190400 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: trytond_stock -Version: 6.0.7 +Version: 6.0.8 Summary: Tryton module for stock and inventory Home-page: http://www.tryton.org/ Author: Tryton diff -Nru tryton-modules-stock-6.0.7/product.py tryton-modules-stock-6.0.8/product.py --- tryton-modules-stock-6.0.7/product.py 2021-08-20 22:27:08.000000000 +0000 +++ tryton-modules-stock-6.0.8/product.py 2021-10-28 23:41:16.000000000 +0000 @@ -552,7 +552,7 @@ from_ = move.join(product, condition=move.product == product.id) product_clause = product.template.in_(product_template or [-1]) product_column = Concat('product.template,', product.template) - products = ['product.template,%s' % i for i in product_template] + products = [('product.template', i) for i in product_template] else: product = context.get('product', -1) if product is None: @@ -561,7 +561,7 @@ product = [product] product_clause = move.product.in_(product or [-1]) product_column = Concat('product.product,', move.product) - products = ['product.product,%s' % i for i in product] + products = [('product.product', i) for i in product] if 'warehouse' in context: warehouse = Location(context.get('warehouse')) @@ -576,7 +576,7 @@ ], query=True, order=[])) date_column = Coalesce(move.effective_date, move.planned_date) query = (from_.select( - (Max(move.id) + len(products)).as_('id'), + Max(move.id * 3).as_('id'), Literal(0).as_('create_uid'), CurrentTimestamp().as_('create_date'), Literal(None).as_('write_uid'), @@ -598,14 +598,15 @@ | (date_column >= today)), group_by=(date_column, product_column, move.company), with_=warehouse)) - for i, product in enumerate(products): + for model, id_ in products: + gap = ['product.template', 'product.product'].index(model) + 1 query |= Select([ - Literal(i).as_('id'), + Literal(id_ * 3 + gap).as_('id'), Literal(0).as_('create_uid'), CurrentTimestamp().as_('create_date'), Literal(None).as_('write_uid'), Literal(None).as_('write_date'), - Literal(product).as_('product'), + Literal('%s,%s' % (model, id_)).as_('product'), Literal(today).as_('date'), Literal(context.get('company', -1)).as_('company'), ]) @@ -1041,8 +1042,8 @@ revisions = [] costs = defaultdict(list) if self.model.__name__ == 'product.product': - products = records = list(self.records) - for product in products: + records = list(self.records) + for product in list(records): revision = self.get_revision(Revision) revision.product = product revision.template = product.template @@ -1055,8 +1056,8 @@ costs[cost].append(product) records.remove(product) elif self.model.__name__ == 'product.template': - templates = records = list(self.records) - for template in templates: + records = list(self.records) + for template in list(records): revision = self.get_revision(Revision) revision.template = template revisions.append(revision) diff -Nru tryton-modules-stock-6.0.7/tryton.cfg tryton-modules-stock-6.0.8/tryton.cfg --- tryton-modules-stock-6.0.7/tryton.cfg 2021-09-01 20:54:03.000000000 +0000 +++ tryton-modules-stock-6.0.8/tryton.cfg 2021-10-28 23:41:16.000000000 +0000 @@ -1,5 +1,5 @@ [tryton] -version=6.0.7 +version=6.0.8 depends: company currency diff -Nru tryton-modules-stock-6.0.7/trytond_stock.egg-info/PKG-INFO tryton-modules-stock-6.0.8/trytond_stock.egg-info/PKG-INFO --- tryton-modules-stock-6.0.7/trytond_stock.egg-info/PKG-INFO 2021-09-16 21:46:51.000000000 +0000 +++ tryton-modules-stock-6.0.8/trytond_stock.egg-info/PKG-INFO 2021-11-04 23:08:09.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: trytond-stock -Version: 6.0.7 +Version: 6.0.8 Summary: Tryton module for stock and inventory Home-page: http://www.tryton.org/ Author: Tryton