From ab300843ce2ad96b9f45f0d8af21e55d67f16a28 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 24 Jan 2014 14:52:16 +0100 Subject: [PATCH] [FIX] website_sale_crm: create a bridge to add order into website sale teams if crm is installed bzr revid: chm@openerp.com-20140124135216-3ikjg2glx29stk1j --- addons/website_sale/data/website_sale_data.xml | 7 ------- addons/website_sale/models/website.py | 7 ------- addons/website_sale_crm/__init__.py | 0 addons/website_sale_crm/__openerp__.py | 15 +++++++++++++++ addons/website_sale_crm/data/website_sale_crm.xml | 13 +++++++++++++ addons/website_sale_crm/models/__init__.py | 1 + addons/website_sale_crm/models/website.py | 14 ++++++++++++++ 7 files changed, 43 insertions(+), 14 deletions(-) create mode 100644 addons/website_sale_crm/__init__.py create mode 100644 addons/website_sale_crm/__openerp__.py create mode 100644 addons/website_sale_crm/data/website_sale_crm.xml create mode 100644 addons/website_sale_crm/models/__init__.py create mode 100644 addons/website_sale_crm/models/website.py diff --git a/addons/website_sale/data/website_sale_data.xml b/addons/website_sale/data/website_sale_data.xml index d54b25fad0b..fcb62312275 100644 --- a/addons/website_sale/data/website_sale_data.xml +++ b/addons/website_sale/data/website_sale_data.xml @@ -32,12 +32,5 @@ oe_image_full - - Website - Website - Website - - - diff --git a/addons/website_sale/models/website.py b/addons/website_sale/models/website.py index 6a16a5d9543..8ea4e01cb4d 100644 --- a/addons/website_sale/models/website.py +++ b/addons/website_sale/models/website.py @@ -145,14 +145,7 @@ class Website(orm.Model): """ Create a new quotation used in the ecommerce (event, sale) """ SaleOrder = self.pool.get('sale.order') quotation_values = self._ecommerce_get_quotation_values(cr, uid, context=context) - - section_ids = request.registry["crm.case.section"].search( - request.cr, SUPERUSER_ID, [("code", "=", "Website")], context=context) - if section_ids: - quotation_values['section_id'] = section_ids[0] - quotation_values['user_id'] = False - return SaleOrder.create(cr, SUPERUSER_ID, quotation_values, context=context) def ecommerce_get_new_order(self, cr, uid, context=None): diff --git a/addons/website_sale_crm/__init__.py b/addons/website_sale_crm/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/addons/website_sale_crm/__openerp__.py b/addons/website_sale_crm/__openerp__.py new file mode 100644 index 00000000000..8cecbb17a36 --- /dev/null +++ b/addons/website_sale_crm/__openerp__.py @@ -0,0 +1,15 @@ +{ + 'name': 'E-Commerce with CRM', + 'version': '0.1', + 'category': 'Hidden', + 'description': """ +""", + 'author': 'OpenERP SA', + 'depends': ['website_sale', 'sale_crm'], + 'data': [ + 'data/website_sale_crm.xml', + ], + 'installable': True, + 'auto_install': True +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/website_sale_crm/data/website_sale_crm.xml b/addons/website_sale_crm/data/website_sale_crm.xml new file mode 100644 index 00000000000..dad22228f01 --- /dev/null +++ b/addons/website_sale_crm/data/website_sale_crm.xml @@ -0,0 +1,13 @@ + + + + + + Website + Website + Website + + + + + diff --git a/addons/website_sale_crm/models/__init__.py b/addons/website_sale_crm/models/__init__.py new file mode 100644 index 00000000000..b8b239729b6 --- /dev/null +++ b/addons/website_sale_crm/models/__init__.py @@ -0,0 +1 @@ +import website \ No newline at end of file diff --git a/addons/website_sale_crm/models/website.py b/addons/website_sale_crm/models/website.py new file mode 100644 index 00000000000..50cb70d7009 --- /dev/null +++ b/addons/website_sale_crm/models/website.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +from openerp.osv import orm +from openerp import SUPERUSER_ID + + +class Website(orm.Model): + _inherit = 'website' + + def _ecommerce_create_quotation(self, cr, uid, context=None): + order_id = super(Website, self)._ecommerce_create_quotation(cr, uid, context=context) + section_ids = self.pool["crm.case.section"].search(cr, SUPERUSER_ID, [("code", "=", "Website")], context=context) + if section_ids: + self.pool["sale.order"].write(cr, SUPERUSER_ID, {'section_id': section_ids[0]}, context=context) + return order_id