[12.0][REF] stock_demand_estimate:

* remove dependency with date_range and web_widget_x2many_2d_matrix.
* relicense to lgpl.
* update copyrights eficent -> forgeflow.
* fix issue when editing qty dirrectly from the tree view.
This commit is contained in:
Lois Rilo
2019-12-24 17:38:17 +01:00
parent 1291a197a8
commit 1d86b05a47
17 changed files with 192 additions and 634 deletions

View File

@@ -10,9 +10,9 @@ Stock Demand Estimate
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
:alt: Beta
.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge2| image:: https://img.shields.io/badge/licence-LGPL--3-blue.png
:target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html
:alt: License: LGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
:target: https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_demand_estimate
:alt: OCA/stock-logistics-warehouse
@@ -35,27 +35,6 @@ The module does not provide in itself any specific usage of the estimates.
.. contents::
:local:
Installation
============
This module relies on:
* The OCA module '2D matrix for x2many fields', and can be downloaded from
Github: https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix
* The OCA module 'Date Range', and can be downloaded from
Github: https://github.com/OCA/server-ux/tree/12.0/date_range
Usage
=====
Go to 'Inventory / Configuration / Date Ranges' and define your estimating periods.
Go to 'Inventory / Demand Planning / Create Demand Estimates' to create or
update your demand estimates.
Go to 'Inventory / Demand Planning / Demand Estimates' to review the
estimates created.
Bug Tracker
===========
@@ -72,13 +51,13 @@ Credits
Authors
~~~~~~~
* Eficent
* ForgeFlow
Contributors
~~~~~~~~~~~~
* Jordi Ballester Alomar <jordi.ballester@eficent.com>
* Lois Rilo <lois.rilo@eficent.com>
* Jordi Ballester Alomar <jordi.ballester@forgeflow.com>
* Lois Rilo <lois.rilo@forgeflow.com>
Maintainers
~~~~~~~~~~~

View File

@@ -1,4 +1 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from . import models
from . import wizards

View File

@@ -1,26 +1,20 @@
# Copyright 2016 Eficent Business and IT Consulting Services S.L.
# (http://www.eficent.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
# Copyright 2016-19 ForgeFlow S.L. (https://www.forgeflow.com)
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
{
"name": "Stock Demand Estimate",
"summary": "Allows to create demand estimates.",
"version": "12.0.1.0.0",
"author": "Eficent, "
"Odoo Community Association (OCA)",
"author": "ForgeFlow, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/stock-logistics-warehouse",
"category": "Warehouse Management",
"depends": [
"stock",
"web_widget_x2many_2d_matrix",
"date_range",
],
"data": [
"security/ir.model.access.csv",
"security/stock_security.xml",
"views/stock_demand_estimate_view.xml",
"views/date_range.xml",
"wizards/stock_demand_estimate_wizard_view.xml",
],
"license": "AGPL-3",
"license": "LGPL-3",
"installable": True,
}

View File

@@ -1,4 +1 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from . import stock_demand_estimate
from . import date_range

View File

@@ -1,23 +0,0 @@
# Copyright 2016 Eficent Business and IT Consulting Services S.L.
# (http://www.eficent.com)
from odoo import api, fields, models
class DateRange(models.Model):
_inherit = "date.range"
days = fields.Integer(
string="Days between dates",
compute='_compute_days',
readonly=True,
)
@api.multi
@api.depends('date_start', 'date_end')
def _compute_days(self):
for rec in self.filtered(lambda x: x.date_start and x.date_end):
rec.days = abs((
rec.date_end -
rec.date_start
).days) + 1

View File

@@ -1,22 +1,39 @@
# Copyright 2016 Eficent Business and IT Consulting Services S.L.
# (http://www.eficent.com)
# Copyright 2016-19 ForgeFlow S.L. (https://www.forgeflow.com)
# Copyright 2016 Aleph Objects, Inc. (https://www.alephobjects.com/)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
from odoo import api, fields, models, _
from odoo.addons import decimal_precision as dp
from odoo.exceptions import UserError
from datetime import timedelta, date
class StockDemandEstimate(models.Model):
_name = 'stock.demand.estimate'
_description = 'Stock Demand Estimate Line'
date_range_id = fields.Many2one(
comodel_name="date.range",
string="Estimating Period",
required=True,
ondelete='restrict'
date_from = fields.Date(
compute="_compute_dates",
string="From (computed)",
store=True
)
date_to = fields.Date(
compute="_compute_dates",
string="To (computed)",
store=True,
)
manual_date_from = fields.Date(string="From")
manual_date_to = fields.Date(string="To")
manual_duration = fields.Integer(
string="Duration",
help="Duration (in days)",
default=1,
)
duration = fields.Integer(
compute="_compute_dates",
string="Duration (computed))",
store=True,
)
product_id = fields.Many2one(
comodel_name="product.product",
@@ -43,6 +60,7 @@ class StockDemandEstimate(models.Model):
digits=0,
store=True,
help='Quantity in the default UoM of the product',
readonly=True,
)
daily_qty = fields.Float(
string='Quantity / Day',
@@ -58,11 +76,30 @@ class StockDemandEstimate(models.Model):
)
@api.multi
@api.depends('product_qty', 'date_range_id.days')
@api.depends(
"manual_duration", "manual_date_from", "manual_date_to",
)
def _compute_dates(self):
today = date.today()
for rec in self:
rec.date_from = rec.manual_date_from or today
if rec.manual_date_to:
rec.date_to = rec.manual_date_to
rec.duration = (rec.manual_date_to - rec.date_from).days
elif rec.manual_duration:
rec.date_to = rec.date_from + timedelta(
days=rec.manual_duration)
rec.duration = rec.manual_duration
else:
rec.date_to = rec.date_from + timedelta(days=1)
rec.duration = 1
@api.multi
@api.depends("product_qty", "duration")
def _compute_daily_qty(self):
for rec in self:
if rec.date_range_id.days:
rec.daily_qty = rec.product_qty / rec.date_range_id.days
if rec.duration:
rec.daily_qty = rec.product_qty / rec.duration
else:
rec.daily_qty = 0.0
@@ -74,6 +111,8 @@ class StockDemandEstimate(models.Model):
rec.product_qty = rec.product_uom._compute_quantity(
rec.product_uom_qty, rec.product_id.uom_id
)
else:
rec.product_qty = rec.product_uom_qty
def _inverse_product_quantity(self):
raise UserError(_(
@@ -87,19 +126,33 @@ class StockDemandEstimate(models.Model):
def name_get(self):
res = []
for rec in self:
name = "%s - %s - %s" % (
rec.date_range_id.name, rec.product_id.name,
rec.location_id.name,
name = "%s - %s: %s - %s" % (
rec.date_from, rec.date_to,
rec.product_id.name, rec.location_id.name,
)
res.append((rec.id, name))
return res
@api.onchange("manual_date_to")
def _onchange_manual_date_to(self):
for rec in self:
if rec.manual_date_from:
rec.manual_duration = (
rec.manual_date_to - rec.manual_date_from).days
@api.onchange("manual_duration")
def _onchange_manual_duration(self):
for rec in self:
if rec.manual_date_from:
rec.manual_date_to = rec.manual_date_from + timedelta(
days=rec.manual_duration)
@api.model
def get_quantity_by_date_range(self, date_start, date_end):
"""To be used in other modules"""
# Check if the dates overlap with the period
period_date_start = self.date_range_id.date_start
period_date_end = self.date_range_id.date_end
period_date_start = self.date_from
period_date_end = self.date_to
# We need only the periods that overlap
# the dates introduced by the user.

View File

@@ -1,2 +1,2 @@
* Jordi Ballester Alomar <jordi.ballester@eficent.com>
* Lois Rilo <lois.rilo@eficent.com>
* Jordi Ballester Alomar <jordi.ballester@forgeflow.com>
* Lois Rilo <lois.rilo@forgeflow.com>

View File

@@ -1,6 +0,0 @@
This module relies on:
* The OCA module '2D matrix for x2many fields', and can be downloaded from
Github: https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix
* The OCA module 'Date Range', and can be downloaded from
Github: https://github.com/OCA/server-ux/tree/12.0/date_range

View File

@@ -1,7 +0,0 @@
Go to 'Inventory / Configuration / Date Ranges' and define your estimating periods.
Go to 'Inventory / Demand Planning / Create Demand Estimates' to create or
update your demand estimates.
Go to 'Inventory / Demand Planning / Demand Estimates' to review the
estimates created.

View File

@@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
<meta name="generator" content="Docutils 0.15.2: http://docutils.sourceforge.net/" />
<title>Stock Demand Estimate</title>
<style type="text/css">
@@ -367,44 +367,24 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_demand_estimate"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_demand_estimate"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/lgpl-3.0-standalone.html"><img alt="License: LGPL-3" src="https://img.shields.io/badge/licence-LGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_demand_estimate"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_demand_estimate"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
<p>This module allows to create demand estimates for a given product and
location, on configurable time periods.</p>
<p>The module does not provide in itself any specific usage of the estimates.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#installation" id="id1">Installation</a></li>
<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="installation">
<h1><a class="toc-backref" href="#id1">Installation</a></h1>
<p>This module relies on:</p>
<ul class="simple">
<li>The OCA module 2D matrix for x2many fields, and can be downloaded from
Github: <a class="reference external" href="https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix">https://github.com/OCA/web/tree/12.0/web_widget_x2many_2d_matrix</a></li>
<li>The OCA module Date Range, and can be downloaded from
Github: <a class="reference external" href="https://github.com/OCA/server-ux/tree/12.0/date_range">https://github.com/OCA/server-ux/tree/12.0/date_range</a></li>
</ul>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#id2">Usage</a></h1>
<p>Go to Inventory / Configuration / Date Ranges and define your estimating periods.</p>
<p>Go to Inventory / Demand Planning / Create Demand Estimates to create or
update your demand estimates.</p>
<p>Go to Inventory / Demand Planning / Demand Estimates to review the
estimates created.</p>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#id3">Bug Tracker</a></h1>
<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
@@ -412,22 +392,22 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
<h1><a class="toc-backref" href="#id4">Credits</a></h1>
<h1><a class="toc-backref" href="#id2">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#id5">Authors</a></h2>
<h2><a class="toc-backref" href="#id3">Authors</a></h2>
<ul class="simple">
<li>Eficent</li>
<li>ForgeFlow</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
<ul class="simple">
<li>Jordi Ballester Alomar &lt;<a class="reference external" href="mailto:jordi.ballester&#64;eficent.com">jordi.ballester&#64;eficent.com</a>&gt;</li>
<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;eficent.com">lois.rilo&#64;eficent.com</a>&gt;</li>
<li>Jordi Ballester Alomar &lt;<a class="reference external" href="mailto:jordi.ballester&#64;forgeflow.com">jordi.ballester&#64;forgeflow.com</a>&gt;</li>
<li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;forgeflow.com">lois.rilo&#64;forgeflow.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#id7">Maintainers</a></h2>
<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose

View File

@@ -1,3 +1 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from . import test_stock_demand_estimate

View File

@@ -1,11 +1,10 @@
# Copyright 2017 Eficent Business and IT Consulting Services S.L.
# (http://www.eficent.com)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from dateutil.rrule import MONTHLY
from odoo import fields
from odoo.exceptions import ValidationError
# Copyright 2017-19 ForgeFlow S.L. (https://www.forgeflow.com)
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
from odoo.tests.common import SavepointCase
from datetime import date, timedelta as td
class TestStockDemandEstimate(SavepointCase):
@classmethod
@@ -14,10 +13,13 @@ class TestStockDemandEstimate(SavepointCase):
cls.res_users_model = cls.env['res.users']
cls.product_model = cls.env['product.product']
cls.stock_location_model = cls.env['stock.location']
cls.estimate_model = cls.env["stock.demand.estimate"]
cls.g_stock_manager = cls.env.ref('stock.group_stock_manager')
cls.g_stock_user = cls.env.ref('stock.group_stock_user')
cls.company = cls.env.ref('base.main_company')
cls.uom_unit = cls.env.ref('uom.product_uom_unit')
cls.uom_dozen = cls.env.ref('uom.product_uom_dozen')
# Create users:
cls.manager = cls._create_user(
@@ -30,27 +32,13 @@ class TestStockDemandEstimate(SavepointCase):
[cls.g_stock_user],
cls.company,
).id
cls.drt_monthly = cls.env['date.range.type'].create({
'name': 'Month',
'allow_overlap': False,
})
generator = cls.env['date.range.generator']
generator = generator.create({
'date_start': '1943-01-01',
'name_prefix': '1943-',
'type_id': cls.drt_monthly.id,
'duration_count': 1,
'unit_of_time': MONTHLY,
'count': 12,
})
generator.action_apply()
# Create a product:
cls.product1 = cls.product_model.create({
cls.product_1 = cls.product_model.create({
'name': 'Test Product 1',
'type': 'product',
'default_code': 'PROD1',
"uom_id": cls.uom_unit.id,
})
# Create a location:
cls.location = cls.stock_location_model.create({
@@ -72,107 +60,57 @@ class TestStockDemandEstimate(SavepointCase):
})
return user
def test_demand_estimate(self):
"""Tests creation of demand estimates."""
sheets = self.env['stock.demand.estimate.sheet'].search([])
for sheet in sheets:
sheet.unlink()
wiz = self.env['stock.demand.estimate.wizard']
wiz = wiz.create({
'date_start': '1943-01-01',
'date_end': '1943-12-31',
'location_id': self.location.id,
'date_range_type_id': self.drt_monthly.id,
'product_ids': [(6, 0, [self.product1.id])],
def test_01_create_estimate(self):
"""Crete an estimate entering manually the date from and date to."""
date_from = date.today() + td(days=10)
date_to = date.today() + td(days=20)
estimate = self.estimate_model.create({
"product_id": self.product_1.id,
"location_id": self.location.id,
"manual_date_from": date_from,
"manual_date_to": date_to,
"product_uom_qty": 500.0,
})
wiz.create_sheet()
sheets = self.env['stock.demand.estimate.sheet'].search([])
for sheet in sheets:
self.assertEqual(
len(sheet.line_ids),
12,
'There should be 12 lines.',
)
self.assertEqual(
fields.Date.to_string(sheet.date_start),
'1943-01-01',
'The date start should be 1943-01-01',
)
self.assertEqual(
fields.Date.to_string(sheet.date_end),
'1943-12-31',
'The date end should be 1943-12-31',
)
self.assertEqual(
sheet.location_id.id,
self.location.id,
'Wrong location',
)
for line in sheet.line_ids:
line.product_uom_qty = 1
self.assertEqual(
line.product_id.id,
self.product1.id,
'The product does not match in the line',
)
self.assertEqual(
line.location_id.id,
self.location.id,
'The product does not match in the line',
)
sheet.button_validate()
ranges = self.env['date.range'].search(
[('type_id', '=', self.drt_monthly.id)],
)
estimates = self.env['stock.demand.estimate'].search(
[('date_range_id', 'in', ranges.ids)]
)
self.assertEqual(
len(estimates),
12,
'There should be 12 estimate records.',
)
for estimate in estimates:
self.assertEqual(
estimate.product_id.id,
self.product1.id,
'The product does not match in the estimate',
)
self.assertEqual(
estimate.location_id.id,
self.location.id,
'The product does not match in the estimate',
)
self.assertEqual(estimate.date_from, date_from)
self.assertEqual(estimate.date_to, date_to)
self.assertEqual(estimate.duration, 10)
self.assertEqual(estimate.product_qty, 500.0)
self.assertEqual(estimate.daily_qty, 500.0 / 10.0)
sheets = self.env['stock.demand.estimate.sheet'].search([])
for sheet in sheets:
sheet.unlink()
wiz = self.env['stock.demand.estimate.wizard']
wiz = wiz.create({
'date_start': '1943-01-01',
'date_end': '1943-12-31',
'location_id': self.location.id,
'date_range_type_id': self.drt_monthly.id,
'product_ids': [(6, 0, [self.product1.id])],
def test_02_create_estimate_by_duration_and_different_uom(self):
"""Create an estimate entering manually the date from, duration and
using a different UoM than product's."""
date_from = date.today() + td(days=10)
estimate = self.estimate_model.create({
"product_id": self.product_1.id,
"location_id": self.location.id,
"manual_date_from": date_from,
"manual_duration": 15,
"product_uom_qty": 100.0,
"product_uom": self.uom_dozen.id,
})
wiz.create_sheet()
sheets = self.env['stock.demand.estimate.sheet'].search([])
for sheet in sheets:
for line in sheet.line_ids:
self.assertEqual(
line.product_uom_qty,
1,
'The quantity should be 1',
)
self.assertEqual(estimate.date_from, date_from)
expected_date_to = estimate.date_from + td(days=15)
self.assertEqual(estimate.date_to, expected_date_to)
self.assertEqual(estimate.duration, 15)
expected_qty = 100 * 12.0 # 100 dozens -> units
self.assertEqual(estimate.product_qty, expected_qty)
self.assertEqual(estimate.daily_qty, expected_qty / 15)
def test_invalid_dates(self):
wiz = self.env['stock.demand.estimate.wizard']
with self.assertRaises(ValidationError):
wiz.create({
'date_start': '1943-12-31',
'date_end': '1943-01-01',
'location_id': self.location.id,
'date_range_type_id': self.drt_monthly.id,
'product_ids': [(6, 0, [self.product1.id])],
})
def test_03_get_qty_by_range(self):
date_from = date.today() + td(days=10)
date_to = date.today() + td(days=20)
estimate = self.estimate_model.create({
"product_id": self.product_1.id,
"location_id": self.location.id,
"manual_date_from": date_from,
"manual_date_to": date_to,
"product_uom_qty": 100.0,
})
self.assertEqual(estimate.daily_qty, 10.0)
res = estimate.get_quantity_by_date_range(
date_from + td(days=3), date_from + td(days=17))
self.assertEqual(res, 80)
res = estimate.get_quantity_by_date_range(
date_from + td(days=3), date_from + td(days=7))
self.assertEqual(res, 50)

View File

@@ -1,10 +0,0 @@
<?xml version="1.0"?>
<odoo>
<menuitem id="date_range_menu"
string="Date Ranges"
parent="stock.menu_stock_config_settings"
action="date_range.date_range_action"
sequence="99"/>
</odoo>

View File

@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<odoo>
<record id="stock_demand_estimate_view_tree"
model="ir.ui.view">
<record id="stock_demand_estimate_view_tree" model="ir.ui.view">
<field name="name">stock.demand.estimate.tree</field>
<field name="model">stock.demand.estimate</field>
<field name="arch" type="xml">
<tree string="Stock Demand Estimate" editable="top" create="0">
<field name="date_range_id"/>
<tree>
<field name="date_from" string="Date From"/>
<field name="date_to" string="Date To"/>
<field name="product_id"/>
<field name="location_id"/>
<field name="product_uom_qty"/>
@@ -18,6 +18,36 @@
</field>
</record>
<record id="stock_demand_estimate_view_form" model="ir.ui.view">
<field name="name">stock.demand.estimate.form</field>
<field name="model">stock.demand.estimate</field>
<field name="arch" type="xml">
<form>
<sheet>
<group>
<group name="dates_read" class="oe_read_only">
<field name="date_from" string="Date From"/>
<field name="date_to" string="Date To"/>
<field name="duration" string="Duration"/>
</group>
<group name="dates_edit" class="oe_edit_only">
<field name="manual_date_from" string="Date From"/>
<field name="manual_date_to" string="Date To"/>
<field name="manual_duration" string="Duration"/>
</group>
<group>
<field name="product_id"/>
<field name="location_id"/>
<field name="product_uom_qty"/>
<field name="product_uom"/>
<field name="daily_qty"/>
</group>
</group>
</sheet>
</form>
</field>
</record>
<record id="stock_demand_estimate_view_pivot" model="ir.ui.view">
<field name="name">stock.demand.estimate.pivot</field>
<field name="model">stock.demand.estimate</field>
@@ -25,7 +55,7 @@
<pivot string="Stock Demand Estimate">
<field name="product_qty" type="measure"/>
<field name="product_id" type="row"/>
<field name="date_range_id" type="col"/>
<field name="date_from" type="col"/>
</pivot>
</field>
</record>
@@ -36,7 +66,6 @@
<field name="model">stock.demand.estimate</field>
<field name="arch" type="xml">
<search string="Search Stock Demand Estimates">
<field name="date_range_id"/>
<field name="product_id"/>
<field name="location_id"/>
</search>
@@ -49,7 +78,7 @@
<field name="type">ir.actions.act_window</field>
<field name="res_model">stock.demand.estimate</field>
<field name="view_type">form</field>
<field name="view_mode">tree,pivot</field>
<field name="view_mode">tree,form,pivot</field>
<field name="search_view_id"
ref="stock_demand_estimate_view_search"/>
</record>

View File

@@ -1,3 +0,0 @@
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from . import stock_demand_estimate_wizard

View File

@@ -1,265 +0,0 @@
# Copyright 2016 Eficent Business and IT Consulting Services S.L.
# (http://www.eficent.com)
# Copyright 2016 Aleph Objects, Inc. (https://www.alephobjects.com/)
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
from odoo import api, fields, models, _
from odoo.osv import expression
from odoo.addons import decimal_precision as dp
from odoo.exceptions import UserError, ValidationError
class StockDemandEstimateSheet(models.TransientModel):
_name = 'stock.demand.estimate.sheet'
_description = 'Stock Demand Estimate Sheet'
date_start = fields.Date(
string="Date From",
readonly=True,
)
date_end = fields.Date(
string="Date to",
readonly=True,
)
date_range_type_id = fields.Many2one(
string='Date Range Type',
comodel_name='date.range.type',
readonly=True,
)
location_id = fields.Many2one(
comodel_name="stock.location",
string="Location",
readonly=True,
)
line_ids = fields.Many2many(
string="Estimates",
comodel_name='stock.demand.estimate.sheet.line',
relation='stock_demand_estimate_line_rel',
)
product_ids = fields.Many2many(
string="Products",
comodel_name="product.product",
)
@api.onchange('date_start', 'date_end', 'date_range_type_id',)
def _onchange_dates(self):
for sheet in self:
if not all([sheet.date_start, sheet.date_end,
sheet.date_range_type_id]):
return
ranges = sheet._get_ranges()
if not ranges:
raise UserError(_('There is no ranges created.'))
estimates = self.env['stock.demand.estimate'].search([
('product_id', 'in', sheet.product_ids.ids),
('date_range_id', 'in', ranges.ids),
('location_id', '=', sheet.location_id.id),
])
lines = []
for product in sheet.product_ids:
for _range in ranges:
estimate = estimates.filtered(
lambda x: (x.date_range_id == _range and
x.product_id == product)
)
if estimate:
uom_id = fields.first(estimate).product_uom.id
uom_qty = estimate[0].product_uom_qty
estimate_id = estimate[0].id
else:
uom_id = product.uom_id.id
uom_qty = 0.0
estimate_id = None
lines.append((0, 0, sheet._get_default_estimate_line(
_range,
product,
uom_id,
uom_qty,
estimate_id=estimate_id,
)))
sheet.line_ids = lines
def _get_ranges(self):
domain_1 = [
'&',
('type_id', '=', self.date_range_type_id.id), '|', '&',
('date_start', '>=', self.date_start),
('date_start', '<=', self.date_end),
'&',
('date_end', '>=', self.date_start),
('date_end', '<=', self.date_end),
]
domain_2 = [
'&',
('type_id', '=', self.date_range_type_id.id),
'&',
('date_start', '<=', self.date_start),
('date_end', '>=', self.date_start),
]
domain = expression.OR([domain_1, domain_2])
ranges = self.env['date.range'].search(domain)
return ranges
def _get_default_estimate_line(self, _range, product,
uom_id, uom_qty, estimate_id=None):
name_y = '{} - {}'.format(product.name, product.uom_id.name)
if product.default_code:
name_y += '[{}] {}'.format(product.default_code, name_y)
values = {
'value_x': _range.name,
'value_y': name_y,
'date_range_id': _range.id,
'product_id': product.id,
'product_uom': uom_id,
'product_uom_qty': uom_qty,
'location_id': self.location_id.id,
'estimate_id': estimate_id,
}
return values
@api.model
def _prepare_estimate_data(self, line):
return {
'date_range_id': line.date_range_id.id,
'product_id': line.product_id.id,
'location_id': line.location_id.id,
'product_uom_qty': line.product_uom_qty,
'product_uom': line.product_id.uom_id.id,
}
@api.multi
def button_validate(self):
res = []
for line in self.line_ids:
if line.estimate_id:
line.estimate_id.product_uom_qty = line.product_uom_qty
res.append(line.estimate_id.id)
else:
data = self._prepare_estimate_data(line)
estimate = self.env['stock.demand.estimate'].create(data)
res.append(estimate.id)
res = {
'domain': [('id', 'in', res)],
'name': _('Stock Demand Estimates'),
'src_model': 'stock.demand.estimate.wizard',
'view_type': 'form',
'view_mode': 'tree',
'res_model': 'stock.demand.estimate',
'type': 'ir.actions.act_window'
}
return res
class StockDemandEstimateSheetLine(models.TransientModel):
_name = 'stock.demand.estimate.sheet.line'
_description = 'Stock Demand Estimate Sheet Line'
estimate_id = fields.Many2one(
comodel_name='stock.demand.estimate'
)
date_range_id = fields.Many2one(
comodel_name='date.range',
string='Period',
)
location_id = fields.Many2one(
comodel_name='stock.location',
string="Stock Location",
)
product_id = fields.Many2one(
comodel_name='product.product',
string='Product',
)
value_x = fields.Char(
string='Period Name',
)
value_y = fields.Char(
string='Product Name',
)
product_uom_qty = fields.Float(
string="Quantity",
digits=dp.get_precision('Product UoM'),
)
class DemandEstimateWizard(models.TransientModel):
_name = 'stock.demand.estimate.wizard'
_description = 'Stock Demand Estimate Wizard'
date_start = fields.Date(
string="Date From",
required=True,
)
date_end = fields.Date(
string="Date To",
required=True,
)
date_range_type_id = fields.Many2one(
string='Date Range Type',
comodel_name='date.range.type',
required=True,
)
location_id = fields.Many2one(
comodel_name="stock.location",
string="Location",
required=True,
)
product_ids = fields.Many2many(
comodel_name="product.product",
string="Products",
)
@api.onchange('date_range_type_id')
def _onchange_date_range_type_id(self):
if self.date_range_type_id.company_id:
return {
'domain': {'location_id': [
('company_id', '=', self.date_range_type_id.company_id.id)
]}
}
return {}
@api.constrains('date_start', 'date_end')
def _check_start_end_dates(self):
self.ensure_one()
if self.date_start > self.date_end:
raise ValidationError(
_('The start date cannot be later than the end date.')
)
@api.multi
def _prepare_demand_estimate_sheet(self):
self.ensure_one()
return {
'date_start': self.date_start,
'date_end': self.date_end,
'date_range_type_id': self.date_range_type_id.id,
'location_id': self.location_id.id,
}
@api.multi
def create_sheet(self):
self.ensure_one()
if not self.product_ids:
raise UserError(_('You must select at least one product.'))
# 2d matrix widget need real records to work
sheet = self.env['stock.demand.estimate.sheet'].create({
'date_start': self.date_start,
'date_end': self.date_end,
'date_range_type_id': self.date_range_type_id.id,
'location_id': self.location_id.id,
'product_ids': [(6, 0, self.product_ids.ids)],
})
sheet._onchange_dates()
res = {
'name': _('Estimate Sheet'),
'src_model': 'stock.demand.estimate.wizard',
'view_type': 'form',
'view_mode': 'form',
'target': 'new',
'res_model': 'stock.demand.estimate.sheet',
'res_id': sheet.id,
'type': 'ir.actions.act_window',
}
return res

View File

@@ -1,93 +0,0 @@
<?xml version="1.0"?>
<odoo>
<record id="stock_demand_estimate_sheet_view_form"
model="ir.ui.view">
<field name="name">stock.demand.estimate.sheet.form</field>
<field name="model">stock.demand.estimate.sheet</field>
<field name="arch" type="xml">
<form string="Stock Demand Estimate Sheet">
<group name="dates">
<label for="date_start" string="Period"/>
<div><field name="date_start" class="oe_inline"/> to <field name="date_end" class="oe_inline"/></div>
</group>
<group>
<group name="attributes" colspan="2">
<field name="date_range_type_id"/>
<field name="location_id"/>
</group>
</group>
<div/>
<group name="estimated_quantity"
string="Estimated quantity">
<field name="line_ids" nolabel="1"
widget="x2many_2d_matrix"
field_x_axis="value_x"
field_y_axis="value_y"
field_value="product_uom_qty"
x_axis_clickable="0"
y_axis_clickable="0">
<tree>
<field name="value_x"/>
<field name="value_y"/>
<field name="product_uom_qty"/>
</tree>
</field>
</group>
<footer>
<button name="button_validate"
type="object"
string="Validate"
class="oe_highlight"/>
<button class="oe_link"
special="cancel"
string="Cancel"/>
</footer>
</form>
</field>
</record>
<record id="demand_estimate_wizard_view_form"
model="ir.ui.view">
<field name="name">stock.demand.estimate.wizard.form</field>
<field name="model">stock.demand.estimate.wizard</field>
<field name="arch" type="xml">
<form string="Stock Demand Estimate Wizard">
<sheet>
<group name="dates">
<label for="date_start" string="Period"/>
<div><field name="date_start" class="oe_inline"/> to <field name="date_end" class="oe_inline"/></div>
</group>
<group>
<group name="attributes">
<field name="date_range_type_id"/>
<field name="location_id"/>
</group>
</group>
<div/>
<group name="products" string="Products">
<field name="product_ids" nolabel="1"/>
</group>
<footer>
<button name="create_sheet" string="Prepare"
type="object" class="oe_highlight" /> or
<button string="Cancel" class="oe_link" special="cancel" />
</footer>
</sheet>
</form>
</field>
</record>
<act_window name="Create Stock Demand Estimates"
res_model="stock.demand.estimate.wizard"
src_model="stock.demand.estimate.sheet"
view_mode="form"
target="new"
key2="client_action_multi"
id="stock_demand_estimate_wizard_action"/>
<menuitem id="stock_demand_estimate_wizard_menu"
parent="stock_demand_planning_menu"
action="stock_demand_estimate_wizard_action"/>
</odoo>