[FIX] res.partner.category: use the automatic relation table name (so each _inherit from res.partner can define its own).
bzr revid: vmt@openerp.com-20120619150647-yfe3kkxm43opdfr7
This commit is contained in:
parent
c9c27a2432
commit
b4b8caca4f
|
@ -61,7 +61,7 @@ added to partners that match the segmentation criterions after computation.'),
|
||||||
for categ in categs:
|
for categ in categs:
|
||||||
if start:
|
if start:
|
||||||
if categ['exclusif']:
|
if categ['exclusif']:
|
||||||
cr.execute('delete from res_partner_category_rel \
|
cr.execute('delete from res_partner_res_partner_category_rel \
|
||||||
where category_id=%s', (categ['categ_id'][0],))
|
where category_id=%s', (categ['categ_id'][0],))
|
||||||
|
|
||||||
id = categ['id']
|
id = categ['id']
|
||||||
|
@ -81,7 +81,7 @@ added to partners that match the segmentation criterions after computation.'),
|
||||||
partners.remove(pid)
|
partners.remove(pid)
|
||||||
|
|
||||||
for partner_id in partners:
|
for partner_id in partners:
|
||||||
cr.execute('insert into res_partner_category_rel (category_id,partner_id) \
|
cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) \
|
||||||
values (%s,%s)', (categ['categ_id'][0], partner_id))
|
values (%s,%s)', (categ['categ_id'][0], partner_id))
|
||||||
|
|
||||||
self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
|
self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
|
||||||
|
|
|
@ -116,7 +116,7 @@ def _recompute_categ(self, cr, uid, pid, answers_ids):
|
||||||
ok = []
|
ok = []
|
||||||
cr.execute('''
|
cr.execute('''
|
||||||
select r.category_id
|
select r.category_id
|
||||||
from res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id)
|
from res_partner_res_partner_category_rel r left join crm_segmentation s on (r.category_id = s.categ_id)
|
||||||
where r.partner_id = %s and (s.exclusif = false or s.exclusif is null)
|
where r.partner_id = %s and (s.exclusif = false or s.exclusif is null)
|
||||||
''', (pid,))
|
''', (pid,))
|
||||||
for x in cr.fetchall():
|
for x in cr.fetchall():
|
||||||
|
@ -249,7 +249,7 @@ class crm_segmentation(osv.osv):
|
||||||
for categ in categs:
|
for categ in categs:
|
||||||
if start:
|
if start:
|
||||||
if categ['exclusif']:
|
if categ['exclusif']:
|
||||||
cr.execute('delete from res_partner_category_rel where \
|
cr.execute('delete from res_partner_res_partner_category_rel where \
|
||||||
category_id=%s', (categ['categ_id'][0],))
|
category_id=%s', (categ['categ_id'][0],))
|
||||||
|
|
||||||
id = categ['id']
|
id = categ['id']
|
||||||
|
@ -281,7 +281,7 @@ class crm_segmentation(osv.osv):
|
||||||
partners.remove(pid)
|
partners.remove(pid)
|
||||||
|
|
||||||
for partner_id in partners:
|
for partner_id in partners:
|
||||||
cr.execute('insert into res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
|
cr.execute('insert into res_partner_res_partner_category_rel (category_id,partner_id) values (%s,%s)', (categ['categ_id'][0],partner_id))
|
||||||
|
|
||||||
self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
|
self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
|
||||||
return True
|
return True
|
||||||
|
|
Loading…
Reference in New Issue