From 6652fc026b6addd25df24522da0b6c7389c783b6 Mon Sep 17 00:00:00 2001 From: Author Name Date: Wed, 15 Mar 2017 12:04:42 +0100 Subject: [PATCH 1/3] =?UTF-8?q?from=20AK=20@author=20S=C3=A9bastien=20BEAU?= =?UTF-8?q?=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- product_quick_bom/README.rst | 77 +++++++++++ product_quick_bom/__init__.py | 24 ++++ product_quick_bom/__openerp__.py | 45 +++++++ product_quick_bom/bom.py | 44 +++++++ product_quick_bom/i18n/fr.po | 42 ++++++ product_quick_bom/i18n/product_quick_bom.pot | 42 ++++++ product_quick_bom/product.py | 77 +++++++++++ product_quick_bom/product_view.xml | 24 ++++ product_quick_bom/static/description/icon.png | Bin 0 -> 9455 bytes product_quick_bom/static/description/icon.svg | 79 +++++++++++ .../static/description/index.html | 124 ++++++++++++++++++ 11 files changed, 578 insertions(+) create mode 100644 product_quick_bom/README.rst create mode 100644 product_quick_bom/__init__.py create mode 100644 product_quick_bom/__openerp__.py create mode 100644 product_quick_bom/bom.py create mode 100644 product_quick_bom/i18n/fr.po create mode 100644 product_quick_bom/i18n/product_quick_bom.pot create mode 100644 product_quick_bom/product.py create mode 100644 product_quick_bom/product_view.xml create mode 100644 product_quick_bom/static/description/icon.png create mode 100644 product_quick_bom/static/description/icon.svg create mode 100644 product_quick_bom/static/description/index.html diff --git a/product_quick_bom/README.rst b/product_quick_bom/README.rst new file mode 100644 index 000000000..5dac978a2 --- /dev/null +++ b/product_quick_bom/README.rst @@ -0,0 +1,77 @@ +.. 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 + +============== +{module_title} +============== + +This module was written to create quickly the bom for your product. +Indeed in the product form you now have a new tab "bom" that give you the posibility +to add the bom line directly here + +Installation +============ + +To install this module, you just need to install it + +Configuration +============= + +No configuration is required + +Usage +===== + +To use this module, you need to: + +* go to a product form, click on edit, add a line in the bom tab and see that a bom + linked to the product have been created + +.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas + :alt: Try me on Runbot + :target: https://runbot.odoo-community.org/runbot/{repo_id}/{branch} + +.. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt +.. branch is "8.0" for example + +For further information, please visit: + +* https://www.odoo.com/forum/help-1 + +Known issues / Roadmap +====================== + +* ... + +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 +`here `_. + + +Credits +======= + +Contributors +------------ + +* Sébastien Beau + +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 http://odoo-community.org. diff --git a/product_quick_bom/__init__.py b/product_quick_bom/__init__.py new file mode 100644 index 000000000..ed8e79d96 --- /dev/null +++ b/product_quick_bom/__init__.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Module for OpenERP +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# @author Sébastien BEAU +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################### + +from . import product +from . import bom diff --git a/product_quick_bom/__openerp__.py b/product_quick_bom/__openerp__.py new file mode 100644 index 000000000..b82ce6937 --- /dev/null +++ b/product_quick_bom/__openerp__.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Module for OpenERP +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# @author Sébastien BEAU +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################### + +{ + "name": "Product Quick Bom", + "summary": "Create the bom directly from the product", + "version": "8.0.1.0.0", + "category": "mrp", + "website": "https://odoo-community.org/", + "author": "Akretion, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "external_dependencies": { + "python": [], + "bin": [], + }, + "depends": [ + "mrp", + ], + "data": [ + "product_view.xml", + ], + "demo": [ + ], +} diff --git a/product_quick_bom/bom.py b/product_quick_bom/bom.py new file mode 100644 index 000000000..d333c187e --- /dev/null +++ b/product_quick_bom/bom.py @@ -0,0 +1,44 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Module for OpenERP +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# @author Sébastien BEAU +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################### + +from openerp import models, fields, api +from collections import defaultdict +from openerp.exceptions import Warning as UserError + + +class MrpBom(models.Model): + _inherit = 'mrp.bom' + + _sql_constraint = ( + 'uniq_product_template', + 'uniq(product_tmpl_id)', + 'You can only have one Bom per product template', + ) + + +class MrpBomLine(models.Model): + _inherit = 'mrp.bom.line' + + product_tmpl_id = fields.Many2one( + 'product.template', + related='bom_id.product_tmpl_id', + store=True) diff --git a/product_quick_bom/i18n/fr.po b/product_quick_bom/i18n/fr.po new file mode 100644 index 000000000..2687df31c --- /dev/null +++ b/product_quick_bom/i18n/fr.po @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_quick_bom +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-13 16:24+0000\n" +"PO-Revision-Date: 2015-09-13 16:24+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: product_quick_bom +#: model:ir.model,name:product_quick_bom.model_mrp_bom +msgid "Bill of Material" +msgstr "Nomenclature" + +#. module: product_quick_bom +#: field:product.template,bom_line_ids:0 +msgid "Bom Line" +msgstr "Composant" + +#. module: product_quick_bom +#: view:product.template:product_quick_bom.product_template_form_view +msgid "Bom line" +msgstr "Composant" + +#. module: product_quick_bom +#: help:product.template,bom_line_ids:0 +msgid "If you product is manufactured you can selecthere the componant to product them" +msgstr "Si votre produit est fabriqué vous pouvez définir les composants ici" + +#. module: product_quick_bom +#: model:ir.model,name:product_quick_bom.model_product_template +msgid "Product Template" +msgstr "Modèle d'article" + diff --git a/product_quick_bom/i18n/product_quick_bom.pot b/product_quick_bom/i18n/product_quick_bom.pot new file mode 100644 index 000000000..6e228f84a --- /dev/null +++ b/product_quick_bom/i18n/product_quick_bom.pot @@ -0,0 +1,42 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * product_quick_bom +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 8.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-13 16:25+0000\n" +"PO-Revision-Date: 2015-09-13 16:25+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: product_quick_bom +#: model:ir.model,name:product_quick_bom.model_mrp_bom +msgid "Bill of Material" +msgstr "" + +#. module: product_quick_bom +#: field:product.template,bom_line_ids:0 +msgid "Bom Line" +msgstr "" + +#. module: product_quick_bom +#: view:product.template:product_quick_bom.product_template_form_view +msgid "Bom line" +msgstr "" + +#. module: product_quick_bom +#: help:product.template,bom_line_ids:0 +msgid "If you product is manufactured you can selecthere the componant to product them" +msgstr "" + +#. module: product_quick_bom +#: model:ir.model,name:product_quick_bom.model_product_template +msgid "Product Template" +msgstr "" + diff --git a/product_quick_bom/product.py b/product_quick_bom/product.py new file mode 100644 index 000000000..7040315b6 --- /dev/null +++ b/product_quick_bom/product.py @@ -0,0 +1,77 @@ +# -*- coding: utf-8 -*- +############################################################################### +# +# Module for OpenERP +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# @author Sébastien BEAU +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################### + +from openerp import models, fields, api +from collections import defaultdict +from openerp.exceptions import Warning as UserError + + +class ProductTemplate(models.Model): + _inherit = 'product.template' + + bom_line_ids = fields.One2many( + 'mrp.bom.line', + 'product_tmpl_id', + string='Bom Line', + help='If you product is manufactured you can select' + 'here the componant to product them') + + @api.model + def _extract_bom_line(self, vals): + return vals.pop('bom_line_ids', {}) + + @api.multi + def _prepare_bom_vals(self, vals): + return { + 'product_tmpl_id': self.id, + 'bom_line_ids': vals, + } + + @api.one + def _process_bom_vals(self, vals): + if self.bom_ids: + self.bom_ids[0].write({'bom_line_ids': vals}) + else: + bom = self.env['mrp.bom'].create(self._prepare_bom_vals(vals)) + + @api.model + def create(self, vals): + bom_vals = self._extract_bom_line(vals) + record = super(ProductTemplate, self).create(vals) + if bom_vals: + record._process_bom_vals(bom_vals) + return record + + @api.multi + def write(self, vals): + bom_vals = self._extract_bom_line(vals) + res = super(ProductTemplate, self).write(vals) + if bom_vals: + self._process_bom_vals(bom_vals) + return res + + @api.multi + def unlink(self): + for record in self: + if record.bom_ids: + record.bom_ids.unlink() + return super(ProductTemplate, self).unlink() diff --git a/product_quick_bom/product_view.xml b/product_quick_bom/product_view.xml new file mode 100644 index 000000000..0a996070b --- /dev/null +++ b/product_quick_bom/product_view.xml @@ -0,0 +1,24 @@ + + + + + + product.template + + + + + + + + + + + + + + + + + + diff --git a/product_quick_bom/static/description/icon.png b/product_quick_bom/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/product_quick_bom/static/description/icon.svg b/product_quick_bom/static/description/icon.svg new file mode 100644 index 000000000..a7a26d093 --- /dev/null +++ b/product_quick_bom/static/description/icon.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/product_quick_bom/static/description/index.html b/product_quick_bom/static/description/index.html new file mode 100644 index 000000000..27f067420 --- /dev/null +++ b/product_quick_bom/static/description/index.html @@ -0,0 +1,124 @@ +
+
+
+

Module name

+

This module was written to extend the functionality of ... to support ... and allow you to ...

+
+
+
+ +
+
+
+

Installation

+
+
+

To install this module, you need to: +

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Configuration

+
+
+

To configure this module, you need to: +

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Usage

+
+
+

To use this module, you need to: +

    +
  • ...
    • +
+

+

For further information, please visit: +

+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Known issues / Roadmap

+
+
+

+

    +
  • ...
    • +
+

+
+
+
+ + + +
+
+
+
+ +
+
+
+

Credits

+
+
+

Contributors

+ +
+
+

Maintainer

+

+ 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 http://odoo-community.org.
+ +

+
+
+
From 0849579f4f853fabdbd1f7816e7a1804d186af7a Mon Sep 17 00:00:00 2001 From: MonsieurB Date: Thu, 4 May 2017 16:38:01 +0200 Subject: [PATCH 2/3] mig to 10 --- product_quick_bom/README.rst | 26 +--- product_quick_bom/__init__.py | 20 +-- product_quick_bom/__manifest__.py | 22 ++++ product_quick_bom/__openerp__.py | 45 ------- product_quick_bom/bom.py | 29 +--- product_quick_bom/i18n/fr.po | 2 +- product_quick_bom/i18n/product_quick_bom.pot | 42 ------ product_quick_bom/product.py | 52 +++----- product_quick_bom/product_view.xml | 10 +- .../static/description/index.html | 124 ------------------ product_quick_bom/tests/__init__.py | 5 + product_quick_bom/tests/test_quick_bom.py | 61 +++++++++ 12 files changed, 124 insertions(+), 314 deletions(-) create mode 100644 product_quick_bom/__manifest__.py delete mode 100644 product_quick_bom/__openerp__.py delete mode 100644 product_quick_bom/i18n/product_quick_bom.pot delete mode 100644 product_quick_bom/static/description/index.html create mode 100644 product_quick_bom/tests/__init__.py create mode 100644 product_quick_bom/tests/test_quick_bom.py diff --git a/product_quick_bom/README.rst b/product_quick_bom/README.rst index 5dac978a2..2697b28e9 100644 --- a/product_quick_bom/README.rst +++ b/product_quick_bom/README.rst @@ -2,24 +2,14 @@ :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 -============== -{module_title} -============== +================= +product_quick_bom +================= This module was written to create quickly the bom for your product. Indeed in the product form you now have a new tab "bom" that give you the posibility to add the bom line directly here -Installation -============ - -To install this module, you just need to install it - -Configuration -============= - -No configuration is required - Usage ===== @@ -30,7 +20,7 @@ To use this module, you need to: .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/{repo_id}/{branch} + :target: https://runbot.odoo-community.org/runbot/manufacture/10.0 .. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt .. branch is "8.0" for example @@ -39,18 +29,14 @@ For further information, please visit: * https://www.odoo.com/forum/help-1 -Known issues / Roadmap -====================== - -* ... Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. +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 -`here `_. +`here `_. Credits diff --git a/product_quick_bom/__init__.py b/product_quick_bom/__init__.py index ed8e79d96..e55d597f7 100644 --- a/product_quick_bom/__init__.py +++ b/product_quick_bom/__init__.py @@ -1,24 +1,6 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Module for OpenERP # Copyright (C) 2015 Akretion (http://www.akretion.com). -# @author Sébastien BEAU -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import product from . import bom diff --git a/product_quick_bom/__manifest__.py b/product_quick_bom/__manifest__.py new file mode 100644 index 000000000..5d7f04e59 --- /dev/null +++ b/product_quick_bom/__manifest__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +{ + "name": "Product Quick Bom", + "summary": "Create the bom directly from the product", + "version": "10.0.1.0.0", + "category": "mrp", + "website": "https://odoo-community.org/", + "author": "Akretion, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "depends": [ + "mrp", + ], + "data": [ + "product_view.xml", + ], + +} diff --git a/product_quick_bom/__openerp__.py b/product_quick_bom/__openerp__.py deleted file mode 100644 index b82ce6937..000000000 --- a/product_quick_bom/__openerp__.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################### -# -# Module for OpenERP -# Copyright (C) 2015 Akretion (http://www.akretion.com). -# @author Sébastien BEAU -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### - -{ - "name": "Product Quick Bom", - "summary": "Create the bom directly from the product", - "version": "8.0.1.0.0", - "category": "mrp", - "website": "https://odoo-community.org/", - "author": "Akretion, Odoo Community Association (OCA)", - "license": "AGPL-3", - "application": False, - "installable": True, - "external_dependencies": { - "python": [], - "bin": [], - }, - "depends": [ - "mrp", - ], - "data": [ - "product_view.xml", - ], - "demo": [ - ], -} diff --git a/product_quick_bom/bom.py b/product_quick_bom/bom.py index d333c187e..9e3313ab2 100644 --- a/product_quick_bom/bom.py +++ b/product_quick_bom/bom.py @@ -1,28 +1,8 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Module for OpenERP # Copyright (C) 2015 Akretion (http://www.akretion.com). -# @author Sébastien BEAU -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields, api -from collections import defaultdict -from openerp.exceptions import Warning as UserError +from odoo import fields, models, _ class MrpBom(models.Model): @@ -31,7 +11,7 @@ class MrpBom(models.Model): _sql_constraint = ( 'uniq_product_template', 'uniq(product_tmpl_id)', - 'You can only have one Bom per product template', + _('You can only have one Bom per product template'), ) @@ -39,6 +19,7 @@ class MrpBomLine(models.Model): _inherit = 'mrp.bom.line' product_tmpl_id = fields.Many2one( - 'product.template', + comodel_name='product.template', related='bom_id.product_tmpl_id', + readonly=True, store=True) diff --git a/product_quick_bom/i18n/fr.po b/product_quick_bom/i18n/fr.po index 2687df31c..06e34065b 100644 --- a/product_quick_bom/i18n/fr.po +++ b/product_quick_bom/i18n/fr.po @@ -32,7 +32,7 @@ msgstr "Composant" #. module: product_quick_bom #: help:product.template,bom_line_ids:0 -msgid "If you product is manufactured you can selecthere the componant to product them" +msgid "If your product is manufactured you can select here the component to produce them" msgstr "Si votre produit est fabriqué vous pouvez définir les composants ici" #. module: product_quick_bom diff --git a/product_quick_bom/i18n/product_quick_bom.pot b/product_quick_bom/i18n/product_quick_bom.pot deleted file mode 100644 index 6e228f84a..000000000 --- a/product_quick_bom/i18n/product_quick_bom.pot +++ /dev/null @@ -1,42 +0,0 @@ -# Translation of Odoo Server. -# This file contains the translation of the following modules: -# * product_quick_bom -# -msgid "" -msgstr "" -"Project-Id-Version: Odoo Server 8.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-13 16:25+0000\n" -"PO-Revision-Date: 2015-09-13 16:25+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: product_quick_bom -#: model:ir.model,name:product_quick_bom.model_mrp_bom -msgid "Bill of Material" -msgstr "" - -#. module: product_quick_bom -#: field:product.template,bom_line_ids:0 -msgid "Bom Line" -msgstr "" - -#. module: product_quick_bom -#: view:product.template:product_quick_bom.product_template_form_view -msgid "Bom line" -msgstr "" - -#. module: product_quick_bom -#: help:product.template,bom_line_ids:0 -msgid "If you product is manufactured you can selecthere the componant to product them" -msgstr "" - -#. module: product_quick_bom -#: model:ir.model,name:product_quick_bom.model_product_template -msgid "Product Template" -msgstr "" - diff --git a/product_quick_bom/product.py b/product_quick_bom/product.py index 7040315b6..1517bcec9 100644 --- a/product_quick_bom/product.py +++ b/product_quick_bom/product.py @@ -1,39 +1,19 @@ # -*- coding: utf-8 -*- -############################################################################### -# -# Module for OpenERP # Copyright (C) 2015 Akretion (http://www.akretion.com). -# @author Sébastien BEAU -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################### +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp import models, fields, api -from collections import defaultdict -from openerp.exceptions import Warning as UserError +from odoo import api, fields, models class ProductTemplate(models.Model): _inherit = 'product.template' bom_line_ids = fields.One2many( - 'mrp.bom.line', - 'product_tmpl_id', + comodel_name='mrp.bom.line', + inverse_name='product_tmpl_id', string='Bom Line', - help='If you product is manufactured you can select' - 'here the componant to product them') + help='If your product is manufactured you can select ' + 'here the component to produce them') @api.model def _extract_bom_line(self, vals): @@ -41,17 +21,19 @@ class ProductTemplate(models.Model): @api.multi def _prepare_bom_vals(self, vals): + self.ensure_one() return { 'product_tmpl_id': self.id, 'bom_line_ids': vals, } - @api.one + @api.multi def _process_bom_vals(self, vals): - if self.bom_ids: - self.bom_ids[0].write({'bom_line_ids': vals}) - else: - bom = self.env['mrp.bom'].create(self._prepare_bom_vals(vals)) + for record in self: + if record.bom_ids: + record.bom_ids[0].write({'bom_line_ids': vals}) + else: + record.env['mrp.bom'].create(self._prepare_bom_vals(vals)) @api.model def create(self, vals): @@ -63,10 +45,16 @@ class ProductTemplate(models.Model): @api.multi def write(self, vals): + """ default_type is in product and bom so _context ovewrite the default + value for bom with typ:'product' need to becarefull + """ bom_vals = self._extract_bom_line(vals) res = super(ProductTemplate, self).write(vals) if bom_vals: - self._process_bom_vals(bom_vals) + ctx = self._context.copy() + ctx.pop('default_type', None) + self.with_context(ctx)._process_bom_vals(bom_vals) + return res @api.multi diff --git a/product_quick_bom/product_view.xml b/product_quick_bom/product_view.xml index 0a996070b..804c1267c 100644 --- a/product_quick_bom/product_view.xml +++ b/product_quick_bom/product_view.xml @@ -1,13 +1,11 @@ - - - + product.template - + @@ -19,6 +17,4 @@ - - - + diff --git a/product_quick_bom/static/description/index.html b/product_quick_bom/static/description/index.html deleted file mode 100644 index 27f067420..000000000 --- a/product_quick_bom/static/description/index.html +++ /dev/null @@ -1,124 +0,0 @@ -
-
-
-

Module name

-

This module was written to extend the functionality of ... to support ... and allow you to ...

-
-
-
- -
-
-
-

Installation

-
-
-

To install this module, you need to: -

    -
  • ...
    • -
-

-
-
-
- - - -
-
-
-
- -
-
-
-

Configuration

-
-
-

To configure this module, you need to: -

    -
  • ...
    • -
-

-
-
-
- - - -
-
-
-
- -
-
-
-

Usage

-
-
-

To use this module, you need to: -

    -
  • ...
    • -
-

-

For further information, please visit: -

-

-
-
-
- - - -
-
-
-
- -
-
-
-

Known issues / Roadmap

-
-
-

-

    -
  • ...
    • -
-

-
-
-
- - - -
-
-
-
- -
-
-
-

Credits

-
-
-

Contributors

- -
-
-

Maintainer

-

- 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 http://odoo-community.org.
- -

-
-
-
diff --git a/product_quick_bom/tests/__init__.py b/product_quick_bom/tests/__init__.py new file mode 100644 index 000000000..161d59021 --- /dev/null +++ b/product_quick_bom/tests/__init__.py @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_quick_bom \ No newline at end of file diff --git a/product_quick_bom/tests/test_quick_bom.py b/product_quick_bom/tests/test_quick_bom.py new file mode 100644 index 000000000..101fa367d --- /dev/null +++ b/product_quick_bom/tests/test_quick_bom.py @@ -0,0 +1,61 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from openerp.tests.common import TransactionCase +import logging +_logger = logging.getLogger(__name__) + + +class TestQuickBom(TransactionCase): + + def setUp(self): + super(TestQuickBom, self).setUp() + self.computer = self.env.ref( + 'product.product_product_5_product_template') + self.ram = self.env.ref('product.product_product_13_product_template') + self.hard_drive = self.env.ref( + 'product.product_product_17_product_template') + self.cpu = self.env.ref('product.product_product_22_product_template') + + def test_create_bom(self): + self.computer.write({'bom_line_ids': [ + (0, 0, {'product_id': self.ram.id, 'product_qty': 2, }), + (0, 0, {'product_id': self.hard_drive.id, 'product_qty': 2, }), + (0, 0, {'product_id': self.cpu.id, 'product_qty': 1, })]}) + bom = self.computer.bom_ids + self.assertEqual(self.computer.id, bom.product_tmpl_id.id) + self.assertEqual(bom.bom_line_ids[0].product_id.id, + self.ram.id) + self.assertEqual(bom.bom_line_ids[0].product_qty, 2) + self.assertEqual(bom.bom_line_ids[1].product_id.id, + self.hard_drive.id) + self.assertEqual(bom.bom_line_ids[1].product_qty, 2) + self.assertEqual(bom.bom_line_ids[2].product_id.id, + self.cpu.id) + self.assertEqual(bom.bom_line_ids[2].product_qty, 1) + + def test_read_bom(self): + + bom = self.env['mrp.bom'].create({ + 'type': 'normal', + 'product_tmpl_id': self.computer.id}) + bomline1 = self.env['mrp.bom.line'].create({ + 'product_id': self.ram.id, + 'product_qty': 2, + 'bom_id': bom.id, + }) + bomline2 = self.env['mrp.bom.line'].create({ + 'product_id': self.hard_drive.id, + 'product_qty': 2, + 'bom_id': bom.id, + }) + bomline3 = self.env['mrp.bom.line'].create({ + 'product_id': self.cpu.id, + 'product_qty': 1, + 'bom_id': bom.id, + }) + + self.assertTrue(bomline1 in self.computer.bom_line_ids) + self.assertTrue(bomline2 in self.computer.bom_line_ids) + self.assertTrue(bomline3 in self.computer.bom_line_ids) From 5e1e4b67c15cd7ce6c8c2302d684ef9b29fead55 Mon Sep 17 00:00:00 2001 From: MonsieurB Date: Fri, 8 Sep 2017 14:43:28 +0200 Subject: [PATCH 3/3] OCA reviews --- product_quick_bom/README.rst | 10 ++++------ product_quick_bom/__init__.py | 3 +-- product_quick_bom/__manifest__.py | 2 +- product_quick_bom/models/__init__.py | 6 ++++++ product_quick_bom/{ => models}/bom.py | 0 product_quick_bom/{ => models}/product.py | 1 - product_quick_bom/tests/__init__.py | 6 +----- product_quick_bom/tests/test_quick_bom.py | 12 ++++-------- product_quick_bom/{ => views}/product_view.xml | 0 9 files changed, 17 insertions(+), 23 deletions(-) create mode 100644 product_quick_bom/models/__init__.py rename product_quick_bom/{ => models}/bom.py (100%) rename product_quick_bom/{ => models}/product.py (99%) rename product_quick_bom/{ => views}/product_view.xml (100%) diff --git a/product_quick_bom/README.rst b/product_quick_bom/README.rst index 2697b28e9..1c012bd77 100644 --- a/product_quick_bom/README.rst +++ b/product_quick_bom/README.rst @@ -3,7 +3,7 @@ :alt: License: AGPL-3 ================= -product_quick_bom +Product Quick Bom ================= This module was written to create quickly the bom for your product. @@ -15,12 +15,12 @@ Usage To use this module, you need to: -* go to a product form, click on edit, add a line in the bom tab and see that a bom - linked to the product have been created +* Go to a product form, click on edit, add a line in the bom tab and see that a bom + linked to the product have been created. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/manufacture/10.0 + :target: https://runbot.odoo-community.org/runbot/129/10.0 .. repo_id is available in https://github.com/OCA/maintainer-tools/blob/master/tools/repos_with_ids.txt .. branch is "8.0" for example @@ -36,8 +36,6 @@ 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 -`here `_. - Credits ======= diff --git a/product_quick_bom/__init__.py b/product_quick_bom/__init__.py index e55d597f7..8ebf94e87 100644 --- a/product_quick_bom/__init__.py +++ b/product_quick_bom/__init__.py @@ -2,5 +2,4 @@ # Copyright (C) 2015 Akretion (http://www.akretion.com). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from . import product -from . import bom +from . import models diff --git a/product_quick_bom/__manifest__.py b/product_quick_bom/__manifest__.py index 5d7f04e59..a0f27800e 100644 --- a/product_quick_bom/__manifest__.py +++ b/product_quick_bom/__manifest__.py @@ -16,7 +16,7 @@ "mrp", ], "data": [ - "product_view.xml", + "views/product_view.xml", ], } diff --git a/product_quick_bom/models/__init__.py b/product_quick_bom/models/__init__.py new file mode 100644 index 000000000..e55d597f7 --- /dev/null +++ b/product_quick_bom/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2015 Akretion (http://www.akretion.com). +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import product +from . import bom diff --git a/product_quick_bom/bom.py b/product_quick_bom/models/bom.py similarity index 100% rename from product_quick_bom/bom.py rename to product_quick_bom/models/bom.py diff --git a/product_quick_bom/product.py b/product_quick_bom/models/product.py similarity index 99% rename from product_quick_bom/product.py rename to product_quick_bom/models/product.py index 1517bcec9..4eca5dd82 100644 --- a/product_quick_bom/product.py +++ b/product_quick_bom/models/product.py @@ -54,7 +54,6 @@ class ProductTemplate(models.Model): ctx = self._context.copy() ctx.pop('default_type', None) self.with_context(ctx)._process_bom_vals(bom_vals) - return res @api.multi diff --git a/product_quick_bom/tests/__init__.py b/product_quick_bom/tests/__init__.py index 161d59021..7f893d1fe 100644 --- a/product_quick_bom/tests/__init__.py +++ b/product_quick_bom/tests/__init__.py @@ -1,5 +1 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2015 Akretion (http://www.akretion.com). -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). - -from . import test_quick_bom \ No newline at end of file +from . import test_quick_bom diff --git a/product_quick_bom/tests/test_quick_bom.py b/product_quick_bom/tests/test_quick_bom.py index 101fa367d..4893a8bde 100644 --- a/product_quick_bom/tests/test_quick_bom.py +++ b/product_quick_bom/tests/test_quick_bom.py @@ -2,7 +2,7 @@ # Copyright (C) 2015 Akretion (http://www.akretion.com). # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -from openerp.tests.common import TransactionCase +from odoo.tests.common import TransactionCase import logging _logger = logging.getLogger(__name__) @@ -25,18 +25,14 @@ class TestQuickBom(TransactionCase): (0, 0, {'product_id': self.cpu.id, 'product_qty': 1, })]}) bom = self.computer.bom_ids self.assertEqual(self.computer.id, bom.product_tmpl_id.id) - self.assertEqual(bom.bom_line_ids[0].product_id.id, - self.ram.id) + self.assertEqual(bom.bom_line_ids[0].product_id.id, self.ram.id) self.assertEqual(bom.bom_line_ids[0].product_qty, 2) - self.assertEqual(bom.bom_line_ids[1].product_id.id, - self.hard_drive.id) + self.assertEqual(bom.bom_line_ids[1].product_id.id, self.hard_drive.id) self.assertEqual(bom.bom_line_ids[1].product_qty, 2) - self.assertEqual(bom.bom_line_ids[2].product_id.id, - self.cpu.id) + self.assertEqual(bom.bom_line_ids[2].product_id.id, self.cpu.id) self.assertEqual(bom.bom_line_ids[2].product_qty, 1) def test_read_bom(self): - bom = self.env['mrp.bom'].create({ 'type': 'normal', 'product_tmpl_id': self.computer.id}) diff --git a/product_quick_bom/product_view.xml b/product_quick_bom/views/product_view.xml similarity index 100% rename from product_quick_bom/product_view.xml rename to product_quick_bom/views/product_view.xml