Ashvin Rathod (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-applicant-ara into 
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-applicant-ara/+merge/106128

Hello,

[IMP] hr_recruitment: Improve applicant form view.

Thank you,
ara

-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-applicant-ara/+merge/106128
Your team OpenERP R&D Team is requested to review the proposed merge of 
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-applicant-ara into 
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr_recruitment/hr_recruitment.py'
--- hr_recruitment/hr_recruitment.py	2012-04-06 12:37:32 +0000
+++ hr_recruitment/hr_recruitment.py	2012-05-17 09:40:23 +0000
@@ -140,7 +140,7 @@
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'probability': fields.float('Probability'),
-        'partner_id': fields.many2one('res.partner', 'Partner'),
+        'partner_id': fields.many2one('res.partner', 'Contact'),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
@@ -172,7 +172,7 @@
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'survey': fields.related('job_id', 'survey_id', type='many2one', relation='survey', string='Survey'),
         'response': fields.integer("Response"),
-        'reference': fields.char('Refered By', size=128),
+        'reference': fields.char('Referred By', size=128),
         'source_id': fields.many2one('hr.recruitment.source', 'Source'),
         'day_open': fields.function(_compute_day, string='Days to Open', \
                                 multi='day_open', type="float", store=True),

=== modified file 'hr_recruitment/hr_recruitment_view.xml'
--- hr_recruitment/hr_recruitment_view.xml	2012-04-26 14:37:28 +0000
+++ hr_recruitment/hr_recruitment_view.xml	2012-05-17 09:40:23 +0000
@@ -86,41 +86,35 @@
                 </div>
             </div>
             <sheet string="Jobs - Recruitment Form" layout="auto">
-                <group colspan="4" col="4">
-                    <field name="name" string="Subject"/>
-                    <group colspan="2" col="4">
-                        <field name="partner_name"/>
+                <field name="name" string="Subject"/>
+                <field name="partner_name"/>
+                <field name="job_id" on_change="onchange_job(job_id)"/>
+                <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
+                <group col="11" colspan="4">
+                        <field name="user_id"/>
+                        <field name="title_action"/>
+                        <field name="date_action"/>
+                        <field name="survey" invisible="1"/>
                         <button name="action_makeMeeting" type="object" string="Meeting" icon="gtk-index"/>
-                        <button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action"/>
-                    </group>
-                    <field name="user_id"/>
-                    <field name="job_id" on_change="onchange_job(job_id)"/>
-                    <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                    <group colspan="2" col="4">
+                        <button name="action_print_survey" string="Print Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
+                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}"/>
+                        <field name="response" invisible="1"/>
+                </group>
+                <group colspan="2" col="4">
                         <field name="stage_id" domain="['|',('department_id','=',department_id),('department_id','=',False)]"/>
                         <button name="stage_previous" string="" type="object" icon="gtk-go-back"/>
                         <button icon="gtk-go-forward" string="" name="stage_next" type="object"/>
                     </group>
-                    <field name="date_action"/>
-                    <group colspan="2" col="8">
-                        <field name="title_action"/>
-                        <field name="survey" invisible="1"/>
-                        <button name="action_print_survey" string="Interview" type="object" icon="gtk-print" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <button name="%(survey.action_view_survey_question_message)d" string="Answer" type="action" icon="gtk-execute" context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}" attrs="{'readonly':[('survey','=',False)]}"/>
-                        <field name="response" invisible="1"/>
-                    </group>
-                    <newline/>
-                </group>
                 <notebook colspan="4">
                     <page string="Job Info">
                         <group col="3" colspan="2">
                             <separator colspan="3" string="Contact"/>
-                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)"/>
-                            <button string="Create Partner"
+                            <field name="partner_id" on_change="onchange_partner_id(partner_id, email_from)" colspan="2"/>
+                            <button string="Create Contact"
                                     name="%(action_hr_recruitment_partner_create)d"
-                                    icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
-                            <newline/>
-                            <field name="email_from" colspan="3"/>
+                                    icon="gtk-index" type="action" attrs="{'invisible':[('partner_id','!=',False)]}"/>
+                            <field name="email_from" colspan="2"/>
+                            <button string="Send New Email" name="%(mail.action_email_compose_message_wizard)d" icon="terp-mail-message-new" type="action" attrs="{'invisible':[('email_from','=',False)]}"/>
                             <field name="partner_phone" colspan="3"/>
                             <field name="partner_mobile" colspan="3"/>
                         </group>

=== modified file 'hr_recruitment/i18n/hr_recruitment.pot'
--- hr_recruitment/i18n/hr_recruitment.pot	2012-02-08 01:08:30 +0000
+++ hr_recruitment/i18n/hr_recruitment.pot	2012-05-17 09:40:23 +0000
@@ -150,7 +150,7 @@
 #. module: hr_recruitment
 #: view:hr.applicant:0 view:hr.recruitment.partner.create:0
 #: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
-msgid "Create Partner"
+msgid "Create Contact"
 msgstr ""
 
 #. module: hr_recruitment
@@ -160,7 +160,7 @@
 
 #. module: hr_recruitment
 #: field:hr.applicant,reference:0
-msgid "Refered By"
+msgid "Referred By"
 msgstr ""
 
 #. module: hr_recruitment
@@ -516,6 +516,7 @@
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
+#: field:hr.applicant,partner_id:0 view:hr.recruitment.report:0
 msgid "Contact"
 msgstr ""
 
@@ -530,7 +531,6 @@
 msgstr ""
 
 #. module: hr_recruitment
-#: field:hr.applicant,partner_id:0 view:hr.recruitment.report:0
 #: field:hr.recruitment.report,partner_id:0
 msgid "Partner"
 msgstr ""

_______________________________________________
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

Reply via email to