diff options
| author | Olivier Laurent <olt@tinyerp.com> | 2008-12-15 12:42:21 +0100 |
|---|---|---|
| committer | Olivier Laurent <olt@tinyerp.com> | 2008-12-15 12:42:21 +0100 |
| commit | b99c9646c3c1b349c00aabf7c8f2f74c38c83e57 (patch) | |
| tree | 62db94a1ef99376ddce4b7229a6e1d623b1e449d | |
| parent | 077e97c5d8b621183b0f15b76fab48fcf4f717ea (diff) | |
| parent | f0f0b55df3f3e9a7acb8fa5727a5c5e0bc3afefc (diff) | |
merge
bzr revid: olt@tinyerp.com-20081215114221-2uok6xi9y26tlwtb
| -rw-r--r-- | addons/crm_profiling/crm_profiling.py | 8 | ||||
| -rw-r--r-- | addons/hr_expense/report/expense.rml | 11 |
2 files changed, 6 insertions, 13 deletions
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='''<?xml version="1.0"?> <form string="%s">''' % _('Questionnaire') - for x in result: - quest_form = quest_form + '''<field name="quest_form'''+str(x[1])+'''"/><newline/>''' - 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 + '<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 + 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 @@ <tr> <td> <para style="terp_default_9"> - <font color="white"> </font> </para> </td> <td> - <para style="terp_default_italic_8">[[ format(line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr')) ]]</para> + <para style="terp_default_italic_8">[[ line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr') ]]</para> </td> <td> <para style="terp_default_9"> - <font color="white"> </font> </para> </td> <td> <para style="terp_default_Right_9"> - <font color="white"> </font> </para> </td> <td> <para style="terp_default_Right_9"> - <font color="white"> </font> </para> </td> <td> <para style="terp_default_Right_9"> - <font color="white"> </font> </para> </td> <td> <para style="terp_default_Right_9"> - <font color="white"> </font> </para> </td> <td> <para style="terp_default_Right_9"> - <font color="white"> </font> </para> </td> </tr> @@ -297,4 +290,4 @@ </para> <para style="terp_default_9">This document must be dated and signed for reimbursment</para> </story> -</document> +</document>
\ No newline at end of file |