odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Merge with lp:~openerp-dev/openobject-addons/jam-dev-addons 

bzr revid: sbh@tinyerp.com-20110118122440-3mc1ldpvhyl4ix74
This commit is contained in:
Sbh (OpenERP) 2011-01-18 17:54:40 +05:30
parent 7ca7912098 0dfbaaf721
commit 3a64e7c5de
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/survey/survey.py
View File

@ -184,7 +184,7 @@ class survey_page(osv.osv):
if len(context['line_order'][-1]) > 2 and type(context['line_order'][-1][2]) == type({}) and context['line_order'][-1][2].has_key('sequence'):
data['sequence'] = context['line_order'][-1][2]['sequence'] + 1
if context.has_key('survey_id'):
data['survey_id'] = context['survey_id']
data['survey_id'] = context.get('survey_id', False)
return data
def survey_save(self, cr, uid, ids, context=None):

5
addons/survey/wizard/survey_answer.py
View File

@ -297,8 +297,9 @@ class survey_question_wiz(osv.osv_memory):
fields[tools.ustr(que.id) + "_" + tools.ustr(ans.id)] = {'type':'datetime', 'string':ans.answer}
elif que_rec.type == 'descriptive_text':
for que_test in que_rec.descriptive_text.split('\n'):
etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
if que_rec.descriptive_text:
for que_test in que_rec.descriptive_text.split('\n'):
etree.SubElement(xml_group, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
elif que_rec.type == 'single_textbox':
etree.SubElement(xml_group, 'field', {'readonly' :str(readonly), 'name': tools.ustr(que.id) + "_single", 'nolabel':"1" ,'colspan':"4"})