From 6a444a5bcc2ad03af6fd27438c5b182d1791c671 Mon Sep 17 00:00:00 2001 From: Timon Tschanz Date: Fri, 4 Jan 2019 13:03:03 +0100 Subject: [PATCH] [11.0][MIG] port stock_available_mrp to 11.0 --- stock_available_mrp/__init__.py | 3 +- stock_available_mrp/__manifest__.py | 10 +-- stock_available_mrp/demo/mrp_data.xml | 2 +- stock_available_mrp/i18n/de.po | 34 ++++++-- stock_available_mrp/i18n/es.po | 29 +++++-- stock_available_mrp/i18n/fi.po | 29 +++++-- stock_available_mrp/i18n/fr.po | 29 +++++-- stock_available_mrp/i18n/hr_HR.po | 80 +++++++++++------- stock_available_mrp/i18n/it.po | 42 ++++----- stock_available_mrp/i18n/pt_BR.po | 76 ++++++++++------- stock_available_mrp/i18n/sl.po | 37 ++++++-- .../i18n/stock_available_mrp.pot | 35 +++++--- stock_available_mrp/i18n/zh_CN.po | 51 ++++++----- stock_available_mrp/models/__init__.py | 3 +- stock_available_mrp/models/product_product.py | 21 +++-- .../models/product_template.py | 3 +- .../static/description/icon.png | Bin 0 -> 9455 bytes stock_available_mrp/tests/__init__.py | 3 +- .../tests/test_potential_qty.py | 65 ++++++++------ 19 files changed, 352 insertions(+), 200 deletions(-) create mode 100644 stock_available_mrp/static/description/icon.png diff --git a/stock_available_mrp/__init__.py b/stock_available_mrp/__init__.py index 0443836b4..2f72d6f91 100644 --- a/stock_available_mrp/__init__.py +++ b/stock_available_mrp/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014 Numérigraphe SARL +# Copyright 2014 Numérigraphe SARL # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models diff --git a/stock_available_mrp/__manifest__.py b/stock_available_mrp/__manifest__.py index 5564377f3..58a507f11 100644 --- a/stock_available_mrp/__manifest__.py +++ b/stock_available_mrp/__manifest__.py @@ -1,11 +1,11 @@ -# -*- coding: utf-8 -*- -# © 2014 Numérigraphe SARL, Camptocamp +# Copyright 2014 Numérigraphe SARL, Camptocamp # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Consider the production potential is available to promise', - 'version': '10.0.1.0.0', - "author": u"Numérigraphe," - u"Odoo Community Association (OCA)", + 'version': '11.0.1.0.0', + "author": "Numérigraphe," + "Odoo Community Association (OCA)", + 'website': 'https://github.com/OCA/stock-logistics-warehouse', 'category': 'Hidden', 'depends': [ 'stock_available', diff --git a/stock_available_mrp/demo/mrp_data.xml b/stock_available_mrp/demo/mrp_data.xml index 0099e9349..a41a04f4c 100644 --- a/stock_available_mrp/demo/mrp_data.xml +++ b/stock_available_mrp/demo/mrp_data.xml @@ -21,7 +21,7 @@ 10.0 47.0 - consu + product E-COM10-WHITE diff --git a/stock_available_mrp/i18n/de.po b/stock_available_mrp/i18n/de.po index 3fc625b7f..deb92b8bd 100644 --- a/stock_available_mrp/i18n/de.po +++ b/stock_available_mrp/i18n/de.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: # Rudolf Schnapka , 2016 msgid "" @@ -11,13 +11,25 @@ msgstr "" "POT-Creation-Date: 2016-01-14 01:38+0000\n" "PO-Revision-Date: 2016-01-14 09:35+0000\n" "Last-Translator: Rudolf Schnapka \n" -"Language-Team: German (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-8-0/language/de/)\n" +"Language-Team: German (http://www.transifex.com/oca/OCA-stock-logistics-" +"warehouse-8-0/language/de/)\n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: stock_available_mrp +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" + +#. module: stock_available_mrp +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" + #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product msgid "Product" @@ -29,6 +41,16 @@ msgid "Product Template" msgstr "Produktvorlage" #. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" -msgstr "Tausend" +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" + +#. module: stock_available_mrp +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." +msgstr "" + +#~ msgid "Thousand" +#~ msgstr "Tausend" diff --git a/stock_available_mrp/i18n/es.po b/stock_available_mrp/i18n/es.po index aab2eb182..1eb112127 100644 --- a/stock_available_mrp/i18n/es.po +++ b/stock_available_mrp/i18n/es.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: msgid "" msgstr "" @@ -10,13 +10,25 @@ msgstr "" "POT-Creation-Date: 2016-01-14 01:38+0000\n" "PO-Revision-Date: 2016-01-13 16:35+0000\n" "Last-Translator: <>\n" -"Language-Team: Spanish (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-8-0/language/es/)\n" +"Language-Team: Spanish (http://www.transifex.com/oca/OCA-stock-logistics-" +"warehouse-8-0/language/es/)\n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: stock_available_mrp +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" + +#. module: stock_available_mrp +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" + #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product msgid "Product" @@ -28,6 +40,13 @@ msgid "Product Template" msgstr "Plantilla de producto" #. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" + +#. module: stock_available_mrp +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." msgstr "" diff --git a/stock_available_mrp/i18n/fi.po b/stock_available_mrp/i18n/fi.po index fa81ddfe0..8c6389aee 100644 --- a/stock_available_mrp/i18n/fi.po +++ b/stock_available_mrp/i18n/fi.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: msgid "" msgstr "" @@ -10,13 +10,25 @@ msgstr "" "POT-Creation-Date: 2016-01-14 01:38+0000\n" "PO-Revision-Date: 2016-01-13 16:35+0000\n" "Last-Translator: <>\n" -"Language-Team: Finnish (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-8-0/language/fi/)\n" +"Language-Team: Finnish (http://www.transifex.com/oca/OCA-stock-logistics-" +"warehouse-8-0/language/fi/)\n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. module: stock_available_mrp +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" + +#. module: stock_available_mrp +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" + #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product msgid "Product" @@ -28,6 +40,13 @@ msgid "Product Template" msgstr "Tuotteen malli" #. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" + +#. module: stock_available_mrp +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." msgstr "" diff --git a/stock_available_mrp/i18n/fr.po b/stock_available_mrp/i18n/fr.po index 0aaafddd3..b61ff2a0a 100644 --- a/stock_available_mrp/i18n/fr.po +++ b/stock_available_mrp/i18n/fr.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: msgid "" msgstr "" @@ -10,13 +10,25 @@ msgstr "" "POT-Creation-Date: 2016-01-14 01:38+0000\n" "PO-Revision-Date: 2016-01-13 16:35+0000\n" "Last-Translator: <>\n" -"Language-Team: French (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-8-0/language/fr/)\n" +"Language-Team: French (http://www.transifex.com/oca/OCA-stock-logistics-" +"warehouse-8-0/language/fr/)\n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +#. module: stock_available_mrp +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" + +#. module: stock_available_mrp +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" + #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product msgid "Product" @@ -28,6 +40,13 @@ msgid "Product Template" msgstr "Modèle de produit" #. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" + +#. module: stock_available_mrp +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." msgstr "" diff --git a/stock_available_mrp/i18n/hr_HR.po b/stock_available_mrp/i18n/hr_HR.po index 59853430f..15a0b4f1f 100644 --- a/stock_available_mrp/i18n/hr_HR.po +++ b/stock_available_mrp/i18n/hr_HR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: # Bole , 2016 msgid "" @@ -11,28 +11,25 @@ msgstr "" "POT-Creation-Date: 2016-06-12 19:59+0000\n" "PO-Revision-Date: 2016-06-14 10:45+0000\n" "Last-Translator: Bole \n" -"Language-Team: Croatian (Croatia) (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-9-0/language/hr_HR/)\n" +"Language-Team: Croatian (Croatia) (http://www.transifex.com/oca/OCA-stock-" +"logistics-warehouse-9-0/language/hr_HR/)\n" +"Language: hr_HR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: hr_HR\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #. module: stock_available_mrp -#: model:ir.ui.view,arch_db:stock_available_mrp.view_product_form_potential_qty -msgid "Potential" -msgstr "Potencijal" +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_component_ids -msgid "Component ids" -msgstr "ID-ovi komponenata" - -#. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_potential_qty -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_template_potential_qty -msgid "Potential" -msgstr "Potencijal" +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product @@ -45,21 +42,42 @@ msgid "Product Template" msgstr "Predložak proizvoda" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_product_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand." -msgstr "Količina ovog proizvoda nije mogla biti proizvedena korištenjem trenutno raspoloživih materijala." +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_template_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand. If the product has several variants, this will be the biggest " -"quantity that can be made for a any single variant." -msgstr "Količina ovog proizvoda koja može biti proizvodedna raspoloživim količinama sirovina. Ako proizvod ima nekoliko varijanti, ovo će biti najveća moguća količina koja se može proizvesti za svaku pojedinu varijantu." +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." +msgstr "" -#. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" -msgstr "Tisuću" +#~ msgid "Potential" +#~ msgstr "Potencijal" + +#~ msgid "Component ids" +#~ msgstr "ID-ovi komponenata" + +#~ msgid "Potential" +#~ msgstr "Potencijal" + +#~ msgid "" +#~ "Quantity of this Product that could be produced using the materials " +#~ "already at hand." +#~ msgstr "" +#~ "Količina ovog proizvoda nije mogla biti proizvedena korištenjem trenutno " +#~ "raspoloživih materijala." + +#~ msgid "" +#~ "Quantity of this Product that could be produced using the materials " +#~ "already at hand. If the product has several variants, this will be the " +#~ "biggest quantity that can be made for a any single variant." +#~ msgstr "" +#~ "Količina ovog proizvoda koja može biti proizvodedna raspoloživim " +#~ "količinama sirovina. Ako proizvod ima nekoliko varijanti, ovo će biti " +#~ "najveća moguća količina koja se može proizvesti za svaku pojedinu " +#~ "varijantu." + +#~ msgid "Thousand" +#~ msgstr "Tisuću" diff --git a/stock_available_mrp/i18n/it.po b/stock_available_mrp/i18n/it.po index bace38b97..24cf94c0d 100644 --- a/stock_available_mrp/i18n/it.po +++ b/stock_available_mrp/i18n/it.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: msgid "" msgstr "" @@ -10,27 +10,23 @@ msgstr "" "POT-Creation-Date: 2016-09-04 10:11+0000\n" "PO-Revision-Date: 2016-04-27 11:10+0000\n" "Last-Translator: <>\n" -"Language-Team: Italian (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-9-0/language/it/)\n" +"Language-Team: Italian (http://www.transifex.com/oca/OCA-stock-logistics-" +"warehouse-9-0/language/it/)\n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. module: stock_available_mrp -#: model:ir.ui.view,arch_db:stock_available_mrp.view_product_form_potential_qty -msgid "Potential" +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_component_ids -msgid "Component ids" -msgstr "" - -#. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_potential_qty -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_template_potential_qty -msgid "Potential" +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" msgstr "" #. module: stock_available_mrp @@ -44,21 +40,13 @@ msgid "Product Template" msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_product_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand." +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_template_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand. If the product has several variants, this will be the biggest " -"quantity that can be made for a any single variant." -msgstr "" - -#. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." msgstr "" diff --git a/stock_available_mrp/i18n/pt_BR.po b/stock_available_mrp/i18n/pt_BR.po index de9e46c7a..d8c9dbdf6 100644 --- a/stock_available_mrp/i18n/pt_BR.po +++ b/stock_available_mrp/i18n/pt_BR.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: # Claudio Araujo Santos , 2016 msgid "" @@ -11,28 +11,24 @@ msgstr "" "POT-Creation-Date: 2016-07-03 20:56+0000\n" "PO-Revision-Date: 2016-07-07 19:41+0000\n" "Last-Translator: Claudio Araujo Santos \n" -"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-9-0/language/pt_BR/)\n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/oca/OCA-stock-" +"logistics-warehouse-9-0/language/pt_BR/)\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #. module: stock_available_mrp -#: model:ir.ui.view,arch_db:stock_available_mrp.view_product_form_potential_qty -msgid "Potential" -msgstr "Potencial" +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_component_ids -msgid "Component ids" -msgstr "IDs de componentes" - -#. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_potential_qty -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_template_potential_qty -msgid "Potential" -msgstr "Potencial" +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product @@ -45,21 +41,41 @@ msgid "Product Template" msgstr "Modelo Produto" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_product_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand." -msgstr "Quantidade deste produto que poderia ser produzido usando os materiais já na mão." +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_template_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand. If the product has several variants, this will be the biggest " -"quantity that can be made for a any single variant." -msgstr "Quantidade deste produto que poderia ser produzido usando os materiais já na mão. Se o produto tiver várias variantes, esta será a maior quantidade que pode ser feito por qualquer uma única variante." +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." +msgstr "" -#. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" -msgstr "Mil" +#~ msgid "Potential" +#~ msgstr "Potencial" + +#~ msgid "Component ids" +#~ msgstr "IDs de componentes" + +#~ msgid "Potential" +#~ msgstr "Potencial" + +#~ msgid "" +#~ "Quantity of this Product that could be produced using the materials " +#~ "already at hand." +#~ msgstr "" +#~ "Quantidade deste produto que poderia ser produzido usando os materiais já " +#~ "na mão." + +#~ msgid "" +#~ "Quantity of this Product that could be produced using the materials " +#~ "already at hand. If the product has several variants, this will be the " +#~ "biggest quantity that can be made for a any single variant." +#~ msgstr "" +#~ "Quantidade deste produto que poderia ser produzido usando os materiais já " +#~ "na mão. Se o produto tiver várias variantes, esta será a maior quantidade " +#~ "que pode ser feito por qualquer uma única variante." + +#~ msgid "Thousand" +#~ msgstr "Mil" diff --git a/stock_available_mrp/i18n/sl.po b/stock_available_mrp/i18n/sl.po index 753889eea..096be0bde 100644 --- a/stock_available_mrp/i18n/sl.po +++ b/stock_available_mrp/i18n/sl.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: # Matjaž Mozetič , 2016 msgid "" @@ -11,12 +11,25 @@ msgstr "" "POT-Creation-Date: 2016-01-14 01:38+0000\n" "PO-Revision-Date: 2016-01-14 05:18+0000\n" "Last-Translator: Matjaž Mozetič \n" -"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-8-0/language/sl/)\n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-stock-logistics-" +"warehouse-8-0/language/sl/)\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: sl\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" + +#. module: stock_available_mrp +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" + +#. module: stock_available_mrp +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product @@ -29,6 +42,16 @@ msgid "Product Template" msgstr "Predloga proizvoda" #. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" -msgstr "Tisoč" +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" + +#. module: stock_available_mrp +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." +msgstr "" + +#~ msgid "Thousand" +#~ msgstr "Tisoč" diff --git a/stock_available_mrp/i18n/stock_available_mrp.pot b/stock_available_mrp/i18n/stock_available_mrp.pot index ae3a04141..ff8ef8502 100644 --- a/stock_available_mrp/i18n/stock_available_mrp.pot +++ b/stock_available_mrp/i18n/stock_available_mrp.pot @@ -1,13 +1,11 @@ -# Translation of OpenERP Server. +# Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 7.0\n" +"Project-Id-Version: Odoo Server 11.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-30 19:41+0000\n" -"PO-Revision-Date: 2014-07-30 19:41+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -16,18 +14,35 @@ msgstr "" "Plural-Forms: \n" #. module: stock_available_mrp -#: field:product.product,potential_qty:0 -msgid "Potential" +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" +msgstr "" + +#. module: stock_available_mrp +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" msgstr "" #. module: stock_available_mrp -#: code:_description:0 #: model:ir.model,name:stock_available_mrp.model_product_product -#, python-format msgid "Product" msgstr "" #. module: stock_available_mrp -#: help:product.product,potential_qty:0 -msgid "Quantity of this Product that could be produced using the materials already at hand." +#: model:ir.model,name:stock_available_mrp.model_product_template +msgid "Product Template" msgstr "" + +#. module: stock_available_mrp +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" +msgstr "" + +#. module: stock_available_mrp +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." +msgstr "" + diff --git a/stock_available_mrp/i18n/zh_CN.po b/stock_available_mrp/i18n/zh_CN.po index f9a83998f..044142b9d 100644 --- a/stock_available_mrp/i18n/zh_CN.po +++ b/stock_available_mrp/i18n/zh_CN.po @@ -1,7 +1,7 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: # * stock_available_mrp -# +# # Translators: # Jeffery Chenn , 2016 msgid "" @@ -11,28 +11,24 @@ msgstr "" "POT-Creation-Date: 2016-08-28 10:00+0000\n" "PO-Revision-Date: 2016-09-04 06:06+0000\n" "Last-Translator: Jeffery Chenn \n" -"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-stock-logistics-warehouse-9-0/language/zh_CN/)\n" +"Language-Team: Chinese (China) (http://www.transifex.com/oca/OCA-stock-" +"logistics-warehouse-9-0/language/zh_CN/)\n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" -"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #. module: stock_available_mrp -#: model:ir.ui.view,arch_db:stock_available_mrp.view_product_form_potential_qty -msgid "Potential" -msgstr "潜在" - -#. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_component_ids -msgid "Component ids" +#: model:product.product,name:stock_available_mrp.product_product_9_white +#: model:product.template,name:stock_available_mrp.product_product_9_white_product_template +msgid "Apple Wireless Keyboard" msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_potential_qty -#: model:ir.model.fields,field_description:stock_available_mrp.field_product_template_potential_qty -msgid "Potential" -msgstr "潜在" +#: model:ir.model.fields,field_description:stock_available_mrp.field_product_product_bom_id +msgid "Bill of Materials" +msgstr "" #. module: stock_available_mrp #: model:ir.model,name:stock_available_mrp.model_product_product @@ -45,21 +41,22 @@ msgid "Product Template" msgstr "产品模板" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_product_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand." +#: model:product.product,name:stock_available_mrp.product_kit_1a +#: model:product.template,name:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build Kit" msgstr "" #. module: stock_available_mrp -#: model:ir.model.fields,help:stock_available_mrp.field_product_template_potential_qty -msgid "" -"Quantity of this Product that could be produced using the materials already " -"at hand. If the product has several variants, this will be the biggest " -"quantity that can be made for a any single variant." +#: model:product.product,description:stock_available_mrp.product_kit_1a +#: model:product.template,description:stock_available_mrp.product_kit_1a_product_template +msgid "Self Build kit." msgstr "" -#. module: stock_available_mrp -#: model:product.uom,name:stock_available_mrp.thousand -msgid "Thousand" -msgstr "千" +#~ msgid "Potential" +#~ msgstr "潜在" + +#~ msgid "Potential" +#~ msgstr "潜在" + +#~ msgid "Thousand" +#~ msgstr "千" diff --git a/stock_available_mrp/models/__init__.py b/stock_available_mrp/models/__init__.py index defb121af..28a3f0d0a 100644 --- a/stock_available_mrp/models/__init__.py +++ b/stock_available_mrp/models/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014 Numérigraphe SARL +# Copyright 2014 Numérigraphe SARL # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import product_product diff --git a/stock_available_mrp/models/product_product.py b/stock_available_mrp/models/product_product.py index 57a3b1d4d..8798c3ffe 100644 --- a/stock_available_mrp/models/product_product.py +++ b/stock_available_mrp/models/product_product.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014 Numérigraphe SARL +# Copyright 2014 Numérigraphe SARL # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from collections import Counter @@ -62,7 +61,7 @@ class ProductProduct(models.Model): if not product_with_bom: return res, stock_dict icp = self.env['ir.config_parameter'] - stock_available_mrp_based_on = icp.get_param( + stock_available_mrp_based_on = icp.sudo().get_param( 'stock_available_mrp_based_on', 'qty_available' ) @@ -77,7 +76,7 @@ class ProductProduct(models.Model): # Compute stock for product components. # {'productid': {field_name: qty}} - if res and stock_available_mrp_based_on in res.values()[0]: + if res and stock_available_mrp_based_on in list(res.values())[0]: # If the qty is computed by the same method use it to avoid # stressing the cache component_qties, _ = \ @@ -104,12 +103,20 @@ class ProductProduct(models.Model): # Find the lowest quantity we can make with the stock at hand components_potential_qty = min( [component_qties[component.id][ - stock_available_mrp_based_on] // need + stock_available_mrp_based_on] / need for component, need in component_needs.items()] ) - potential_qty = (product.bom_id.product_qty * - components_potential_qty) + bom_id = product.bom_id + potential_qty = (bom_id.product_qty * components_potential_qty) + + # We want to respect the rounding factor of the potential_qty + # Rounding down as we want to be pesimistic. + potential_qty = bom_id.product_uom_id._compute_quantity( + potential_qty, + product.bom_id.product_tmpl_id.uom_id, + rounding_method='DOWN' + ) res[product.id]['potential_qty'] = potential_qty res[product.id]['immediately_usable_qty'] += potential_qty diff --git a/stock_available_mrp/models/product_template.py b/stock_available_mrp/models/product_template.py index 5ae46c3a5..dee7e6147 100644 --- a/stock_available_mrp/models/product_template.py +++ b/stock_available_mrp/models/product_template.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014 Numérigraphe SARL +# Copyright 2014 Numérigraphe SARL # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo import models, api diff --git a/stock_available_mrp/static/description/icon.png b/stock_available_mrp/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/stock_available_mrp/tests/__init__.py b/stock_available_mrp/tests/__init__.py index e6b40413f..4382bb886 100644 --- a/stock_available_mrp/tests/__init__.py +++ b/stock_available_mrp/tests/__init__.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014 Numérigraphe SARL +# Copyright 2014 Numérigraphe SARL # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import test_potential_qty diff --git a/stock_available_mrp/tests/test_potential_qty.py b/stock_available_mrp/tests/test_potential_qty.py index 83cfba1ef..cdd16916f 100644 --- a/stock_available_mrp/tests/test_potential_qty.py +++ b/stock_available_mrp/tests/test_potential_qty.py @@ -1,5 +1,4 @@ -# -*- coding: utf-8 -*- -# © 2014 Numérigraphe SARL +# Copyright 2014 Numérigraphe SARL # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from odoo.tests.common import TransactionCase @@ -17,7 +16,14 @@ class TestPotentialQty(TransactionCase): self.bom_line_model = self.env["mrp.bom.line"] self.stock_quant_model = self.env["stock.quant"] self.config = self.env['ir.config_parameter'] + self.location = self.env['stock.location'] + # Get the warehouses + self.wh_main = self.browse_ref('stock.warehouse0') + self.wh_ch = self.browse_ref('stock.stock_warehouse_shop0') + # We need to compute parent_left and parent_right of the locations as + # they are used to compute qty_available of the product. + self.location._parent_store_compute() self.setup_demo_data() def setup_demo_data(self): @@ -26,9 +32,11 @@ class TestPotentialQty(TransactionCase): 'mrp.product_product_build_kit_product_template') #  First variant self.var1 = self.browse_ref('mrp.product_product_build_kit') + self.var1.type = 'product' #  Second variant self.var2 = self.browse_ref( 'stock_available_mrp.product_kit_1a') + self.var2.type = 'product' # Components that can be used to make the product component_ids = [ # KeyBoard @@ -41,15 +49,12 @@ class TestPotentialQty(TransactionCase): for component_id in ( component_ids + [v.id for v in self.tmpl.product_variant_ids]): - inventory = self.env['stock.inventory'].create( - {'name': 'no components: %s' % component_id, - 'location_id': self.ref('stock.stock_location_locations'), - 'filter': 'product', - 'product_id': component_id}) - inventory.prepare_inventory() - inventory.reset_real_qty() - inventory.action_done() + prod = self.product_model.browse(component_id) + self.env['stock.quant'].search([ + ('product_id', '=', prod.id) + ]).unlink() + self.product_model.invalidate_cache() #  A product without a BoM self.product_wo_bom = self.browse_ref('product.product_product_11') @@ -60,10 +65,6 @@ class TestPotentialQty(TransactionCase): self.var2, self.product_wo_bom]} - # Get the warehouses - self.wh_main = self.browse_ref('stock.warehouse0') - self.wh_ch = self.browse_ref('stock.stock_warehouse_shop0') - def create_inventory(self, product_id, qty, location_id=None): if location_id is None: location_id = self.wh_main.lot_stock_id.id @@ -73,8 +74,7 @@ class TestPotentialQty(TransactionCase): 'location_id': location_id, 'filter': 'partial' }) - inventory.prepare_inventory() - + inventory.action_start() self.env['stock.inventory.line'].create({ 'inventory_id': inventory.id, 'product_id': product_id, @@ -124,7 +124,7 @@ class TestPotentialQty(TransactionCase): 'company_id': chicago_id, 'location_id': self.wh_ch.lot_stock_id.id, 'filter': 'partial'}) - inventory.prepare_inventory() + inventory.action_start() self.env['stock.inventory.line'].create( {'inventory_id': inventory.id, 'company_id': chicago_id, @@ -139,7 +139,7 @@ class TestPotentialQty(TransactionCase): 'company_id': chicago_id, 'location_id': self.wh_ch.lot_stock_id.id, 'filter': 'partial'}) - inventory.prepare_inventory() + inventory.action_start() self.env['stock.inventory.line'].create( {'inventory_id': inventory.id, 'company_id': chicago_id, @@ -194,7 +194,7 @@ class TestPotentialQty(TransactionCase): {'name': 'Receive Mouses', 'location_id': self.wh_main.lot_stock_id.id, 'filter': 'partial'}) - inventory.prepare_inventory() + inventory.action_start() self.env['stock.inventory.line'].create( {'inventory_id': inventory.id, 'product_id': self.ref('product.product_product_12'), @@ -212,7 +212,7 @@ class TestPotentialQty(TransactionCase): {'name': 'components for 1st variant', 'location_id': self.wh_main.lot_stock_id.id, 'filter': 'partial'}) - inventory.prepare_inventory() + inventory.action_start() self.env['stock.inventory.line'].create( {'inventory_id': inventory.id, 'product_id': self.ref( @@ -236,7 +236,7 @@ class TestPotentialQty(TransactionCase): {'name': 'components for 2nd variant', 'location_id': self.wh_ch.lot_stock_id.id, 'filter': 'partial'}) - inventory.prepare_inventory() + inventory.action_start() self.env['stock.inventory.line'].create( {'inventory_id': inventory.id, 'product_id': self.ref('product.product_product_12'), @@ -279,17 +279,24 @@ class TestPotentialQty(TransactionCase): def test_multi_unit_recursive_bom(self): # Test multi-level and multi-units BOM - + uom_unit = self.env.ref('product.product_uom_unit') + uom_unit.rounding = 1.0 p1 = self.product_model.create({ 'name': 'Test product with BOM', + 'type': 'product', + 'uom_id': self.env.ref('product.product_uom_unit').id, }) p2 = self.product_model.create({ 'name': 'Test sub product with BOM', + 'type': 'product', + 'uom_id': self.env.ref('product.product_uom_unit').id, }) p3 = self.product_model.create({ - 'name': 'Test component' + 'name': 'Test component', + 'type': 'product', + 'uom_id': self.env.ref('product.product_uom_unit').id, }) bom_p1 = self.bom_model.create({ @@ -301,6 +308,8 @@ class TestPotentialQty(TransactionCase): 'bom_id': bom_p1.id, 'product_id': p3.id, 'product_qty': 1, + 'product_uom_id': self.env.ref('product.product_uom_unit').id, + }) # Two p2 which have a bom @@ -308,6 +317,8 @@ class TestPotentialQty(TransactionCase): 'bom_id': bom_p1.id, 'product_id': p2.id, 'product_qty': 2, + 'product_uom_id': self.env.ref('product.product_uom_unit').id, + }) bom_p2 = self.bom_model.create({ @@ -321,6 +332,8 @@ class TestPotentialQty(TransactionCase): 'bom_id': bom_p2.id, 'product_id': p3.id, 'product_qty': 2, + 'product_uom_id': self.env.ref('product.product_uom_unit').id, + }) p1.refresh() @@ -329,7 +342,6 @@ class TestPotentialQty(TransactionCase): self.assertEqual(0, p1.potential_qty) self.create_inventory(p3.id, 1) - p1.refresh() self.assertEqual(0, p1.potential_qty) @@ -389,6 +401,7 @@ class TestPotentialQty(TransactionCase): # If iMac has a Bom and can be manufactured component = self.product_model.create({ 'name': 'component', + 'type': 'product' }) self.create_inventory(component.id, 5) @@ -415,14 +428,14 @@ class TestPotentialQty(TransactionCase): p1.refresh() self.assertEqual(5.0, p1.potential_qty) - def test_potential_qty__list(self): + def test_potential_qty_list(self): # Try to highlight a bug when _get_potential_qty is called on # a recordset with multiple products # Recursive compute is not working p1 = self.product_model.create({'name': 'Test P1'}) p2 = self.product_model.create({'name': 'Test P2'}) - p3 = self.product_model.create({'name': 'Test P3'}) + p3 = self.product_model.create({'name': 'Test P3', 'type': 'product'}) self.config.set_param('stock_available_mrp_based_on', 'immediately_usable_qty')