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

[MERGE] merged pna's branch lp:~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde-appraisals-pna 

bzr revid: bde@tinyerp.com-20121112072250-kaios7i7p5ityxyg
This commit is contained in:
Bharat Devnani (OpenERP) 2012-11-12 12:52:50 +05:30
parent 53fdee00ce b372c41e5c
commit 0a0072169b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/hr_evaluation/hr_evaluation.py
View File

@ -187,13 +187,17 @@ class hr_evaluation(osv.osv):
return res
def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
evaluation_plan_id=False
vals = {}
vals['plan_id']=False
vals['date']=False
if employee_id:
employee_obj=self.pool.get('hr.employee')
for employee in employee_obj.browse(cr, uid, [employee_id], context=context):
if employee and employee.evaluation_plan_id and employee.evaluation_plan_id.id:
evaluation_plan_id=employee.evaluation_plan_id.id
return {'value': {'plan_id':evaluation_plan_id}}
vals.update({'plan_id':employee.evaluation_plan_id.id})
if employee.evaluation_date :
vals.update({'date': employee.evaluation_date})
return {'value': vals}
def button_plan_in_progress(self, cr, uid, ids, context=None):
mail_message = self.pool.get('mail.message')

4
addons/survey/report/survey_form.py
View File

@ -135,7 +135,7 @@ class survey_form(report_rml):
</initialize>
<paraStyle name="response" fontName="Helvetica-oblique" fontSize="9.5"/>
<paraStyle name="page" fontName="helvetica-bold" fontSize="15.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="title" fontName="helvetica-bold" fontSize="18.0" leftIndent="0.0" textColor="white"/>
<paraStyle name="title" fontName="helvetica-bold" fontSize="18.0" leading="15" leftIndent="0.0" textColor="white"/>
<paraStyle name="question" fontName="helvetica-boldoblique" fontSize="10.0" leftIndent="3.0"/>
<paraStyle name="answer" fontName="helvetica" fontSize="09.0" leftIndent="0.0"/>
<paraStyle name="descriptive_text" fontName="helvetica" fontSize="10.0" leftIndent="0.0"/>
@ -165,7 +165,7 @@ class survey_form(report_rml):
seq += 1
rml += """
<blockTable colWidths='"""+_tbl_widths+"""' style="page_tbl">
<tr><td><para style="page">"""+ tools.ustr(seq) + """. """ + to_xml(tools.ustr(page.title)) + """</para></td></tr>
<tr><td><para style="page">"""+ tools.ustr(seq) + """. """ + to_xml(tools.ustr(page.title)) + """</para><para style="P2"><font></font></para></td></tr>
</blockTable>"""
if page.note:
rml += """<para style="P2"></para><blockTable colWidths='"""+_tbl_widths+"""' style="note_table">

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

@ -185,8 +185,9 @@ class survey_question_wiz(osv.osv_memory):
etree.SubElement(xml_form, 'field', {'invisible':'1','name': "wizardid_" + str(wiz_id),'default':str(lambda *a: 0),'modifiers':'{"invisible":true}'})
if note:
xml_group_note = etree.SubElement(xml_form, 'group', {'col': '1','colspan': '4'})
for que_test in note.split('\n'):
etree.SubElement(xml_form, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
etree.SubElement(xml_group_note, 'label', {'string': to_xml(tools.ustr(que_test)), 'align':"0.0"})
que_ids = question_ids
qu_no = 0