Planning:
Allow planning on accounts from all users or specific users Allow child_of on tasks bzr revid: fp@tinyerp.com-b93415dbb72c60d08e2439e01d036a1cb857cbdb
This commit is contained in:
parent
733f718674
commit
1ca9f6c121
|
@ -17,7 +17,7 @@
|
|||
<field name="priority" eval="18"/>
|
||||
<field name="arch" type="xml">
|
||||
<notebook position="inside">
|
||||
<page string="Analysys summary">
|
||||
<page string="Analysis summary">
|
||||
<separator string="Work done stats" colspan="4" />
|
||||
<field name="total_cost"/>
|
||||
<field name="remaining_ca"/>
|
||||
|
@ -36,11 +36,11 @@
|
|||
<field name="real_margin_rate"/>
|
||||
<separator string="Key dates" colspan="4" />
|
||||
<field name="last_invoice_date"/>
|
||||
<field name="last_worked_invoiced_date" select="1"/>
|
||||
<field name="last_worked_invoiced_date" select="2"/>
|
||||
<field name="last_worked_date"/>
|
||||
<separator string="To be invoiced" colspan="4" />
|
||||
<field name="hours_qtt_non_invoiced"/>
|
||||
<field name="ca_to_invoice" select="1"/>
|
||||
<field name="ca_to_invoice" select="2"/>
|
||||
|
||||
</page>
|
||||
<page string="Stats by month">
|
||||
|
|
|
@ -12,7 +12,6 @@
|
|||
<act_window name="My projects"
|
||||
domain="[('manager', '=', uid)]"
|
||||
res_model="project.project"
|
||||
src_model="res.users"
|
||||
view_type="form"
|
||||
view_mode="tree,form"
|
||||
id="act_my_project"/>
|
||||
|
@ -20,7 +19,6 @@
|
|||
<act_window name="My accounts to invoice"
|
||||
domain="[('user_id','=',uid),('state','<>','close'),('partner_id','<>',False)]"
|
||||
res_model="account.analytic.account"
|
||||
src_model="res.users"
|
||||
view_type="form"
|
||||
view_mode="tree,form"
|
||||
view_id="view_account_analytic_simplified"
|
||||
|
|
|
@ -128,7 +128,6 @@ class report_account_analytic_planning_stat(osv.osv):
|
|||
project_id in (select id from project_project where category_id=%d) and
|
||||
date_close>=%s and
|
||||
date_close<=%s''', (
|
||||
line.user_id.id,
|
||||
line.account_id.id,
|
||||
line.planning_id.date_from,
|
||||
line.planning_id.date_to)
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<field name="model">report.task.user.pipeline.open</field>
|
||||
<field name="type">form</field>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Tasks by Projects">
|
||||
<form string="Tasks by projects">
|
||||
<field name="user_id" select="1"/>
|
||||
<field name="company_id" select="1"/>
|
||||
<field name="task_nbr" select="2"/>
|
||||
|
@ -27,21 +27,19 @@
|
|||
<field name="model">report.task.user.pipeline.open</field>
|
||||
<field name="type">graph</field>
|
||||
<field name="arch" type="xml">
|
||||
<graph string="Tasks by Projects" type="bar">
|
||||
<graph string="Tasks by projects" type="bar">
|
||||
<field name="user_id" groups="task_state"/>
|
||||
<field name="task_progress"/>
|
||||
</graph>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="view_task_project_tree">
|
||||
<field name="name">report.project.task.tree</field>
|
||||
<field name="model">report.task.user.pipeline.open</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="arch" type="xml">
|
||||
<tree string="Tasks by Projects">
|
||||
<tree string="Tasks by projects">
|
||||
<field name="user_id"/>
|
||||
<field name="company_id"/>
|
||||
<field name="task_nbr"/>
|
||||
|
@ -58,24 +56,30 @@
|
|||
<field name="view_mode">tree,graph</field>
|
||||
<field name="domain">[]</field>
|
||||
</record>
|
||||
<menuitem name="Project/Reporting/All Months/Tasks by Projects" action="action_project_task" id="menu_project_task_user_tree"/>
|
||||
<menuitem name="Project/Reporting/All Months/Tasks by projects" action="action_project_task" id="menu_project_task_user_tree"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_project_task_done">
|
||||
<field name="name">Closed Task by Projects</field>
|
||||
<field name="name">Closed task by company</field>
|
||||
<field name="res_model">report.task.user.pipeline.open</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="domain">[('task_state','=','done')]</field>
|
||||
</record>
|
||||
<menuitem name="Project/Reporting/All Months/Closed Task by Projects" action="action_project_task_done" id="menu_project_task_user_tree2"/>
|
||||
<menuitem
|
||||
name="Project/Reporting/All Months/Closed task by company"
|
||||
action="action_project_task_done"
|
||||
id="menu_project_task_user_tree2"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_project_task_open">
|
||||
<field name="name">Opened Task by Projects</field>
|
||||
<field name="name">Opened task by projects</field>
|
||||
<field name="res_model">report.task.user.pipeline.open</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,graph</field>
|
||||
<field name="domain">[('task_state','=','open')]</field>
|
||||
</record>
|
||||
<menuitem name="Project/Reporting/All Months/Opened Task by Projects" action="action_project_task_open" id="menu_project_task_user_tree3"/>
|
||||
<menuitem
|
||||
name="Project/Reporting/All Months/Opened task by company"
|
||||
action="action_project_task_open"
|
||||
id="menu_project_task_user_tree3"/>
|
||||
</data>
|
||||
</terp>
|
||||
|
|
Loading…
Reference in New Issue