[MERGE] merged with main addons

bzr revid: bde@tinyerp.com-20110915113201-fgbs2d2qr45ljmsg

1 files changed, 16 insertions, 3 deletions

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 46d5cf55a98..869d1f93994 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -222,7 +222,7 @@
             <field name="model">hr_evaluation.evaluation</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree colors="blue:state in ('draft');black:state in ('wait','progress');gray:state in('done','cancel')" string="Evaluation">
+                <tree colors="blue:state == 'draft';black:state in ('wait','progress');gray:state in('done','cancel')" string="Evaluation">
                     <field name="employee_id"/>
                     <field name="plan_id"/>
                     <field name="date"/>
@@ -306,6 +306,10 @@
                         <field name="response" readonly="1"/>
                         <field name="user_to_review_id"/>
                         <field name="user_id" string="Interviewer"/>
+                        <button string="Send Reminder Email"
+                        name="%(mail.action_email_compose_message_wizard)d"
+                        icon="terp-mail-message-new" type="action" colspan="2"
+                        states="waiting_answer"/>
                     </group>
                     <newline/>
                     <separator string="State" colspan="4"/>
@@ -329,6 +333,7 @@
                     <field name="response" readonly="1" invisible="True"/>
                     <button name="%(survey.action_view_survey_question_message)d" string="Interview Question" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0}" attrs="{'readonly':[('response','=',False)]}" />
+                    <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" colspan="2" states="waiting_answer"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -403,8 +408,16 @@
 
         <menuitem name="Interview Requests" parent="menu_eval_hr" id="menu_open_hr_evaluation_interview_requests"
             action="action_hr_evaluation_interview_tree"/>
-        <menuitem name="Evaluation Reminders" parent="menu_eval_hr" id="menu_eval_send_mail"
-           action="action_hr_evaluation_send_mail" sequence="45" groups="base.group_hr_manager"/>
+
+      <!-- Email Compose message Action-->
+      <act_window
+      id="evaluation_reminders" name="Evaluation Reminders"
+      res_model="mail.compose.message"
+      src_model="hr.evaluation.interview"
+      view_type="form" view_mode="form"
+      target="new" multi="True"
+      key2="client_action_multi"
+      context="{'mail.compose.message.mode':'mass_mail'}"/>
 
       <!-- Evaluation Interviews Button on Employee Form -->
       <act_window