<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Timesheet" type="bar">
- <field name="name" />
- <field name="total_att" operator = "+"/>
- <field name="total_ts" operator = "+"/>
- <field name="user_id" group = "True"/>
+ <field name="user_id" />
+ <field name="quantity" operator = "+"/>
+ <field name="state" group = "True"/>
</graph>
</field>
</record>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Timesheet">
- <field name="date_current"/>
- <field name="name"/>
- <field name="user_id"/>
- <field name="date_from"/>
- <field name="date_to"/>
- <field name="total_att"/>
- <field name="total_diff"/>
- <field name="total_ts"/>
- <field name="state"/>
+ <field name="date_current" invisible="1"/>
+ <field name="name" invisible="1"/>
+ <field name="user_id" invisible="1"/>
+ <field name="date_from" invisible="1"/>
+ <field name="date_to" invisible="1"/>
+ <field name="quantity" sum="#Quantity"/>
+ <field name="cost" sum="#Cost"/>
+ <field name="state" invisible="1"/>
<field name="department_id" invisible="1"/>
<field name="company_id" invisible="1"/>
- <field name="name" invisible="1"/>
+ <field name="to_invoice" invisible="1"/>
+ <field name="product_id" invisible="1"/>
+ <field name="account_id" invisible="1"/>
+ <field name="general_account_id" invisible="1"/>
+ <field name="year" invisible="1"/>
+ <field name="day" invisible="1"/>
<field name="month" invisible="1"/>
</tree>
</field>
<field name="type">search</field>
<field name="arch" type="xml">
<search string="Timesheet">
- <group col="10" colspan="4">
- <filter icon="terp-hr" string="This Year" domain="[('year','=',time.strftime('%%Y'))]" help="Timesheet by user in this year"/>
- <filter icon="terp-hr" string="This Month" domain="[('month','=',time.strftime('%%m'))]" help="Timesheet by user in this month"/>
- <separator orientation="vertical"/>
- <field name="user_id" widget="selection">
- <filter icon="terp-hr"
- string="My Timesheet"
- domain="[('user_id','=',uid)]"/></field>
- <field name="name"/>
- <field name="department_id"/>
+ <group col="10" colspan="12">
+ <filter icon="terp-hr" string="This Year"
+ domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')),('date_current','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
+ help="Timesheet in this year"/>
+ <filter icon="terp-hr" string="This Month"
+ name="month"
+ domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')), ('date_current','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
+ help="Timesheet in this month"/>
+ <filter icon="gtk-media-rewind"
+ string=" 7 Days "
+ separator="1"
+ domain="[('date_current','<=', time.strftime('%%Y-%%m-%%d')), ('date_current','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
+ help="Timesheet during last 7 days"/>
+ <separator orientation="vertical"/>
+ <filter icon="terp-hr"
+ string="Draft"
+ domain="[('state','=','draft')]"/>
+ <filter icon="terp-hr"
+ string="Confirmed"
+ domain="[('state','=','confirm')]"/>
+ <separator orientation="vertical"/>
+ <field name="product_id"/>
+ <field name="user_id" widget="selection">
+ <filter icon="terp-hr"
+ string="My timesheet"
+ help = "My timesheet "
+ domain="[('user_id','=',uid)]" />
+ <filter icon="terp-hr"
+ string="Non Assigned timesheets to users"
+ help="Non Assigned timesheets to users"
+ domain="[('user_id','=',False)]"/>
+ </field>
+ <field name="company_id" widget="selection" groups="base.group_multi_company"/>
</group>
<newline/>
- <group expand="1" string="Extended options..." colspan="10" col="12">
- <filter icon="terp-hr"
- string="New"
- domain="[('state','=','new')]"/>
- <filter icon="terp-hr"
- string="Draft"
- domain="[('state','=','draft')]"/>
- <filter icon="terp-hr"
- string="Confirmed"
- domain="[('state','=','confirm')]"/>
- <filter icon="terp-hr"
- string="Done"
- domain="[('state','=','done')]"/>
- <newline/>
- <field name="date_from"/>
- <field name="date_to"/>
- </group>
+ <group expand="0" string="Extended options..." colspan="10" col="12">
+ <filter icon="terp-hr"
+ string="New"
+ domain="[('state','=','new')]"/>
+ <separator orientation="vertical"/>
+ <field name="date_from"/>
+ <separator orientation="vertical"/>
+ <field name="account_id"/>
+ <field name="department_id" widget="selection"/>
+ <newline/>
+ <filter icon="terp-hr"
+ string="Done"
+ domain="[('state','=','done')]"/>
+ <separator orientation="vertical"/>
+ <field name="date_to"/>
+ <separator orientation="vertical"/>
+ <field name="general_account_id"/>
+ <field name="to_invoice" widget="selection"/>
+ </group>
<newline/>
<group expand="1" string="Group By..." colspan="10" col="12">
<filter string="User" name="User" icon="terp-hr" context="{'group_by':'user_id'}"/>
- <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}"/>
- <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
+ <filter string="Product" icon="terp-hr" context="{'group_by':'product_id'}"/>
+ <separator orientation="vertical"/>
+ <filter string="Type of Invoicing" icon="terp-hr" context="{'group_by':'to_invoice'}"/>
+ <filter string="Analytic Account" icon="terp-hr" context="{'group_by':'account_id'}"/>
+ <filter string="General Account" icon="terp-hr" context="{'group_by':'general_account_id'}"/>
<separator orientation="vertical"/>
+ <filter string="Company" icon="terp-hr" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
+ <filter string="Department" icon="terp-hr" context="{'group_by':'department_id'}"/>
<filter string="State" icon="terp-hr" context="{'group_by':'state'}"/>
<separator orientation="vertical"/>
- <filter string="Month" icon="terp-hr" context="{'group_by':'date_current'}"/>
+ <filter string="Day" icon="terp-hr" context="{'group_by':'day'}"/>
+ <filter string="Month" icon="terp-hr" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-hr" context="{'group_by':'year'}"/>
</group>
</search>
<field name="res_model">timesheet.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
- <field name="context">{'search_default_User': 1}</field>
+ <field name="context">{'search_default_month':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_timesheet_report_search"/>
</record>
<menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" parent="hr.menu_hr_reporting"/>
projects / odoo / odoo.git / blobdiff