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

[MERGE]

Browse Source 
bzr revid: apa@tinyerp.com-20120628102925-17wg14ro1ie16gvx
This commit is contained in:
Amit Patel (OpenERP)
2012-06-28 15:59:25 +05:30
parent f895582bb1 38072b256c
commit 9bbcf9cfe6
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm_segmentation.py
+2 -2
View File
@@ -61,7 +61,7 @@ added to partners that match the segmentation criterions after computation.'),
for categ in categs:
if start:
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],))
id = categ['id']
@@ -81,7 +81,7 @@ added to partners that match the segmentation criterions after computation.'),
partners.remove(pid)
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))
self.write(cr, uid, [id], {'state':'not running', 'partner_id':0})
addons/crm_profiling/crm_profiling.py
+3 -3
View File
@@ -116,7 +116,7 @@ def _recompute_categ(self, cr, uid, pid, answers_ids):
ok = []
cr.execute('''
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)
''', (pid,))
for x in cr.fetchall():
@@ -249,7 +249,7 @@ class crm_segmentation(osv.osv):
for categ in categs:
if start:
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],))
id = categ['id']
@@ -281,7 +281,7 @@ class crm_segmentation(osv.osv):
partners.remove(pid)
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})
return True