From d32921dac890f26286995d560d1ceb3fc109bc40 Mon Sep 17 00:00:00 2001 From: Lionel Sausin Date: Fri, 6 Nov 2015 17:19:14 +0100 Subject: [PATCH] [IMP] Decouple the quantity for templates and variants There are cases where we dot NOT want to simply sum the quantities of all the variants. For example when dealing with manufacturing capacities, we may have to chose between variants because we can't make ALL of them with the same components. So instead of a simple non-modular implementation, we'll let each module define his own implementation of how to compute the product template's quantity available for sale. --- stock_available/__openerp__.py | 2 +- stock_available/models/product_product.py | 7 ++-- stock_available/models/product_template.py | 15 +++++--- stock_available_immediately/__openerp__.py | 2 +- .../models/__init__.py | 1 + .../models/product_product.py | 4 ++- .../models/product_template.py | 35 +++++++++++++++++++ 7 files changed, 56 insertions(+), 10 deletions(-) create mode 100644 stock_available_immediately/models/product_template.py diff --git a/stock_available/__openerp__.py b/stock_available/__openerp__.py index 7a5e16806943..05010376722d 100644 --- a/stock_available/__openerp__.py +++ b/stock_available/__openerp__.py @@ -20,7 +20,7 @@ { 'name': 'Stock available to promise', - 'version': '8.0.2.0.0', + 'version': '8.0.3.0.0', "author": u"Numérigraphe,Odoo Community Association (OCA)", 'category': 'Warehouse', 'depends': ['stock'], diff --git a/stock_available/models/product_product.py b/stock_available/models/product_product.py index 7cc671d0d7ca..c318b420b330 100644 --- a/stock_available/models/product_product.py +++ b/stock_available/models/product_product.py @@ -36,8 +36,11 @@ def _immediately_usable_qty(self): By default, available to promise = forecasted quantity. - Must be overridden by another module that actually implement - computations.""" + **Each** sub-module **must** override this method in **both** + `product.product` **and** `product.template`, because we can't + decide in advance how to compute the template's quantity from the + variants. + """ for prod in self: prod.immediately_usable_qty = prod.virtual_available diff --git a/stock_available/models/product_template.py b/stock_available/models/product_template.py index f2ee5f958e01..c7d0ac07162c 100644 --- a/stock_available/models/product_template.py +++ b/stock_available/models/product_template.py @@ -28,12 +28,17 @@ class ProductTemplate(models.Model): @api.multi @api.depends('product_variant_ids.immediately_usable_qty') def _immediately_usable_qty(self): - """Compute the quantity using all the variants""" + """No-op implementation of the stock available to promise. + + By default, available to promise = forecasted quantity. + + **Each** sub-module **must** override this method in **both** + `product.product` **and** `product.template`, because we can't + decide in advance how to compute the template's quantity from the + variants. + """ for tmpl in self: - tmpl.immediately_usable_qty = sum( - v.immediately_usable_qty - for v in tmpl.product_variant_ids - ) + tmpl.immediately_usable_qty = tmpl.virtual_available immediately_usable_qty = fields.Float( digits=dp.get_precision('Product Unit of Measure'), diff --git a/stock_available_immediately/__openerp__.py b/stock_available_immediately/__openerp__.py index 0175129fb0c6..3d0637eab39d 100644 --- a/stock_available_immediately/__openerp__.py +++ b/stock_available_immediately/__openerp__.py @@ -22,7 +22,7 @@ { "name": "Ignore planned receptions in quantity available to promise", - "version": "8.0.2.0.0", + "version": "8.0.2.0.1", "depends": ["stock_available"], "author": "Camptocamp,Odoo Community Association (OCA)", "license": "AGPL-3", diff --git a/stock_available_immediately/models/__init__.py b/stock_available_immediately/models/__init__.py index a28883030ce9..3f986c807158 100644 --- a/stock_available_immediately/models/__init__.py +++ b/stock_available_immediately/models/__init__.py @@ -19,3 +19,4 @@ ############################################################################## from . import product_product +from . import product_template diff --git a/stock_available_immediately/models/product_product.py b/stock_available_immediately/models/product_product.py index c0c1d547913e..7098e1036bac 100644 --- a/stock_available_immediately/models/product_product.py +++ b/stock_available_immediately/models/product_product.py @@ -28,7 +28,9 @@ class ProductProduct(models.Model): @api.multi @api.depends('virtual_available', 'incoming_qty') def _immediately_usable_qty(self): - """Ignore the incoming goods in the quantity available to promise""" + """Ignore the incoming goods in the quantity available to promise + + This is the same implementation as for templates.""" super(ProductProduct, self)._immediately_usable_qty() for prod in self: prod.immediately_usable_qty -= prod.incoming_qty diff --git a/stock_available_immediately/models/product_template.py b/stock_available_immediately/models/product_template.py new file mode 100644 index 000000000000..d8cd5ed34fd8 --- /dev/null +++ b/stock_available_immediately/models/product_template.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# This module is copyright (C) 2014 Numérigraphe SARL. All Rights Reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +from openerp import models, api + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + @api.multi + @api.depends('virtual_available', 'incoming_qty') + def _immediately_usable_qty(self): + """Ignore the incoming goods in the quantity available to promise + + This is the same implementation as for variants.""" + super(ProductTemplate, self)._immediately_usable_qty() + for tmpl in self: + tmpl.immediately_usable_qty -= tmpl.incoming_qty