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

merge 

bzr revid: olt@tinyerp.com-20081215114221-2uok6xi9y26tlwtb
This commit is contained in:
Olivier Laurent 2008-12-15 12:42:21 +01:00
parent 077e97c5d8 f0f0b55df3
commit b99c9646c3
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/crm_profiling/crm_profiling.py
View File

@ -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),

11
addons/hr_expense/report/expense.rml
View File

@ -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>