Merge lp:~openerp-dev/openobject-addons/trunk-bug-1103057-cga into lp:openobject-addons

[Chandni Gandhi(OpenERP)]

Hello,

Add unlink for survey answers.

Thanks.

[lp:~openerp-dev/openobject-addons/trunk-bug-1103057-cga]

8533. By Chandni Gandhi(OpenERP) on 2013-02-08

[MERGE]:With latest code

Unmerged revisions

8533. By Chandni Gandhi(OpenERP) on 2013-02-08

[MERGE]:With latest code

8532. By Chandni Gandhi(OpenERP) on 2013-02-05

[FIX]:Add unlink in survey answer

=== modified file 'survey/survey.py'
--- survey/survey.py	2012-12-06 14:56:32 +0000
+++ survey/survey.py	2013-02-08 11:38:23 +0000
@@ -400,7 +400,10 @@
             val.update({'in_visible_rating_weight':True, 'in_visible_menu_choice':True,\
                          'in_visible_answer_type':True})
             return {'value': val}
-
+    
+    def unlink(self, cr, uid, ids, context=None):
+        return osv.osv.unlink(self, cr, uid, ids, context=context)
+    
     def write(self, cr, uid, ids, vals, context=None):
         questions = self.read(cr,uid, ids, ['answer_choice_ids', 'type', 'required_type',\
                         'req_ans', 'minimum_req_ans', 'maximum_req_ans', 'column_heading_ids', 'page_id', 'question'])
@@ -428,8 +431,6 @@
                 for ans in vals['answer_choice_ids']:
                     if type(ans[2]) == type({}):
                         ans_len += 1
-                    else:
-                        ans_len -= 1
 
             if que_type not in ['descriptive_text', 'single_textbox', 'comment','table']:
                 if not ans_len:
@@ -650,7 +651,14 @@
             context = {}
         data = super(survey_answer, self).default_get(cr, uid, fields, context)
         return data
-
+    
+    def unlink(self, cr, uid, ids, context=None):
+        q = self.browse(cr,uid,ids[0]).question_id
+        res = osv.osv.unlink(self, cr, uid, ids, context=context)
+        
+        if not len(q.answer_choice_ids):
+            raise osv.except_osv(_('Warning!'),_('You must enter at least one Answers for question "%s"') % (q.question))
+        return res
 survey_answer()
 
 class survey_response(osv.osv):