odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]attendance related fields and menu hide 

bzr revid: pna@tinyerp.com-20120924081934-2e2bj1fa4pstrg91
This commit is contained in:
Pinakin Nayi (OpenERP) 2012-09-24 13:49:34 +05:30
parent f29f08339f
commit 4550c4ced8
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr/res_config_view.xml
View File

@ -69,7 +69,7 @@
<field name="module_hr_timesheet_sheet" class="oe_inline"/> <field name="module_hr_timesheet_sheet" class="oe_inline"/>
<label for="module_hr_timesheet_sheet"/> <label for="module_hr_timesheet_sheet"/>
</div> </div>
<div> <div name="hr_attendance">
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/> <field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>
<label for="module_hr_attendance"/> <label for="module_hr_attendance"/>
</div> </div>

2
addons/hr_attendance/res_config_view.xml
View File

@ -7,7 +7,7 @@
<field name="inherit_id" ref="hr.view_human_resources_configuration"/> <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="//div[@name='hr_timesheet']" position="after"> <xpath expr="//div[@name='hr_attendance']" position="after">
<div> <div>
<field name="group_hr_attendance" class="oe_inline"/> <field name="group_hr_attendance" class="oe_inline"/>
<label for="group_hr_attendance"/> <label for="group_hr_attendance"/>

2
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -333,7 +333,7 @@ class hr_timesheet_sheet(osv.osv):
'draft': [('readonly', False)], 'draft': [('readonly', False)],
'new': [('readonly', False)]} 'new': [('readonly', False)]}
), ),
'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances',groups="base.group_attendance"), 'attendances_ids' : one2many_mod2('hr.attendance', 'sheet_id', 'Attendances'),
'state' : fields.selection([ 'state' : fields.selection([
('new', 'New'), ('new', 'New'),
('draft','Open'), ('draft','Open'),

2
addons/hr_timesheet_sheet/hr_timesheet_sheet_data.xml
View File

@ -20,7 +20,7 @@
<field name="name">My Timesheet</field> <field name="name">My Timesheet</field>
</record> </record>
<menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" groups="base.group_hr_attendance" sequence="1"/> <menuitem name="My Current Timesheet" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_attendance.menu_hr_time_tracking" action="ir_actions_server_timsheet_sheet" sequence="1"/>
</data> </data>
</openerp> </openerp>

10
addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
View File

@ -66,7 +66,7 @@
<group> <group>
<field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/> <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time"/> <field name="total_timesheet" widget="float_time"/>
<field name="total_difference" widget="float_time"/> <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
<field name="user_id" invisible="1"/> <field name="user_id" invisible="1"/>
</group> </group>
</group> </group>
@ -84,7 +84,7 @@
</div> </div>
</group> </group>
<group colspan="4" col="3"> <group colspan="4" col="3">
<field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1"> <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1" groups="base.group_hr_attendance">
<tree string="Attendances" editable="bottom"> <tree string="Attendances" editable="bottom">
<field name="name"/> <field name="name"/>
<field name="action"/> <field name="action"/>
@ -136,7 +136,7 @@
<field name="name"/> <field name="name"/>
<field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/> <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time"/> <field name="total_timesheet" widget="float_time"/>
<field name="total_difference" widget="float_time"/> <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
</tree> </tree>
</field> </field>
</page> </page>
@ -320,7 +320,7 @@
<field name="department_id"/> <field name="department_id"/>
<field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/> <field name="total_attendance" widget="float_time" groups="base.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time"/> <field name="total_timesheet" widget="float_time"/>
<field name="total_difference" widget="float_time"/> <field name="total_difference" widget="float_time" groups="base.group_hr_attendance"/>
<field name="state"/> <field name="state"/>
</tree> </tree>
</field> </field>
@ -334,7 +334,7 @@
<field name="name"/> <field name="name"/>
<field name="total_attendance" widget="float_time" sum="Total Attendances" groups="base.group_hr_attendance"/> <field name="total_attendance" widget="float_time" sum="Total Attendances" groups="base.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time" sum="Total Timesheet"/> <field name="total_timesheet" widget="float_time" sum="Total Timesheet"/>
<field name="total_difference" widget="float_time" sum="Total Difference"/> <field name="total_difference" widget="float_time" sum="Total Difference" groups="base.group_hr_attendance"/>
</tree> </tree>
</field> </field>
</record> </record>

2
addons/project_timesheet/project_timesheet_view.xml
View File

@ -97,7 +97,7 @@
<menuitem action="hr_timesheet.action_hr_timesheet_sign_in" <menuitem action="hr_timesheet.action_hr_timesheet_sign_in"
id="menu_hr_timesheet_sign_in" id="menu_hr_timesheet_sign_in"
parent="hr_attendance.menu_hr_attendance" parent="hr_attendance.menu_hr_attendance"
sequence="5" /> sequence="5" groups="base.group_hr_attendance" />
<menuitem id="menu_project_billing" name="Invoicing" <menuitem id="menu_project_billing" name="Invoicing"
parent="base.menu_main_pm" sequence="5"/> parent="base.menu_main_pm" sequence="5"/>