From 1a2ed69ab166a73349a33c53c9679c7f0519fde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lionel=20Sausin=20=28Num=C3=A9rigraphe=29?= Date: Thu, 26 Feb 2015 12:26:05 +0100 Subject: [PATCH] [REF] Fix W503 vs newest pep8 check Cherry-picked from v7 at 853f5d4056c213e32eefa32124a197d92de74b6e Conflicts: stock_available/product.py --- __unported__/stock_available_sale/product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/__unported__/stock_available_sale/product.py b/__unported__/stock_available_sale/product.py index ada61ed22..2c81e8b0d 100644 --- a/__unported__/stock_available_sale/product.py +++ b/__unported__/stock_available_sale/product.py @@ -67,8 +67,8 @@ class ProductProduct(orm.Model): INNER JOIN sale_order ON (sale_order_line.order_id = sale_order.id) WHERE product_id in %s - AND sale_order_line.state = 'draft' """ - + date_str + shop_str + + AND sale_order_line.state = 'draft' """ + + date_str + shop_str + "GROUP BY sale_order_line.product_id, product_uom", (tuple(ids),) + date_args + shop_args) results = cr.fetchall()