bzr revid: pinky-ffe3299813fc604b7553270c696ad97758d2f60f
This commit is contained in:
pinky 2007-01-03 14:53:05 +00:00
parent 6aa46af98a
commit cee4894957
4 changed files with 24 additions and 4 deletions

View File

@ -3,7 +3,15 @@
"version":"1.0",
"author":"Tiny",
"category":"Profile",
"depends":["base", "hr", "hr_timesheet", "hr_timesheet_invoice", "hr_timesheet_project", "crm", "project"],
"depends":[
"hr",
"hr_timesheet",
"hr_timesheet_invoice",
"hr_timesheet_project",
"crm",
"project",
"board_project",
"board_account"],
"demo_xml":[],
"update_xml":[],
"active":False,

View File

@ -63,6 +63,7 @@
<field name="user_id" model="res.users" search="[('login','=','demo')]"/>
<field name="project_id" ref="project_project_21"/>
<field name="name">Internal testing + Software Install</field>
<field name="date_deadline">2007-06-06</field>
</record>
<record id="project_task_188" model="project.task">
<field name="sequence">17</field>
@ -158,6 +159,7 @@
<field name="user_id" model="res.users" search="[('login','=','admin')]"/>
<field name="project_id" ref="project_project_23"/>
<field name="name">In house trainings</field>
<field name="date_deadline">2007-06-06</field>
</record>
<record id="project_task_202" model="project.task">
<field name="sequence">50</field>

View File

@ -0,0 +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,
1 name date_from date_to line_ids/amount line_ids/amount_unit line_ids/user_id line_ids/account_id user_id
2 Planning 2007 2007-01-01 2007-01-31 5.0 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

View File

@ -93,13 +93,13 @@ class report_timesheet_invoice(osv.osv):
_auto = False
_columns = {
'user_id':fields.many2one('res.users', 'User', readonly=True, relate=True),
'project_id':fields.many2one('res.users', 'User', readonly=True, relate=True),
'manager_id':fields.many2one('res.users', 'User', readonly=True, relate=True),
'project_id':fields.many2one('res.users', 'Project', readonly=True, relate=True),
'manager_id':fields.many2one('res.users', 'Manager', readonly=True, relate=True),
'quantity': fields.float('Quantity', readonly=True),
'amount_invoice': fields.float('To invoice', readonly=True)
}
_rec_name = 'user_id'
_order = 'name desc,user_id desc'
_order = 'user_id desc'
def init(self, cr):
cr.execute("""
create or replace view report_timesheet_invoice as (