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

Better views and graphs 

Better demo data

bzr revid: fp@tinyerp.com-7ace400ea4961ce4b6dea4fb25eda4b8efd6150e
This commit is contained in:
Fabien Pinckaers 2007-06-10 10:44:02 +00:00
parent 2b79397f0a
commit 687ff0df82
15 changed files with 94 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/account/wizard/wizard_journal_select.py
View File

@ -35,7 +35,7 @@ def _action_open_window(self, cr, uid, data, context):
journal_id,period_id = cr.fetchone()
return {
'domain': "[('journal_id','=',%d), ('period_id','=',%d)]" % (journal_id,period_id),
'name': 'Saisie Standard',
#'name': 'Saisie Standard',
'view_type': 'form',
'view_mode': 'tree,form',
'res_model': 'account.move.line',

12
addons/crm/crm_demo.xml
View File

@ -190,7 +190,7 @@ Send them a price.</field>
<field name="date">2005-04-05</field>
<field name="date_deadline">2005-05-07</field>
<field name="canal_id" search="[]" model="res.partner.canal"/>
<field name="state">open</field>
<field name="state">pending</field>
<field name="user_id" search="[('login','=','demo')]" model="res.users"/>
</record>
@ -263,7 +263,7 @@ Send them a price.</field>
<field name="date">2005-04-05</field>
<field name="date_deadline">2005-05-07</field>
<field name="canal_id" search="[]" model="res.partner.canal"/>
<field name="state">open</field>
<field name="state">done</field>
<field name="user_id" search="[('login','=','demo')]" model="res.users"/>
</record>
@ -318,7 +318,7 @@ Send them a price.</field>
<field name="date">2005-04-05</field>
<field name="date_deadline">2005-05-07</field>
<field name="canal_id" search="[]" model="res.partner.canal"/>
<field name="state">open</field>
<field name="state">done</field>
<field name="user_id" search="[('login','=','admin')]" model="res.users"/>
</record>
@ -445,7 +445,7 @@ Send them a price.</field>
<field name="date">2005-04-05</field>
<field name="date_deadline">2005-05-07</field>
<field name="canal_id" search="[]" model="res.partner.canal"/>
<field name="state">open</field>
<field name="state">done</field>
<field name="user_id" search="[('login','=','demo')]" model="res.users"/>
</record>
@ -537,7 +537,7 @@ Send them a price.</field>
<field name="date">2005-04-05</field>
<field name="date_deadline">2005-05-07</field>
<field name="canal_id" search="[]" model="res.partner.canal"/>
<field name="state">open</field>
<field name="state">cancel</field>
<field name="user_id" search="[('login','=','demo')]" model="res.users"/>
</record>
@ -610,7 +610,7 @@ Send them a price.</field>
<field name="date">2005-04-05</field>
<field name="date_deadline">2005-05-07</field>
<field name="canal_id" search="[]" model="res.partner.canal"/>
<field name="state">open</field>
<field name="state">done</field>
<field name="user_id" search="[('login','=','demo')]" model="res.users"/>
</record>

40
addons/hr/hr_demo.xml
View File

@ -148,102 +148,102 @@
</record>
<record model="hr.attendance" id="attendance1">
<field name="name">2005-05-04 08:21</field>
<field name="name" eval="time.strftime('%Y-%m-01 08:21')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance2">
<field name="name">2005-05-04 11:51</field>
<field name="name" eval="time.strftime('%Y-%m-01 11:51')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance3">
<field name="name">2005-05-04 12:47</field>
<field name="name" eval="time.strftime('%Y-%m-02 12:47')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance4">
<field name="name">2005-05-04 19:53</field>
<field name="name" eval="time.strftime('%Y-%m-02 19:53')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance5">
<field name="name">2005-05-05 07:32</field>
<field name="name" eval="time.strftime('%Y-%m-03 07:32')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance6">
<field name="name">2005-05-05 12:32</field>
<field name="name" eval="time.strftime('%Y-%m-03 12:32')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance7">
<field name="name">2005-05-05 14:01</field>
<field name="name" eval="time.strftime('%Y-%m-04 14:01')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance8">
<field name="name">2005-05-05 17:21</field>
<field name="name" eval="time.strftime('%Y-%m-04 17:21')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance9">
<field name="name">2005-05-06 09:10</field>
<field name="name" eval="time.strftime('%Y-%m-05 09:10')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance10">
<field name="name">2005-05-06 12:42</field>
<field name="name" eval="time.strftime('%Y-%m-05 12:42')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance11">
<field name="name">2005-05-06 13:10</field>
<field name="name" eval="time.strftime('%Y-%m-06 13:10')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance12">
<field name="name">2005-05-06 18:34</field>
<field name="name" eval="time.strftime('%Y-%m-06 18:34')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance13">
<field name="name">2005-05-07 08:21</field>
<field name="name" eval="time.strftime('%Y-%m-07 08:21')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance14">
<field name="name">2005-05-07 18:21</field>
<field name="name" eval="time.strftime('%Y-%m-07 18:21')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance15">
<field name="name">2005-05-08 08:21</field>
<field name="name" eval="time.strftime('%Y-%m-08 08:21')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance16">
<field name="name">2005-05-08 12:54</field>
<field name="name" eval="time.strftime('%Y-%m-08 12:54')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance17">
<field name="name">2005-05-08 13:32</field>
<field name="name" eval="time.strftime('%Y-%m-09 13:32')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance18">
<field name="name">2005-05-08 19:31</field>
<field name="name" eval="time.strftime('%Y-%m-09 19:31')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance19">
<field name="name">2005-05-26 07:10</field>
<field name="name" eval="time.strftime('%Y-%m-10 07:10')"/>
<field name="action">sign_in</field>
<field name="employee_id" ref="employee1" />
</record>
<record model="hr.attendance" id="attendance20">
<field name="name">2005-05-26 12:34</field>
<field name="name" eval="time.strftime('%Y-%m-10 12:34')"/>
<field name="action">sign_out</field>
<field name="employee_id" ref="employee1" />
</record>

18
addons/hr_timesheet/hr_timesheet_demo.xml
View File

@ -34,7 +34,7 @@
<record model="hr.analytic.timesheet" id="analytic_timesheet1">
<field name="amount">-240.0</field>
<field name="date">2005-05-04</field>
<field name="date" eval="time.strftime('%Y-%m-%d')"/>
<field name="name">Letters</field>
<field name="unit_amount">8.0</field>
<field name="account_id" search="[('name','=', 'Administratif')]" model="account.analytic.account"/>
@ -46,7 +46,7 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet2">
<field name="amount">-120.0</field>
<field name="date">2005-05-05</field>
<field name="date" eval="time.strftime('%Y-%m-01')"/>
<field name="name">Support by phone</field>
<field name="unit_amount">4.0</field>
<field name="account_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
@ -58,7 +58,7 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet3">
<field name="amount">-120.0</field>
<field name="date">2005-05-05</field>
<field name="date" eval="time.strftime('%Y-%m-01')"/>
<field name="name">Support</field>
<field name="unit_amount">4.0</field>
<field name="account_id" search="[('name','=', 'Seagate P2')]" model="account.analytic.account"/>
@ -70,7 +70,7 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet4">
<field name="amount">-240.0</field>
<field name="date">2005-05-06</field>
<field name="date" eval="time.strftime('%Y-%m-02')"/>
<field name="name">Repport on this</field>
<field name="unit_amount">8.0</field>
<field name="account_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
@ -82,7 +82,7 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet5">
<field name="amount">-240.0</field>
<field name="date">2005-05-06</field>
<field name="date" eval="time.strftime('%Y-%m-03')"/>
<field name="name">Repport on that</field>
<field name="unit_amount">8.0</field>
<field name="account_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
@ -94,7 +94,7 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet6">
<field name="amount">-240.0</field>
<field name="date">2005-05-07</field>
<field name="date" eval="time.strftime('%Y-%m-04')"/>
<field name="name">Phone support</field>
<field name="unit_amount">8.0</field>
<field name="account_id" search="[('name','=', 'Sednacom')]" model="account.analytic.account"/>
@ -106,8 +106,8 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet7">
<field name="amount">-210.0</field>
<field name="date">2005-05-08</field>
<field name="name">Phone support on reporting engine</field>
<field name="date" eval="time.strftime('%Y-%m-05')"/>
<field name="unit_amount">7.0</field>
<field name="account_id" search="[('name','=', 'Camp To Camp')]" model="account.analytic.account"/>
<field name="product_id" ref="hr_timesheet.product_consultant"/>
@ -118,7 +118,7 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet8">
<field name="amount">-210.0</field>
<field name="date">2005-05-09</field>
<field name="date" eval="time.strftime('%Y-%m-06')"/>
<field name="name">Quotation 234 done</field>
<field name="unit_amount">8.0</field>
<field name="account_id" search="[('name','=', 'Agrolait')]" model="account.analytic.account"/>
@ -130,7 +130,7 @@
</record>
<record model="hr.analytic.timesheet" id="analytic_timesheet9">
<field name="amount">-210.0</field>
<field name="date">2005-05-10</field>
<field name="date" eval="time.strftime('%Y-%m-07')"/>
<field name="name">Quotation 356</field>
<field name="unit_amount">8.0</field>
<field name="account_id" search="[('name','=', 'Agrolait')]" model="account.analytic.account"/>

4
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
View File

@ -234,7 +234,7 @@ class hr_timesheet_sheet(osv.osv):
}
def _default_date_from(self,cr, uid, context={}):
user = self.pool.get('res.users').browse(cr, uid, uid, context)
r = user.company_id.timesheet_range
r = user.company_id and user.company_id.timesheet_range or 'month'
if r=='month':
return time.strftime('%Y-%m-01')
elif r=='week':
@ -244,7 +244,7 @@ class hr_timesheet_sheet(osv.osv):
return time.strftime('%Y-%m-%d')
def _default_date_to(self,cr, uid, context={}):
user = self.pool.get('res.users').browse(cr, uid, uid, context)
r = user.company_id.timesheet_range
r = user.company_id and user.company_id.timesheet_range or 'month'
if r=='month':
return (DateTime.now() + DateTime.RelativeDateTime(months=+1,day=1,days=-1)).strftime('%Y-%m-%d')
elif r=='week':

4
addons/hr_timesheet_sheet/hr_timesheet_sheet_demo.xml
View File

@ -4,9 +4,11 @@
<record model="hr_timesheet_sheet.sheet" id="sheet1">
<field name="name">Sheet 1</field>
<field name="user_id" search="[('login','=','admin')]" model="res.users"/>
<!--
<field name="date_from">2005-05-01</field>
<field name="date_to">2005-05-31</field>
<field name="date_current">2005-05-04</field>
-->
<field name="date_current" eval="time.strftime('%Y-%m-%d')"/>
</record>
<record model="hr.attendance" id="hr.attendance1">

4
addons/profile_service/__terp__.py
View File

@ -9,7 +9,9 @@
"hr_timesheet_invoice",
"hr_timesheet_project",
"crm",
"project"],
"project",
"board_project"
],
#"board_project",
#"board_account"],
"demo_xml":[],

7
addons/project/project_demo.xml
View File

@ -17,18 +17,21 @@
<field name="priority">10</field>
<field name="parent_id" ref="project_project_9"/>
<field name="name">Study + Prototype</field>
<field name="category_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
</record>
<record id="project_project_22" model="project.project">
<field name="planned_hours">264.0</field>
<field name="priority">20</field>
<field name="parent_id" ref="project_project_9"/>
<field name="name">Specific Developements</field>
<field name="category_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
</record>
<record id="project_project_23" model="project.project">
<field name="planned_hours">104.0</field>
<field name="priority">30</field>
<field name="parent_id" ref="project_project_9"/>
<field name="name">Install, data import, configuration</field>
<field name="category_id" search="[('name','=', 'Seagate P1')]" model="account.analytic.account"/>
</record>
<record id="project_task_116" model="project.task">
@ -98,10 +101,12 @@
</record>
<record id="project_task_193" model="project.task">
<field name="sequence">29</field>
<field name="planned_hours">48.0</field>
<field name="planned_hours">24.0</field>
<field name="user_id" model="res.users" search="[('login','=','admin')]"/>
<field name="project_id" ref="project_project_21"/>
<field name="name">MRP; functionnal layer</field>
<field name="state">done</field>
<field name="date_close" eval="time.strftime('%Y-%m-%d 12:12')"/>
</record>
<record id="project_task_194" model="project.task">
<field name="sequence">30</field>

20
addons/report_analytic_line/report_account_analytic.planning.csv
View File

@ -1,10 +1,10 @@
name,date_from,date_to,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/account_id,user_id
Planning 2007,2007-01-01,2007-01-31,5.0,Day,admin,Seagate P1,admin
,,,7.0,Day,admin,Seagate P2,
,,,2.0,Day,admin,Sednacom,
,,,3.0,Day,admin,Administratif,
,,,4.0,Day,admin,Commercial & Marketing,
,,,6.0,Day,demo,Seagate P1,
,,,7.0,Day,demo,Seagate P2,
,,,1.0,Day,demo,Camp To Camp,
,,,7.0,Day,demo,Agrolait,
name,line_ids/amount,line_ids/amount_unit,line_ids/user_id,line_ids/account_id,user_id
Planning 2007,5.0,Day,admin,Seagate P1,admin
,7.0,Day,admin,Seagate P2,
,2.0,Day,admin,Sednacom,
,3.0,Day,admin,Administratif,
,4.0,Day,admin,Commercial & Marketing,
,6.0,Day,demo,Seagate P1,
,7.0,Day,demo,Seagate P2,
,1.0,Day,demo,Camp To Camp,
,7.0,Day,demo,Agrolait,

1 name date_from line_ids/amount date_to line_ids/amount_unit line_ids/user_id line_ids/account_id user_id
2 Planning 2007 2007-01-01 5.0 2007-01-31 Day admin Seagate P1 admin
3 7.0 Day admin Seagate P2
4 2.0 Day admin Sednacom
5 3.0 Day admin Administratif
6 4.0 Day admin Commercial & Marketing
7 6.0 Day demo Seagate P1
8 7.0 Day demo Seagate P2
9 1.0 Day demo Camp To Camp
10 7.0 Day demo Agrolait

2
addons/report_analytic_line/report_analytic_line_view.xml
View File

@ -43,7 +43,7 @@
<field name="type">graph</field>
<field name="arch" type="xml">
<graph type="bar" string="Costs to invoice">
<field name="name" group="True"/>
<field name="name"/>
<field name="sale_price" operator="+"/>
</graph>
</field>

4
addons/report_analytic_line/report_analytic_planning.py
View File

@ -133,8 +133,8 @@ class report_account_analytic_planning_stat(osv.osv):
'manager_id': fields.many2one('res.users', 'Manager'),
'account_id': fields.many2one('account.analytic.account', 'Account', required=True),
'sum_amount': fields.float('Planned Work', required=True),
'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Work made'),
'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks made'),
'sum_amount_real': fields.function(_sum_amount_real, method=True, string='Timesheet'),
'sum_amount_tasks': fields.function(_sum_amount_tasks, method=True, string='Tasks'),
}
_order = 'planning_id,user_id'
def init(self, cr):

2
addons/report_analytic_line/report_analytic_planning_view.xml
View File

@ -149,7 +149,7 @@
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Planning statistics" type="bar">
<field name="account_id" group="True"/>
<field name="account_id"/>
<field name="sum_amount" operator="+"/>
<field name="sum_amount_real" operator="+"/>
<field name="sum_amount_tasks" operator="+"/>

5
addons/report_crm/report_crm_view.xml
View File

@ -45,9 +45,10 @@
<field name="model">report.crm.case.user</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Cases by User and Section" type="bar">
<field name="user_id" group="True"/>
<graph string="Cases by User and Section" type="bar" orientation="horizontal">
<field name="state"/>
<field name="nbr" operator="+"/>
<field name="user_id" group="True"/>
</graph>
</field>
</record>

4
addons/report_timesheet/report_timesheet.py
View File

@ -103,14 +103,14 @@ class report_timesheet_account_date(osv.osv):
create or replace view report_timesheet_account_date as (
select
min(id) as id,
create_date as name,
date as name,
user_id,
account_id,
sum(unit_amount) as quantity
from
account_analytic_line
group by
create_date, user_id, account_id
date, user_id, account_id
)
""")
report_timesheet_account_date()

32
addons/report_timesheet/report_timesheet_view.xml
View File

@ -12,8 +12,9 @@
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Timesheet by user" type="bar">
<field name="name" group="True"/>
<field name="name"/>
<field name="quantity" operator="+"/>
<field name="user_id" group="True"/>
</graph>
</field>
</record>
@ -58,11 +59,27 @@
action="action_timesheet_user_stat"
id="menu_report_timesheet_user"/>
<record model="ir.ui.view" id="view_timesheet_account_date_graph_account">
<field name="name">report_timesheet.account.date.graph</field>
<field name="model">report_timesheet.account.date</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Daily timesheet per account" orientation="horizontal" type="bar">
<field name="name"/>
<field name="quantity" operator="+"/>
<field name="account_id" group="True"/>
</graph>
</field>
</record>
<record model="ir.actions.act_window" id="action_timesheet_user_stat_my">
<field name="name">My timesheet of the month</field>
<field name="res_model">report_timesheet.user</field>
<field name="res_model">report_timesheet.account.date</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="view_id" ref="view_timesheet_account_date_graph_account"/>
<field name="domain">[('name','&gt;=',time.strftime('%Y-%m-01')), ('user_id','=',uid)]</field>
</record>
<menuitem
@ -91,7 +108,7 @@
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Timesheet by invoice">
<field name="account_id" group="True"/>
<field name="account_id"/>
<field name="amount_invoice" operator="+"/>
</graph>
</field>
@ -171,15 +188,15 @@
<field name="model">report_timesheet.account.date</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Daily timesheet per account">
<field name="account_id" group="True"/>
<graph string="Daily timesheet per account" orientation="horizontal">
<field name="account_id"/>
<field name="quantity" operator="+"/>
<field name="user_id" group="True"/>
</graph>
</field>
</record>
<record model="ir.ui.view" id="view_timesheet_account_date_form">
<field name="name">report_timesheet.timesheet.account.date.form</field>
<field name="model">report_timesheet.account.date</field>
@ -239,8 +256,9 @@
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Timesheet per account">
<field name="account_id" group="True"/>
<field name="account_id"/>
<field name="quantity" operator="+"/>
<field name="user_id" group="True"/>
</graph>
</field>
</record>