From 56d27f003a6f1e5a47752e230cbc069d9640bad3 Mon Sep 17 00:00:00 2001 From: Sergio Teruel Date: Tue, 19 Feb 2019 18:20:36 +0100 Subject: [PATCH] [11.0][FIX] stock_secondary_unit: Remove procurement_rule move. Fix dependencies --- stock_secondary_unit/__manifest__.py | 2 +- stock_secondary_unit/models/__init__.py | 1 - .../models/procurement_rule.py | 23 ------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 stock_secondary_unit/models/procurement_rule.py diff --git a/stock_secondary_unit/__manifest__.py b/stock_secondary_unit/__manifest__.py index 5e0d2718b..d2d65f53a 100644 --- a/stock_secondary_unit/__manifest__.py +++ b/stock_secondary_unit/__manifest__.py @@ -12,7 +12,7 @@ 'application': False, 'installable': True, 'depends': [ - 'sale_stock', + 'stock', 'product_secondary_unit', ], 'data': [ diff --git a/stock_secondary_unit/models/__init__.py b/stock_secondary_unit/models/__init__.py index e86540488..960afa99e 100644 --- a/stock_secondary_unit/models/__init__.py +++ b/stock_secondary_unit/models/__init__.py @@ -1,4 +1,3 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from . import procurement_rule from . import product from . import stock_move diff --git a/stock_secondary_unit/models/procurement_rule.py b/stock_secondary_unit/models/procurement_rule.py deleted file mode 100644 index 1d6ec8133..000000000 --- a/stock_secondary_unit/models/procurement_rule.py +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2018 Tecnativa - Sergio Teruel -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import models - - -class ProcurementRule(models.Model): - _inherit = 'procurement.rule' - - def _get_stock_move_values(self, product_id, product_qty, product_uom, - location_id, name, origin, values, group_id): - res = super(ProcurementRule, self)._get_stock_move_values( - product_id, product_qty, product_uom, location_id, name, origin, - values, group_id - ) - if values.get('sale_line_id', False): - sale_line = self.env['sale.order.line'].browse( - values['sale_line_id']) - if sale_line.secondary_uom_id: - res.update({ - 'secondary_uom_id': sale_line.secondary_uom_id.id, - 'secondary_uom_qty': sale_line.secondary_uom_qty, - }) - return res