Foram Katharotiya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso-appraisal-fka
into lp:~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso.
Requested reviews:
Amit Patel (OpenERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso-appraisal-fka/+merge/124908
Hello sir
- remove Function of the "Title" field below "Date of Review
- the cancel should just close the popup, not change status done
- in survey form change state name of cancelled to draft
Thanks,
FKA
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-addons-hr-appraisal-pso-appraisal-fka/+merge/124908
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_data.xml'
--- hr_evaluation/hr_evaluation_data.xml 2012-08-30 14:18:52 +0000
+++ hr_evaluation/hr_evaluation_data.xml 2012-09-18 12:46:20 +0000
@@ -399,12 +399,6 @@
<field name="type">char</field>
<field eval="5" name="sequence"/>
</record>
- <record id="survey_answer_98" model="survey.answer">
- <field name="answer">Title</field>
- <field name="question_id" ref="survey_question_2"/>
- <field name="type">char</field>
- <field eval="6" name="sequence"/>
- </record>
<record id="survey_question_column_heading_4" model="survey.question.column.heading">
<field name="in_visible_rating_weight">1</field>
<field name="in_visible_menu_choice">1</field>
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2012-09-06 11:50:36 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2012-09-18 12:46:20 +0000
@@ -239,7 +239,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-18 12:46:20 +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-28 07:32:29 +0000
+++ survey/survey.py 2012-09-18 12:46:20 +0000
@@ -59,7 +59,7 @@
help="Set to one if survey is answerable only once"),
'response_user': fields.integer('Maximum Answer per User',
help="Set to one if you require only one Answer per user"),
- 'state': fields.selection([('open', 'Open'), ('cancel', 'Cancelled'),('close', 'Closed') ], 'Status', readonly=True),
+ 'state': fields.selection([('draft', 'Draft'),('open', 'Open'), ('close', 'Closed') ], 'Status', readonly=True),
'responsible_id': fields.many2one('res.users', 'Responsible', help="User responsible for survey"),
'tot_start_survey': fields.integer("Total Started Survey", readonly=1),
'tot_comp_survey': fields.integer("Total Completed Survey", readonly=1),
@@ -87,8 +87,8 @@
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' })
+ def survey_draft(self, cr, uid, ids, arg):
+ self.write(cr, uid, ids, {'state': 'draft' })
return True
def copy(self, cr, uid, ids, default=None, context=None):
=== modified file 'survey/survey_view.xml'
--- survey/survey_view.xml 2012-09-10 21:55:16 +0000
+++ survey/survey_view.xml 2012-09-18 12:46:20 +0000
@@ -19,10 +19,10 @@
<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="draft,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"/>
+ <button name="survey_draft" string="Set to Draft" states="open" type="object"/>
+ <field name="state" widget="statusbar" statusbar_visible="draft,open,close"/>
</header>
<sheet>
<div class="oe_button_box oe_right">
=== modified file 'survey/wizard/survey_answer.py'
--- survey/wizard/survey_answer.py 2012-09-10 21:55:16 +0000
+++ survey/wizard/survey_answer.py 2012-09-18 12:46:20 +0000
@@ -600,7 +600,6 @@
if context.has_key('cur_id'):
if context.has_key('request') and context.get('request',False):
self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
- self.pool.get(context.get('object',False)).survey_req_done(cr, uid, [int(context.get('cur_id'))], context)
else:
self.pool.get(context.get('object',False)).write(cr, uid, [int(context.get('cur_id',False))], {'response' : response_id})
if sur_name_read['store_ans'] and type(safe_eval(sur_name_read['store_ans'])) == dict:
_______________________________________________
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
