diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py index c5a8b118b0f..708294490f5 100644 --- a/addons/crm_profiling/crm_profiling.py +++ b/addons/crm_profiling/crm_profiling.py @@ -137,11 +137,11 @@ class questionnaire(osv.osv): quest_fields={} quest_form='''
''' % _('Questionnaire') - for x in result: - quest_form = quest_form + '''''' - quest_fields['quest_form'+str(x[1])] = {'string': str(x[0]), 'type': 'many2one', 'relation': 'crm_profiling.answer', 'domain': [('question_id','=',x[1])] } + for name, oid in result: + quest_form = quest_form + '' % (oid,) + quest_fields['quest_form%d' % (oid,)] = {'string': name, 'type': 'many2one', 'relation': 'crm_profiling.answer', 'domain': [('question_id','=',oid)] } quest_form = quest_form + '''''' - return quest_form,quest_fields + return quest_form, quest_fields _columns = { 'name': fields.char("Questionnaire",size=128, required=True), diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml index 7c1ecd03635..fe6714ab8cb 100644 --- a/addons/hr_expense/report/expense.rml +++ b/addons/hr_expense/report/expense.rml @@ -213,40 +213,33 @@ - - [[ format(line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr')) ]] + [[ line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr') ]] - - - - - - @@ -297,4 +290,4 @@ This document must be dated and signed for reimbursment - + \ No newline at end of file