From 30b32a9b58c411466335af093a8bd893c310d043 Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Fri, 23 Dec 2016 11:20:14 +0200 Subject: [PATCH 01/24] [ADD] Added website_product_config to repo --- website_product_configurator_mrp/__init__.py | 3 +++ .../__openerp__.py | 18 +++++++++++++ .../controllers/__init__.py | 3 +++ .../controllers/main.py | 26 ++++++++++++++++++ .../i18n/website_product_configurator_mrp.pot | 27 +++++++++++++++++++ .../templates.xml | 17 ++++++++++++ 6 files changed, 94 insertions(+) create mode 100755 website_product_configurator_mrp/__init__.py create mode 100755 website_product_configurator_mrp/__openerp__.py create mode 100644 website_product_configurator_mrp/controllers/__init__.py create mode 100644 website_product_configurator_mrp/controllers/main.py create mode 100644 website_product_configurator_mrp/i18n/website_product_configurator_mrp.pot create mode 100644 website_product_configurator_mrp/templates.xml diff --git a/website_product_configurator_mrp/__init__.py b/website_product_configurator_mrp/__init__.py new file mode 100755 index 000000000..b0f26a9a6 --- /dev/null +++ b/website_product_configurator_mrp/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import controllers diff --git a/website_product_configurator_mrp/__openerp__.py b/website_product_configurator_mrp/__openerp__.py new file mode 100755 index 000000000..8b4fd16ae --- /dev/null +++ b/website_product_configurator_mrp/__openerp__.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +{ + 'name': 'Website Configurator Manufacturing', + 'version': '1.0', + 'category': 'Website', + 'summary': 'Website integration of MRP', + 'description': """Adds MRP logic to configurable products in frontend""", + 'author': 'Pledra', + 'license': 'AGPL-3', + 'website': 'http://www.pledra.com/', + 'depends': [ + 'product_configurator_mrp', + 'website_product_configurator', + ], + 'data': ['templates.xml'], + 'installable': True, + 'auto_install': False, +} diff --git a/website_product_configurator_mrp/controllers/__init__.py b/website_product_configurator_mrp/controllers/__init__.py new file mode 100644 index 000000000..65a8c1201 --- /dev/null +++ b/website_product_configurator_mrp/controllers/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import main diff --git a/website_product_configurator_mrp/controllers/main.py b/website_product_configurator_mrp/controllers/main.py new file mode 100644 index 000000000..d7e42243e --- /dev/null +++ b/website_product_configurator_mrp/controllers/main.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +from openerp.http import request + +from openerp.addons.website_product_configurator.controllers.main import ( + WebsiteProductConfig +) + + +class WebsiteProductConfigMrp(WebsiteProductConfig): + + def cart_update(self, product, post): + if post.get('assembly') == 'kit': + attr_products = product.attribute_value_ids.mapped( + 'product_id') + for product in attr_products: + request.website.sale_get_order(force_create=1)._cart_update( + product_id=int(product.id), + add_qty=float(post.get('add_qty')), + ) + else: + request.website.sale_get_order(force_create=1)._cart_update( + product_id=int(product.id), + add_qty=float(post.get('add_qty')), + ) + return request.redirect("/shop/cart") diff --git a/website_product_configurator_mrp/i18n/website_product_configurator_mrp.pot b/website_product_configurator_mrp/i18n/website_product_configurator_mrp.pot new file mode 100644 index 000000000..f6ddebf9a --- /dev/null +++ b/website_product_configurator_mrp/i18n/website_product_configurator_mrp.pot @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_product_configurator_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-23 09:35+0000\n" +"PO-Revision-Date: 2016-12-23 09:35+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: website_product_configurator_mrp +#: model:ir.ui.view,arch_db:website_product_configurator_mrp.cfg_session +msgid "Assembled" +msgstr "" + +#. module: website_product_configurator_mrp +#: model:ir.ui.view,arch_db:website_product_configurator_mrp.cfg_session +msgid "Kit" +msgstr "" + diff --git a/website_product_configurator_mrp/templates.xml b/website_product_configurator_mrp/templates.xml new file mode 100644 index 000000000..53e1b4dd8 --- /dev/null +++ b/website_product_configurator_mrp/templates.xml @@ -0,0 +1,17 @@ + + + + + + + + From 580fc2860c1f30bae770dcf13beae3b283f97fb4 Mon Sep 17 00:00:00 2001 From: Thorsten Vocks Date: Thu, 29 Dec 2016 10:11:23 +0100 Subject: [PATCH 02/24] de translations of product_configurator (Pledra) de translations of product_configurator (Pledra) --- website_product_configurator_mrp/i18n/de.po | 27 +++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 website_product_configurator_mrp/i18n/de.po diff --git a/website_product_configurator_mrp/i18n/de.po b/website_product_configurator_mrp/i18n/de.po new file mode 100644 index 000000000..d1c6abeca --- /dev/null +++ b/website_product_configurator_mrp/i18n/de.po @@ -0,0 +1,27 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * website_product_configurator_mrp +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 9.0c\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-12-23 09:35+0000\n" +"PO-Revision-Date: 2016-12-23 09:35+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: website_product_configurator_mrp +#: model:ir.ui.view,arch_db:website_product_configurator_mrp.cfg_session +msgid "Assembled" +msgstr "Fertiggestellt" + +#. module: website_product_configurator_mrp +#: model:ir.ui.view,arch_db:website_product_configurator_mrp.cfg_session +msgid "Kit" +msgstr "" + From df0f82a1c51e87dc7e6b45ac7a4ee439be4f4dba Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Thu, 30 Mar 2017 22:11:06 +0200 Subject: [PATCH 03/24] Flake8 fixes (#47) * Flake8 fixes --- website_product_configurator_mrp/__openerp__.py | 3 +-- website_product_configurator_mrp/controllers/main.py | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/website_product_configurator_mrp/__openerp__.py b/website_product_configurator_mrp/__openerp__.py index 8b4fd16ae..dfe49bf97 100755 --- a/website_product_configurator_mrp/__openerp__.py +++ b/website_product_configurator_mrp/__openerp__.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- { 'name': 'Website Configurator Manufacturing', - 'version': '1.0', + 'version': '9.0.1.0.0', 'category': 'Website', 'summary': 'Website integration of MRP', - 'description': """Adds MRP logic to configurable products in frontend""", 'author': 'Pledra', 'license': 'AGPL-3', 'website': 'http://www.pledra.com/', diff --git a/website_product_configurator_mrp/controllers/main.py b/website_product_configurator_mrp/controllers/main.py index d7e42243e..8a80a2872 100644 --- a/website_product_configurator_mrp/controllers/main.py +++ b/website_product_configurator_mrp/controllers/main.py @@ -11,8 +11,7 @@ class WebsiteProductConfigMrp(WebsiteProductConfig): def cart_update(self, product, post): if post.get('assembly') == 'kit': - attr_products = product.attribute_value_ids.mapped( - 'product_id') + attr_products = product.attribute_value_ids.mapped('product_id') for product in attr_products: request.website.sale_get_order(force_create=1)._cart_update( product_id=int(product.id), @@ -20,7 +19,7 @@ def cart_update(self, product, post): ) else: request.website.sale_get_order(force_create=1)._cart_update( - product_id=int(product.id), - add_qty=float(post.get('add_qty')), - ) + product_id=int(product.id), + add_qty=float(post.get('add_qty')), + ) return request.redirect("/shop/cart") From cb4e56f886bef2e323f3816cfe3affef0394262f Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Sun, 14 May 2017 12:09:52 +0300 Subject: [PATCH 04/24] [WIP] Basic subconfiguration process --- website_product_configurator_mrp/controllers/main.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/website_product_configurator_mrp/controllers/main.py b/website_product_configurator_mrp/controllers/main.py index 8a80a2872..e6a053e20 100644 --- a/website_product_configurator_mrp/controllers/main.py +++ b/website_product_configurator_mrp/controllers/main.py @@ -23,3 +23,11 @@ def cart_update(self, product, post): add_qty=float(post.get('add_qty')), ) return request.redirect("/shop/cart") + + def config_vars(self, product_tmpl, active_step=None, data=None): + res = super(WebsiteProductConfigMrp, self).config_vars( + product_tmpl=product_tmpl, active_step=active_step, data=data) + active_step = res.get('active_step') + if active_step and active_step.product_tmpl_id != product_tmpl: + import pdb;pdb.set_trace() + return res From e0802ee1c8e420dd5bc00c444cf065ee60f0a454 Mon Sep 17 00:00:00 2001 From: Helly Rajyaguru Date: Mon, 5 Feb 2018 19:29:54 +0530 Subject: [PATCH 05/24] #T1532 partial commit --- website_product_configurator_mrp/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_product_configurator_mrp/__openerp__.py b/website_product_configurator_mrp/__openerp__.py index dfe49bf97..05dfe2c3f 100755 --- a/website_product_configurator_mrp/__openerp__.py +++ b/website_product_configurator_mrp/__openerp__.py @@ -12,6 +12,6 @@ 'website_product_configurator', ], 'data': ['templates.xml'], - 'installable': True, + 'installable': False, 'auto_install': False, } From 92ae4459e021a3d791b7fc283a2a1855080ae522 Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Tue, 20 Feb 2018 19:44:57 +0100 Subject: [PATCH 06/24] Removed console.log, renamed __openerp__.py files to __manifest__.py --- .../{__openerp__.py => __manifest__.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename website_product_configurator_mrp/{__openerp__.py => __manifest__.py} (100%) diff --git a/website_product_configurator_mrp/__openerp__.py b/website_product_configurator_mrp/__manifest__.py similarity index 100% rename from website_product_configurator_mrp/__openerp__.py rename to website_product_configurator_mrp/__manifest__.py From d7a1051e30b41b6ed671bf0e7ef586cc7d0b11fd Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Mon, 14 May 2018 13:01:18 +0200 Subject: [PATCH 07/24] Bumped version to 11.0 and removed all traces of coding: utf-8 from py files --- website_product_configurator_mrp/__init__.py | 2 -- website_product_configurator_mrp/__manifest__.py | 4 ++-- website_product_configurator_mrp/controllers/__init__.py | 2 -- website_product_configurator_mrp/controllers/main.py | 2 -- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/website_product_configurator_mrp/__init__.py b/website_product_configurator_mrp/__init__.py index b0f26a9a6..e046e49fb 100755 --- a/website_product_configurator_mrp/__init__.py +++ b/website_product_configurator_mrp/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import controllers diff --git a/website_product_configurator_mrp/__manifest__.py b/website_product_configurator_mrp/__manifest__.py index 05dfe2c3f..7e67056b0 100755 --- a/website_product_configurator_mrp/__manifest__.py +++ b/website_product_configurator_mrp/__manifest__.py @@ -1,7 +1,6 @@ -# -*- coding: utf-8 -*- { 'name': 'Website Configurator Manufacturing', - 'version': '9.0.1.0.0', + 'version': '11.0.1.0.0', 'category': 'Website', 'summary': 'Website integration of MRP', 'author': 'Pledra', @@ -12,6 +11,7 @@ 'website_product_configurator', ], 'data': ['templates.xml'], + 'application': True, 'installable': False, 'auto_install': False, } diff --git a/website_product_configurator_mrp/controllers/__init__.py b/website_product_configurator_mrp/controllers/__init__.py index 65a8c1201..12a7e529b 100644 --- a/website_product_configurator_mrp/controllers/__init__.py +++ b/website_product_configurator_mrp/controllers/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import main diff --git a/website_product_configurator_mrp/controllers/main.py b/website_product_configurator_mrp/controllers/main.py index e6a053e20..21a78b4c3 100644 --- a/website_product_configurator_mrp/controllers/main.py +++ b/website_product_configurator_mrp/controllers/main.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from openerp.http import request from openerp.addons.website_product_configurator.controllers.main import ( From c1d3b9eaa3e10030c71e3e0889fc11363a969d2b Mon Sep 17 00:00:00 2001 From: Shruti Singh Date: Thu, 5 Jul 2018 13:08:48 +0530 Subject: [PATCH 08/24] [FIX]product_configurator, website_product_configurator, product_configurator_mrp : correct method-name, claas-name, arguments --- website_product_configurator_mrp/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_product_configurator_mrp/__manifest__.py b/website_product_configurator_mrp/__manifest__.py index 7e67056b0..dffd36828 100755 --- a/website_product_configurator_mrp/__manifest__.py +++ b/website_product_configurator_mrp/__manifest__.py @@ -12,6 +12,6 @@ ], 'data': ['templates.xml'], 'application': True, - 'installable': False, + 'installable': True, 'auto_install': False, } From 2cc627f0375e8830dd14e2ad9150874adc889b84 Mon Sep 17 00:00:00 2001 From: Paul Catinean Date: Thu, 30 Aug 2018 14:03:05 +0200 Subject: [PATCH 09/24] Added product_configurator_stock and website_product_configurator and website_product_configurator_mrp to uninstallable list --- website_product_configurator_mrp/__manifest__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_product_configurator_mrp/__manifest__.py b/website_product_configurator_mrp/__manifest__.py index dffd36828..7e67056b0 100755 --- a/website_product_configurator_mrp/__manifest__.py +++ b/website_product_configurator_mrp/__manifest__.py @@ -12,6 +12,6 @@ ], 'data': ['templates.xml'], 'application': True, - 'installable': True, + 'installable': False, 'auto_install': False, } From 2fb9ce821f03d4dda11ca5dcc616d068b162b70a Mon Sep 17 00:00:00 2001 From: Pooja Khandelwal Date: Mon, 27 May 2019 16:18:24 +0530 Subject: [PATCH 10/24] [ADD][#T00494]website_product_configurator:solved flake8 and pylints --- website_product_configurator_mrp/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website_product_configurator_mrp/controllers/main.py b/website_product_configurator_mrp/controllers/main.py index 21a78b4c3..fdc83e6a7 100644 --- a/website_product_configurator_mrp/controllers/main.py +++ b/website_product_configurator_mrp/controllers/main.py @@ -27,5 +27,5 @@ def config_vars(self, product_tmpl, active_step=None, data=None): product_tmpl=product_tmpl, active_step=active_step, data=data) active_step = res.get('active_step') if active_step and active_step.product_tmpl_id != product_tmpl: - import pdb;pdb.set_trace() + pass return res From 2014b738f4e0d316403c734e1dd083546cfa1a71 Mon Sep 17 00:00:00 2001 From: Ritesh Bambhaniya Date: Wed, 19 Feb 2020 12:08:33 +0530 Subject: [PATCH 11/24] [MIG][T3202]odoo-product-configurator:improve xpath and manifest file --- website_product_configurator_mrp/__manifest__.py | 6 +++--- website_product_configurator_mrp/controllers/main.py | 9 ++++----- website_product_configurator_mrp/templates.xml | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/website_product_configurator_mrp/__manifest__.py b/website_product_configurator_mrp/__manifest__.py index 7e67056b0..113850edb 100755 --- a/website_product_configurator_mrp/__manifest__.py +++ b/website_product_configurator_mrp/__manifest__.py @@ -1,17 +1,17 @@ { 'name': 'Website Configurator Manufacturing', - 'version': '11.0.1.0.0', + 'version': '13.0.1.0.0', 'category': 'Website', 'summary': 'Website integration of MRP', 'author': 'Pledra', 'license': 'AGPL-3', 'website': 'http://www.pledra.com/', 'depends': [ - 'product_configurator_mrp', + # 'product_configurator_mrp', 'website_product_configurator', ], 'data': ['templates.xml'], 'application': True, - 'installable': False, + 'installable': True, 'auto_install': False, } diff --git a/website_product_configurator_mrp/controllers/main.py b/website_product_configurator_mrp/controllers/main.py index fdc83e6a7..4fabd268f 100644 --- a/website_product_configurator_mrp/controllers/main.py +++ b/website_product_configurator_mrp/controllers/main.py @@ -1,11 +1,10 @@ -from openerp.http import request +from odoo.http import request -from openerp.addons.website_product_configurator.controllers.main import ( - WebsiteProductConfig -) +from odoo.addons.website_product_configurator.controllers.main import ProductConfigWebsiteSale -class WebsiteProductConfigMrp(WebsiteProductConfig): + +class WebsiteProductConfigMrp(ProductConfigWebsiteSale): def cart_update(self, product, post): if post.get('assembly') == 'kit': diff --git a/website_product_configurator_mrp/templates.xml b/website_product_configurator_mrp/templates.xml index 53e1b4dd8..c057f86e7 100644 --- a/website_product_configurator_mrp/templates.xml +++ b/website_product_configurator_mrp/templates.xml @@ -1,9 +1,9 @@ - + -