130
mrp_warehouse_calendar/README.rst
Normal file
@@ -0,0 +1,130 @@
|
||||
======================
|
||||
MRP Warehouse Calendar
|
||||
======================
|
||||
|
||||
..
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! This file is generated by oca-gen-addon-readme !!
|
||||
!! changes will be overwritten. !!
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! source digest: sha256:18cdb9aea24afa77c86c9bf4c578ce490415389ba52053aabd18c04b457002eb
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
|
||||
.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
|
||||
:target: https://odoo-community.org/page/development-status
|
||||
:alt: Production/Stable
|
||||
.. |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%2Fmanufacture-lightgray.png?logo=github
|
||||
:target: https://github.com/OCA/manufacture/tree/18.0/mrp_warehouse_calendar
|
||||
:alt: OCA/manufacture
|
||||
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
|
||||
:target: https://translation.odoo-community.org/projects/manufacture-18-0/manufacture-18-0-mrp_warehouse_calendar
|
||||
:alt: Translate me on Weblate
|
||||
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
|
||||
:target: https://runboat.odoo-community.org/builds?repo=OCA/manufacture&target_branch=18.0
|
||||
:alt: Try me on Runboat
|
||||
|
||||
|badge1| |badge2| |badge3| |badge4| |badge5|
|
||||
|
||||
This module ensures that manufacturing orders created from procurements
|
||||
respect the calendar assigned to the warehouse associated with the
|
||||
manufacturing order's picking type. The planned start date of the
|
||||
manufacturing order is calculated based on the product's manufacturing
|
||||
lead time and the working schedules defined in the warehouse calendar.
|
||||
|
||||
Additionally, any manual rescheduling of the start or end date of a
|
||||
manufacturing order will also take the lead time into account, following
|
||||
the working days defined by the warehouse calendar.
|
||||
|
||||
**Table of contents**
|
||||
|
||||
.. contents::
|
||||
:local:
|
||||
|
||||
Configuration
|
||||
=============
|
||||
|
||||
- This module depends on
|
||||
`stock_warehouse_calendar <https://github.com/OCA/stock-logistics-warehouse>`__
|
||||
- Go to *Settings* and activate the developer mode. |Developer mode|
|
||||
- Go to *Settings > Technical > Resource > Working Schedules* and
|
||||
define your resource calendar. |Working Schedules|
|
||||
- Go to *Inventory > Configuration > Warehouse Management > Warehouses*
|
||||
and assign the Working Schedule. |Warehouse Management|
|
||||
|
||||
.. |Developer mode| image:: https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/developer_mode.gif
|
||||
.. |Working Schedules| image:: https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/working_schedules.gif
|
||||
.. |Warehouse Management| image:: https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/warehouse_management.gif
|
||||
|
||||
Usage
|
||||
=====
|
||||
|
||||
When a manufacturing order is created out of a procurement evaluation
|
||||
(from an orderpoint, MTO,...) the calendar is considered in the
|
||||
computation of the planned start date of the manufacturing order.
|
||||
|
||||
For example, if it takes 1 day to manufacture a product and it is
|
||||
required for Monday: |Replenish|
|
||||
|
||||
the manufacturing order will be created with planned start date on the
|
||||
previous Friday, if the warehouse operates under a Mo-Fri working
|
||||
calendar. |Manufacturing Order|
|
||||
|
||||
Manual changes to the start or end date of a manufacturing order will
|
||||
also respect the lead time and the warehouse calendar's working days.
|
||||
|Manual change day|
|
||||
|
||||
.. |Replenish| image:: https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/replenish.png
|
||||
.. |Manufacturing Order| image:: https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/manufacturing_order.png
|
||||
.. |Manual change day| image:: https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/change_day.gif
|
||||
|
||||
Bug Tracker
|
||||
===========
|
||||
|
||||
Bugs are tracked on `GitHub Issues <https://github.com/OCA/manufacture/issues>`_.
|
||||
In case of trouble, please check there if your issue has already been reported.
|
||||
If you spotted it first, help us to smash it by providing a detailed and welcomed
|
||||
`feedback <https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_warehouse_calendar%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
|
||||
|
||||
Do not contact contributors directly about support or help with technical issues.
|
||||
|
||||
Credits
|
||||
=======
|
||||
|
||||
Authors
|
||||
-------
|
||||
|
||||
* ForgeFlow
|
||||
|
||||
Contributors
|
||||
------------
|
||||
|
||||
- Jordi Ballester <jordi.ballester@forgeflow.com>
|
||||
- Lois Rilo <lois.rilo@forgeflow.com>
|
||||
|
||||
Maintainers
|
||||
-----------
|
||||
|
||||
This module is maintained by the OCA.
|
||||
|
||||
.. image:: https://odoo-community.org/logo.png
|
||||
:alt: Odoo Community Association
|
||||
:target: https://odoo-community.org
|
||||
|
||||
OCA, or the Odoo Community Association, is a nonprofit organization whose
|
||||
mission is to support the collaborative development of Odoo features and
|
||||
promote its widespread use.
|
||||
|
||||
.. |maintainer-JordiBForgeFlow| image:: https://github.com/JordiBForgeFlow.png?size=40px
|
||||
:target: https://github.com/JordiBForgeFlow
|
||||
:alt: JordiBForgeFlow
|
||||
|
||||
Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
|
||||
|
||||
|maintainer-JordiBForgeFlow|
|
||||
|
||||
This module is part of the `OCA/manufacture <https://github.com/OCA/manufacture/tree/18.0/mrp_warehouse_calendar>`_ project on GitHub.
|
||||
|
||||
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
|
||||
1
mrp_warehouse_calendar/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import models
|
||||
16
mrp_warehouse_calendar/__manifest__.py
Normal file
@@ -0,0 +1,16 @@
|
||||
# Copyright 2021 ForgeFlow S.L. (https://www.forgeflow.com)
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
{
|
||||
"name": "MRP Warehouse Calendar",
|
||||
"summary": "Considers the warehouse calendars in manufacturing",
|
||||
"version": "18.0.1.0.0",
|
||||
"license": "LGPL-3",
|
||||
"website": "https://github.com/OCA/manufacture",
|
||||
"author": "ForgeFlow, Odoo Community Association (OCA)",
|
||||
"category": "Manufacturing",
|
||||
"depends": ["mrp", "stock_warehouse_calendar"],
|
||||
"installable": True,
|
||||
"development_status": "Production/Stable",
|
||||
"maintainers": ["JordiBForgeFlow"],
|
||||
}
|
||||
31
mrp_warehouse_calendar/i18n/de.po
Normal file
@@ -0,0 +1,31 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * mrp_warehouse_calendar
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 11.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"PO-Revision-Date: 2018-12-09 10:43+0000\n"
|
||||
"Last-Translator: Maria Sparenberg <maria.sparenberg@gmx.net>\n"
|
||||
"Language-Team: none\n"
|
||||
"Language: de\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 3.3\n"
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_mrp_production
|
||||
#, fuzzy
|
||||
msgid "Production Order"
|
||||
msgstr "Fertigungsauftrag"
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_stock_rule
|
||||
msgid "Stock Rule"
|
||||
msgstr ""
|
||||
|
||||
#~ msgid "Procurement Rule"
|
||||
#~ msgstr "Beschaffungsregel"
|
||||
27
mrp_warehouse_calendar/i18n/es.po
Normal file
@@ -0,0 +1,27 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * mrp_warehouse_calendar
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"PO-Revision-Date: 2023-07-10 10:08+0000\n"
|
||||
"Last-Translator: Ivorra78 <informatica@totmaterial.es>\n"
|
||||
"Language-Team: none\n"
|
||||
"Language: es\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 4.17\n"
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_mrp_production
|
||||
msgid "Production Order"
|
||||
msgstr "Orden de Producción"
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_stock_rule
|
||||
msgid "Stock Rule"
|
||||
msgstr "Regla de existencias"
|
||||
27
mrp_warehouse_calendar/i18n/it.po
Normal file
@@ -0,0 +1,27 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * mrp_warehouse_calendar
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 16.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"PO-Revision-Date: 2023-06-23 13:09+0000\n"
|
||||
"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
|
||||
"Language-Team: none\n"
|
||||
"Language: it\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: nplurals=2; plural=n != 1;\n"
|
||||
"X-Generator: Weblate 4.17\n"
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_mrp_production
|
||||
msgid "Production Order"
|
||||
msgstr "Ordine di produzione"
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_stock_rule
|
||||
msgid "Stock Rule"
|
||||
msgstr "Regola di giacenza"
|
||||
24
mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot
Normal file
@@ -0,0 +1,24 @@
|
||||
# Translation of Odoo Server.
|
||||
# This file contains the translation of the following modules:
|
||||
# * mrp_warehouse_calendar
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Odoo Server 17.0\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"Last-Translator: \n"
|
||||
"Language-Team: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: \n"
|
||||
"Plural-Forms: \n"
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_mrp_production
|
||||
msgid "Production Order"
|
||||
msgstr ""
|
||||
|
||||
#. module: mrp_warehouse_calendar
|
||||
#: model:ir.model,name:mrp_warehouse_calendar.model_stock_rule
|
||||
msgid "Stock Rule"
|
||||
msgstr ""
|
||||
2
mrp_warehouse_calendar/models/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
||||
from . import mrp_production
|
||||
from . import stock_rule
|
||||
49
mrp_warehouse_calendar/models/mrp_production.py
Normal file
@@ -0,0 +1,49 @@
|
||||
# Copyright 2018-19 ForgeFlow S.L. (https://www.forgeflow.com)
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
from odoo import api, models
|
||||
|
||||
|
||||
class MrpProduction(models.Model):
|
||||
_inherit = "mrp.production"
|
||||
|
||||
@api.depends(
|
||||
"company_id",
|
||||
"date_start",
|
||||
"is_planned",
|
||||
"product_id",
|
||||
"workorder_ids.duration_expected",
|
||||
)
|
||||
def _compute_date_finished(self):
|
||||
res = super()._compute_date_finished()
|
||||
productions = self.filtered(lambda p: p.date_start and not p.is_planned)
|
||||
for production in productions:
|
||||
warehouse = self.picking_type_id.warehouse_id
|
||||
if warehouse.calendar_id:
|
||||
if production.bom_id.produce_delay:
|
||||
production.date_finished = warehouse.calendar_id.plan_days(
|
||||
+1 * production.bom_id.produce_delay + 1,
|
||||
production.date_start,
|
||||
)
|
||||
if production.company_id.manufacturing_lead:
|
||||
production.date_finished = warehouse.calendar_id.plan_days(
|
||||
+1 * production.company_id.manufacturing_lead + 1,
|
||||
production.date_finished,
|
||||
)
|
||||
production.move_finished_ids = [
|
||||
(1, m.id, {"date": production.date_finished})
|
||||
for m in production.move_finished_ids
|
||||
]
|
||||
return res
|
||||
|
||||
@api.returns("self", lambda value: value.id)
|
||||
def copy(self, default=None):
|
||||
mo = super().copy(default=default)
|
||||
dt_planned = mo.date_start
|
||||
warehouse = mo.picking_type_id.warehouse_id
|
||||
if warehouse.calendar_id and mo.bom_id.produce_delay:
|
||||
date_expected = warehouse.calendar_id.plan_days(
|
||||
+1 * self.bom_id.produce_delay + 1, dt_planned
|
||||
)
|
||||
mo.date_finished = date_expected
|
||||
return mo
|
||||
21
mrp_warehouse_calendar/models/stock_rule.py
Normal file
@@ -0,0 +1,21 @@
|
||||
# Copyright 2018-19 ForgeFlow S.L. (https://www.forgeflow.com)
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class StockRule(models.Model):
|
||||
_inherit = "stock.rule"
|
||||
|
||||
def _get_date_planned(self, bom_id, values):
|
||||
date_planned = super()._get_date_planned(bom_id, values)
|
||||
picking_type = self.picking_type_id or values["warehouse_id"].manu_type_id
|
||||
# We force the date planned to be at the beginning of the day.
|
||||
# So no work intervals are found in planned date.
|
||||
dt_planned = fields.Datetime.to_datetime(values["date_planned"]).replace(hour=0)
|
||||
warehouse = picking_type.warehouse_id
|
||||
if warehouse.calendar_id and bom_id.produce_delay:
|
||||
lead_days = values["company_id"].manufacturing_lead + bom_id.produce_delay
|
||||
date_expected = warehouse.calendar_id.plan_days(-1 * lead_days, dt_planned)
|
||||
date_planned = date_expected
|
||||
return date_planned
|
||||
3
mrp_warehouse_calendar/pyproject.toml
Normal file
@@ -0,0 +1,3 @@
|
||||
[build-system]
|
||||
requires = ["whool"]
|
||||
build-backend = "whool.buildapi"
|
||||
10
mrp_warehouse_calendar/readme/CONFIGURE.md
Normal file
@@ -0,0 +1,10 @@
|
||||
- This module depends on
|
||||
[stock_warehouse_calendar](https://github.com/OCA/stock-logistics-warehouse)
|
||||
- Go to *Settings* and activate the developer mode.
|
||||

|
||||
- Go to *Settings \> Technical \> Resource \> Working Schedules* and define
|
||||
your resource calendar.
|
||||

|
||||
- Go to *Inventory \> Configuration \> Warehouse Management \>
|
||||
Warehouses* and assign the Working Schedule.
|
||||

|
||||
2
mrp_warehouse_calendar/readme/CONTRIBUTORS.md
Normal file
@@ -0,0 +1,2 @@
|
||||
- Jordi Ballester \<<jordi.ballester@forgeflow.com>\>
|
||||
- Lois Rilo \<<lois.rilo@forgeflow.com>\>
|
||||
11
mrp_warehouse_calendar/readme/DESCRIPTION.md
Normal file
@@ -0,0 +1,11 @@
|
||||
This module ensures that manufacturing orders created from
|
||||
procurements respect the calendar assigned to the warehouse
|
||||
associated with the manufacturing order's picking type.
|
||||
The planned start date of the manufacturing order is calculated
|
||||
based on the product's manufacturing lead time and the working
|
||||
schedules defined in the warehouse calendar.
|
||||
|
||||
Additionally, any manual rescheduling of the start or
|
||||
end date of a manufacturing order will also take the lead
|
||||
time into account, following the working days defined by
|
||||
the warehouse calendar.
|
||||
16
mrp_warehouse_calendar/readme/USAGE.md
Normal file
@@ -0,0 +1,16 @@
|
||||
When a manufacturing order is created out of a procurement evaluation
|
||||
(from an orderpoint, MTO,...) the calendar is considered in the
|
||||
computation of the planned start date of the manufacturing order.
|
||||
|
||||
For example, if it takes 1 day to manufacture a product and it is
|
||||
required for Monday:
|
||||

|
||||
|
||||
the manufacturing order will be created with
|
||||
planned start date on the previous Friday, if the warehouse operates
|
||||
under a Mo-Fri working calendar.
|
||||

|
||||
|
||||
Manual changes to the start or end date of a manufacturing order will
|
||||
also respect the lead time and the warehouse calendar's working days.
|
||||

|
||||
BIN
mrp_warehouse_calendar/static/description/change_day.gif
Normal file
|
After Width: | Height: | Size: 323 KiB |
BIN
mrp_warehouse_calendar/static/description/developer_mode.gif
Normal file
|
After Width: | Height: | Size: 892 KiB |
BIN
mrp_warehouse_calendar/static/description/icon.png
Normal file
|
After Width: | Height: | Size: 9.2 KiB |
461
mrp_warehouse_calendar/static/description/index.html
Normal file
@@ -0,0 +1,461 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<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: https://docutils.sourceforge.io/" />
|
||||
<title>MRP Warehouse Calendar</title>
|
||||
<style type="text/css">
|
||||
|
||||
/*
|
||||
:Author: David Goodger (goodger@python.org)
|
||||
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
|
||||
:Copyright: This stylesheet has been placed in the public domain.
|
||||
|
||||
Default cascading style sheet for the HTML output of Docutils.
|
||||
Despite the name, some widely supported CSS2 features are used.
|
||||
|
||||
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
|
||||
customize this style sheet.
|
||||
*/
|
||||
|
||||
/* used to remove borders from tables and images */
|
||||
.borderless, table.borderless td, table.borderless th {
|
||||
border: 0 }
|
||||
|
||||
table.borderless td, table.borderless th {
|
||||
/* Override padding for "table.docutils td" with "! important".
|
||||
The right padding separates the table cells. */
|
||||
padding: 0 0.5em 0 0 ! important }
|
||||
|
||||
.first {
|
||||
/* Override more specific margin styles with "! important". */
|
||||
margin-top: 0 ! important }
|
||||
|
||||
.last, .with-subtitle {
|
||||
margin-bottom: 0 ! important }
|
||||
|
||||
.hidden {
|
||||
display: none }
|
||||
|
||||
.subscript {
|
||||
vertical-align: sub;
|
||||
font-size: smaller }
|
||||
|
||||
.superscript {
|
||||
vertical-align: super;
|
||||
font-size: smaller }
|
||||
|
||||
a.toc-backref {
|
||||
text-decoration: none ;
|
||||
color: black }
|
||||
|
||||
blockquote.epigraph {
|
||||
margin: 2em 5em ; }
|
||||
|
||||
dl.docutils dd {
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
/* Uncomment (and remove this text!) to get bold-faced definition list terms
|
||||
dl.docutils dt {
|
||||
font-weight: bold }
|
||||
*/
|
||||
|
||||
div.abstract {
|
||||
margin: 2em 5em }
|
||||
|
||||
div.abstract p.topic-title {
|
||||
font-weight: bold ;
|
||||
text-align: center }
|
||||
|
||||
div.admonition, div.attention, div.caution, div.danger, div.error,
|
||||
div.hint, div.important, div.note, div.tip, div.warning {
|
||||
margin: 2em ;
|
||||
border: medium outset ;
|
||||
padding: 1em }
|
||||
|
||||
div.admonition p.admonition-title, div.hint p.admonition-title,
|
||||
div.important p.admonition-title, div.note p.admonition-title,
|
||||
div.tip p.admonition-title {
|
||||
font-weight: bold ;
|
||||
font-family: sans-serif }
|
||||
|
||||
div.attention p.admonition-title, div.caution p.admonition-title,
|
||||
div.danger p.admonition-title, div.error p.admonition-title,
|
||||
div.warning p.admonition-title, .code .error {
|
||||
color: red ;
|
||||
font-weight: bold ;
|
||||
font-family: sans-serif }
|
||||
|
||||
/* Uncomment (and remove this text!) to get reduced vertical space in
|
||||
compound paragraphs.
|
||||
div.compound .compound-first, div.compound .compound-middle {
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
div.compound .compound-last, div.compound .compound-middle {
|
||||
margin-top: 0.5em }
|
||||
*/
|
||||
|
||||
div.dedication {
|
||||
margin: 2em 5em ;
|
||||
text-align: center ;
|
||||
font-style: italic }
|
||||
|
||||
div.dedication p.topic-title {
|
||||
font-weight: bold ;
|
||||
font-style: normal }
|
||||
|
||||
div.figure {
|
||||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
div.footer, div.header {
|
||||
clear: both;
|
||||
font-size: smaller }
|
||||
|
||||
div.line-block {
|
||||
display: block ;
|
||||
margin-top: 1em ;
|
||||
margin-bottom: 1em }
|
||||
|
||||
div.line-block div.line-block {
|
||||
margin-top: 0 ;
|
||||
margin-bottom: 0 ;
|
||||
margin-left: 1.5em }
|
||||
|
||||
div.sidebar {
|
||||
margin: 0 0 0.5em 1em ;
|
||||
border: medium outset ;
|
||||
padding: 1em ;
|
||||
background-color: #ffffee ;
|
||||
width: 40% ;
|
||||
float: right ;
|
||||
clear: right }
|
||||
|
||||
div.sidebar p.rubric {
|
||||
font-family: sans-serif ;
|
||||
font-size: medium }
|
||||
|
||||
div.system-messages {
|
||||
margin: 5em }
|
||||
|
||||
div.system-messages h1 {
|
||||
color: red }
|
||||
|
||||
div.system-message {
|
||||
border: medium outset ;
|
||||
padding: 1em }
|
||||
|
||||
div.system-message p.system-message-title {
|
||||
color: red ;
|
||||
font-weight: bold }
|
||||
|
||||
div.topic {
|
||||
margin: 2em }
|
||||
|
||||
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
|
||||
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
|
||||
margin-top: 0.4em }
|
||||
|
||||
h1.title {
|
||||
text-align: center }
|
||||
|
||||
h2.subtitle {
|
||||
text-align: center }
|
||||
|
||||
hr.docutils {
|
||||
width: 75% }
|
||||
|
||||
img.align-left, .figure.align-left, object.align-left, table.align-left {
|
||||
clear: left ;
|
||||
float: left ;
|
||||
margin-right: 1em }
|
||||
|
||||
img.align-right, .figure.align-right, object.align-right, table.align-right {
|
||||
clear: right ;
|
||||
float: right ;
|
||||
margin-left: 1em }
|
||||
|
||||
img.align-center, .figure.align-center, object.align-center {
|
||||
display: block;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
table.align-center {
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
||||
.align-left {
|
||||
text-align: left }
|
||||
|
||||
.align-center {
|
||||
clear: both ;
|
||||
text-align: center }
|
||||
|
||||
.align-right {
|
||||
text-align: right }
|
||||
|
||||
/* reset inner alignment in figures */
|
||||
div.align-right {
|
||||
text-align: inherit }
|
||||
|
||||
/* div.align-center * { */
|
||||
/* text-align: left } */
|
||||
|
||||
.align-top {
|
||||
vertical-align: top }
|
||||
|
||||
.align-middle {
|
||||
vertical-align: middle }
|
||||
|
||||
.align-bottom {
|
||||
vertical-align: bottom }
|
||||
|
||||
ol.simple, ul.simple {
|
||||
margin-bottom: 1em }
|
||||
|
||||
ol.arabic {
|
||||
list-style: decimal }
|
||||
|
||||
ol.loweralpha {
|
||||
list-style: lower-alpha }
|
||||
|
||||
ol.upperalpha {
|
||||
list-style: upper-alpha }
|
||||
|
||||
ol.lowerroman {
|
||||
list-style: lower-roman }
|
||||
|
||||
ol.upperroman {
|
||||
list-style: upper-roman }
|
||||
|
||||
p.attribution {
|
||||
text-align: right ;
|
||||
margin-left: 50% }
|
||||
|
||||
p.caption {
|
||||
font-style: italic }
|
||||
|
||||
p.credits {
|
||||
font-style: italic ;
|
||||
font-size: smaller }
|
||||
|
||||
p.label {
|
||||
white-space: nowrap }
|
||||
|
||||
p.rubric {
|
||||
font-weight: bold ;
|
||||
font-size: larger ;
|
||||
color: maroon ;
|
||||
text-align: center }
|
||||
|
||||
p.sidebar-title {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold ;
|
||||
font-size: larger }
|
||||
|
||||
p.sidebar-subtitle {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold }
|
||||
|
||||
p.topic-title {
|
||||
font-weight: bold }
|
||||
|
||||
pre.address {
|
||||
margin-bottom: 0 ;
|
||||
margin-top: 0 ;
|
||||
font: inherit }
|
||||
|
||||
pre.literal-block, pre.doctest-block, pre.math, pre.code {
|
||||
margin-left: 2em ;
|
||||
margin-right: 2em }
|
||||
|
||||
pre.code .ln { color: gray; } /* line numbers */
|
||||
pre.code, code { background-color: #eeeeee }
|
||||
pre.code .comment, code .comment { color: #5C6576 }
|
||||
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
|
||||
pre.code .literal.string, code .literal.string { color: #0C5404 }
|
||||
pre.code .name.builtin, code .name.builtin { color: #352B84 }
|
||||
pre.code .deleted, code .deleted { background-color: #DEB0A1}
|
||||
pre.code .inserted, code .inserted { background-color: #A3D289}
|
||||
|
||||
span.classifier {
|
||||
font-family: sans-serif ;
|
||||
font-style: oblique }
|
||||
|
||||
span.classifier-delimiter {
|
||||
font-family: sans-serif ;
|
||||
font-weight: bold }
|
||||
|
||||
span.interpreted {
|
||||
font-family: sans-serif }
|
||||
|
||||
span.option {
|
||||
white-space: nowrap }
|
||||
|
||||
span.pre {
|
||||
white-space: pre }
|
||||
|
||||
span.problematic, pre.problematic {
|
||||
color: red }
|
||||
|
||||
span.section-subtitle {
|
||||
/* font-size relative to parent (h1..h6 element) */
|
||||
font-size: 80% }
|
||||
|
||||
table.citation {
|
||||
border-left: solid 1px gray;
|
||||
margin-left: 1px }
|
||||
|
||||
table.docinfo {
|
||||
margin: 2em 4em }
|
||||
|
||||
table.docutils {
|
||||
margin-top: 0.5em ;
|
||||
margin-bottom: 0.5em }
|
||||
|
||||
table.footnote {
|
||||
border-left: solid 1px black;
|
||||
margin-left: 1px }
|
||||
|
||||
table.docutils td, table.docutils th,
|
||||
table.docinfo td, table.docinfo th {
|
||||
padding-left: 0.5em ;
|
||||
padding-right: 0.5em ;
|
||||
vertical-align: top }
|
||||
|
||||
table.docutils th.field-name, table.docinfo th.docinfo-name {
|
||||
font-weight: bold ;
|
||||
text-align: left ;
|
||||
white-space: nowrap ;
|
||||
padding-left: 0 }
|
||||
|
||||
/* "booktabs" style (no vertical lines) */
|
||||
table.docutils.booktabs {
|
||||
border: 0px;
|
||||
border-top: 2px solid;
|
||||
border-bottom: 2px solid;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
table.docutils.booktabs * {
|
||||
border: 0px;
|
||||
}
|
||||
table.docutils.booktabs th {
|
||||
border-bottom: thin solid;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
|
||||
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
|
||||
font-size: 100% }
|
||||
|
||||
ul.auto-toc {
|
||||
list-style-type: none }
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="document" id="mrp-warehouse-calendar">
|
||||
<h1 class="title">MRP Warehouse Calendar</h1>
|
||||
|
||||
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! This file is generated by oca-gen-addon-readme !!
|
||||
!! changes will be overwritten. !!
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
!! source digest: sha256:18cdb9aea24afa77c86c9bf4c578ce490415389ba52053aabd18c04b457002eb
|
||||
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
|
||||
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" 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 image-reference" href="https://github.com/OCA/manufacture/tree/18.0/mrp_warehouse_calendar"><img alt="OCA/manufacture" src="https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/manufacture-18-0/manufacture-18-0-mrp_warehouse_calendar"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/manufacture&target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
|
||||
<p>This module ensures that manufacturing orders created from procurements
|
||||
respect the calendar assigned to the warehouse associated with the
|
||||
manufacturing order’s picking type. The planned start date of the
|
||||
manufacturing order is calculated based on the product’s manufacturing
|
||||
lead time and the working schedules defined in the warehouse calendar.</p>
|
||||
<p>Additionally, any manual rescheduling of the start or end date of a
|
||||
manufacturing order will also take the lead time into account, following
|
||||
the working days defined by the warehouse calendar.</p>
|
||||
<p><strong>Table of contents</strong></p>
|
||||
<div class="contents local topic" id="contents">
|
||||
<ul class="simple">
|
||||
<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
|
||||
<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
|
||||
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
|
||||
<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
|
||||
<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
|
||||
<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
|
||||
<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="configuration">
|
||||
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
|
||||
<ul class="simple">
|
||||
<li>This module depends on
|
||||
<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse">stock_warehouse_calendar</a></li>
|
||||
<li>Go to <em>Settings</em> and activate the developer mode. <img alt="Developer mode" src="https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/developer_mode.gif" /></li>
|
||||
<li>Go to <em>Settings > Technical > Resource > Working Schedules</em> and
|
||||
define your resource calendar. <img alt="Working Schedules" src="https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/working_schedules.gif" /></li>
|
||||
<li>Go to <em>Inventory > Configuration > Warehouse Management > Warehouses</em>
|
||||
and assign the Working Schedule. <img alt="Warehouse Management" src="https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/warehouse_management.gif" /></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="usage">
|
||||
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
|
||||
<p>When a manufacturing order is created out of a procurement evaluation
|
||||
(from an orderpoint, MTO,…) the calendar is considered in the
|
||||
computation of the planned start date of the manufacturing order.</p>
|
||||
<p>For example, if it takes 1 day to manufacture a product and it is
|
||||
required for Monday: <img alt="Replenish" src="https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/replenish.png" /></p>
|
||||
<p>the manufacturing order will be created with planned start date on the
|
||||
previous Friday, if the warehouse operates under a Mo-Fri working
|
||||
calendar. <img alt="Manufacturing Order" src="https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/manufacturing_order.png" /></p>
|
||||
<p>Manual changes to the start or end date of a manufacturing order will
|
||||
also respect the lead time and the warehouse calendar’s working days.
|
||||
<img alt="Manual change day" src="https://raw.githubusercontent.com/OCA/manufacture/18.0/mrp_warehouse_calendar/static/description/change_day.gif" /></p>
|
||||
</div>
|
||||
<div class="section" id="bug-tracker">
|
||||
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
|
||||
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/manufacture/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 to smash it by providing a detailed and welcomed
|
||||
<a class="reference external" href="https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_warehouse_calendar%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
|
||||
<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="#toc-entry-4">Credits</a></h1>
|
||||
<div class="section" id="authors">
|
||||
<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
|
||||
<ul class="simple">
|
||||
<li>ForgeFlow</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="contributors">
|
||||
<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
|
||||
<ul class="simple">
|
||||
<li>Jordi Ballester <<a class="reference external" href="mailto:jordi.ballester@forgeflow.com">jordi.ballester@forgeflow.com</a>></li>
|
||||
<li>Lois Rilo <<a class="reference external" href="mailto:lois.rilo@forgeflow.com">lois.rilo@forgeflow.com</a>></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="section" id="maintainers">
|
||||
<h2><a class="toc-backref" href="#toc-entry-7">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
|
||||
mission is to support the collaborative development of Odoo features and
|
||||
promote its widespread use.</p>
|
||||
<p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
|
||||
<p><a class="reference external image-reference" href="https://github.com/JordiBForgeFlow"><img alt="JordiBForgeFlow" src="https://github.com/JordiBForgeFlow.png?size=40px" /></a></p>
|
||||
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/manufacture/tree/18.0/mrp_warehouse_calendar">OCA/manufacture</a> project on GitHub.</p>
|
||||
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
After Width: | Height: | Size: 92 KiB |
BIN
mrp_warehouse_calendar/static/description/replenish.png
Normal file
|
After Width: | Height: | Size: 120 KiB |
|
After Width: | Height: | Size: 218 KiB |
BIN
mrp_warehouse_calendar/static/description/working_schedules.gif
Normal file
|
After Width: | Height: | Size: 379 KiB |
1
mrp_warehouse_calendar/tests/__init__.py
Normal file
@@ -0,0 +1 @@
|
||||
from . import test_mrp_warehouse_calendar
|
||||
145
mrp_warehouse_calendar/tests/test_mrp_warehouse_calendar.py
Normal file
@@ -0,0 +1,145 @@
|
||||
# Copyright 2018-19 ForgeFlow S.L. (https://www.forgeflow.com)
|
||||
# License LGPL-3.0 or later (https://www.gnu.org/licenses/lgpl.html).
|
||||
|
||||
from odoo import fields
|
||||
from odoo.tests.common import TransactionCase
|
||||
|
||||
|
||||
class TestMrpWarehouseCalendar(TransactionCase):
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
self.move_obj = self.env["stock.move"]
|
||||
self.pg_obj = self.env["procurement.group"]
|
||||
|
||||
self.company = self.env.ref("base.main_company")
|
||||
self.warehouse = self.env.ref("stock.warehouse0")
|
||||
self.customer_loc = self.env.ref("stock.stock_location_customers")
|
||||
self.company_partner = self.env.ref("base.main_partner")
|
||||
self.calendar = self.env.ref("resource.resource_calendar_std")
|
||||
self.manufacture_route = self.env.ref("mrp.route_warehouse0_manufacture")
|
||||
|
||||
self.warehouse.calendar_id = self.calendar.id
|
||||
self.warehouse_2 = self.env["stock.warehouse"].create(
|
||||
{"code": "WH-T", "name": "Warehouse Test", "calendar_id": self.calendar.id}
|
||||
)
|
||||
|
||||
self.product = self.env["product.product"].create(
|
||||
{
|
||||
"name": "test product",
|
||||
"default_code": "PRD",
|
||||
"type": "consu",
|
||||
"is_storable": "True",
|
||||
}
|
||||
)
|
||||
self.product_2 = self.env["product.product"].create(
|
||||
{
|
||||
"name": "test product 2",
|
||||
"default_code": "PRD 2",
|
||||
"type": "consu",
|
||||
"is_storable": "True",
|
||||
}
|
||||
)
|
||||
self.bom = self.env["mrp.bom"].create(
|
||||
{
|
||||
"product_id": self.product.id,
|
||||
"product_tmpl_id": self.product.product_tmpl_id.id,
|
||||
"product_uom_id": self.product.uom_id.id,
|
||||
"product_qty": 1.0,
|
||||
"type": "normal",
|
||||
"produce_delay": 1,
|
||||
}
|
||||
)
|
||||
self.env["mrp.bom.line"].create(
|
||||
{"bom_id": self.bom.id, "product_id": self.product_2.id, "product_qty": 2}
|
||||
)
|
||||
|
||||
self.product.route_ids = [(6, 0, self.manufacture_route.ids)]
|
||||
|
||||
def test_procurement_with_calendar(self):
|
||||
"""Ensure that the planned start date of the manufacturing order
|
||||
respects the warehouse calendar. The planned procurement date is
|
||||
during a working interval, and the manufacturing lead time should
|
||||
adjust the start date accordingly."""
|
||||
values = {
|
||||
"date_planned": "2097-01-07 09:00:00", # Monday inside working hours
|
||||
"warehouse_id": self.warehouse,
|
||||
"company_id": self.company,
|
||||
"rule_id": self.manufacture_route,
|
||||
}
|
||||
self.pg_obj.run(
|
||||
[
|
||||
self.pg_obj.Procurement(
|
||||
self.product,
|
||||
100,
|
||||
self.product.uom_id,
|
||||
self.warehouse.lot_stock_id,
|
||||
"Test",
|
||||
"Test",
|
||||
self.warehouse.company_id,
|
||||
values,
|
||||
)
|
||||
]
|
||||
)
|
||||
mo = self.env["mrp.production"].search(
|
||||
[("product_id", "=", self.product.id)], limit=1
|
||||
)
|
||||
date_plan_start = fields.Date.to_date(mo.date_start)
|
||||
# Friday 4th Jan 2097
|
||||
friday = fields.Date.to_date("2097-01-04 09:00:00")
|
||||
|
||||
self.assertEqual(date_plan_start, friday)
|
||||
|
||||
def test_procurement_with_calendar_02(self):
|
||||
"""Verify that procurement respects the warehouse calendar
|
||||
when the planned date is outside working hours. The planned
|
||||
manufacturing order start date should be adjusted to the last
|
||||
available working interval."""
|
||||
values = {
|
||||
"date_planned": "2097-01-07 01:00:00", # Monday outside working hours
|
||||
"warehouse_id": self.warehouse,
|
||||
"company_id": self.company,
|
||||
"rule_id": self.manufacture_route,
|
||||
}
|
||||
self.pg_obj.run(
|
||||
[
|
||||
self.pg_obj.Procurement(
|
||||
self.product,
|
||||
100,
|
||||
self.product.uom_id,
|
||||
self.warehouse.lot_stock_id,
|
||||
"Test 2",
|
||||
"Test 2",
|
||||
self.warehouse.company_id,
|
||||
values,
|
||||
)
|
||||
]
|
||||
)
|
||||
mo = self.env["mrp.production"].search(
|
||||
[("product_id", "=", self.product.id)], limit=1
|
||||
)
|
||||
date_plan_start = fields.Date.to_date(mo.date_start)
|
||||
# Friday 4th Jan 2097
|
||||
friday = fields.Date.to_date("2097-01-04 09:00:00")
|
||||
|
||||
self.assertEqual(date_plan_start, friday)
|
||||
|
||||
def test_onchange_date_planned(self):
|
||||
"""Test the impact of changing the planned start date (`date_start`)
|
||||
on the planned end date (`date_finished`) in a manufacturing order.
|
||||
Verify that the system correctly computes the end date considering
|
||||
the manufacturing lead time and the warehouse calendar."""
|
||||
mo = self.env["mrp.production"].new(
|
||||
{
|
||||
"product_id": self.product.id,
|
||||
"bom_id": self.bom.id,
|
||||
"product_qty": 1,
|
||||
"picking_type_id": self.env[
|
||||
"mrp.production"
|
||||
]._get_default_picking_type_id(self.company.id),
|
||||
}
|
||||
)
|
||||
mo.date_start = "2097-01-04 09:00:00"
|
||||
mo._compute_date_finished()
|
||||
date_plan_finished = fields.Date.to_date(mo.date_finished)
|
||||
monday = fields.Date.to_date("2097-01-07 09:00:00")
|
||||
self.assertEqual(date_plan_finished, monday)
|
||||