From 58f92089ad152fa51405318910f8f937273e385f Mon Sep 17 00:00:00 2001 From: robinkeunen Date: Fri, 8 Jun 2018 11:33:21 +0200 Subject: [PATCH] flake stock coverage --- stock_coverage/__openerp__.py | 1 + stock_coverage/models/product_template.py | 12 ++++++------ stock_coverage/tests/test_stock_coverage.py | 7 +------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/stock_coverage/__openerp__.py b/stock_coverage/__openerp__.py index 7348736..a7640b8 100644 --- a/stock_coverage/__openerp__.py +++ b/stock_coverage/__openerp__.py @@ -13,6 +13,7 @@ the display range. 'license': 'AGPL-3', 'depends': [ 'product', + 'purchase', 'point_of_sale', 'stock' ], diff --git a/stock_coverage/models/product_template.py b/stock_coverage/models/product_template.py index 951c7ac..a4aa50b 100644 --- a/stock_coverage/models/product_template.py +++ b/stock_coverage/models/product_template.py @@ -13,7 +13,7 @@ class ProductTemplate(models.Model): ) calculation_range = fields.Integer( 'Calculation range (days)', - default=365, # todo sensible defaults, 14, 28? + default=14, ) average_consumption = fields.Float( @@ -68,9 +68,8 @@ class ProductTemplate(models.Model): self.env['pos.order.line'] .search([ ('product_id', 'in', products.ids), - ('create_date', '>', - fields.Datetime.to_string(pol_date_limit)) - ]) + ('create_date', '>', fields.Datetime.to_string(pol_date_limit)) # noqa + ]) ) if order_lines: @@ -116,10 +115,11 @@ class ProductTemplate(models.Model): BETWEEN date_trunc('day', now()) - calculation_range * interval '1 days' and date_trunc('day', now()) group by product_template_id - """ + """ # noqa self.env.cr.execute(query) results = {pid: qty for pid, qty in self.env.cr.fetchall()} for product in products: - product.total_consumption = results.get(product.id, product.total_consumption) + product.total_consumption = results.get(product.id, + product.total_consumption) diff --git a/stock_coverage/tests/test_stock_coverage.py b/stock_coverage/tests/test_stock_coverage.py index d8696ea..290b6af 100644 --- a/stock_coverage/tests/test_stock_coverage.py +++ b/stock_coverage/tests/test_stock_coverage.py @@ -1,12 +1,7 @@ # -*- coding: utf-8 -*- -from collections import namedtuple -from openerp.tests.common import TransactionCase -from openerp.addons.stock.product import product_template as ProductTemplate -from openerp.addons.stock.product import product_product as ProductProduct import datetime as dt - -# fixme setup tests based on demo data, test on a clean database +from openerp.tests.common import TransactionCase _datetimes = map( lambda d: d.strftime('%Y-%m-%d %H:%M:%S'),