From d47cc4a6ba261c86bfbacf25084dc6d3d4f7d29d Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Fri, 29 Jun 2018 15:45:49 +0200 Subject: [PATCH 01/28] 11.0 add mrp_warehouse_calendar --- mrp_warehouse_calendar/__init__.py | 1 + mrp_warehouse_calendar/__manifest__.py | 20 ++++ mrp_warehouse_calendar/models/__init__.py | 2 + .../models/mrp_production.py | 28 ++++++ .../models/procurement_rule.py | 23 +++++ mrp_warehouse_calendar/readme/CONFIGURE.rst | 9 ++ .../readme/CONTRIBUTORS.rst | 1 + mrp_warehouse_calendar/readme/DESCRIPTION.rst | 7 ++ mrp_warehouse_calendar/readme/ROADMAP.rst | 0 mrp_warehouse_calendar/readme/USAGE.rst | 8 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes mrp_warehouse_calendar/tests/__init__.py | 1 + .../tests/test_mrp_warehouse_calendar.py | 87 ++++++++++++++++++ 13 files changed, 187 insertions(+) create mode 100644 mrp_warehouse_calendar/__init__.py create mode 100644 mrp_warehouse_calendar/__manifest__.py create mode 100644 mrp_warehouse_calendar/models/__init__.py create mode 100644 mrp_warehouse_calendar/models/mrp_production.py create mode 100644 mrp_warehouse_calendar/models/procurement_rule.py create mode 100644 mrp_warehouse_calendar/readme/CONFIGURE.rst create mode 100644 mrp_warehouse_calendar/readme/CONTRIBUTORS.rst create mode 100644 mrp_warehouse_calendar/readme/DESCRIPTION.rst create mode 100644 mrp_warehouse_calendar/readme/ROADMAP.rst create mode 100644 mrp_warehouse_calendar/readme/USAGE.rst create mode 100644 mrp_warehouse_calendar/static/description/icon.png create mode 100644 mrp_warehouse_calendar/tests/__init__.py create mode 100644 mrp_warehouse_calendar/tests/test_mrp_warehouse_calendar.py 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..c86d2a4ea --- /dev/null +++ b/mrp_warehouse_calendar/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + "name": "MRP Warehouse Calendar", + "summary": "Considers the warehouse calendars in manufacturing", + "version": "11.0.1.0.0", + "license": "AGPL-3", + "website": "https://github.com/stock-logistics-warehouse", + "author": "Eficent, " + "Odoo Community Association (OCA)", + "category": "Manufacturing", + "depends": [ + "mrp", + "stock_warehouse_calendar", + ], + "installable": True, + 'development_status': 'Beta', + 'maintainers': ['jbeficent'], +} diff --git a/mrp_warehouse_calendar/models/__init__.py b/mrp_warehouse_calendar/models/__init__.py new file mode 100644 index 000000000..1847eff88 --- /dev/null +++ b/mrp_warehouse_calendar/models/__init__.py @@ -0,0 +1,2 @@ +from . import mrp_production +from . import procurement_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..c82b47e71 --- /dev/null +++ b/mrp_warehouse_calendar/models/mrp_production.py @@ -0,0 +1,28 @@ +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import api, fields, models + + +class MrpProduction(models.Model): + _inherit = 'mrp.production' + + @api.onchange('date_planned_start', 'product_id') + def onchange_date_planned(self): + dt_planned = fields.Datetime.from_string(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.multi + def copy(self, default=None): + mo = super(MrpProduction, self).copy(default=default) + dt_planned = fields.Datetime.from_string(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/procurement_rule.py b/mrp_warehouse_calendar/models/procurement_rule.py new file mode 100644 index 000000000..4911785c0 --- /dev/null +++ b/mrp_warehouse_calendar/models/procurement_rule.py @@ -0,0 +1,23 @@ +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import fields, models + + +class ProcurementRule(models.Model): + _inherit = 'procurement.rule' + + def _get_date_planned(self, product_id, values): + date_planned = super(ProcurementRule, self)._get_date_planned( + product_id, values) + picking_type = self.picking_type_id or \ + values['warehouse_id'].manu_type_id + dt_planned = fields.Datetime.from_string(values['date_planned']) + 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 - 1, 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..d72a49b94 --- /dev/null +++ b/mrp_warehouse_calendar/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Jordi Ballester (EFICENT) . \ No newline at end of file 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/ROADMAP.rst b/mrp_warehouse_calendar/readme/ROADMAP.rst new file mode 100644 index 000000000..e69de29bb 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 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 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..9b858fb03 --- /dev/null +++ b/mrp_warehouse_calendar/tests/test_mrp_warehouse_calendar.py @@ -0,0 +1,87 @@ +# Copyright 2018 Eficent Business and IT Consulting Services, S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.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.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.env['procurement.group'].run( + self.product, 100, + self.product.uom_id, + self.warehouse.lot_stock_id, 'Test', + 'Test', values) + mo = self.env['mrp.production'].search( + [('product_id', '=', self.product.id)], limit=1) + date_plan_start = fields.Datetime.from_string( + mo.date_planned_start).date() + # Friday 4th Jan 2097 + friday = fields.Datetime.from_string('2097-01-04 09:00:00').date() + + 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.Datetime.from_string( + mo.date_planned_finished).date() + monday = fields.Datetime.from_string('2097-01-07 09:00:00').date() + self.assertEqual(date_plan_finished, monday) From 09ceb343fff3078bb4dc71100c3dc1f8980a54ab Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Fri, 6 Jul 2018 18:29:45 +0200 Subject: [PATCH 02/28] [FIX] remove empty file to make readme generator work properly --- mrp_warehouse_calendar/README.rst | 112 +++++ .../i18n/mrp_warehouse_calendar.pot | 25 + mrp_warehouse_calendar/readme/ROADMAP.rst | 0 .../static/description/index.html | 449 ++++++++++++++++++ 4 files changed, 586 insertions(+) create mode 100644 mrp_warehouse_calendar/README.rst create mode 100644 mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot delete mode 100644 mrp_warehouse_calendar/readme/ROADMAP.rst create mode 100644 mrp_warehouse_calendar/static/description/index.html diff --git a/mrp_warehouse_calendar/README.rst b/mrp_warehouse_calendar/README.rst new file mode 100644 index 000000000..1141fb85e --- /dev/null +++ b/mrp_warehouse_calendar/README.rst @@ -0,0 +1,112 @@ +====================== +MRP Warehouse Calendar +====================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github + :target: https://github.com/OCA/manufacture/tree/11.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-11-0/manufacture-11-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/11.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 +~~~~~~~ + +* Eficent + +Contributors +~~~~~~~~~~~~ + +* Jordi Ballester (EFICENT) . + +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-jbeficent| image:: https://github.com/jbeficent.png?size=40px + :target: https://github.com/jbeficent + :alt: jbeficent + +Current `maintainer `_: + +|maintainer-jbeficent| + +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/i18n/mrp_warehouse_calendar.pot b/mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot new file mode 100644 index 000000000..705e4c202 --- /dev/null +++ b/mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot @@ -0,0 +1,25 @@ +# 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" +"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 "Manufacturing Order" +msgstr "" + +#. module: mrp_warehouse_calendar +#: model:ir.model,name:mrp_warehouse_calendar.model_procurement_rule +msgid "Procurement Rule" +msgstr "" + diff --git a/mrp_warehouse_calendar/readme/ROADMAP.rst b/mrp_warehouse_calendar/readme/ROADMAP.rst deleted file mode 100644 index e69de29bb..000000000 diff --git a/mrp_warehouse_calendar/static/description/index.html b/mrp_warehouse_calendar/static/description/index.html new file mode 100644 index 000000000..69e57c852 --- /dev/null +++ b/mrp_warehouse_calendar/static/description/index.html @@ -0,0 +1,449 @@ + + + + + + +MRP Warehouse Calendar + + + +
+

MRP Warehouse Calendar

+ + +

Beta License: AGPL-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

+
    +
  • Eficent
    • +
+
+
+

Contributors

+ +
+
+

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:

+

jbeficent

+

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.

+
+
+
+ + From 08c1313fb69270e602b7ed84f623cf19dde3cd14 Mon Sep 17 00:00:00 2001 From: Saran L Date: Sun, 5 Aug 2018 17:15:59 +0200 Subject: [PATCH 03/28] [MIG] mrp_warehouse_calendar: Migration to 12.0 --- mrp_warehouse_calendar/README.rst | 12 +++---- mrp_warehouse_calendar/__manifest__.py | 2 +- mrp_warehouse_calendar/i18n/de.po | 32 +++++++++++++++++++ .../i18n/mrp_warehouse_calendar.pot | 8 ++--- mrp_warehouse_calendar/models/__init__.py | 2 +- .../models/mrp_production.py | 6 ++-- .../{procurement_rule.py => stock_rule.py} | 8 ++--- .../static/description/index.html | 8 ++--- .../tests/test_mrp_warehouse_calendar.py | 10 +++--- 9 files changed, 59 insertions(+), 29 deletions(-) create mode 100644 mrp_warehouse_calendar/i18n/de.po rename mrp_warehouse_calendar/models/{procurement_rule.py => stock_rule.py} (78%) diff --git a/mrp_warehouse_calendar/README.rst b/mrp_warehouse_calendar/README.rst index 1141fb85e..889c286ac 100644 --- a/mrp_warehouse_calendar/README.rst +++ b/mrp_warehouse_calendar/README.rst @@ -14,13 +14,13 @@ MRP Warehouse Calendar :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github - :target: https://github.com/OCA/manufacture/tree/11.0/mrp_warehouse_calendar + :target: https://github.com/OCA/manufacture/tree/12.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-11-0/manufacture-11-0-mrp_warehouse_calendar + :target: https://translation.odoo-community.org/projects/manufacture-12-0/manufacture-12-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/11.0 + :target: https://runbot.odoo-community.org/runbot/129/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -69,7 +69,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -103,10 +103,10 @@ promote its widespread use. :target: https://github.com/jbeficent :alt: jbeficent -Current `maintainer `_: +Current `maintainer `__: |maintainer-jbeficent| -This module is part of the `OCA/manufacture `_ project on GitHub. +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/__manifest__.py b/mrp_warehouse_calendar/__manifest__.py index c86d2a4ea..264b6cffb 100644 --- a/mrp_warehouse_calendar/__manifest__.py +++ b/mrp_warehouse_calendar/__manifest__.py @@ -4,7 +4,7 @@ { "name": "MRP Warehouse Calendar", "summary": "Considers the warehouse calendars in manufacturing", - "version": "11.0.1.0.0", + "version": "12.0.1.0.0", "license": "AGPL-3", "website": "https://github.com/stock-logistics-warehouse", "author": "Eficent, " diff --git a/mrp_warehouse_calendar/i18n/de.po b/mrp_warehouse_calendar/i18n/de.po new file mode 100644 index 000000000..28f28331e --- /dev/null +++ b/mrp_warehouse_calendar/i18n/de.po @@ -0,0 +1,32 @@ +# 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 "Manufacturing Order" +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 index 705e4c202..2acc45ba3 100644 --- a/mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot +++ b/mrp_warehouse_calendar/i18n/mrp_warehouse_calendar.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: <>\n" "Language-Team: \n" @@ -15,11 +15,11 @@ msgstr "" #. module: mrp_warehouse_calendar #: model:ir.model,name:mrp_warehouse_calendar.model_mrp_production -msgid "Manufacturing Order" +msgid "Production Order" msgstr "" #. module: mrp_warehouse_calendar -#: model:ir.model,name:mrp_warehouse_calendar.model_procurement_rule -msgid "Procurement Rule" +#: 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 index 1847eff88..6379cdc3a 100644 --- a/mrp_warehouse_calendar/models/__init__.py +++ b/mrp_warehouse_calendar/models/__init__.py @@ -1,2 +1,2 @@ from . import mrp_production -from . import procurement_rule +from . import stock_rule diff --git a/mrp_warehouse_calendar/models/mrp_production.py b/mrp_warehouse_calendar/models/mrp_production.py index c82b47e71..46764ee40 100644 --- a/mrp_warehouse_calendar/models/mrp_production.py +++ b/mrp_warehouse_calendar/models/mrp_production.py @@ -1,7 +1,7 @@ # Copyright 2018 Eficent Business and IT Consulting Services, S.L. # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import api, fields, models +from odoo import api, models class MrpProduction(models.Model): @@ -9,7 +9,7 @@ class MrpProduction(models.Model): @api.onchange('date_planned_start', 'product_id') def onchange_date_planned(self): - dt_planned = fields.Datetime.from_string(self.date_planned_start) + 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( @@ -19,7 +19,7 @@ class MrpProduction(models.Model): @api.multi def copy(self, default=None): mo = super(MrpProduction, self).copy(default=default) - dt_planned = fields.Datetime.from_string(mo.date_planned_start) + 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( diff --git a/mrp_warehouse_calendar/models/procurement_rule.py b/mrp_warehouse_calendar/models/stock_rule.py similarity index 78% rename from mrp_warehouse_calendar/models/procurement_rule.py rename to mrp_warehouse_calendar/models/stock_rule.py index 4911785c0..84a93d8dd 100644 --- a/mrp_warehouse_calendar/models/procurement_rule.py +++ b/mrp_warehouse_calendar/models/stock_rule.py @@ -4,15 +4,15 @@ from odoo import fields, models -class ProcurementRule(models.Model): - _inherit = 'procurement.rule' +class StockRule(models.Model): + _inherit = 'stock.rule' def _get_date_planned(self, product_id, values): - date_planned = super(ProcurementRule, self)._get_date_planned( + date_planned = super(StockRule, self)._get_date_planned( product_id, values) picking_type = self.picking_type_id or \ values['warehouse_id'].manu_type_id - dt_planned = fields.Datetime.from_string(values['date_planned']) + dt_planned = fields.Datetime.to_datetime(values['date_planned']) warehouse = picking_type.warehouse_id if warehouse.calendar_id and product_id.produce_delay: lead_days = values['company_id'].manufacturing_lead + \ diff --git a/mrp_warehouse_calendar/static/description/index.html b/mrp_warehouse_calendar/static/description/index.html index 69e57c852..b3fd8b1cc 100644 --- a/mrp_warehouse_calendar/static/description/index.html +++ b/mrp_warehouse_calendar/static/description/index.html @@ -3,7 +3,7 @@ - + MRP Warehouse Calendar