[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

1 files changed, 5 insertions, 35 deletions

diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 59137966da0..587ddbe0b52 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -159,30 +159,6 @@ class questionnaire(osv.osv):
     _name="crm_profiling.questionnaire"
     _description= "Questionnaire"
 
-    def build_form(self, cr, uid, data, context=None):
-        """
-            @param self: The object pointer
-            @param cr: the current row, from the database cursor,
-            @param uid: the current user’s ID for security checks,
-            @param data: Get Data
-            @param context: A standard dictionary for contextual values """
-        
-        query = """
-        select name, id
-        from crm_profiling_question
-        where id in ( select question from profile_questionnaire_quest_rel where questionnaire = %s)"""
-        res = cr.execute(query, (data['form']['questionnaire_name'],))
-        result = cr.fetchall()
-        quest_fields={}
-        quest_form='''<?xml version="1.0"?>
-            <form string="%s">''' % _('Questionnaire')
-        for name, oid in result:
-            quest_form = quest_form + '<field name="quest_form%d"/><newline/>' % (oid,)
-            quest_fields['quest_form%d' % (oid,)] = {'string': name, 'type': 'many2one', \
-                        'relation': 'crm_profiling.answer', 'domain': [('question_id','=',oid)] }
-        quest_form = quest_form + '''</form>'''
-        return quest_form, quest_fields
-
     _columns = {
         'name': fields.char("Questionnaire",size=128, required=True),
         'description':fields.text("Description", required=True),
@@ -210,25 +186,19 @@ class partner(osv.osv):
                                 "partner","answer","Answers"),
         }
 
-    def _questionnaire_compute(self, cr, uid, data, context=None):
+    def _questionnaire_compute(self, cr, uid, answers, context=None):
         """
             @param self: The object pointer
             @param cr: the current row, from the database cursor,
             @param uid: the current user’s ID for security checks,
             @param data: Get Data
             @param context: A standard dictionary for contextual values """
-
-        temp = []
-        for x in data['form']:
-            if x.startswith("quest_form") and data['form'][x] != 0 :
-                temp.append(data['form'][x])
-
+        partner_id = context.get('active_id')
         query = "select answer from partner_question_rel where partner=%s"
-        cr.execute(query, (data['id'],))
+        cr.execute(query, (partner_id,))
         for x in cr.fetchall():
-            temp.append(x[0])
-
-        self.write(cr, uid, [data['id']], {'answers_ids':[[6, 0, temp]]}, context=context)
+            answers.append(x[0])
+        self.write(cr, uid, [partner_id], {'answers_ids': [[6, 0, answers]]}, context=context)
         return {}