Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde-appraisals-pna into
lp:~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde.
Requested reviews:
Bharat Devnani (Open ERP) (bde-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde-appraisals-pna/+merge/133858
Hello Sir,
I improved hr Appraisals (10 clicks hr).
Thanks,
pna
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde-appraisals-pna/+merge/133858
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-10-hr-click-2-bde.
=== modified file 'hr_evaluation/hr_evaluation.py'
--- hr_evaluation/hr_evaluation.py 2012-11-06 06:09:06 +0000
+++ hr_evaluation/hr_evaluation.py 2012-11-12 06:03:20 +0000
@@ -187,13 +187,17 @@
return res
def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
- evaluation_plan_id=False
+ val = {}
+ val['evaluation_plan_id']=False
+ val['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}}
+ val.update({'plan_id':employee.evaluation_plan_id.id})
+ if employee.evaluation_date :
+ val.update({'date': employee.evaluation_date})
+ return {'value': val}
def button_plan_in_progress(self, cr, uid, ids, context=None):
mail_message = self.pool.get('mail.message')
=== modified file 'survey/report/survey_form.py'
--- survey/report/survey_form.py 2011-01-14 00:11:01 +0000
+++ survey/report/survey_form.py 2012-11-12 06:03:20 +0000
@@ -165,7 +165,7 @@
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">
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2012-10-29 09:14:15 +0000
+++ survey/wizard/survey_answer.py 2012-11-12 06:03:20 +0000
@@ -185,8 +185,9 @@
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
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
