Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks-hr-mma into
lp:openobject-addons.
Requested reviews:
Purnendu Singh (OpenERP) (psi-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks-hr-mma/+merge/107772
Hello Sir ,
I have improved hr module related changes as per specification on pad
Thanks.
mma
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-first_10_clicks-hr-mma/+merge/107772
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-first_10_clicks-hr-mma.
=== modified file 'hr/hr.py'
--- hr/hr.py 2012-05-22 16:10:55 +0000
+++ hr/hr.py 2012-06-11 12:49:25 +0000
@@ -209,6 +209,7 @@
'color': fields.integer('Color Index'),
'city': fields.related('address_id', 'city', type='char', string='City'),
'login': fields.related('user_id', 'login', type='char', string='Login', readonly=1),
+ 'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1),
}
def unlink(self, cr, uid, ids, context=None):
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-06-09 14:39:04 +0000
+++ hr/hr_view.xml 2012-06-11 12:49:25 +0000
@@ -46,8 +46,6 @@
<field name="parent_id" />
</group>
<group groups="base.group_hr_user" string="Social IDs">
- <field name="ssnid"/>
- <field name="sinid"/>
<field name="identification_id"/>
<field name="passport_id"/>
<field name="otherid"/>
@@ -73,7 +71,7 @@
</group>
</page>
<page string="Categories" groups="base.group_hr_user">
- <field name="category_ids"/>
+ <field name="category_ids" colspan="4" nolabel="1" widget="many2many_tags"/>
</page>
<page string="Notes" groups="base.group_hr_user">
<field name="notes"/>
@@ -134,6 +132,7 @@
<field name="type">kanban</field>
<field name="arch" type="xml">
<kanban>
+ <field name="last_login"/>
<templates>
<t t-name="kanban-box">
<div class="oe_employee_vignette">
@@ -143,6 +142,11 @@
<div class="oe_employee_details">
<h4><a type="edit"><field name="name"/> (<field name="login"/>)</a></h4>
<ul>
+ <li t-if="record.last_login.raw_value">
+ <span t-if="record.last_login.raw_value && record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
+ <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
+ </span>
+ </li>
<li t-if="record.job_id.raw_value"><field name="job_id"/></li>
<li t-if="record.work_location.raw_value"><field name="work_location"/></li>
<li t-if="record.work_phone.raw_value">Tel: <field name="work_phone"/></li>
@@ -421,9 +425,29 @@
<filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
</group>
</search>
- </field>
- </record>
-
+ </field>
+ </record>
+
+ <record id="view_hr_job_employee_form" model="ir.ui.view">
+ <field name="name">hr.job.employee.form</field>
+ <field name="model">hr.job</field>
+ <field name="type">form</field>
+ <field name="priority">20</field>
+ <field name="arch" type="xml">
+ <form string="Job">
+ <field name="name" />
+ <field name="department_id" />
+ <newline/>
+ <notebook colspan="4">
+ <page string="Description">
+ <separator colspan="4" string="Job Description"/>
+ <field name="description" colspan="4" nolabel="1"/>
+ </page>
+ </notebook>
+ </form>
+ </field>
+ </record>
+
<record model="ir.actions.act_window" id="action_hr_job">
<field name="name">Job Positions</field>
<field name="res_model">hr.job</field>
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-05-23 06:53:42 +0000
+++ hr_holidays/hr_holidays.py 2012-06-11 12:49:25 +0000
@@ -512,7 +512,6 @@
'current_leave_id': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Type",type='many2one', relation='hr.holidays.status'),
'leave_date_from': fields.function(_get_leave_status, multi='leave_status', type='date', string='From Date'),
'leave_date_to': fields.function(_get_leave_status, multi='leave_status', type='date', string='To Date'),
- 'last_login': fields.related('user_id', 'date', type='datetime', string='Latest Connection', readonly=1)
}
hr_employee()
=== modified file 'hr_holidays/hr_holidays_view.xml'
--- hr_holidays/hr_holidays_view.xml 2012-06-11 09:07:01 +0000
+++ hr_holidays/hr_holidays_view.xml 2012-06-11 12:49:25 +0000
@@ -284,7 +284,7 @@
<field name="act_window_id" ref="open_ask_holidays"/>
</record>
- <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
+ <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
<record model="ir.actions.act_window" id="request_approve_holidays">
<field name="name">Requests Approve</field>
@@ -493,8 +493,8 @@
<field name="arch" type="xml">
<field name="coach_id" position="after">
<field name="remaining_leaves"/>
- <field name="current_leave_id"/>
- <field name="current_leave_state" attrs="{'invisible':[('current_leave_id','=',False)]}"/>
+ <field name="current_leave_id" invisible="1"/>
+ <field name="current_leave_state" invisible="1"/>
</field>
</field>
</record>
@@ -506,21 +506,15 @@
<field name="arch" type="xml">
<xpath expr="//templates" position="before">
<field name="current_leave_state"/>
- <field name="last_login"/>
<field name="leave_date_from"/>
<field name="leave_date_to"/>
</xpath>
- <xpath expr="//div[@class='oe_employee_details']/ul/li" position="before">
- <li t-if="record.current_leave_id.raw_value || record.last_login.raw_value">
- <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
- <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
- <field name="current_leave_id"/>
- </span>
- </span>
- <span t-if="record.last_login.raw_value && record.last_login.raw_value.is().today()" class="oe_kanban_button" style="font-size: 100%%">
- <t t-esc="record.last_login.raw_value.toString('HH:mm')"/>
- </span>
- </li>
+ <xpath expr="//div[@class='oe_employee_details']/ul/li/span" position="before">
+ <span t-if="record.current_leave_id.raw_value" t-att-class="record.current_leave_state.raw_value=='validate'?'oe_kanban_color_3':'oe_kanban_color_2'">
+ <span class="oe_kanban_button" style="font-size: 100%%" t-att-title="record.leave_date_from.raw_value.toString('ddd dS MMM') + ' - ' + record.leave_date_to.raw_value.toString('ddd dS MMM')" >
+ <field name="current_leave_id"/>
+ </span>
+ </span>
</xpath>
</field>
</record>
_______________________________________________
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
