From 833a147f5af7863fa31c9d0dba1f83e882cb902c Mon Sep 17 00:00:00 2001 From: Arnold Moyaux Date: Thu, 28 Nov 2019 15:46:37 +0000 Subject: [PATCH] [IMP] purchase_stock: merge RFQ from RR only for same date --- addons/purchase_stock/models/stock_rule.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/purchase_stock/models/stock_rule.py b/addons/purchase_stock/models/stock_rule.py index f300d31132d..08c6d17db01 100644 --- a/addons/purchase_stock/models/stock_rule.py +++ b/addons/purchase_stock/models/stock_rule.py @@ -2,6 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from collections import defaultdict +from datetime import datetime from dateutil.relativedelta import relativedelta from itertools import groupby @@ -289,6 +290,12 @@ class StockRule(models.Model): ('picking_type_id', '=', self.picking_type_id.id), ('company_id', '=', company_id.id), ) + if values.get('orderpoint_id'): + procurement_date = fields.Date.to_date(values['date_planned']) - relativedelta(days=int(values['supplier'].delay) + company_id.po_lead) + domain += ( + ('date_order', '<=', datetime.combine(procurement_date, datetime.max.time())), + ('date_order', '>=', datetime.combine(procurement_date, datetime.min.time())) + ) if group: domain += (('group_id', '=', group.id),) return domain