<field name="model">hr_timesheet_sheet.sheet</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Timesheets">
+ <tree string="Timesheets"
+ colors="blue:state == 'draft';grey:state == 'done'">
<field name="user_id"/>
<field name="date_from"/>
<field name="date_to"/>
<field name="name"/>
- <field name="total_attendance"/>
+ <field name="department_id"/>
+ <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
<field name="total_timesheet"/>
- <field name="total_difference"/>
+ <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
<field name="state"/>
</tree>
</field>
</record>
-
-
+
<record id="hr_timesheet_account_form" model="ir.ui.view">
<field name="name">hr.timesheet.account.form</field>
<field name="model">hr_timesheet_sheet.sheet.account</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Timesheet by accounts">
+ <form string="Timesheet by Accounts">
<field name="sheet_id" select="1"/>
<field name="name" select="1"/>
<field name="total" sum="Total"/>
</form>
</field>
</record>
-
+
<record id="hr_timesheet_account_tree" model="ir.ui.view">
<field name="name">hr.timesheet.account.tree</field>
<field name="model">hr_timesheet_sheet.sheet.account</field>
</tree>
</field>
</record>
-
-
+<!--
<record id="hr_timesheet_day_form" model="ir.ui.view">
<field name="name">hr.timesheet.day.form</field>
<field name="model">hr_timesheet_sheet.sheet.day</field>
<field name="sheet_id" select="1"/>
<field name="name" select="1"/>
<field name="total_timesheet"/>
- <field name="total_attendance"/>
- <field name="total_difference"/>
+ <field name="total_attendance" groups="hr_attendance.group_hr_attendance"/>
+ <field name="total_difference" groups="hr_attendance.group_hr_attendance"/>
</form>
</field>
</record>
-
-
+
<record id="hr_timesheet_day_tree" model="ir.ui.view">
<field name="name">hr.timesheet.day.tree</field>
<field name="model">hr_timesheet_sheet.sheet.day</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree colors="red:total_difference<=0.1;blue:total_difference>=0.1" string="Timesheet by Days">
+ <tree colors="red:total_difference<0.1;blue:total_difference>=0.1" string="Timesheet by Days">
<field name="sheet_id"/>
<field name="name"/>
<field name="total_timesheet" sum="Total Timesheet"/>
- <field name="total_attendance" sum="Total Attendance"/>
- <field name="total_difference" sum="Total Difference"/>
+ <field name="total_attendance" sum="Total Attendance" groups="hr_attendance.group_hr_attendance"/>
+ <field name="total_difference" sum="Total Difference" groups="hr_attendance.group_hr_attendance"/>
</tree>
</field>
</record>
-
+-->
<record id="hr_timesheet_sheet_form" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.form</field>
<field name="model">hr_timesheet_sheet.sheet</field>
<field name="user_id"/>
<field name="date_from"/>
<field name="date_to"/>
-
+ <field name="company_id" select="1" groups="base.group_multi_company"/>
+ <field name="department_id"/>
<notebook colspan="4">
<page string="Daily View">
<group col="6" colspan="4">
- <button name="button_dummy" string="Go to:" type="object"/>
+ <button name="button_dummy" string="Go to:" type="object" icon="gtk-redo"/>
<field name="date_current" nolabel="1"/>
<label string=""/>
<button icon="gtk-media-previous" name="date_previous" string="" type="object"/>
- <button name="date_today" string="Today" type="object"/>
+ <button name="date_today" string="Today" type="object" icon="gtk-home"/>
<button icon="gtk-media-next" name="date_next" string="" type="object"/>
</group>
-
- <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1">
+
+ <field colspan="3" context="name=date_current,user_id=user_id" height="100" name="attendances_ids" nolabel="1" groups="hr_attendance.group_hr_attendance">
<tree string="Attendances">
<field name="name"/>
<field name="action"/>
<field invisible="1" name="employee_id"/>
</tree>
</field>
- <group col="1" colspan="1">
- <button name="sign_in" string="Sign In" type="object"/>
- <button name="sign_out" string="Sign Out" type="object"/>
+ <group col="1" colspan="1" groups="hr_attendance.group_hr_attendance">
+ <button name="sign_in" string="Sign In" type="object" icon="gtk-go-back"/>
+ <button name="sign_out" string="Sign Out" type="object" icon="gtk-go-forward"/>
</group>
-
-
- <field name="state_attendance"/>
- <field name="total_attendance_day" widget="float_time"/>
+
+ <field name="state_attendance" groups="hr_attendance.group_hr_attendance"/>
+ <field name="total_attendance_day" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
<field colspan="4" context="date=date_current,user_id=user_id" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
<tree editable="top" string="Timesheet">
<field invisible="1" name="date"/>
<field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
<field name="amount"/>
<field name="general_account_id"/>
-<!-- <field name="journal_id"/>-->
<field invisible="1" name="user_id" required="1"/>
</tree>
+ <form string="Timesheet">
+ <field name="date"/>
+ <field domain="[('type','=','normal'), ('state', '<>', 'close')]" name="account_id" on_change="on_change_account_id(account_id)"/>
+ <field name="name"/>
+ <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)" widget="float_time"/>
+ <field name="to_invoice"/>
+ <field invisible="1" name="journal_id"/>
+ <field invisible="1" name="product_id"/>
+ <field invisible="1" name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, product_uom_id)"/>
+ <field name="amount"/>
+ <field name="general_account_id"/>
+ <field name="user_id" required="1"/>
+ </form>
</field>
<field name="total_difference_day" widget="float_time"/>
<field name="total_timesheet_day" widget="float_time"/>
</page>
<page string="By Day">
<field colspan="4" name="period_ids" nolabel="1">
- <tree colors="red:total_difference<=0.1;blue:total_difference>=0.1" string="Period">
+ <tree colors="red:total_difference<0.1;blue:total_difference>=0.1" string="Period">
<field name="name"/>
- <field name="total_attendance" widget="float_time"/>
+ <field name="total_attendance" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
<field name="total_timesheet" widget="float_time"/>
- <field name="total_difference" widget="float_time"/>
+ <field name="total_difference" widget="float_time" groups="hr_attendance.group_hr_attendance"/>
</tree>
</field>
- <field name="total_attendance" widget="float_time"/>
- <field name="total_timesheet" widget="float_time"/>
- <field name="total_difference" widget="float_time"/>
+ <group colspan="4" col="6">
+ <field name="total_attendance" widget="float_time"/>
+ <field name="total_timesheet" widget="float_time"/>
+ <field name="total_difference" widget="float_time"/>
+ </group>
</page>
- <!--
- <page string="By account">
- <field name="account_ids" colspan="4" nolabel="1">
- <tree string="Analytic accounts">
- <field name="name"/>
- <field name="total" widget="float_time"/>
- <field name="invoice_rate"/>
- </tree>
- </field>
- </page>
- -->
</notebook>
<field name="state"/>
<group col="4" colspan="2">
- <button name="button_confirm" states="draft" string="Confirm" type="object"/>
- <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
- <button name="cancel" states="confirm" string="Refuse"/>
- <button name="done" states="confirm" string="Accept"/>
+ <button name="button_confirm" states="draft" string="Confirm" type="object" icon="gtk-execute"/>
+ <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+ <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-stop"/>
+ <button name="done" states="confirm" string="Accept" type="workflow" icon="gtk-apply"/>
</group>
</form>
</field>
</record>
-
+
+ <record id="view_hr_timesheet_sheet_filter" model="ir.ui.view">
+ <field name="name">hr_timesheet_sheet.sheet.filter</field>
+ <field name="model">hr_timesheet_sheet.sheet</field>
+ <field name="type">search</field>
+ <field name="arch" type="xml">
+ <search string="Search Timesheet">
+ <group col="10" colspan="4">
+ <filter icon="terp-partner" domain="[('user_id','=',uid)]" help="My" />
+ <separator orientation="vertical"/>
+ <filter icon="terp-crm" string="In Progress" domain="[('state','in',('draft', 'new'))]" help="Unvalidated Timesheets"/>
+ <filter icon="terp-crm" string="To Validate" domain="[('state','=','confirmed')]" help="Confirmed Timesheets"/>
+ <separator orientation="vertical"/>
+ <field name="user_id" select="1" widget="selection"/>
+ <field name="date_from"/>
+ <field name="department_id" widget="selection">
+ <filter icon="terp-crm"
+ domain="[('department_id','=',context.get('department_id',False))]"
+ help="My Departments Timesheet"/>
+ </field>
+ </group>
+ <newline/>
+ <group expand="1" string="Group By..." colspan="4" col="20">
+ <filter string="Users" icon="terp-project" domain="[]" context="{'group_by':'user_id'}"/>
+ <filter string="Department" icon="terp-project" domain="[]" context="{'group_by':'department_id'}"/>
+ </group>
+ </search>
+ </field>
+ </record>
+
<record id="act_hr_timesheet_sheet_form" model="ir.actions.act_window">
<field name="name">Timesheets</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr_timesheet_sheet.sheet</field>
<field name="view_type">form</field>
<field name="view_id" eval="False"/>
+ <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
</record>
- <menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/><menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="next_id_60"/>
-
- <record id="act_hr_timesheet_sheet_form_my" model="ir.actions.act_window">
- <field name="name">My timesheets</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">hr_timesheet_sheet.sheet</field>
- <field name="domain">[('user_id','=',uid)]</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- </record>
- <menuitem action="act_hr_timesheet_sheet_form_my" id="menu_act_hr_timesheet_sheet_form_my" parent="hr_timesheet_sheet.next_id_60"/>
-
- <record id="act_hr_timesheet_sheet_form_my_confirm" model="ir.actions.act_window">
- <field name="name">My timesheets to confirm</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">hr_timesheet_sheet.sheet</field>
- <field name="domain">[('user_id','=',uid),('state','=','draft'),('date_to','<=',time.strftime('%Y-%m-%d'))]</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- </record>
- <menuitem action="act_hr_timesheet_sheet_form_my_confirm" id="menu_act_hr_timesheet_sheet_form_my_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my"/>
-
- <wizard id="act_hr_timesheet_sheet_form_department_current" model="hr.employee" name="hr_timesheet_sheet.department.open" string="My department's timesheet"/>
- <menuitem action="act_hr_timesheet_sheet_form_department_current" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_current" parent="hr_timesheet_sheet.next_id_60" type="wizard"/>
-
- <wizard id="act_hr_timesheet_sheet_form_department_validate" model="hr.employee" name="hr_timesheet_sheet.department.validate.open" string="My department's timesheet"/>
- <menuitem action="act_hr_timesheet_sheet_form_department_validate" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_validate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
-
-
- <wizard id="act_hr_timesheet_sheet_form_department_confirm" model="hr.employee" name="hr_timesheet_sheet.department.confirm.open" string="My department's timesheet"/>
- <menuitem action="act_hr_timesheet_sheet_form_department_confirm" icon="STOCK_JUSTIFY_FILL" id="menu_act_hr_timesheet_sheet_form_department_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_current" type="wizard"/>
-
-
-
-
- <wizard id="act_hr_timesheet_sheet_form_my_current" model="hr.employee" name="hr_timesheet_sheet.current.open" string="My Current Timesheet"/>
- <menuitem action="act_hr_timesheet_sheet_form_my_current" icon="STOCK_NEW" id="menu_act_hr_timesheet_sheet_form_my_current" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_my" type="wizard"/>
-
- <record id="act_hr_timesheet_sheet_form_all_confirm" model="ir.actions.act_window">
- <field name="name">Timesheets To Confirm</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">hr_timesheet_sheet.sheet</field>
- <field name="domain">[('state','=','draft'),('date_to','<=',time.strftime('%Y-%m-%d'))]</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- </record>
- <menuitem action="act_hr_timesheet_sheet_form_all_confirm" id="menu_act_hr_timesheet_sheet_form_all_confirm" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
-
- <record id="act_hr_timesheet_sheet_form_all_valid" model="ir.actions.act_window">
- <field name="name">Timesheets To Validate</field>
- <field name="type">ir.actions.act_window</field>
- <field name="res_model">hr_timesheet_sheet.sheet</field>
- <field name="domain">[('state','=','confirm')]</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- </record>
- <menuitem action="act_hr_timesheet_sheet_form_all_valid" id="menu_act_hr_timesheet_sheet_form_all_valid" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
-
+ <!--Time Tracking menu in project Management-->
+ <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>
+ <menuitem
+ id="base.menu_project_management_time_tracking"
+ name="Time Tracking"
+ parent="base.menu_main_pm" sequence="3"/>
+ <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
+ groups="hr.group_hr_manager" sequence="5"/>
+ <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
+ <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
+ groups="hr.group_hr_manager"/>
+
<!--
Company inheritancy
-->
-
+
<record id="hr_timesheet_sheet_company" model="ir.ui.view">
<field name="name">res.company.sheet</field>
<field name="model">res.company</field>
</page>
</field>
</record>
-
+
<!--
hr.analytic.timesheet inheritancy
-->
-
+
<record id="hr_timesheet_line_form" model="ir.ui.view">
<field name="name">hr.analytic.timesheet.form</field>
<field name="model">hr.analytic.timesheet</field>
<field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_form"/>
<field name="arch" type="xml">
<field name="date" position="after">
- <field name="sheet_id" select="2"/>
+ <field name="sheet_id" />
</field>
</field>
</record>
<!--
hr.attendance inheritancy
-->
-
+
+ <record model="ir.ui.view" id="view_hr_attendance_filter">
+ <field name="name">view_hr_attendance_filter</field>
+ <field name="model">hr.attendance</field>
+ <field name="type">search</field>
+ <field name="inherit_id" ref="hr_attendance.view_hr_attendance_filter" />
+ <field name="arch" type="xml">
+ <field name="action" position="after">
+ <field name="sheet_id" select="1" />
+ </field>
+ </field>
+ </record>
+
<record id="view_attendance_form" model="ir.ui.view">
<field name="name">hr.attendance.form</field>
<field name="model">hr.attendance</field>
<field name="type">form</field>
- <field name="inherit_id" ref="hr.view_attendance_form"/>
+ <field name="inherit_id" ref="hr_attendance.view_attendance_form"/>
<field name="arch" type="xml">
<field name="action_desc" position="after">
<field name="sheet_id" select="2"/>
<field name="name">hr.attendance.tree</field>
<field name="model">hr.attendance</field>
<field name="type">tree</field>
- <field name="inherit_id" ref="hr.view_attendance_tree"/>
+ <field name="inherit_id" ref="hr_attendance.view_attendance_tree"/>
<field name="arch" type="xml">
- <field name="action_desc" position="after">
+ <field name="action" position="after">
+ <field name="sheet_id"/>
+ </field>
+ </field>
+ </record>
+ <record id="view_attendance_tree_who" model="ir.ui.view">
+ <field name="name">hr.attendance.tree</field>
+ <field name="model">hr.attendance</field>
+ <field name="type">tree</field>
+ <field name="inherit_id" ref="hr_attendance.view_attendance_who"/>
+ <field name="arch" type="xml">
+ <field name="action" position="after">
<field name="sheet_id"/>
</field>
</field>
</record>
-
+
<act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_day" name="Timesheet by Account" res_model="hr_timesheet_sheet.sheet.account" src_model="hr_timesheet_sheet.sheet"/>
- <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/>
-
-
+<!-- <act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_by_account" name="Timesheet by Day" res_model="hr_timesheet_sheet.sheet.day" src_model="hr_timesheet_sheet.sheet"/> -->
+
+
<act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet" name="Timesheet Lines" res_model="hr.analytic.timesheet" src_model="hr_timesheet_sheet.sheet"/>
-
+
<act_window domain="[('sheet_id', '=', active_id)]" id="act_hr_timesheet_sheet_sheet_2_hr_attendance" name="Attendances" res_model="hr.attendance" src_model="hr_timesheet_sheet.sheet"/>
-
+
<record id="hr_timesheet_sheet_tree_simplified" model="ir.ui.view">
<field name="name">hr.timesheet.sheet.tree.simplified</field>
<field name="model">hr_timesheet_sheet.sheet</field>
</tree>
</field>
</record>
-
- <record id="act_hr_timesheet_sheet_unvalidate" model="ir.actions.act_window">
- <field name="name">Unvalidated Timesheets</field>
- <field name="res_model">hr_timesheet_sheet.sheet</field>
- <field name="domain">[('state','<>','done'),('date_to','<',time.strftime('%Y-%m-%d'))]</field>
- <field name="view_type">form</field>
- <field name="view_id" ref="hr_timesheet_sheet_tree_simplified"/>
- </record>
-
- <menuitem action="act_hr_timesheet_sheet_unvalidate" id="menu_hr_timesheet_sheet_unvalidate" parent="hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"/>
+
</data>
</openerp>
projects / odoo / odoo.git / blobdiff