diff --git a/mrp_warehouse_calendar/README.rst b/mrp_warehouse_calendar/README.rst new file mode 100644 index 000000000..b2084692f --- /dev/null +++ b/mrp_warehouse_calendar/README.rst @@ -0,0 +1,113 @@ +====================== +MRP Warehouse Calendar +====================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/13.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-13-0/manufacture-13-0-mrp_warehouse_calendar + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/129/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +With this module the manufacturing orders created from procurements consider +the calendar assigned to the warehouse of the picking type of the +manufacturing order to determine, based on the product's manufacturing +lead time, the planned start date of the manufacturing order. + +Further manual replannings of start/end date of the manufacturing order +also consider the lead time using the warehouse calendar days. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +* This module depends on `stock_warehouse_calendar `_ + +* Go to *Settings* and activate the developer mode. + +* Go to *Settings > Technical > Resource > Working Time* and define your + resource calendar. + +* Go to *Inventory > Configuration > Warehouse Management > Warehouses* + and assign the Resource Calendar. + +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, the manufacturing order will be created with planned start date +on the previous Friday, if the warehouse operates under a Mo-Fri working +calendar. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +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 +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* ForgeFlow + +Contributors +~~~~~~~~~~~~ + +* Jordi Ballester +* Lois Rilo + +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 `__: + +|maintainer-JordiBForgeFlow| + +This module is part of the `OCA/manufacture `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mrp_warehouse_calendar/__init__.py b/mrp_warehouse_calendar/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/mrp_warehouse_calendar/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/mrp_warehouse_calendar/__manifest__.py b/mrp_warehouse_calendar/__manifest__.py new file mode 100644 index 000000000..b908b1af8 --- /dev/null +++ b/mrp_warehouse_calendar/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2018-19 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": "14.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"], +} diff --git a/mrp_warehouse_calendar/i18n/de.po b/mrp_warehouse_calendar/i18n/de.po new file mode 100644 index 000000000..0e3f51dd0 --- /dev/null +++ b/mrp_warehouse_calendar/i18n/de.po @@ -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 \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" diff --git a/mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot b/mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot new file mode 100644 index 000000000..8237fa10d --- /dev/null +++ b/mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot @@ -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 13.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 "" diff --git a/mrp_warehouse_calendar/models/__init__.py b/mrp_warehouse_calendar/models/__init__.py new file mode 100644 index 000000000..6379cdc3a --- /dev/null +++ b/mrp_warehouse_calendar/models/__init__.py @@ -0,0 +1,2 @@ +from . import mrp_production +from . import stock_rule diff --git a/mrp_warehouse_calendar/models/mrp_production.py b/mrp_warehouse_calendar/models/mrp_production.py new file mode 100644 index 000000000..cb2c2573a --- /dev/null +++ b/mrp_warehouse_calendar/models/mrp_production.py @@ -0,0 +1,30 @@ +# 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.onchange("date_planned_start", "product_id") + def onchange_date_planned(self): + dt_planned = self.date_planned_start + warehouse = self.picking_type_id.warehouse_id + if warehouse.calendar_id and self.product_id.produce_delay: + date_expected_finished = warehouse.calendar_id.plan_days( + +1 * self.product_id.produce_delay + 1, dt_planned + ) + self.date_planned_finished = date_expected_finished + + @api.returns("self", lambda value: value.id) + def copy(self, default=None): + mo = super().copy(default=default) + dt_planned = mo.date_planned_start + warehouse = mo.picking_type_id.warehouse_id + if warehouse.calendar_id and mo.product_id.produce_delay: + date_expected = warehouse.calendar_id.plan_days( + +1 * self.product_id.produce_delay + 1, dt_planned + ) + mo.date_planned_finished = date_expected + return mo diff --git a/mrp_warehouse_calendar/models/stock_rule.py b/mrp_warehouse_calendar/models/stock_rule.py new file mode 100644 index 000000000..d23e3b756 --- /dev/null +++ b/mrp_warehouse_calendar/models/stock_rule.py @@ -0,0 +1,23 @@ +# 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, product_id, company_id, values): + date_planned = super()._get_date_planned(product_id, company_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 product_id.produce_delay: + lead_days = ( + values["company_id"].manufacturing_lead + product_id.produce_delay + ) + date_expected = warehouse.calendar_id.plan_days(-1 * lead_days, dt_planned) + date_planned = date_expected + return date_planned diff --git a/mrp_warehouse_calendar/readme/CONFIGURE.rst b/mrp_warehouse_calendar/readme/CONFIGURE.rst new file mode 100644 index 000000000..16ab5b81e --- /dev/null +++ b/mrp_warehouse_calendar/readme/CONFIGURE.rst @@ -0,0 +1,9 @@ +* This module depends on `stock_warehouse_calendar `_ + +* Go to *Settings* and activate the developer mode. + +* Go to *Settings > Technical > Resource > Working Time* and define your + resource calendar. + +* Go to *Inventory > Configuration > Warehouse Management > Warehouses* + and assign the Resource Calendar. diff --git a/mrp_warehouse_calendar/readme/CONTRIBUTORS.rst b/mrp_warehouse_calendar/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..8cc067b15 --- /dev/null +++ b/mrp_warehouse_calendar/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Jordi Ballester +* Lois Rilo diff --git a/mrp_warehouse_calendar/readme/DESCRIPTION.rst b/mrp_warehouse_calendar/readme/DESCRIPTION.rst new file mode 100644 index 000000000..1c29d471f --- /dev/null +++ b/mrp_warehouse_calendar/readme/DESCRIPTION.rst @@ -0,0 +1,7 @@ +With this module the manufacturing orders created from procurements consider +the calendar assigned to the warehouse of the picking type of the +manufacturing order to determine, based on the product's manufacturing +lead time, the planned start date of the manufacturing order. + +Further manual replannings of start/end date of the manufacturing order +also consider the lead time using the warehouse calendar days. diff --git a/mrp_warehouse_calendar/readme/USAGE.rst b/mrp_warehouse_calendar/readme/USAGE.rst new file mode 100644 index 000000000..081b0392d --- /dev/null +++ b/mrp_warehouse_calendar/readme/USAGE.rst @@ -0,0 +1,8 @@ +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. diff --git a/mrp_warehouse_calendar/static/description/icon.png b/mrp_warehouse_calendar/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/mrp_warehouse_calendar/static/description/icon.png differ diff --git a/mrp_warehouse_calendar/static/description/index.html b/mrp_warehouse_calendar/static/description/index.html new file mode 100644 index 000000000..2e98b2ad0 --- /dev/null +++ b/mrp_warehouse_calendar/static/description/index.html @@ -0,0 +1,450 @@ + + + + + + +MRP Warehouse Calendar + + + +
+

MRP Warehouse Calendar

+ + +

Production/Stable License: LGPL-3 OCA/manufacture Translate me on Weblate Try me on Runbot

+

With this module the manufacturing orders created from procurements consider +the calendar assigned to the warehouse of the picking type of the +manufacturing order to determine, based on the product’s manufacturing +lead time, the planned start date of the manufacturing order.

+

Further manual replannings of start/end date of the manufacturing order +also consider the lead time using the warehouse calendar days.

+

Table of contents

+ +
+

Configuration

+
    +
  • This module depends on stock_warehouse_calendar
    • +
  • Go to Settings and activate the developer mode.
    • +
  • Go to Settings > Technical > Resource > Working Time and define your +resource calendar.
    • +
  • Go to Inventory > Configuration > Warehouse Management > Warehouses +and assign the Resource Calendar.
    • +
+
+
+

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, the manufacturing order will be created with planned start date +on the previous Friday, if the warehouse operates under a Mo-Fri working +calendar.

+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +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 +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • ForgeFlow
    • +
+
+ +
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

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.

+

Current maintainer:

+

JordiBForgeFlow

+

This module is part of the OCA/manufacture project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/mrp_warehouse_calendar/tests/__init__.py b/mrp_warehouse_calendar/tests/__init__.py new file mode 100644 index 000000000..5b771f092 --- /dev/null +++ b/mrp_warehouse_calendar/tests/__init__.py @@ -0,0 +1 @@ +from . import test_mrp_warehouse_calendar diff --git a/mrp_warehouse_calendar/tests/test_mrp_warehouse_calendar.py b/mrp_warehouse_calendar/tests/test_mrp_warehouse_calendar.py new file mode 100644 index 000000000..fce86966c --- /dev/null +++ b/mrp_warehouse_calendar/tests/test_mrp_warehouse_calendar.py @@ -0,0 +1,129 @@ +# 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(TestMrpWarehouseCalendar, self).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": "product", + "produce_delay": 1, + } + ) + self.product_2 = self.env["product.product"].create( + {"name": "test product 2", "default_code": "PRD 2", "type": "product"} + ) + 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", + } + ) + 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): + values = { + "date_planned": "2097-01-07 09:00:00", # Monday + "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_planned_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): + """Test procuring at the beginning of the day, with no work intervals + before.""" + values = { + "date_planned": "2097-01-07 01:00:00", # Monday + "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_planned_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): + 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(), + } + ) + mo.date_planned_start = "2097-01-04 09:00:00" + mo.onchange_date_planned() + date_plan_finished = fields.Date.to_date(mo.date_planned_finished) + monday = fields.Date.to_date("2097-01-07 09:00:00") + self.assertEqual(date_plan_finished, monday)