pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] website_crm_Partner_assign: avoid open lead in opp form and vice-versa

Browse Source
This commit is contained in:
Jeremy Kersten
2017-02-01 09:05:45 +01:00
parent 3d0cc2d6d2
commit ce584f756a
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_crm_partner_assign/controllers/main.py
+12 -6
View File
@@ -5,6 +5,7 @@ import datetime
import werkzeug
from collections import OrderedDict
from werkzeug.exceptions import NotFound
from odoo import fields
from odoo import http
@@ -149,16 +150,21 @@ class WebsiteAccount(website_account):
})
return request.render("website_crm_partner_assign.portal_my_opportunities", values)
@http.route(['/my/lead/<model("crm.lead"):lead>'], type='http', auth="user", website=True)
def portal_my_lead(self, lead=None, **kw):
@http.route(['''/my/lead/<model('crm.lead', "[('type','=', 'lead')]"):lead>'''], type='http', auth="user", website=True)
def portal_my_lead(self, lead, **kw):
if lead.type != 'lead':
raise NotFound()
return request.render("website_crm_partner_assign.portal_my_lead", {'lead': lead})
@http.route(['/my/opportunity/<model("crm.lead"):lead>'], type='http', auth="user", website=True)
def portal_my_opportunity(self, lead=None, **kw):
@http.route(['''/my/opportunity/<model('crm.lead', "[('type','=', 'opportunity')]"):opp>'''], type='http', auth="user", website=True)
def portal_my_opportunity(self, opp, **kw):
if opp.type != 'opportunity':
raise NotFound()
return request.render(
"website_crm_partner_assign.portal_my_opportunity", {
'opportunity': lead,
'user_activity': lead.activity_ids.filtered(lambda activity: activity.user_id == request.env.user)[:1],
'opportunity': opp,
'user_activity': opp.activity_ids.filtered(lambda activity: activity.user_id == request.env.user)[:1],
'stages': request.env['crm.stage'].search([('probability', '!=', '100')], order='sequence desc'),
'activity_types': request.env['mail.activity.type'].sudo().search([]),
'states': request.env['res.country.state'].sudo().search([]),