Hardik Sanchawat (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso-hr-hsa into
lp:~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso.
Requested reviews:
Priyesh (OpenERP) (pso-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso-hr-hsa/+merge/122648
Hello,
I improved appraisal module in that :
- Appraisals: it is is possible to click on "switch to graph" view.
- Remove cancel button in appraisal plan.
- In Appraisal interview in that possible to click next and previous.
- Click on Cancel button status is not change.
Thanks
- HSA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso-hr-hsa/+merge/122648
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso.
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2012-08-17 07:31:41 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2012-09-04 10:13:23 +0000
@@ -241,7 +241,7 @@
<field name="name">Appraisal</field>
<field name="res_model">hr_evaluation.evaluation</field>
<field name="view_type">form</field>
- <field name="view_mode">tree,form,graph</field>
+ <field name="view_mode">tree,form</field>
<field name="search_view_id" ref="hr_evaluation.evaluation_search"/>
<field name="context">{"search_default_next_month":1}</field>
<field name="help" type="html">
=== modified file 'hr_evaluation/security/ir.model.access.csv'
--- hr_evaluation/security/ir.model.access.csv 2012-02-27 08:42:25 +0000
+++ hr_evaluation/security/ir.model.access.csv 2012-09-04 10:13:23 +0000
@@ -39,4 +39,4 @@
access_survey_question_column_heading_hr_employee,survey.question.column.heading.employee,survey.model_survey_question_column_heading,base.group_user,1,0,0,0
access_survey_response_line_hr_employee,survey.response.line.employee,survey.model_survey_response_line,base.group_user,1,1,1,0
access_survey_response_answer_hr_employee,survey.response.answer.hr.employee,survey.model_survey_response_answer,base.group_user,1,1,1,0
-
+access_survey_tbl_column_heading_hr_employee,survey.tbl.column.heading,survey.model_survey_tbl_column_heading,base.group_user,1,1,1,0
=== modified file 'survey/survey.py'
--- survey/survey.py 2012-08-10 14:43:39 +0000
+++ survey/survey.py 2012-09-04 10:13:23 +0000
@@ -87,10 +87,6 @@
self.write(cr, uid, ids, {'state': 'close', 'date_close': strftime("%Y-%m-%d %H:%M:%S") })
return True
- def survey_cancel(self, cr, uid, ids, arg):
- self.write(cr, uid, ids, {'state': 'cancel' })
- return True
-
def copy(self, cr, uid, ids, default=None, context=None):
vals = {}
current_rec = self.read(cr, uid, ids, context=context)
=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml 2012-08-14 12:11:17 +0000
+++ survey/survey_view.xml 2012-09-04 10:13:23 +0000
@@ -19,15 +19,14 @@
<field name="arch" type="xml">
<form string="Survey" version="7.0">
<header>
- <button name="survey_open" string="Open" states="cancel,close" type="object"/>
+ <button name="survey_open" string="Open" states="close" type="object"/>
<button name="survey_close" string="Close" states="open" type="object" class="oe_highlight"/>
- <button name="survey_cancel" string="Cancel" states="open" type="object"/>
<field name="state" widget="statusbar" statusbar_visible="open,close"/>
</header>
<sheet>
<div class="oe_button_box oe_right">
- <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
- <button name="%(action_view_survey_question_message)d" states="open,draft,close,cancel" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
+ <button name="%(action_view_survey_question_message)d" states="open,draft,close" string="Test Survey" type="action" icon="gtk-new" context="{'active':True,'survey_id': active_id}" attrs="{'invisible':[('id','=',0)]}"/>
+ <button name="%(action_view_survey_question_message)d" states="open,draft,close" string="Answer Survey" type="action" icon="gtk-execute" context="{'survey_id': active_id}" attrs="{'invisible':[('state','!=','open')]}"/>
</div>
<div class="oe_title">
<label for="title" class="oe_edit_only"/>
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2012-08-10 14:43:39 +0000
+++ survey/wizard/survey_answer.py 2012-09-04 10:13:23 +0000
@@ -366,7 +366,7 @@
but_string = "Done"
if context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages and context.has_key('response_id') and context.has_key('response_no') and context.get('response_no',0) + 1 == len(context.get('response_id',0)):
- etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Done") ,'context' : tools.ustr(context)})
+ etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'special' : 'cancel','string': tools.ustr("Cancel") ,'context' : tools.ustr(context)})
elif context.has_key('active') and context.get('active', False) and int(page_number) + 1 == total_pages and context.has_key('response_id'):
etree.SubElement(xml_group, 'button', {'icon': "gtk-go-forward", 'name':"action_forward_next",'string': tools.ustr("Next Answer") ,'type':"object",'context' : tools.ustr(context)})
elif context.has_key('active') and context.get('active',False) and int(page_number) + 1 == total_pages:
_______________________________________________
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
