From 0ceb04f76f4c97c1b27dd4354000a5ef45cee316 Mon Sep 17 00:00:00 2001 From: David Date: Thu, 10 May 2018 20:22:27 +0200 Subject: [PATCH 01/17] [ADD] mrp_production_grouped_by_product: New Module --- mrp_production_grouped_by_product/README.rst | 56 ++++++++++++ mrp_production_grouped_by_product/__init__.py | 2 + .../__manifest__.py | 18 ++++ .../models/__init__.py | 3 + .../models/mrp_production.py | 15 ++++ .../models/procurement.py | 44 ++++++++++ .../tests/__init__.py | 2 + .../test_mrp_production_grouped_by_product.py | 85 +++++++++++++++++++ 8 files changed, 225 insertions(+) create mode 100644 mrp_production_grouped_by_product/README.rst create mode 100644 mrp_production_grouped_by_product/__init__.py create mode 100644 mrp_production_grouped_by_product/__manifest__.py create mode 100644 mrp_production_grouped_by_product/models/__init__.py create mode 100644 mrp_production_grouped_by_product/models/mrp_production.py create mode 100644 mrp_production_grouped_by_product/models/procurement.py create mode 100644 mrp_production_grouped_by_product/tests/__init__.py create mode 100644 mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py diff --git a/mrp_production_grouped_by_product/README.rst b/mrp_production_grouped_by_product/README.rst new file mode 100644 index 000000000..1833e03d7 --- /dev/null +++ b/mrp_production_grouped_by_product/README.rst @@ -0,0 +1,56 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +============================= +Production Grouped By Product +============================= + +Groups pending productions by product. + +Configuration +============= + + +Usage +===== + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/129/11.0 + +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 smash it by providing detailed and welcomed feedback. + +Credits +======= + +Images +------ + +* Odoo Community Association: `Icon `_. + +Contributors +------------ + +* David Vidal + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +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. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/mrp_production_grouped_by_product/__init__.py b/mrp_production_grouped_by_product/__init__.py new file mode 100644 index 000000000..a9e337226 --- /dev/null +++ b/mrp_production_grouped_by_product/__init__.py @@ -0,0 +1,2 @@ + +from . import models diff --git a/mrp_production_grouped_by_product/__manifest__.py b/mrp_production_grouped_by_product/__manifest__.py new file mode 100644 index 000000000..3815ef003 --- /dev/null +++ b/mrp_production_grouped_by_product/__manifest__.py @@ -0,0 +1,18 @@ +# Copyright 2018 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + 'name': 'Production Grouped By Product', + 'version': '11.0.1.0.0', + 'category': 'MRP', + 'author': 'Tecnativa, ' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/oca/manufacture', + 'license': 'AGPL-3', + 'depends': [ + 'mrp', + ], + 'data': [ + ], + 'installable': True, +} diff --git a/mrp_production_grouped_by_product/models/__init__.py b/mrp_production_grouped_by_product/models/__init__.py new file mode 100644 index 000000000..29b455422 --- /dev/null +++ b/mrp_production_grouped_by_product/models/__init__.py @@ -0,0 +1,3 @@ + +from . import mrp_production +from . import procurement diff --git a/mrp_production_grouped_by_product/models/mrp_production.py b/mrp_production_grouped_by_product/models/mrp_production.py new file mode 100644 index 000000000..d6e97b1a0 --- /dev/null +++ b/mrp_production_grouped_by_product/models/mrp_production.py @@ -0,0 +1,15 @@ +# Copyright 2018 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class MrpProduction(models.Model): + _inherit = 'mrp.production' + + @api.model + def create(self, vals): + if not self._context.get('merge_products_into_mo'): + return super(MrpProduction, self).create(vals) + # We return the MO to merge into + return self._context.get('merge_products_into_mo') diff --git a/mrp_production_grouped_by_product/models/procurement.py b/mrp_production_grouped_by_product/models/procurement.py new file mode 100644 index 000000000..de99e50d7 --- /dev/null +++ b/mrp_production_grouped_by_product/models/procurement.py @@ -0,0 +1,44 @@ +# Copyright 2018 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class ProcuermentRule(models.Model): + _inherit = 'procurement.rule' + + def _run_manufacture(self, product_id, product_qty, product_uom, + location_id, name, origin, values): + bom = self._get_matching_bom(product_id, values) + # Send to super for exception + if not bom: + return super(ProcuermentRule, self)._run_manufacture( + product_id, product_qty, product_uom, location_id, + name, origin, values) + open_mo = self._find_equal_open_mo( + product_id, bom, location_id, values) + # Create mo as usual + if not open_mo: + return super(ProcuermentRule, self)._run_manufacture( + product_id, product_qty, product_uom, location_id, + name, origin, values) + # Add product qty to mo + self.env['change.production.qty'].create({ + 'mo_id': open_mo.id, + 'product_qty': open_mo.product_qty + product_qty, + }).change_prod_qty() + # We pass the record in the context so the chatter is correctly written + additional_context={'merge_products_into_mo': open_mo} + return super(ProcuermentRule, self.with_context(**additional_context) + )._run_manufacture(product_id, product_qty, product_uom, + location_id,name, origin, values) + + def _find_equal_open_mo(self, product_id, bom, location_id, values): + """Returns the first occurrence according to conditions""" + return self.env['mrp.production'].search([ + ('state', 'not in', ['progress', 'done', 'cancel']), + ('product_id', '=', product_id.id), + ('bom_id', '=', bom.id), + ('location_dest_id', '=', location_id.id), + ('company_id', '=', values.get('company_id').id), + ], limit=1) diff --git a/mrp_production_grouped_by_product/tests/__init__.py b/mrp_production_grouped_by_product/tests/__init__.py new file mode 100644 index 000000000..66f012923 --- /dev/null +++ b/mrp_production_grouped_by_product/tests/__init__.py @@ -0,0 +1,2 @@ + +from . import test_mrp_production_grouped_by_product diff --git a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py new file mode 100644 index 000000000..7ffa9fc64 --- /dev/null +++ b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - David Vidal +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import common + + +class TestProductionGroupedByProduct(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestProductionGroupedByProduct, cls).setUpClass() + cls.product1 = cls.env['product.product'].create({ + 'name': 'TEST Muffin', + 'route_ids': [(6, 0, [ + cls.env.ref('mrp.route_warehouse0_manufacture').id])], + 'type': 'product', + }) + cls.product2 = cls.env['product.product'].create({ + 'name': 'TEST Paper muffin cup', + 'type': 'product', + }) + cls.product3 = cls.env['product.product'].create({ + 'name': 'TEST Muffin paset', + 'type': 'product', + }) + cls.bom = cls.env['mrp.bom'].create({ + 'product_id': cls.product1.id, + 'product_tmpl_id': cls.product1.product_tmpl_id.id, + 'type': 'normal', + 'bom_line_ids': [(0, 0, { + 'product_id': cls.product2.id, + 'product_qty': 1, + }), (0, 0, { + 'product_id': cls.product3.id, + 'product_qty': 0.2, + })] + }) + cls.env['stock.change.product.qty'].create({ + 'product_id': cls.product2.id, + 'new_quantity': 100.0, + }).change_product_qty() + cls.env['stock.change.product.qty'].create({ + 'product_id': cls.product3.id, + 'new_quantity': 100.0, + }).change_product_qty() + cls.stock_picking_type = cls.env.ref('stock.picking_type_out') + cls.procurement_rule = cls.env['stock.warehouse.orderpoint'].create({ + 'name': 'XXX/00000', + 'product_id': cls.product1.id, + 'product_min_qty': 10, + 'product_max_qty': 100, + }) + + def test_mo_by_product(self): + self.env['procurement.group'].run_scheduler() + mo = self.env['mrp.production'].search([ + ('product_id', '=', self.product1.id), + ]) + self.assertTrue(mo) + # + picking = self.env['stock.picking'].create({ + 'picking_type_id': self.stock_picking_type.id, + 'location_id': self.env.ref('stock.stock_location_stock').id, + 'location_dest_id': self.env.ref( + 'stock.stock_location_customers').id, + }) + move = self.env['stock.move'].create({ + 'name': self.product1.name, + 'product_id': self.product1.id, + 'product_uom_qty': 1000, + 'product_uom': self.product1.uom_id.id, + 'picking_id': picking.id, + 'picking_type_id': self.stock_picking_type.id, + 'location_id': picking.location_id.id, + 'location_dest_id': picking.location_id.id, + }) + move.quantity_done = 1000 + picking.action_assign() + self.product1.virtual_available = -500 + self.env['procurement.group'].run_scheduler() + mo = self.env['mrp.production'].search([ + ('product_id', '=', self.product1.id), + ]) + self.assertEqual(len(mo), 1) From 1d89c9ad1be89a0441641fe0caf261aaa039dab8 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 10 May 2018 21:03:59 +0200 Subject: [PATCH 02/17] [IMP] mrp_production_grouped_by_company: Context evaluation on mrp.production + tests --- mrp_production_grouped_by_product/README.rst | 23 ++++-- .../__manifest__.py | 1 + .../models/mrp_production.py | 46 ++++++++++-- .../models/procurement.py | 44 +++--------- .../test_mrp_production_grouped_by_product.py | 70 ++++++++++--------- 5 files changed, 105 insertions(+), 79 deletions(-) diff --git a/mrp_production_grouped_by_product/README.rst b/mrp_production_grouped_by_product/README.rst index 1833e03d7..40d01b606 100644 --- a/mrp_production_grouped_by_product/README.rst +++ b/mrp_production_grouped_by_product/README.rst @@ -6,11 +6,14 @@ Production Grouped By Product ============================= -Groups pending productions by product. - -Configuration -============= +When you have several sales orders with make to (MTO) order products that +require to be manufactured, you end up with one manufacturing order for each of +these sales orders, which is very bad for the management. +With this module, each time an MTO manufacturing order is required to be +created, it first checks that there's no other existing order not yet started +for the same product and bill of materials, and if there's one, then the +quantity of that order is increased instead of creating a new one. Usage ===== @@ -19,6 +22,11 @@ Usage :alt: Try me on Runbot :target: https://runbot.odoo-community.org/runbot/129/11.0 +Known issues / Roadmap +====================== + +* Add a check in the product form for excluding it from being grouped. + Bug Tracker =========== @@ -38,7 +46,12 @@ Images Contributors ------------ -* David Vidal +* Tecnativa _ + + * David Vidal + * Pedro M. Baeza + +Do not contact contributors directly about support or help with technical issues. Maintainer ---------- diff --git a/mrp_production_grouped_by_product/__manifest__.py b/mrp_production_grouped_by_product/__manifest__.py index 3815ef003..78138907c 100644 --- a/mrp_production_grouped_by_product/__manifest__.py +++ b/mrp_production_grouped_by_product/__manifest__.py @@ -1,4 +1,5 @@ # Copyright 2018 Tecnativa - David Vidal +# Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { diff --git a/mrp_production_grouped_by_product/models/mrp_production.py b/mrp_production_grouped_by_product/models/mrp_production.py index d6e97b1a0..f9572f142 100644 --- a/mrp_production_grouped_by_product/models/mrp_production.py +++ b/mrp_production_grouped_by_product/models/mrp_production.py @@ -1,15 +1,51 @@ # Copyright 2018 Tecnativa - David Vidal +# Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import api, models +from odoo.tools import config class MrpProduction(models.Model): _inherit = 'mrp.production' + def _post_mo_merging_adjustments(self, vals): + """Called when a new MO is merged onto existing one for adjusting the + needed values according this merging. + + :param self: Single record of the target record where merging. + :param vals: Dictionary with the new record values. + """ + self.ensure_one() + new_vals = { + 'origin': (self.origin or '') + ",%s" % vals['origin'], + } + if vals.get('move_dest_ids'): + new_vals['move_dest_ids'] = vals['move_dest_ids'] + self.move_finished_ids.move_dest_ids = vals['move_dest_ids'] + self.write(new_vals) + + def _find_grouping_target(self, vals): + mo = self.env['mrp.production'].search([ + ('product_id', '=', vals['product_id']), + ('bom_id', '=', vals.get('bom_id', False)), + ('routing_id', '=', vals.get('routing_id', False)), + ('company_id', '=', vals.get('company_id', False)), + ('state', '=', 'confirmed'), + ], limit=1) + return mo + @api.model def create(self, vals): - if not self._context.get('merge_products_into_mo'): - return super(MrpProduction, self).create(vals) - # We return the MO to merge into - return self._context.get('merge_products_into_mo') + context = self.env.context + if (context.get('group_mo_by_product') and + (not config['test_enable'] or context.get('test_group_mo'))): + mo = self._find_grouping_target(vals) + if mo: + self.env['change.production.qty'].create({ + 'mo_id': mo.id, + 'product_qty': mo.product_qty + vals['product_qty'], + }).change_prod_qty() + mo._post_mo_merging_adjustments(vals) + return mo + return super(MrpProduction, self).create(vals) diff --git a/mrp_production_grouped_by_product/models/procurement.py b/mrp_production_grouped_by_product/models/procurement.py index de99e50d7..19368adc0 100644 --- a/mrp_production_grouped_by_product/models/procurement.py +++ b/mrp_production_grouped_by_product/models/procurement.py @@ -1,44 +1,18 @@ # Copyright 2018 Tecnativa - David Vidal +# Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, fields, models +from odoo import models -class ProcuermentRule(models.Model): +class ProcurementRule(models.Model): _inherit = 'procurement.rule' def _run_manufacture(self, product_id, product_qty, product_uom, location_id, name, origin, values): - bom = self._get_matching_bom(product_id, values) - # Send to super for exception - if not bom: - return super(ProcuermentRule, self)._run_manufacture( - product_id, product_qty, product_uom, location_id, - name, origin, values) - open_mo = self._find_equal_open_mo( - product_id, bom, location_id, values) - # Create mo as usual - if not open_mo: - return super(ProcuermentRule, self)._run_manufacture( - product_id, product_qty, product_uom, location_id, - name, origin, values) - # Add product qty to mo - self.env['change.production.qty'].create({ - 'mo_id': open_mo.id, - 'product_qty': open_mo.product_qty + product_qty, - }).change_prod_qty() - # We pass the record in the context so the chatter is correctly written - additional_context={'merge_products_into_mo': open_mo} - return super(ProcuermentRule, self.with_context(**additional_context) - )._run_manufacture(product_id, product_qty, product_uom, - location_id,name, origin, values) - - def _find_equal_open_mo(self, product_id, bom, location_id, values): - """Returns the first occurrence according to conditions""" - return self.env['mrp.production'].search([ - ('state', 'not in', ['progress', 'done', 'cancel']), - ('product_id', '=', product_id.id), - ('bom_id', '=', bom.id), - ('location_dest_id', '=', location_id.id), - ('company_id', '=', values.get('company_id').id), - ], limit=1) + return super( + ProcurementRule, self.with_context(group_mo_by_product=True), + )._run_manufacture( + product_id, product_qty, product_uom, location_id, name, origin, + values, + ) diff --git a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py index 7ffa9fc64..517d9cfc6 100644 --- a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py +++ b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py @@ -1,11 +1,13 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Tecnativa - David Vidal +# Copyright 2018 Tecnativa - David Vidal +# Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.tests import common class TestProductionGroupedByProduct(common.SavepointCase): + at_install = False + post_install = True @classmethod def setUpClass(cls): @@ -36,14 +38,6 @@ class TestProductionGroupedByProduct(common.SavepointCase): 'product_qty': 0.2, })] }) - cls.env['stock.change.product.qty'].create({ - 'product_id': cls.product2.id, - 'new_quantity': 100.0, - }).change_product_qty() - cls.env['stock.change.product.qty'].create({ - 'product_id': cls.product3.id, - 'new_quantity': 100.0, - }).change_product_qty() cls.stock_picking_type = cls.env.ref('stock.picking_type_out') cls.procurement_rule = cls.env['stock.warehouse.orderpoint'].create({ 'name': 'XXX/00000', @@ -51,35 +45,43 @@ class TestProductionGroupedByProduct(common.SavepointCase): 'product_min_qty': 10, 'product_max_qty': 100, }) + cls.mo = cls.env['mrp.production'].create({ + 'bom_id': cls.bom.id, + 'product_id': cls.product1.id, + 'product_qty': 2, + 'product_uom_id': cls.product1.uom_id.id, + }) + cls.warehouse = cls.env['stock.warehouse'].search([ + ('company_id', '=', cls.env.user.company_id.id), + ], limit=1) + cls.ProcurementGroup = cls.env['procurement.group'] + cls.MrpProduction = cls.env['mrp.production'] def test_mo_by_product(self): - self.env['procurement.group'].run_scheduler() - mo = self.env['mrp.production'].search([ - ('product_id', '=', self.product1.id), - ]) - self.assertTrue(mo) - # - picking = self.env['stock.picking'].create({ - 'picking_type_id': self.stock_picking_type.id, - 'location_id': self.env.ref('stock.stock_location_stock').id, - 'location_dest_id': self.env.ref( - 'stock.stock_location_customers').id, - }) + self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() + mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) + self.assertEqual(len(mo), 1) + self.assertEqual(mo.product_qty, 100) + # Add an MTO move move = self.env['stock.move'].create({ 'name': self.product1.name, 'product_id': self.product1.id, - 'product_uom_qty': 1000, + 'product_uom_qty': 10, 'product_uom': self.product1.uom_id.id, - 'picking_id': picking.id, - 'picking_type_id': self.stock_picking_type.id, - 'location_id': picking.location_id.id, - 'location_dest_id': picking.location_id.id, + 'location_id': self.warehouse.lot_stock_id.id, + 'location_dest_id': ( + self.env.ref('stock.stock_location_customers').id + ), + 'procure_method': 'make_to_order', + 'warehouse_id': self.warehouse.id, }) - move.quantity_done = 1000 - picking.action_assign() - self.product1.virtual_available = -500 - self.env['procurement.group'].run_scheduler() - mo = self.env['mrp.production'].search([ - ('product_id', '=', self.product1.id), - ]) + move.with_context(test_group_mo=True)._action_confirm(merge=False) + self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() + mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) self.assertEqual(len(mo), 1) + self.assertEqual(mo.product_qty, 110) + # Run again the scheduler to see if quantities are altered + self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() + mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) + self.assertEqual(len(mo), 1) + self.assertEqual(mo.product_qty, 110) From 67da2e9260e74afe0974760a63b6e737a1298d67 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Mon, 4 Jun 2018 01:29:31 +0200 Subject: [PATCH 03/17] [IMP] mrp_production_grouped_by_product: Time frames Introduce time frames for grouping. --- mrp_production_grouped_by_product/README.rst | 70 +------------------ .../__manifest__.py | 1 + mrp_production_grouped_by_product/i18n/es.po | 63 +++++++++++++++++ .../models/__init__.py | 1 + .../models/mrp_production.py | 50 +++++++++++-- .../models/stock_picking_type.py | 37 ++++++++++ .../readme/CONFIGURE.rst | 17 +++++ .../readme/CONTRIBUTORS.rst | 4 ++ .../readme/DESCRIPTION.rst | 9 +++ .../readme/ROADMAP.rst | 1 + .../test_mrp_production_grouped_by_product.py | 65 ++++++++++------- .../views/stock_picking_type_views.xml | 17 +++++ 12 files changed, 236 insertions(+), 99 deletions(-) create mode 100644 mrp_production_grouped_by_product/i18n/es.po create mode 100644 mrp_production_grouped_by_product/models/stock_picking_type.py create mode 100644 mrp_production_grouped_by_product/readme/CONFIGURE.rst create mode 100644 mrp_production_grouped_by_product/readme/CONTRIBUTORS.rst create mode 100644 mrp_production_grouped_by_product/readme/DESCRIPTION.rst create mode 100644 mrp_production_grouped_by_product/readme/ROADMAP.rst create mode 100644 mrp_production_grouped_by_product/views/stock_picking_type_views.xml diff --git a/mrp_production_grouped_by_product/README.rst b/mrp_production_grouped_by_product/README.rst index 40d01b606..3f6262529 100644 --- a/mrp_production_grouped_by_product/README.rst +++ b/mrp_production_grouped_by_product/README.rst @@ -1,69 +1 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - -============================= -Production Grouped By Product -============================= - -When you have several sales orders with make to (MTO) order products that -require to be manufactured, you end up with one manufacturing order for each of -these sales orders, which is very bad for the management. - -With this module, each time an MTO manufacturing order is required to be -created, it first checks that there's no other existing order not yet started -for the same product and bill of materials, and if there's one, then the -quantity of that order is increased instead of creating a new one. - -Usage -===== - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/129/11.0 - -Known issues / Roadmap -====================== - -* Add a check in the product form for excluding it from being grouped. - -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 smash it by providing detailed and welcomed feedback. - -Credits -======= - -Images ------- - -* Odoo Community Association: `Icon `_. - -Contributors ------------- - -* Tecnativa _ - - * David Vidal - * Pedro M. Baeza - -Do not contact contributors directly about support or help with technical issues. - -Maintainer ----------- - -.. image:: https://odoo-community.org/logo.png - :alt: Odoo Community Association - :target: https://odoo-community.org - -This module is maintained by the OCA. - -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. - -To contribute to this module, please visit https://odoo-community.org. +**This file is going to be generated by oca-gen-addon-readme.** diff --git a/mrp_production_grouped_by_product/__manifest__.py b/mrp_production_grouped_by_product/__manifest__.py index 78138907c..d1ecdd69a 100644 --- a/mrp_production_grouped_by_product/__manifest__.py +++ b/mrp_production_grouped_by_product/__manifest__.py @@ -14,6 +14,7 @@ 'mrp', ], 'data': [ + 'views/stock_picking_type_views.xml', ], 'installable': True, } diff --git a/mrp_production_grouped_by_product/i18n/es.po b/mrp_production_grouped_by_product/i18n/es.po new file mode 100644 index 000000000..e9c4e2b95 --- /dev/null +++ b/mrp_production_grouped_by_product/i18n/es.po @@ -0,0 +1,63 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_production_grouped_by_product +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-06-03 23:16+0000\n" +"PO-Revision-Date: 2018-06-03 23:16+0000\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_production_grouped_by_product +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +msgid "MO grouping interval (days)" +msgstr "Intervalo de agrupación de OFs (días)" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +msgid "MO grouping max. hour (UTC)" +msgstr "Hora máx. agrupación OFs (UTC)" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_mrp_production +msgid "Manufacturing Order" +msgstr "Orden de fabricación" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_procurement_rule +msgid "Procurement Rule" +msgstr "Regla de abastecimiento" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +msgid "The maximum hour (between 0 and 23) for considering new manufacturing orders inside the same interval period, and thus being grouped on the same MO. IMPORTANT: The hour should be expressed in UTC." +msgstr "La hora máxima (entre 0 y 23) para considerar nuevas órdenes de fabricación dentro del mismo periodo de tiempo, y por tanto siendo agrupadas dentro de la misma OF. IMPORTANTE: La hora debe expresarse en UTC." + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +msgid "The number of days for grouping together on the same manufacturing order." +msgstr "El número de días para agrupar juntas las órdenes de fabricación." + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type +msgid "The operation type determines the picking view" +msgstr "El tipo de operación determina la vista de la operación" + +#. module: mrp_production_grouped_by_product +#: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:36 +#, python-format +msgid "You have to enter a positive value for interval." +msgstr "Debe introducir un valor positivo para el intervalo." + +#. module: mrp_production_grouped_by_product +#: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:29 +#, python-format +msgid "You have to enter a valid hour between 0 and 23." +msgstr "Debe introducir una hora válida entre 0 y 23." diff --git a/mrp_production_grouped_by_product/models/__init__.py b/mrp_production_grouped_by_product/models/__init__.py index 29b455422..b4b7e408a 100644 --- a/mrp_production_grouped_by_product/models/__init__.py +++ b/mrp_production_grouped_by_product/models/__init__.py @@ -1,3 +1,4 @@ from . import mrp_production from . import procurement +from . import stock_picking_type diff --git a/mrp_production_grouped_by_product/models/mrp_production.py b/mrp_production_grouped_by_product/models/mrp_production.py index f9572f142..5dd54a23c 100644 --- a/mrp_production_grouped_by_product/models/mrp_production.py +++ b/mrp_production_grouped_by_product/models/mrp_production.py @@ -2,7 +2,8 @@ # Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import api, models +from dateutil.relativedelta import relativedelta +from odoo import api, fields, models from odoo.tools import config @@ -25,15 +26,54 @@ class MrpProduction(models.Model): self.move_finished_ids.move_dest_ids = vals['move_dest_ids'] self.write(new_vals) - def _find_grouping_target(self, vals): - mo = self.env['mrp.production'].search([ + def _get_grouping_target_domain(self, vals): + """Get the domain for searching manufacturing orders that can match + with the criteria we want to use. + + :param vals: Values dictionary of the MO to be created. + + :return: Odoo domain. + """ + domain = [ ('product_id', '=', vals['product_id']), + ('picking_type_id', '=', vals['picking_type_id']), ('bom_id', '=', vals.get('bom_id', False)), ('routing_id', '=', vals.get('routing_id', False)), ('company_id', '=', vals.get('company_id', False)), ('state', '=', 'confirmed'), - ], limit=1) - return mo + ] + if not vals.get('date_planned_finished'): + return domain + date = fields.Datetime.from_string(vals['date_planned_finished']) + pt = self.env['stock.picking.type'].browse(vals['picking_type_id']) + if date.hour < pt.mo_grouping_max_hour: + date_end = date.replace( + hour=pt.mo_grouping_max_hour, minute=0, second=0, + ) + else: + date_end = date.replace( + day=date.day + 1, hour=pt.mo_grouping_max_hour, minute=0, + second=0, + ) + date_start = date_end - relativedelta(days=pt.mo_grouping_interval) + domain += [ + ('date_planned_finished', '>', + fields.Datetime.to_string(date_start)), + ('date_planned_finished', '<=', + fields.Datetime.to_string(date_end)), + ] + return domain + + def _find_grouping_target(self, vals): + """Return the matching order for grouping. + + :param vals: Values dictionary of the MO to be created. + + :return: Target manufacturing order record (or empty record). + """ + return self.env['mrp.production'].search( + self._get_grouping_target_domain(vals), limit=1, + ) @api.model def create(self, vals): diff --git a/mrp_production_grouped_by_product/models/stock_picking_type.py b/mrp_production_grouped_by_product/models/stock_picking_type.py new file mode 100644 index 000000000..f5b9c3bd5 --- /dev/null +++ b/mrp_production_grouped_by_product/models/stock_picking_type.py @@ -0,0 +1,37 @@ +# Copyright 2018 Tecnativa - Pedro M. Baeza +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _, api, exceptions, fields, models + + +class StockPickingType(models.Model): + _inherit = 'stock.picking.type' + + mo_grouping_max_hour = fields.Integer( + string="MO grouping max. hour (UTC)", + help="The maximum hour (between 0 and 23) for considering new " + "manufacturing orders inside the same interval period, and thus " + "being grouped on the same MO. IMPORTANT: The hour should be " + "expressed in UTC.", + default=19, + ) + mo_grouping_interval = fields.Integer( + string="MO grouping interval (days)", + help="The number of days for grouping together on the same " + "manufacturing order.", + default=1, + ) + + @api.constrains('mo_grouping_max_hour') + def _check_mo_grouping_max_hour(self): + if self.mo_grouping_max_hour < 0 or self.mo_grouping_max_hour > 23: + raise exceptions.ValidationError( + _("You have to enter a valid hour between 0 and 23."), + ) + + @api.constrains('mo_grouping_interval') + def _check_mo_grouping_interval(self): + if self.mo_grouping_interval < 0: + raise exceptions.ValidationError( + _("You have to enter a positive value for interval."), + ) diff --git a/mrp_production_grouped_by_product/readme/CONFIGURE.rst b/mrp_production_grouped_by_product/readme/CONFIGURE.rst new file mode 100644 index 000000000..163bf6c3b --- /dev/null +++ b/mrp_production_grouped_by_product/readme/CONFIGURE.rst @@ -0,0 +1,17 @@ +To configure the time frame for grouping manufacturing order: + +#. Go to *Inventory > Configuration > Warehouse Management > Operation Types* +#. Locate the manufacturing type you are using (default one is called + "Manufacturing"). +#. Open it and change these 2 values: + + * MO grouping max. hour (UTC): The maximum hour (between 0 and 23) for + considering new manufacturing orders inside the same interval period, and + thus being grouped on the same MO. IMPORTANT: The hour should be expressed + in UTC. + * MO grouping interval (days): The number of days for grouping together on + the same manufacturing order. + + Example: If you leave the default values 19 and 1, all the planned orders + between 19:00:01 of the previous day and 20:00:00 of the target date will + be grouped together. diff --git a/mrp_production_grouped_by_product/readme/CONTRIBUTORS.rst b/mrp_production_grouped_by_product/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..cfa3cdf10 --- /dev/null +++ b/mrp_production_grouped_by_product/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Tecnativa __ + + * David Vidal + * Pedro M. Baeza diff --git a/mrp_production_grouped_by_product/readme/DESCRIPTION.rst b/mrp_production_grouped_by_product/readme/DESCRIPTION.rst new file mode 100644 index 000000000..50962a392 --- /dev/null +++ b/mrp_production_grouped_by_product/readme/DESCRIPTION.rst @@ -0,0 +1,9 @@ +When you have several sales orders with make to order (MTO) products that +require to be manufactured, you end up with one manufacturing order for each of +these sales orders, which is very bad for the management. + +With this module, each time an MTO manufacturing order is required to be +created, it first checks that there's no other existing order not yet started +for the same product and bill of materials inside the specied time frame , and +if there's one, then the quantity of that order is increased instead of +creating a new one. diff --git a/mrp_production_grouped_by_product/readme/ROADMAP.rst b/mrp_production_grouped_by_product/readme/ROADMAP.rst new file mode 100644 index 000000000..7845179c4 --- /dev/null +++ b/mrp_production_grouped_by_product/readme/ROADMAP.rst @@ -0,0 +1 @@ +* Add a check in the product form for excluding it from being grouped. diff --git a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py index 517d9cfc6..28afaa0f8 100644 --- a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py +++ b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py @@ -2,6 +2,7 @@ # Copyright 2018 Tecnativa - Pedro M. Baeza # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from odoo import exceptions from odoo.tests import common @@ -12,11 +13,17 @@ class TestProductionGroupedByProduct(common.SavepointCase): @classmethod def setUpClass(cls): super(TestProductionGroupedByProduct, cls).setUpClass() + cls.ProcurementGroup = cls.env['procurement.group'] + cls.MrpProduction = cls.env['mrp.production'] + cls.env.user.company_id.manufacturing_lead = 0 + cls.env.user.tz = False # Make sure there's no timezone in user + cls.picking_type = cls.env.ref('mrp.picking_type_manufacturing') cls.product1 = cls.env['product.product'].create({ 'name': 'TEST Muffin', 'route_ids': [(6, 0, [ cls.env.ref('mrp.route_warehouse0_manufacture').id])], 'type': 'product', + 'produce_delay': 0, }) cls.product2 = cls.env['product.product'].create({ 'name': 'TEST Paper muffin cup', @@ -39,49 +46,57 @@ class TestProductionGroupedByProduct(common.SavepointCase): })] }) cls.stock_picking_type = cls.env.ref('stock.picking_type_out') - cls.procurement_rule = cls.env['stock.warehouse.orderpoint'].create({ - 'name': 'XXX/00000', - 'product_id': cls.product1.id, - 'product_min_qty': 10, - 'product_max_qty': 100, - }) - cls.mo = cls.env['mrp.production'].create({ + cls.mo = cls.MrpProduction.create({ 'bom_id': cls.bom.id, 'product_id': cls.product1.id, 'product_qty': 2, 'product_uom_id': cls.product1.uom_id.id, + 'date_planned_finished': '2018-06-01 15:00:00', + 'date_planned_start': '2018-06-01 15:00:00', }) cls.warehouse = cls.env['stock.warehouse'].search([ ('company_id', '=', cls.env.user.company_id.id), ], limit=1) - cls.ProcurementGroup = cls.env['procurement.group'] - cls.MrpProduction = cls.env['mrp.production'] - - def test_mo_by_product(self): - self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() - mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) - self.assertEqual(len(mo), 1) - self.assertEqual(mo.product_qty, 100) # Add an MTO move - move = self.env['stock.move'].create({ - 'name': self.product1.name, - 'product_id': self.product1.id, + cls.move = cls.env['stock.move'].create({ + 'name': cls.product1.name, + 'product_id': cls.product1.id, 'product_uom_qty': 10, - 'product_uom': self.product1.uom_id.id, - 'location_id': self.warehouse.lot_stock_id.id, + 'product_uom': cls.product1.uom_id.id, + 'location_id': cls.warehouse.lot_stock_id.id, 'location_dest_id': ( - self.env.ref('stock.stock_location_customers').id + cls.env.ref('stock.stock_location_customers').id ), 'procure_method': 'make_to_order', - 'warehouse_id': self.warehouse.id, + 'warehouse_id': cls.warehouse.id, + 'date': '2018-06-01 18:00:00', }) - move.with_context(test_group_mo=True)._action_confirm(merge=False) + + def test_mo_by_product(self): + self.move.with_context(test_group_mo=True)._action_confirm(merge=False) self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) self.assertEqual(len(mo), 1) - self.assertEqual(mo.product_qty, 110) + self.assertEqual(mo.product_qty, 12) # Run again the scheduler to see if quantities are altered self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) self.assertEqual(len(mo), 1) - self.assertEqual(mo.product_qty, 110) + self.assertEqual(mo.product_qty, 12) + + def test_mo_other_date(self): + self.move.date = '2018-06-01 20:01:00' + self.move.with_context(test_group_mo=True)._action_confirm(merge=False) + self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() + mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) + self.assertEqual(len(mo), 2) + + def test_check_mo_grouping_max_hour(self): + with self.assertRaises(exceptions.ValidationError): + self.picking_type.mo_grouping_max_hour = 25 + with self.assertRaises(exceptions.ValidationError): + self.picking_type.mo_grouping_max_hour = -1 + + def test_check_mo_grouping_interval(self): + with self.assertRaises(exceptions.ValidationError): + self.picking_type.mo_grouping_interval = -1 diff --git a/mrp_production_grouped_by_product/views/stock_picking_type_views.xml b/mrp_production_grouped_by_product/views/stock_picking_type_views.xml new file mode 100644 index 000000000..2b24b05e5 --- /dev/null +++ b/mrp_production_grouped_by_product/views/stock_picking_type_views.xml @@ -0,0 +1,17 @@ + + + + + + stock.picking.type + + + + + + + + + + From 95776883501d36baf7dd7bc957377d6c9c4f48c6 Mon Sep 17 00:00:00 2001 From: OCA Git Bot Date: Thu, 14 Jun 2018 05:13:07 +0200 Subject: [PATCH 04/17] [UPD] README.rst --- mrp_production_grouped_by_product/README.rst | 107 +++- .../static/description/index.html | 461 ++++++++++++++++++ 2 files changed, 567 insertions(+), 1 deletion(-) create mode 100644 mrp_production_grouped_by_product/static/description/index.html diff --git a/mrp_production_grouped_by_product/README.rst b/mrp_production_grouped_by_product/README.rst index 3f6262529..9c871ef5d 100644 --- a/mrp_production_grouped_by_product/README.rst +++ b/mrp_production_grouped_by_product/README.rst @@ -1 +1,106 @@ -**This file is going to be generated by oca-gen-addon-readme.** +============================= +Production Grouped By Product +============================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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_production_grouped_by_product + :alt: OCA/manufacture +.. |badge4| 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| + +When you have several sales orders with make to order (MTO) products that +require to be manufactured, you end up with one manufacturing order for each of +these sales orders, which is very bad for the management. + +With this module, each time an MTO manufacturing order is required to be +created, it first checks that there's no other existing order not yet started +for the same product and bill of materials inside the specied time frame , and +if there's one, then the quantity of that order is increased instead of +creating a new one. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +To configure the time frame for grouping manufacturing order: + +#. Go to *Inventory > Configuration > Warehouse Management > Operation Types* +#. Locate the manufacturing type you are using (default one is called + "Manufacturing"). +#. Open it and change these 2 values: + + * MO grouping max. hour (UTC): The maximum hour (between 0 and 23) for + considering new manufacturing orders inside the same interval period, and + thus being grouped on the same MO. IMPORTANT: The hour should be expressed + in UTC. + * MO grouping interval (days): The number of days for grouping together on + the same manufacturing order. + + Example: If you leave the default values 19 and 1, all the planned orders + between 19:00:01 of the previous day and 20:00:00 of the target date will + be grouped together. + +Known issues / Roadmap +====================== + +* Add a check in the product form for excluding it from being grouped. + +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 +~~~~~~~ + +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* Tecnativa __ + + * David Vidal + * Pedro M. Baeza + +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. + +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_production_grouped_by_product/static/description/index.html b/mrp_production_grouped_by_product/static/description/index.html new file mode 100644 index 000000000..ab83fde8f --- /dev/null +++ b/mrp_production_grouped_by_product/static/description/index.html @@ -0,0 +1,461 @@ + + + + + + +Production Grouped By Product + + + +
+

Production Grouped By Product

+ + +

Beta License: AGPL-3 OCA/manufacture Try me on Runbot

+

When you have several sales orders with make to order (MTO) products that +require to be manufactured, you end up with one manufacturing order for each of +these sales orders, which is very bad for the management.

+

With this module, each time an MTO manufacturing order is required to be +created, it first checks that there’s no other existing order not yet started +for the same product and bill of materials inside the specied time frame , and +if there’s one, then the quantity of that order is increased instead of +creating a new one.

+

Table of contents

+ +
+

Configuration

+

To configure the time frame for grouping manufacturing order:

+
    +

  1. Go to Inventory > Configuration > Warehouse Management > Operation Types

    +
    2. +

  2. Locate the manufacturing type you are using (default one is called +“Manufacturing”).

    +
    3. +

  3. Open it and change these 2 values:

    +
      +
    • MO grouping max. hour (UTC): The maximum hour (between 0 and 23) for +considering new manufacturing orders inside the same interval period, and +thus being grouped on the same MO. IMPORTANT: The hour should be expressed +in UTC.
      • +
    • MO grouping interval (days): The number of days for grouping together on +the same manufacturing order.
      • +
    +

    Example: If you leave the default values 19 and 1, all the planned orders +between 19:00:01 of the previous day and 20:00:00 of the target date will +be grouped together.

    +
    4. +
+
+
+

Known issues / Roadmap

+
    +
  • Add a check in the product form for excluding it from being grouped.
    • +
+
+
+

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

+
    +
  • Tecnativa
    • +
+
+
+

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.

+

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 778e9ea5dc26f5fe43a18402d72c5b7927f48f78 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Tue, 19 Jun 2018 12:13:41 +0000 Subject: [PATCH 05/17] [UPD] Update mrp_production_grouped_by_product.pot --- mrp_production_grouped_by_product/i18n/es.po | 16 +++-- .../mrp_production_grouped_by_product.pot | 62 +++++++++++++++++++ 2 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.pot diff --git a/mrp_production_grouped_by_product/i18n/es.po b/mrp_production_grouped_by_product/i18n/es.po index e9c4e2b95..8ec2f6ae8 100644 --- a/mrp_production_grouped_by_product/i18n/es.po +++ b/mrp_production_grouped_by_product/i18n/es.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * mrp_production_grouped_by_product +# * mrp_production_grouped_by_product # msgid "" msgstr "" @@ -10,6 +10,7 @@ msgstr "" "PO-Revision-Date: 2018-06-03 23:16+0000\n" "Last-Translator: <>\n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" @@ -37,12 +38,19 @@ msgstr "Regla de abastecimiento" #. module: mrp_production_grouped_by_product #: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour -msgid "The maximum hour (between 0 and 23) for considering new manufacturing orders inside the same interval period, and thus being grouped on the same MO. IMPORTANT: The hour should be expressed in UTC." -msgstr "La hora máxima (entre 0 y 23) para considerar nuevas órdenes de fabricación dentro del mismo periodo de tiempo, y por tanto siendo agrupadas dentro de la misma OF. IMPORTANTE: La hora debe expresarse en UTC." +msgid "" +"The maximum hour (between 0 and 23) for considering new manufacturing orders " +"inside the same interval period, and thus being grouped on the same MO. " +"IMPORTANT: The hour should be expressed in UTC." +msgstr "" +"La hora máxima (entre 0 y 23) para considerar nuevas órdenes de fabricación " +"dentro del mismo periodo de tiempo, y por tanto siendo agrupadas dentro de " +"la misma OF. IMPORTANTE: La hora debe expresarse en UTC." #. module: mrp_production_grouped_by_product #: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval -msgid "The number of days for grouping together on the same manufacturing order." +msgid "" +"The number of days for grouping together on the same manufacturing order." msgstr "El número de días para agrupar juntas las órdenes de fabricación." #. module: mrp_production_grouped_by_product diff --git a/mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.pot b/mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.pot new file mode 100644 index 000000000..db5203ece --- /dev/null +++ b/mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.pot @@ -0,0 +1,62 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_production_grouped_by_product +# +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_production_grouped_by_product +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +msgid "MO grouping interval (days)" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +msgid "MO grouping max. hour (UTC)" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_mrp_production +msgid "Manufacturing Order" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_procurement_rule +msgid "Procurement Rule" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +msgid "The maximum hour (between 0 and 23) for considering new manufacturing orders inside the same interval period, and thus being grouped on the same MO. IMPORTANT: The hour should be expressed in UTC." +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +msgid "The number of days for grouping together on the same manufacturing order." +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type +msgid "The operation type determines the picking view" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:36 +#, python-format +msgid "You have to enter a positive value for interval." +msgstr "" + +#. module: mrp_production_grouped_by_product +#: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:29 +#, python-format +msgid "You have to enter a valid hour between 0 and 23." +msgstr "" + From c625110e14f8723512a1f11bc1aa792d3068538a Mon Sep 17 00:00:00 2001 From: OCA Git Bot Date: Thu, 21 Jun 2018 05:13:49 +0200 Subject: [PATCH 06/17] [UPD] README.rst --- mrp_production_grouped_by_product/README.rst | 10 +++++++--- .../static/description/index.html | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mrp_production_grouped_by_product/README.rst b/mrp_production_grouped_by_product/README.rst index 9c871ef5d..0055d8770 100644 --- a/mrp_production_grouped_by_product/README.rst +++ b/mrp_production_grouped_by_product/README.rst @@ -16,11 +16,14 @@ Production Grouped By Product .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github :target: https://github.com/OCA/manufacture/tree/11.0/mrp_production_grouped_by_product :alt: OCA/manufacture -.. |badge4| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png +.. |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_production_grouped_by_product + :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| +|badge1| |badge2| |badge3| |badge4| |badge5| When you have several sales orders with make to order (MTO) products that require to be manufactured, you end up with one manufacturing order for each of @@ -68,7 +71,8 @@ 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. +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. diff --git a/mrp_production_grouped_by_product/static/description/index.html b/mrp_production_grouped_by_product/static/description/index.html index ab83fde8f..287be50c0 100644 --- a/mrp_production_grouped_by_product/static/description/index.html +++ b/mrp_production_grouped_by_product/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/manufacture Try me on Runbot

+

Beta License: AGPL-3 OCA/manufacture Translate me on Weblate Try me on Runbot

When you have several sales orders with make to order (MTO) products that require to be manufactured, you end up with one manufacturing order for each of these sales orders, which is very bad for the management.

@@ -424,7 +424,8 @@ be grouped together.

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.

+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.

From 9112ebac982569a85543dd6bba4fc0af2fecc297 Mon Sep 17 00:00:00 2001 From: Jordi Ballester Alomar Date: Mon, 2 Jul 2018 12:01:38 +0200 Subject: [PATCH 07/17] fix test in mrp_production_grouped_by_product --- .../tests/test_mrp_production_grouped_by_product.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py index 28afaa0f8..1425a67d7 100644 --- a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py +++ b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py @@ -70,6 +70,7 @@ class TestProductionGroupedByProduct(common.SavepointCase): 'procure_method': 'make_to_order', 'warehouse_id': cls.warehouse.id, 'date': '2018-06-01 18:00:00', + 'date_expected': '2018-06-01 18:00:00', }) def test_mo_by_product(self): @@ -85,7 +86,9 @@ class TestProductionGroupedByProduct(common.SavepointCase): self.assertEqual(mo.product_qty, 12) def test_mo_other_date(self): - self.move.date = '2018-06-01 20:01:00' + self.move.write( + {'date_expected': '2018-06-01 20:01:00', + 'date': '2018-06-01 20:01:00'}) self.move.with_context(test_group_mo=True)._action_confirm(merge=False) self.ProcurementGroup.with_context(test_group_mo=True).run_scheduler() mo = self.MrpProduction.search([('product_id', '=', self.product1.id)]) From b701d306dc988c43c066aec9ab14f40d26705f7a Mon Sep 17 00:00:00 2001 From: Maria Sparenberg Date: Sun, 9 Dec 2018 09:59:25 +0000 Subject: [PATCH 08/17] Added translation using Weblate (German) --- mrp_production_grouped_by_product/i18n/de.po | 62 ++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 mrp_production_grouped_by_product/i18n/de.po diff --git a/mrp_production_grouped_by_product/i18n/de.po b/mrp_production_grouped_by_product/i18n/de.po new file mode 100644 index 000000000..e796ed171 --- /dev/null +++ b/mrp_production_grouped_by_product/i18n/de.po @@ -0,0 +1,62 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_production_grouped_by_product +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 11.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\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" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +msgid "MO grouping interval (days)" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +msgid "MO grouping max. hour (UTC)" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_mrp_production +msgid "Manufacturing Order" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_procurement_rule +msgid "Procurement Rule" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +msgid "The maximum hour (between 0 and 23) for considering new manufacturing orders inside the same interval period, and thus being grouped on the same MO. IMPORTANT: The hour should be expressed in UTC." +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +msgid "The number of days for grouping together on the same manufacturing order." +msgstr "" + +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type +msgid "The operation type determines the picking view" +msgstr "" + +#. module: mrp_production_grouped_by_product +#: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:36 +#, python-format +msgid "You have to enter a positive value for interval." +msgstr "" + +#. module: mrp_production_grouped_by_product +#: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:29 +#, python-format +msgid "You have to enter a valid hour between 0 and 23." +msgstr "" From 95d7393e73762f53c1cf48f4cc3631e61d4809de Mon Sep 17 00:00:00 2001 From: Maria Sparenberg Date: Sun, 9 Dec 2018 10:00:16 +0000 Subject: [PATCH 09/17] Translated using Weblate (German) Currently translated at 100.0% (9 of 9 strings) Translation: manufacture-11.0/manufacture-11.0-mrp_production_grouped_by_product Translate-URL: https://translation.odoo-community.org/projects/manufacture-11-0/manufacture-11-0-mrp_production_grouped_by_product/de/ --- mrp_production_grouped_by_product/i18n/de.po | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/mrp_production_grouped_by_product/i18n/de.po b/mrp_production_grouped_by_product/i18n/de.po index e796ed171..d46b5664e 100644 --- a/mrp_production_grouped_by_product/i18n/de.po +++ b/mrp_production_grouped_by_product/i18n/de.po @@ -6,57 +6,64 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\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_production_grouped_by_product #: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval msgid "MO grouping interval (days)" -msgstr "" +msgstr "Gruppierungsintervall für Fertigungsaufträge (Tage)" #. module: mrp_production_grouped_by_product #: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour msgid "MO grouping max. hour (UTC)" -msgstr "" +msgstr "Späteste Uhrzeit (UTC) für die Gruppierung von Fertigungsaufträgen" #. module: mrp_production_grouped_by_product #: model:ir.model,name:mrp_production_grouped_by_product.model_mrp_production msgid "Manufacturing Order" -msgstr "" +msgstr "Fertigungsauftrag" #. module: mrp_production_grouped_by_product #: model:ir.model,name:mrp_production_grouped_by_product.model_procurement_rule msgid "Procurement Rule" -msgstr "" +msgstr "Beschaffungsregel" #. module: mrp_production_grouped_by_product #: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour msgid "The maximum hour (between 0 and 23) for considering new manufacturing orders inside the same interval period, and thus being grouped on the same MO. IMPORTANT: The hour should be expressed in UTC." msgstr "" +"Dies ist die späteste Uhrzeit (zwischen 0 und 23) zur Berücksichtigung von " +"neuen Fertigungsaufträgen innerhalb desselben Intervals, die dabei zum " +"selben Fertigungsauftrag gruppiert werden. WICHTIG: Die Uhrzeit muss in UTC " +"angegeben werden." #. module: mrp_production_grouped_by_product #: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval msgid "The number of days for grouping together on the same manufacturing order." msgstr "" +"Dies ist die Anzahl von Tagen zur Gruppierung in demselben Fertigungsauftrag." #. module: mrp_production_grouped_by_product #: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type msgid "The operation type determines the picking view" -msgstr "" +msgstr "Der Vorgangstyp legt die Pick-Ansicht fest" #. module: mrp_production_grouped_by_product #: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:36 #, python-format msgid "You have to enter a positive value for interval." -msgstr "" +msgstr "Sie müssen für das Intervall einen Wert größer 0 eingeben." #. module: mrp_production_grouped_by_product #: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:29 #, python-format msgid "You have to enter a valid hour between 0 and 23." -msgstr "" +msgstr "Sie müssen eine gültige Uhrzeit zwischen 0 und 23 eingeben." From 4be0347ae5926bf47f0a2cb7cd0cdd4c9c646632 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 3 Apr 2019 03:00:38 +0000 Subject: [PATCH 10/17] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 mrp_production_grouped_by_product/static/description/icon.png diff --git a/mrp_production_grouped_by_product/static/description/icon.png b/mrp_production_grouped_by_product/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 From b35a845b455d8db3ce481b14f0247b47b426ad24 Mon Sep 17 00:00:00 2001 From: Ruben Dario Bravo Date: Tue, 16 Apr 2019 17:39:29 -0400 Subject: [PATCH 11/17] [MIG] mrp_production_grouped_by_product: Migration to 12.0 --- .../__manifest__.py | 3 ++- .../models/__init__.py | 2 +- .../models/{procurement.py => stock_rule.py} | 6 +++--- .../test_mrp_production_grouped_by_product.py | 21 ++++++++++++------- 4 files changed, 20 insertions(+), 12 deletions(-) rename mrp_production_grouped_by_product/models/{procurement.py => stock_rule.py} (76%) diff --git a/mrp_production_grouped_by_product/__manifest__.py b/mrp_production_grouped_by_product/__manifest__.py index d1ecdd69a..2b78bab60 100644 --- a/mrp_production_grouped_by_product/__manifest__.py +++ b/mrp_production_grouped_by_product/__manifest__.py @@ -1,10 +1,11 @@ # Copyright 2018 Tecnativa - David Vidal # Copyright 2018 Tecnativa - Pedro M. Baeza +# Copyright 2019 Rubén Bravo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { 'name': 'Production Grouped By Product', - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'MRP', 'author': 'Tecnativa, ' 'Odoo Community Association (OCA)', diff --git a/mrp_production_grouped_by_product/models/__init__.py b/mrp_production_grouped_by_product/models/__init__.py index b4b7e408a..a3df67902 100644 --- a/mrp_production_grouped_by_product/models/__init__.py +++ b/mrp_production_grouped_by_product/models/__init__.py @@ -1,4 +1,4 @@ from . import mrp_production -from . import procurement +from . import stock_rule from . import stock_picking_type diff --git a/mrp_production_grouped_by_product/models/procurement.py b/mrp_production_grouped_by_product/models/stock_rule.py similarity index 76% rename from mrp_production_grouped_by_product/models/procurement.py rename to mrp_production_grouped_by_product/models/stock_rule.py index 19368adc0..05ebe83a9 100644 --- a/mrp_production_grouped_by_product/models/procurement.py +++ b/mrp_production_grouped_by_product/models/stock_rule.py @@ -5,13 +5,13 @@ from odoo import models -class ProcurementRule(models.Model): - _inherit = 'procurement.rule' +class StockRule(models.Model): + _inherit = 'stock.rule' def _run_manufacture(self, product_id, product_qty, product_uom, location_id, name, origin, values): return super( - ProcurementRule, self.with_context(group_mo_by_product=True), + StockRule, self.with_context(group_mo_by_product=True), )._run_manufacture( product_id, product_qty, product_uom, location_id, name, origin, values, diff --git a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py index 1425a67d7..3e91719e3 100644 --- a/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py +++ b/mrp_production_grouped_by_product/tests/test_mrp_production_grouped_by_product.py @@ -1,5 +1,6 @@ # Copyright 2018 Tecnativa - David Vidal # Copyright 2018 Tecnativa - Pedro M. Baeza +# Copyright 2019 Rubén Bravo # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import exceptions @@ -17,7 +18,11 @@ class TestProductionGroupedByProduct(common.SavepointCase): cls.MrpProduction = cls.env['mrp.production'] cls.env.user.company_id.manufacturing_lead = 0 cls.env.user.tz = False # Make sure there's no timezone in user - cls.picking_type = cls.env.ref('mrp.picking_type_manufacturing') + + cls.picking_type = cls.env['stock.picking.type'].search([ + ('code', '=', 'mrp_operation'), + ('sequence_id.company_id', '=', cls.env.user.company_id.id) + ], limit=1) cls.product1 = cls.env['product.product'].create({ 'name': 'TEST Muffin', 'route_ids': [(6, 0, [ @@ -95,11 +100,13 @@ class TestProductionGroupedByProduct(common.SavepointCase): self.assertEqual(len(mo), 2) def test_check_mo_grouping_max_hour(self): - with self.assertRaises(exceptions.ValidationError): - self.picking_type.mo_grouping_max_hour = 25 - with self.assertRaises(exceptions.ValidationError): - self.picking_type.mo_grouping_max_hour = -1 + if self.picking_type: + with self.assertRaises(exceptions.ValidationError): + self.picking_type.mo_grouping_max_hour = 25 + with self.assertRaises(exceptions.ValidationError): + self.picking_type.mo_grouping_max_hour = -1 def test_check_mo_grouping_interval(self): - with self.assertRaises(exceptions.ValidationError): - self.picking_type.mo_grouping_interval = -1 + if self.picking_type: + with self.assertRaises(exceptions.ValidationError): + self.picking_type.mo_grouping_interval = -1 From 4505458c536946d3cb30ebbe38eee244c87cea36 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Apr 2019 16:13:19 +0000 Subject: [PATCH 12/17] [UPD] README.rst --- mrp_production_grouped_by_product/README.rst | 10 +++++----- .../static/description/index.html | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mrp_production_grouped_by_product/README.rst b/mrp_production_grouped_by_product/README.rst index 0055d8770..cfcd1428f 100644 --- a/mrp_production_grouped_by_product/README.rst +++ b/mrp_production_grouped_by_product/README.rst @@ -14,13 +14,13 @@ Production Grouped By Product :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_production_grouped_by_product + :target: https://github.com/OCA/manufacture/tree/12.0/mrp_production_grouped_by_product :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_production_grouped_by_product + :target: https://translation.odoo-community.org/projects/manufacture-12-0/manufacture-12-0-mrp_production_grouped_by_product :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| @@ -72,7 +72,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. @@ -105,6 +105,6 @@ 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. -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_production_grouped_by_product/static/description/index.html b/mrp_production_grouped_by_product/static/description/index.html index 287be50c0..4faae433d 100644 --- a/mrp_production_grouped_by_product/static/description/index.html +++ b/mrp_production_grouped_by_product/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/manufacture Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/manufacture Translate me on Weblate Try me on Runbot

When you have several sales orders with make to order (MTO) products that require to be manufactured, you end up with one manufacturing order for each of these sales orders, which is very bad for the management.

@@ -425,7 +425,7 @@ be grouped together.

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.

@@ -453,7 +453,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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.

-

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.

From 7c6910084d385ce62716accf07e054809a4b9793 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Mon, 29 Apr 2019 16:25:09 +0000 Subject: [PATCH 13/17] [UPD] Update mrp_production_grouped_by_product.pot --- .../mrp_production_grouped_by_product.pot | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.pot b/mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.pot index db5203ece..5a3cae00e 100644 --- a/mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.pot +++ b/mrp_production_grouped_by_product/i18n/mrp_production_grouped_by_product.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" @@ -14,40 +14,40 @@ msgstr "" "Plural-Forms: \n" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_interval msgid "MO grouping interval (days)" msgstr "" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_max_hour msgid "MO grouping max. hour (UTC)" msgstr "" +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type +msgid "Picking Type" +msgstr "" + #. module: mrp_production_grouped_by_product #: model:ir.model,name:mrp_production_grouped_by_product.model_mrp_production -msgid "Manufacturing Order" +msgid "Production Order" msgstr "" #. module: mrp_production_grouped_by_product -#: model:ir.model,name:mrp_production_grouped_by_product.model_procurement_rule -msgid "Procurement Rule" +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_rule +msgid "Stock Rule" msgstr "" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_max_hour msgid "The maximum hour (between 0 and 23) for considering new manufacturing orders inside the same interval period, and thus being grouped on the same MO. IMPORTANT: The hour should be expressed in UTC." msgstr "" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_interval msgid "The number of days for grouping together on the same manufacturing order." msgstr "" -#. module: mrp_production_grouped_by_product -#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type -msgid "The operation type determines the picking view" -msgstr "" - #. module: mrp_production_grouped_by_product #: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:36 #, python-format From 9966e970ea05ca435d9da71b96548326563373e1 Mon Sep 17 00:00:00 2001 From: OCA Transbot Date: Mon, 20 May 2019 20:48:53 +0000 Subject: [PATCH 14/17] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: manufacture-12.0/manufacture-12.0-mrp_production_grouped_by_product Translate-URL: https://translation.odoo-community.org/projects/manufacture-12-0/manufacture-12-0-mrp_production_grouped_by_product/ --- mrp_production_grouped_by_product/i18n/de.po | 44 +++++++++++++------- mrp_production_grouped_by_product/i18n/es.po | 34 +++++++++------ 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/mrp_production_grouped_by_product/i18n/de.po b/mrp_production_grouped_by_product/i18n/de.po index d46b5664e..0e7acb69f 100644 --- a/mrp_production_grouped_by_product/i18n/de.po +++ b/mrp_production_grouped_by_product/i18n/de.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * mrp_production_grouped_by_product +# * mrp_production_grouped_by_product # msgid "" msgstr "" @@ -17,28 +17,38 @@ msgstr "" "X-Generator: Weblate 3.3\n" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_interval msgid "MO grouping interval (days)" msgstr "Gruppierungsintervall für Fertigungsaufträge (Tage)" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_max_hour msgid "MO grouping max. hour (UTC)" msgstr "Späteste Uhrzeit (UTC) für die Gruppierung von Fertigungsaufträgen" +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type +msgid "Picking Type" +msgstr "" + #. module: mrp_production_grouped_by_product #: model:ir.model,name:mrp_production_grouped_by_product.model_mrp_production -msgid "Manufacturing Order" +#, fuzzy +#| msgid "Manufacturing Order" +msgid "Production Order" msgstr "Fertigungsauftrag" #. module: mrp_production_grouped_by_product -#: model:ir.model,name:mrp_production_grouped_by_product.model_procurement_rule -msgid "Procurement Rule" -msgstr "Beschaffungsregel" +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_rule +msgid "Stock Rule" +msgstr "" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour -msgid "The maximum hour (between 0 and 23) for considering new manufacturing orders inside the same interval period, and thus being grouped on the same MO. IMPORTANT: The hour should be expressed in UTC." +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_max_hour +msgid "" +"The maximum hour (between 0 and 23) for considering new manufacturing orders " +"inside the same interval period, and thus being grouped on the same MO. " +"IMPORTANT: The hour should be expressed in UTC." msgstr "" "Dies ist die späteste Uhrzeit (zwischen 0 und 23) zur Berücksichtigung von " "neuen Fertigungsaufträgen innerhalb desselben Intervals, die dabei zum " @@ -46,16 +56,12 @@ msgstr "" "angegeben werden." #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval -msgid "The number of days for grouping together on the same manufacturing order." +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_interval +msgid "" +"The number of days for grouping together on the same manufacturing order." msgstr "" "Dies ist die Anzahl von Tagen zur Gruppierung in demselben Fertigungsauftrag." -#. module: mrp_production_grouped_by_product -#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type -msgid "The operation type determines the picking view" -msgstr "Der Vorgangstyp legt die Pick-Ansicht fest" - #. module: mrp_production_grouped_by_product #: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:36 #, python-format @@ -67,3 +73,9 @@ msgstr "Sie müssen für das Intervall einen Wert größer 0 eingeben." #, python-format msgid "You have to enter a valid hour between 0 and 23." msgstr "Sie müssen eine gültige Uhrzeit zwischen 0 und 23 eingeben." + +#~ msgid "Procurement Rule" +#~ msgstr "Beschaffungsregel" + +#~ msgid "The operation type determines the picking view" +#~ msgstr "Der Vorgangstyp legt die Pick-Ansicht fest" diff --git a/mrp_production_grouped_by_product/i18n/es.po b/mrp_production_grouped_by_product/i18n/es.po index 8ec2f6ae8..97f059b24 100644 --- a/mrp_production_grouped_by_product/i18n/es.po +++ b/mrp_production_grouped_by_product/i18n/es.po @@ -17,27 +17,34 @@ msgstr "" "Plural-Forms: \n" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_interval msgid "MO grouping interval (days)" msgstr "Intervalo de agrupación de OFs (días)" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +#: model:ir.model.fields,field_description:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_max_hour msgid "MO grouping max. hour (UTC)" msgstr "Hora máx. agrupación OFs (UTC)" +#. module: mrp_production_grouped_by_product +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type +msgid "Picking Type" +msgstr "" + #. module: mrp_production_grouped_by_product #: model:ir.model,name:mrp_production_grouped_by_product.model_mrp_production -msgid "Manufacturing Order" +#, fuzzy +#| msgid "Manufacturing Order" +msgid "Production Order" msgstr "Orden de fabricación" #. module: mrp_production_grouped_by_product -#: model:ir.model,name:mrp_production_grouped_by_product.model_procurement_rule -msgid "Procurement Rule" -msgstr "Regla de abastecimiento" +#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_rule +msgid "Stock Rule" +msgstr "" #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_max_hour +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_max_hour msgid "" "The maximum hour (between 0 and 23) for considering new manufacturing orders " "inside the same interval period, and thus being grouped on the same MO. " @@ -48,16 +55,11 @@ msgstr "" "la misma OF. IMPORTANTE: La hora debe expresarse en UTC." #. module: mrp_production_grouped_by_product -#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type_mo_grouping_interval +#: model:ir.model.fields,help:mrp_production_grouped_by_product.field_stock_picking_type__mo_grouping_interval msgid "" "The number of days for grouping together on the same manufacturing order." msgstr "El número de días para agrupar juntas las órdenes de fabricación." -#. module: mrp_production_grouped_by_product -#: model:ir.model,name:mrp_production_grouped_by_product.model_stock_picking_type -msgid "The operation type determines the picking view" -msgstr "El tipo de operación determina la vista de la operación" - #. module: mrp_production_grouped_by_product #: code:addons/mrp_production_grouped_by_product/models/stock_picking_type.py:36 #, python-format @@ -69,3 +71,9 @@ msgstr "Debe introducir un valor positivo para el intervalo." #, python-format msgid "You have to enter a valid hour between 0 and 23." msgstr "Debe introducir una hora válida entre 0 y 23." + +#~ msgid "Procurement Rule" +#~ msgstr "Regla de abastecimiento" + +#~ msgid "The operation type determines the picking view" +#~ msgstr "El tipo de operación determina la vista de la operación" From 8cb52eadbade4b0c3ad8e3b7160c515e4dd13f34 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2019 03:10:43 +0000 Subject: [PATCH 15/17] [UPD] README.rst --- mrp_production_grouped_by_product/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrp_production_grouped_by_product/static/description/index.html b/mrp_production_grouped_by_product/static/description/index.html index 4faae433d..3d3033215 100644 --- a/mrp_production_grouped_by_product/static/description/index.html +++ b/mrp_production_grouped_by_product/static/description/index.html @@ -3,7 +3,7 @@ - + Production Grouped By Product