From 364f97a95de4a5e866c1dd8f8bbccff0c21bd895 Mon Sep 17 00:00:00 2001 From: hveficent Date: Mon, 5 Feb 2018 16:22:07 +0100 Subject: [PATCH 01/11] [ADD] 10.0-mrp_flattened_bom_xlsx --- mrp_flattened_bom_xlsx/README.rst | 71 +++++++++++++++++ mrp_flattened_bom_xlsx/__init__.py | 4 + mrp_flattened_bom_xlsx/__manifest__.py | 18 +++++ mrp_flattened_bom_xlsx/models/__init__.py | 2 + mrp_flattened_bom_xlsx/models/mrp_bom.py | 36 +++++++++ mrp_flattened_bom_xlsx/report/__init__.py | 3 + .../report/flattened_bom_xlsx.py | 74 ++++++++++++++++++ .../report/flattened_bom_xlsx.xml | 22 ++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes 9 files changed, 230 insertions(+) create mode 100644 mrp_flattened_bom_xlsx/README.rst create mode 100644 mrp_flattened_bom_xlsx/__init__.py create mode 100644 mrp_flattened_bom_xlsx/__manifest__.py create mode 100644 mrp_flattened_bom_xlsx/models/__init__.py create mode 100644 mrp_flattened_bom_xlsx/models/mrp_bom.py create mode 100644 mrp_flattened_bom_xlsx/report/__init__.py create mode 100644 mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py create mode 100644 mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml create mode 100644 mrp_flattened_bom_xlsx/static/description/icon.png diff --git a/mrp_flattened_bom_xlsx/README.rst b/mrp_flattened_bom_xlsx/README.rst new file mode 100644 index 00000000..9ea95471 --- /dev/null +++ b/mrp_flattened_bom_xlsx/README.rst @@ -0,0 +1,71 @@ +.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg + :target: https://www.gnu.org/licenses/agpl.html + :alt: License: AGPL-3 + +===================================== +MRP Flattened BOM Report XLSX +===================================== + +This module extends the functionality of the MRP capabilities of Odoo, +and allows you to export the flattened BOM to MS Excel .XLSX format. + +A flattened bill of material removes the intermediate levels in the BOM +and connect the lowest levels directly to the highest level. + +A list of the sum of lowest levels will be shown for every +BoM you export using this method. + +It also maintains units correctly across all nested BOM's and take units +that have been defined in product Unit of Measure field. + + +Usage +===== + +To use this module, you need to: + +#. Go to 'Manufacturing / Products / Bill of Materials' +#. Select a BOM or more BOMS +*(Could be interesting to modify quantities of these BOMs)* +#. Go to 'Action / Export Flattened BOM to Excel'. + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/131/10.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 +------------ + +* Héctor Villarreal + + +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_flattened_bom_xlsx/__init__.py b/mrp_flattened_bom_xlsx/__init__.py new file mode 100644 index 00000000..9e7db851 --- /dev/null +++ b/mrp_flattened_bom_xlsx/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from . import models +from . import report diff --git a/mrp_flattened_bom_xlsx/__manifest__.py b/mrp_flattened_bom_xlsx/__manifest__.py new file mode 100644 index 00000000..d944d630 --- /dev/null +++ b/mrp_flattened_bom_xlsx/__manifest__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +{ + 'name': "Export Flattened BOM to Excel", + 'version': '10.0.1.0.0', + 'category': 'Manufacturing', + 'author': "Eficent, Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/manufacture-reporting', + 'license': 'AGPL-3', + 'depends': ['report_xlsx', 'mrp'], + 'data': [ + 'report/flattened_bom_xlsx.xml', + ], + 'installable': True +} diff --git a/mrp_flattened_bom_xlsx/models/__init__.py b/mrp_flattened_bom_xlsx/models/__init__.py new file mode 100644 index 00000000..05e49a56 --- /dev/null +++ b/mrp_flattened_bom_xlsx/models/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- +from . import mrp_bom diff --git a/mrp_flattened_bom_xlsx/models/mrp_bom.py b/mrp_flattened_bom_xlsx/models/mrp_bom.py new file mode 100644 index 00000000..d095b712 --- /dev/null +++ b/mrp_flattened_bom_xlsx/models/mrp_bom.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from odoo import models + + +class MrpBom(models.Model): + """ Defines bills of material for a product or a product template """ + _inherit = 'mrp.bom' + + def _get_flattened_totals(self, factor=1, totals=None): + """ + Generate a summary of product quantities as a dict of flattened BOM + """ + if totals is None: + totals = {} + for line in self.bom_line_ids: + sub_bom = self._bom_find(product=line.product_id) + if sub_bom: + factor *= line.product_uom_id._compute_quantity( + line.product_qty, line.product_id.uom_id) + sub_bom._get_flattened_totals(factor, totals) + else: + factor /= self.product_uom_id._compute_quantity( + self.product_qty, self.product_uom_id) + if totals.get(line.product_id): + totals[line.product_id] += line.product_uom_id. \ + _compute_quantity( + line.product_qty * factor, line.product_id.uom_id) + else: + totals[line.product_id] = line.product_uom_id. \ + _compute_quantity( + line.product_qty * factor, line.product_id.uom_id) + return totals diff --git a/mrp_flattened_bom_xlsx/report/__init__.py b/mrp_flattened_bom_xlsx/report/__init__.py new file mode 100644 index 00000000..c7ca94be --- /dev/null +++ b/mrp_flattened_bom_xlsx/report/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). +from . import flattened_bom_xlsx diff --git a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py new file mode 100644 index 00000000..ac4c0f30 --- /dev/null +++ b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# (http://www.eficent.com) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +import logging +from odoo.report import report_sxw +from odoo.tools.translate import _ + +_logger = logging.getLogger(__name__) + +try: + from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx +except ImportError: + _logger.debug("report_xlsx not installed, Excel export non functional") + + class ReportXlsx(object): + def __init__(self, *args, **kwargs): + pass + + +class FlattenedBomXlsx(ReportXlsx): + + def print_flattened_bom_lines(self, bom, requirements, sheet, row): + i = row + sheet.write(i, 0, bom.product_tmpl_id.name or '') + sheet.write(i, 1, bom.code or '') + sheet.write(i, 2, bom.display_name or '') + sheet.write(i, 3, bom.product_qty) + sheet.write(i, 4, bom.product_uom_id.name or '') + sheet.write(i, 5, bom.code or '') + i += 1 + for product, total_qty in requirements.iteritems(): + sheet.write(i, 1, product.default_code or '') + sheet.write(i, 2, product.display_name or '') + sheet.write(i, 3, total_qty or 0.0) + sheet.write(i, 4, product.uom_id.name or '') + sheet.write(i, 5, product.code or '') + i += 1 + return i + + def generate_xlsx_report(self, workbook, data, objects): + workbook.set_properties({ + 'comments': 'Created with Python and XlsxWriter from Odoo 10.0'}) + sheet = workbook.add_worksheet(_('Flattened BOM')) + sheet.set_landscape() + sheet.fit_to_pages(1, 0) + sheet.set_zoom(80) + sheet.set_column(0, 0, 40) + sheet.set_column(1, 2, 20) + sheet.set_column(3, 3, 40) + sheet.set_column(4, 6, 20) + title_style = workbook.add_format({'bold': True, + 'bg_color': '#FFFFCC', + 'bottom': 1}) + sheet_title = [_('BOM Name'), + _('Product Reference'), + _('Product Name'), + _('Quantity'), + _('Unit of Measure'), + _('Reference') + ] + sheet.set_row(0, None, None, {'collapsed': 1}) + sheet.write_row(1, 0, sheet_title, title_style) + sheet.freeze_panes(2, 0) + i = 2 + + for o in objects: + totals = o._get_flattened_totals() + i = self.print_flattened_bom_lines(o, totals, sheet, i) + + +FlattenedBomXlsx('report.flattened.bom.xlsx', 'mrp.bom', + parser=report_sxw.rml_parse) diff --git a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml new file mode 100644 index 00000000..43a6e5db --- /dev/null +++ b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml @@ -0,0 +1,22 @@ + + + + + + Export Flattened BOM Excel + mrp.bom + ir.actions.report.xml + flattened.bom.xlsx + xlsx + + + + + Export Flattened BOM Excel + client_action_multi + + mrp.bom + + + diff --git a/mrp_flattened_bom_xlsx/static/description/icon.png b/mrp_flattened_bom_xlsx/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 08856253cb576d442d21e471c035b9c6dbf8addf Mon Sep 17 00:00:00 2001 From: hveficent Date: Thu, 15 Feb 2018 14:18:37 +0100 Subject: [PATCH 02/11] [MIG] mrp_flattened_bom_xlsx: Migration to 11.0 --- mrp_flattened_bom_xlsx/README.rst | 11 ++++---- mrp_flattened_bom_xlsx/__init__.py | 1 - mrp_flattened_bom_xlsx/__manifest__.py | 3 +-- mrp_flattened_bom_xlsx/models/__init__.py | 1 - mrp_flattened_bom_xlsx/models/mrp_bom.py | 1 - mrp_flattened_bom_xlsx/report/__init__.py | 1 - .../report/flattened_bom_xlsx.py | 26 +++++-------------- .../report/flattened_bom_xlsx.xml | 24 +++++++---------- 8 files changed, 23 insertions(+), 45 deletions(-) diff --git a/mrp_flattened_bom_xlsx/README.rst b/mrp_flattened_bom_xlsx/README.rst index 9ea95471..e71cc852 100644 --- a/mrp_flattened_bom_xlsx/README.rst +++ b/mrp_flattened_bom_xlsx/README.rst @@ -24,14 +24,15 @@ Usage To use this module, you need to: -#. Go to 'Manufacturing / Products / Bill of Materials' -#. Select a BOM or more BOMS -*(Could be interesting to modify quantities of these BOMs)* -#. Go to 'Action / Export Flattened BOM to Excel'. +1. Go to 'Manufacturing / Products / Bill of Materials' + +2. Select a BOM or more BOMS *(Could be interesting to modify quantities of these BOMs)* + +3. Go to 'Print / Export Flattened BOM to Excel'. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/131/10.0 + :target: https://runbot.odoo-community.org/runbot/131/11.0 Bug Tracker =========== diff --git a/mrp_flattened_bom_xlsx/__init__.py b/mrp_flattened_bom_xlsx/__init__.py index 9e7db851..8674bdd3 100644 --- a/mrp_flattened_bom_xlsx/__init__.py +++ b/mrp_flattened_bom_xlsx/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import models from . import report diff --git a/mrp_flattened_bom_xlsx/__manifest__.py b/mrp_flattened_bom_xlsx/__manifest__.py index d944d630..e00f62b3 100644 --- a/mrp_flattened_bom_xlsx/__manifest__.py +++ b/mrp_flattened_bom_xlsx/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). { 'name': "Export Flattened BOM to Excel", - 'version': '10.0.1.0.0', + 'version': '11.0.1.0.0', 'category': 'Manufacturing', 'author': "Eficent, Odoo Community Association (OCA)", 'website': 'https://github.com/OCA/manufacture-reporting', diff --git a/mrp_flattened_bom_xlsx/models/__init__.py b/mrp_flattened_bom_xlsx/models/__init__.py index 05e49a56..a352efe9 100644 --- a/mrp_flattened_bom_xlsx/models/__init__.py +++ b/mrp_flattened_bom_xlsx/models/__init__.py @@ -1,2 +1 @@ -# -*- coding: utf-8 -*- from . import mrp_bom diff --git a/mrp_flattened_bom_xlsx/models/mrp_bom.py b/mrp_flattened_bom_xlsx/models/mrp_bom.py index d095b712..1313419b 100644 --- a/mrp_flattened_bom_xlsx/models/mrp_bom.py +++ b/mrp_flattened_bom_xlsx/models/mrp_bom.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). diff --git a/mrp_flattened_bom_xlsx/report/__init__.py b/mrp_flattened_bom_xlsx/report/__init__.py index c7ca94be..06df3655 100644 --- a/mrp_flattened_bom_xlsx/report/__init__.py +++ b/mrp_flattened_bom_xlsx/report/__init__.py @@ -1,3 +1,2 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import flattened_bom_xlsx diff --git a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py index ac4c0f30..be887871 100644 --- a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py +++ b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py @@ -1,25 +1,17 @@ -# -*- coding: utf-8 -*- -# Copyright 2017 Eficent Business and IT Consulting Services S.L. +# Copyright 2018 Eficent Business and IT Consulting Services S.L. # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). import logging -from odoo.report import report_sxw +from odoo import models from odoo.tools.translate import _ _logger = logging.getLogger(__name__) -try: - from odoo.addons.report_xlsx.report.report_xlsx import ReportXlsx -except ImportError: - _logger.debug("report_xlsx not installed, Excel export non functional") - class ReportXlsx(object): - def __init__(self, *args, **kwargs): - pass - - -class FlattenedBomXlsx(ReportXlsx): +class FlattenedBomXlsx(models.AbstractModel): + _name = 'report.mrp_flattened_bom_xlsx.flattened_bom_xlsx' + _inherit = 'report.report_xlsx.abstract' def print_flattened_bom_lines(self, bom, requirements, sheet, row): i = row @@ -30,7 +22,7 @@ def print_flattened_bom_lines(self, bom, requirements, sheet, row): sheet.write(i, 4, bom.product_uom_id.name or '') sheet.write(i, 5, bom.code or '') i += 1 - for product, total_qty in requirements.iteritems(): + for product, total_qty in requirements.items(): sheet.write(i, 1, product.default_code or '') sheet.write(i, 2, product.display_name or '') sheet.write(i, 3, total_qty or 0.0) @@ -41,7 +33,7 @@ def print_flattened_bom_lines(self, bom, requirements, sheet, row): def generate_xlsx_report(self, workbook, data, objects): workbook.set_properties({ - 'comments': 'Created with Python and XlsxWriter from Odoo 10.0'}) + 'comments': 'Created with Python and XlsxWriter from Odoo 11.0'}) sheet = workbook.add_worksheet(_('Flattened BOM')) sheet.set_landscape() sheet.fit_to_pages(1, 0) @@ -68,7 +60,3 @@ def generate_xlsx_report(self, workbook, data, objects): for o in objects: totals = o._get_flattened_totals() i = self.print_flattened_bom_lines(o, totals, sheet, i) - - -FlattenedBomXlsx('report.flattened.bom.xlsx', 'mrp.bom', - parser=report_sxw.rml_parse) diff --git a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml index 43a6e5db..40f3a0bd 100644 --- a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml +++ b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.xml @@ -3,20 +3,14 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). --> - - Export Flattened BOM Excel - mrp.bom - ir.actions.report.xml - flattened.bom.xlsx - xlsx - - - - - Export Flattened BOM Excel - client_action_multi - - mrp.bom - + From c8eeeb6275cdbfb3b61be54af7e21b30ace35eb9 Mon Sep 17 00:00:00 2001 From: hveficent <32061121+hveficent@users.noreply.github.com> Date: Mon, 19 Feb 2018 17:19:43 +0100 Subject: [PATCH 03/11] Update README.rst --- mrp_flattened_bom_xlsx/README.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mrp_flattened_bom_xlsx/README.rst b/mrp_flattened_bom_xlsx/README.rst index e71cc852..4c21c791 100644 --- a/mrp_flattened_bom_xlsx/README.rst +++ b/mrp_flattened_bom_xlsx/README.rst @@ -24,11 +24,13 @@ Usage To use this module, you need to: -1. Go to 'Manufacturing / Products / Bill of Materials' +#. Go to 'Manufacturing / Products / Bill of Materials' -2. Select a BOM or more BOMS *(Could be interesting to modify quantities of these BOMs)* +#. Select a BOM or more BOMS -3. Go to 'Print / Export Flattened BOM to Excel'. + *(Could be interesting to modify quantities of these BOMs)* + +#. Go to 'Print / Export Flattened BOM to Excel'. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot From d744a691a32660e59759ab1072d5fde6a25f4dd9 Mon Sep 17 00:00:00 2001 From: oca-travis Date: Wed, 20 Jun 2018 17:39:16 +0000 Subject: [PATCH 04/11] [UPD] Update mrp_flattened_bom_xlsx.pot --- .../i18n/mrp_flattened_bom_xlsx.pot | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 mrp_flattened_bom_xlsx/i18n/mrp_flattened_bom_xlsx.pot diff --git a/mrp_flattened_bom_xlsx/i18n/mrp_flattened_bom_xlsx.pot b/mrp_flattened_bom_xlsx/i18n/mrp_flattened_bom_xlsx.pot new file mode 100644 index 00000000..5a5f797f --- /dev/null +++ b/mrp_flattened_bom_xlsx/i18n/mrp_flattened_bom_xlsx.pot @@ -0,0 +1,87 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * mrp_flattened_bom_xlsx +# +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_flattened_bom_xlsx +#: code:addons/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py:48 +#, python-format +msgid "BOM Name" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: model:ir.model,name:mrp_flattened_bom_xlsx.model_mrp_bom +msgid "Bill of Material" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: model:ir.model.fields,field_description:mrp_flattened_bom_xlsx.field_report_mrp_flattened_bom_xlsx_flattened_bom_xlsx_display_name +msgid "Display Name" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: model:ir.actions.report,name:mrp_flattened_bom_xlsx.flattened_bom_xlsx +msgid "Export Flattened BOM Structure to Excel" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: code:addons/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py:37 +#, python-format +msgid "Flattened BOM" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: model:ir.model.fields,field_description:mrp_flattened_bom_xlsx.field_report_mrp_flattened_bom_xlsx_flattened_bom_xlsx_id +msgid "ID" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: model:ir.model.fields,field_description:mrp_flattened_bom_xlsx.field_report_mrp_flattened_bom_xlsx_flattened_bom_xlsx___last_update +msgid "Last Modified on" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: code:addons/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py:50 +#, python-format +msgid "Product Name" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: code:addons/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py:49 +#, python-format +msgid "Product Reference" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: code:addons/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py:51 +#, python-format +msgid "Quantity" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: code:addons/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py:53 +#, python-format +msgid "Reference" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: code:addons/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py:52 +#, python-format +msgid "Unit of Measure" +msgstr "" + +#. module: mrp_flattened_bom_xlsx +#: model:ir.model,name:mrp_flattened_bom_xlsx.model_report_mrp_flattened_bom_xlsx_flattened_bom_xlsx +msgid "report.mrp_flattened_bom_xlsx.flattened_bom_xlsx" +msgstr "" + From 826e889e564a1e53f9400125bd30d2fea5f2e3e4 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Mon, 5 Nov 2018 11:40:11 +0100 Subject: [PATCH 05/11] [11.0][IMP] mrp_flattened_bom_xlsx: cover multi level bom case and add tests (#48) --- mrp_flattened_bom_xlsx/README.rst | 1 + mrp_flattened_bom_xlsx/__init__.py | 1 - mrp_flattened_bom_xlsx/models/mrp_bom.py | 37 +++--- .../report/flattened_bom_xlsx.py | 5 +- mrp_flattened_bom_xlsx/tests/__init__.py | 1 + .../tests/test_flattened_bom.py | 119 ++++++++++++++++++ 6 files changed, 148 insertions(+), 16 deletions(-) create mode 100644 mrp_flattened_bom_xlsx/tests/__init__.py create mode 100644 mrp_flattened_bom_xlsx/tests/test_flattened_bom.py diff --git a/mrp_flattened_bom_xlsx/README.rst b/mrp_flattened_bom_xlsx/README.rst index 4c21c791..8c05c8e4 100644 --- a/mrp_flattened_bom_xlsx/README.rst +++ b/mrp_flattened_bom_xlsx/README.rst @@ -56,6 +56,7 @@ Contributors ------------ * Héctor Villarreal +* Lois Rilo Maintainer diff --git a/mrp_flattened_bom_xlsx/__init__.py b/mrp_flattened_bom_xlsx/__init__.py index 8674bdd3..bf588bc8 100644 --- a/mrp_flattened_bom_xlsx/__init__.py +++ b/mrp_flattened_bom_xlsx/__init__.py @@ -1,3 +1,2 @@ -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). from . import models from . import report diff --git a/mrp_flattened_bom_xlsx/models/mrp_bom.py b/mrp_flattened_bom_xlsx/models/mrp_bom.py index 1313419b..d912c721 100644 --- a/mrp_flattened_bom_xlsx/models/mrp_bom.py +++ b/mrp_flattened_bom_xlsx/models/mrp_bom.py @@ -2,34 +2,43 @@ # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo import models +from odoo import api, models class MrpBom(models.Model): """ Defines bills of material for a product or a product template """ _inherit = 'mrp.bom' + @api.multi def _get_flattened_totals(self, factor=1, totals=None): + """Calculate the **unitary** product requirements of flattened BOM. + *Unit* means that the requirements are computed for one unit of the + default UoM of the product. + :returns: dict: keys are components and values are aggregated quantity + in the product default UoM. """ - Generate a summary of product quantities as a dict of flattened BOM - """ + self.ensure_one() if totals is None: totals = {} + factor /= self.product_uom_id._compute_quantity( + self.product_qty, self.product_tmpl_id.uom_id, round=False) for line in self.bom_line_ids: sub_bom = self._bom_find(product=line.product_id) if sub_bom: - factor *= line.product_uom_id._compute_quantity( - line.product_qty, line.product_id.uom_id) - sub_bom._get_flattened_totals(factor, totals) + new_factor = factor * line.product_uom_id._compute_quantity( + line.product_qty, line.product_id.uom_id, round=False) + sub_bom._get_flattened_totals(new_factor, totals) else: - factor /= self.product_uom_id._compute_quantity( - self.product_qty, self.product_uom_id) if totals.get(line.product_id): - totals[line.product_id] += line.product_uom_id. \ - _compute_quantity( - line.product_qty * factor, line.product_id.uom_id) + totals[line.product_id] += factor * \ + line.product_uom_id._compute_quantity( + line.product_qty, + line.product_id.uom_id, + round=False) else: - totals[line.product_id] = line.product_uom_id. \ - _compute_quantity( - line.product_qty * factor, line.product_id.uom_id) + totals[line.product_id] = factor * \ + line.product_uom_id._compute_quantity( + line.product_qty, + line.product_id.uom_id, + round=False) return totals diff --git a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py index be887871..1563527f 100644 --- a/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py +++ b/mrp_flattened_bom_xlsx/report/flattened_bom_xlsx.py @@ -58,5 +58,8 @@ def generate_xlsx_report(self, workbook, data, objects): i = 2 for o in objects: - totals = o._get_flattened_totals() + # We need to calculate the totals for the BoM qty and UoM: + starting_factor = o.product_uom_id._compute_quantity( + o.product_qty, o.product_tmpl_id.uom_id, round=False) + totals = o._get_flattened_totals(factor=starting_factor) i = self.print_flattened_bom_lines(o, totals, sheet, i) diff --git a/mrp_flattened_bom_xlsx/tests/__init__.py b/mrp_flattened_bom_xlsx/tests/__init__.py new file mode 100644 index 00000000..9554abdb --- /dev/null +++ b/mrp_flattened_bom_xlsx/tests/__init__.py @@ -0,0 +1 @@ +from . import test_flattened_bom diff --git a/mrp_flattened_bom_xlsx/tests/test_flattened_bom.py b/mrp_flattened_bom_xlsx/tests/test_flattened_bom.py new file mode 100644 index 00000000..2631f1fd --- /dev/null +++ b/mrp_flattened_bom_xlsx/tests/test_flattened_bom.py @@ -0,0 +1,119 @@ +# 2018 Eficent Business and IT Consulting Services S.L. +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +import odoo.tests.common as common + + +class TestFlattenedBom(common.SavepointCase): + + @classmethod + def setUpClass(cls): + super(TestFlattenedBom, cls).setUpClass() + + cls.product_obj = cls.env['product.product'] + cls.bom_obj = cls.env['mrp.bom'] + cls.bom_line_obj = cls.env['mrp.bom.line'] + + cls.uom_dozen = cls.env.ref('product.product_uom_dozen') + + # Create products: + cls.product_top = cls.product_obj.create({ + 'name': 'Final Product', + 'type': 'product', + 'standard_price': 300.0, + }) + cls.product_sub_1 = cls.product_obj.create({ + 'name': 'L01-01', + 'type': 'product', + 'standard_price': 300.0, + }) + cls.product_sub_2 = cls.product_obj.create({ + 'name': 'L01-02', + 'type': 'product', + 'standard_price': 300.0, + }) + cls.component_1 = cls.product_obj.create({ + 'name': 'RM 01', + 'type': 'product', + 'standard_price': 100.0, + }) + cls.component_2 = cls.product_obj.create({ + 'name': 'RM 01', + 'type': 'product', + 'standard_price': 75.0, + }) + cls.component_3 = cls.product_obj.create({ + 'name': 'RM 03', + 'type': 'product', + 'standard_price': 75.0, + }) + + # Create Bills of Materials: + cls.bom_top = cls.bom_obj.create({ + 'product_tmpl_id': cls.product_top.product_tmpl_id.id, + + }) + cls.line_top_1 = cls.bom_line_obj.create({ + 'product_id': cls.product_sub_1.id, + 'bom_id': cls.bom_top.id, + 'product_qty': 2.0, + }) + cls.line_top_2 = cls.bom_line_obj.create({ + 'product_id': cls.product_sub_2.id, + 'bom_id': cls.bom_top.id, + 'product_qty': 5.0, + }) + + cls.bom_sub_1 = cls.bom_obj.create({ + 'product_tmpl_id': cls.product_sub_1.product_tmpl_id.id, + + }) + cls.line_sub_1_1 = cls.bom_line_obj.create({ + 'product_id': cls.component_1.id, + 'bom_id': cls.bom_sub_1.id, + 'product_qty': 2.0, + }) + cls.line_sub_1_2 = cls.bom_line_obj.create({ + 'product_id': cls.component_2.id, + 'bom_id': cls.bom_sub_1.id, + 'product_qty': 5.0, + }) + + cls.bom_sub_2 = cls.bom_obj.create({ + 'product_tmpl_id': cls.product_sub_2.product_tmpl_id.id, + + }) + cls.line_sub_2_1 = cls.bom_line_obj.create({ + 'product_id': cls.component_1.id, + 'bom_id': cls.bom_sub_2.id, + 'product_qty': 3.0, + }) + cls.line_sub_2_2 = cls.bom_line_obj.create({ + 'product_id': cls.component_3.id, + 'bom_id': cls.bom_sub_2.id, + 'product_qty': 3.0, + }) + + def test_01_flattened_totals(self): + """Test totals computation with a multi level BoM.""" + flat_tot = self.bom_top._get_flattened_totals() + self.assertEqual(len(flat_tot), 3) + # Component 1 = 2*2 + 5*3 = 19 + self.assertEqual(flat_tot.get(self.component_1), 19) + # Component 2 = 2*5 = 10 + self.assertEqual(flat_tot.get(self.component_2), 10) + # Component 3 = 5*3 = 15 + self.assertEqual(flat_tot.get(self.component_3), 15) + + def test_02_different_uom(self): + """Test totals computation with a multi level BoM and different UoM.""" + self.bom_top.product_uom_id = self.uom_dozen + self.line_sub_2_1.product_uom_id = self.uom_dozen + flat_tot = self.bom_top._get_flattened_totals() + self.assertEqual(len(flat_tot), 3) + # Component 1 = 2*2 + 5*3*12 = 184 units -> 184/12 dozens + self.assertAlmostEqual(flat_tot.get(self.component_1), 184 / 12) + # Component 2 = 2*5 = 10 units -> 10/12 dozens + self.assertAlmostEqual(flat_tot.get(self.component_2), 10 / 12) + # Component 3 = 5*3 = 15 units -> 15/12 dozens + self.assertAlmostEqual(flat_tot.get(self.component_3), 15 / 12) From abc6b46feaac2358fe6448cf5c6e732db1ebdc41 Mon Sep 17 00:00:00 2001 From: hveficent Date: Tue, 28 May 2019 19:26:30 +0200 Subject: [PATCH 06/11] [MIG] mrp_flattened_bom_xlsx: Migration to 12.0 --- mrp_flattened_bom_xlsx/README.rst | 72 ++- mrp_flattened_bom_xlsx/__manifest__.py | 2 +- .../readme/CONTRIBUTORS.rst | 2 + mrp_flattened_bom_xlsx/readme/DESCRIPTION.rst | 11 + mrp_flattened_bom_xlsx/readme/USAGE.rst | 9 + .../static/description/index.html | 441 ++++++++++++++++++ .../tests/test_flattened_bom.py | 2 +- 7 files changed, 512 insertions(+), 27 deletions(-) create mode 100644 mrp_flattened_bom_xlsx/readme/CONTRIBUTORS.rst create mode 100644 mrp_flattened_bom_xlsx/readme/DESCRIPTION.rst create mode 100644 mrp_flattened_bom_xlsx/readme/USAGE.rst create mode 100644 mrp_flattened_bom_xlsx/static/description/index.html diff --git a/mrp_flattened_bom_xlsx/README.rst b/mrp_flattened_bom_xlsx/README.rst index 8c05c8e4..1f997f45 100644 --- a/mrp_flattened_bom_xlsx/README.rst +++ b/mrp_flattened_bom_xlsx/README.rst @@ -1,10 +1,29 @@ -.. image:: https://img.shields.io/badge/license-AGPLv3-blue.svg - :target: https://www.gnu.org/licenses/agpl.html - :alt: License: AGPL-3 - -===================================== -MRP Flattened BOM Report XLSX -===================================== +============================= +Export Flattened BOM to Excel +============================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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--reporting-lightgray.png?logo=github + :target: https://github.com/OCA/manufacture-reporting/tree/12.0/mrp_flattened_bom_xlsx + :alt: OCA/manufacture-reporting +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/manufacture-reporting-12-0/manufacture-reporting-12-0-mrp_flattened_bom_xlsx + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/131/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module extends the functionality of the MRP capabilities of Odoo, and allows you to export the flattened BOM to MS Excel .XLSX format. @@ -18,6 +37,10 @@ BoM you export using this method. It also maintains units correctly across all nested BOM's and take units that have been defined in product Unit of Measure field. +**Table of contents** + +.. contents:: + :local: Usage ===== @@ -26,50 +49,49 @@ To use this module, you need to: #. Go to 'Manufacturing / Products / Bill of Materials' -#. Select a BOM or more BOMS +#. Select a BOM or more BOMS *(Could be interesting to modify quantities of these BOMs)* #. Go to 'Print / Export Flattened BOM to Excel'. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/131/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. +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 ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Eficent Contributors ------------- +~~~~~~~~~~~~ * Héctor Villarreal * Lois Rilo +Maintainers +~~~~~~~~~~~ -Maintainer ----------- +This module is maintained by the OCA. .. 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 module is part of the `OCA/manufacture-reporting `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mrp_flattened_bom_xlsx/__manifest__.py b/mrp_flattened_bom_xlsx/__manifest__.py index e00f62b3..64679480 100644 --- a/mrp_flattened_bom_xlsx/__manifest__.py +++ b/mrp_flattened_bom_xlsx/__manifest__.py @@ -4,7 +4,7 @@ { 'name': "Export Flattened BOM to Excel", - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'category': 'Manufacturing', 'author': "Eficent, Odoo Community Association (OCA)", 'website': 'https://github.com/OCA/manufacture-reporting', diff --git a/mrp_flattened_bom_xlsx/readme/CONTRIBUTORS.rst b/mrp_flattened_bom_xlsx/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..55d48067 --- /dev/null +++ b/mrp_flattened_bom_xlsx/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Héctor Villarreal +* Lois Rilo diff --git a/mrp_flattened_bom_xlsx/readme/DESCRIPTION.rst b/mrp_flattened_bom_xlsx/readme/DESCRIPTION.rst new file mode 100644 index 00000000..39e2c8b4 --- /dev/null +++ b/mrp_flattened_bom_xlsx/readme/DESCRIPTION.rst @@ -0,0 +1,11 @@ +This module extends the functionality of the MRP capabilities of Odoo, +and allows you to export the flattened BOM to MS Excel .XLSX format. + +A flattened bill of material removes the intermediate levels in the BOM +and connect the lowest levels directly to the highest level. + +A list of the sum of lowest levels will be shown for every +BoM you export using this method. + +It also maintains units correctly across all nested BOM's and take units +that have been defined in product Unit of Measure field. diff --git a/mrp_flattened_bom_xlsx/readme/USAGE.rst b/mrp_flattened_bom_xlsx/readme/USAGE.rst new file mode 100644 index 00000000..4a0f5c00 --- /dev/null +++ b/mrp_flattened_bom_xlsx/readme/USAGE.rst @@ -0,0 +1,9 @@ +To use this module, you need to: + +#. Go to 'Manufacturing / Products / Bill of Materials' + +#. Select a BOM or more BOMS + + *(Could be interesting to modify quantities of these BOMs)* + +#. Go to 'Print / Export Flattened BOM to Excel'. diff --git a/mrp_flattened_bom_xlsx/static/description/index.html b/mrp_flattened_bom_xlsx/static/description/index.html new file mode 100644 index 00000000..79427ed5 --- /dev/null +++ b/mrp_flattened_bom_xlsx/static/description/index.html @@ -0,0 +1,441 @@ + + + + + + +Export Flattened BOM to Excel + + + +
+

Export Flattened BOM to Excel

+ + +

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

+

This module extends the functionality of the MRP capabilities of Odoo, +and allows you to export the flattened BOM to MS Excel .XLSX format.

+

A flattened bill of material removes the intermediate levels in the BOM +and connect the lowest levels directly to the highest level.

+

A list of the sum of lowest levels will be shown for every +BoM you export using this method.

+

It also maintains units correctly across all nested BOM’s and take units +that have been defined in product Unit of Measure field.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +

  1. Go to ‘Manufacturing / Products / Bill of Materials’

    +
    2. +

  2. Select a BOM or more BOMS

    +

    (Could be interesting to modify quantities of these BOMs)

    +
    3. +

  3. Go to ‘Print / Export Flattened BOM to Excel’.

    +
    4. +
+
+
+

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.

+

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

+

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

+
+
+
+ + diff --git a/mrp_flattened_bom_xlsx/tests/test_flattened_bom.py b/mrp_flattened_bom_xlsx/tests/test_flattened_bom.py index 2631f1fd..75917500 100644 --- a/mrp_flattened_bom_xlsx/tests/test_flattened_bom.py +++ b/mrp_flattened_bom_xlsx/tests/test_flattened_bom.py @@ -14,7 +14,7 @@ def setUpClass(cls): cls.bom_obj = cls.env['mrp.bom'] cls.bom_line_obj = cls.env['mrp.bom.line'] - cls.uom_dozen = cls.env.ref('product.product_uom_dozen') + cls.uom_dozen = cls.env.ref('uom.product_uom_dozen') # Create products: cls.product_top = cls.product_obj.create({ From 8d721215e4e2403f9a0e52e3a03162497ca31cb5 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 5 Jun 2019 12:10:52 +0000 Subject: [PATCH 07/11] [UPD] README.rst --- mrp_flattened_bom_xlsx/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrp_flattened_bom_xlsx/static/description/index.html b/mrp_flattened_bom_xlsx/static/description/index.html index 79427ed5..c5f07ccb 100644 --- a/mrp_flattened_bom_xlsx/static/description/index.html +++ b/mrp_flattened_bom_xlsx/static/description/index.html @@ -3,7 +3,7 @@ - + Export Flattened BOM to Excel