pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] views

Browse Source 
bzr revid: nel@tinyerp.com-20100419112335-zaoruyqh2i2phha6
This commit is contained in:
nel@tinyerp.com
2010-04-19 13:23:35 +02:00
parent 562500e72b
commit 9f69a19dd6
5 changed files with 60 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_recruitment/report/hr_recruitment_report.py
+9 -7
View File
@@ -42,7 +42,8 @@ class hr_recruitment_report(osv.osv):
'department_id':fields.many2one('hr.department','Department',readonly=True),
'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
'salary_prop' : fields.float("Salary Proposed"),
'salary_exp' : fields.float("Salary Expected")
'salary_exp' : fields.float("Salary Expected"),
'available' : fields.float("Availability")
}
_order = 'date desc'
@@ -52,15 +53,16 @@ class hr_recruitment_report(osv.osv):
create or replace view hr_recruitment_report as (
select
min(s.id) as id,
date_trunc('day',s.date) as date,
date_trunc('day',s.create_date) as date,
date_trunc('day',s.date_closed) as date_closed,
to_char(s.date, 'YYYY') as year,
to_char(s.date, 'MM') as month,
to_char(s.create_date, 'YYYY') as year,
to_char(s.create_date, 'MM') as month,
s.state,
s.company_id,
s.user_id,
s.job_id,
s.type_id,
sum(s.availability) as available,
s.department_id,
s.priority,
s.stage_id,
@@ -69,9 +71,9 @@ class hr_recruitment_report(osv.osv):
count(*) as nbr
from hr_applicant s
group by
to_char(s.date, 'YYYY'),
to_char(s.date, 'MM'),
date_trunc('day',s.date),
to_char(s.create_date, 'YYYY'),
to_char(s.create_date, 'MM'),
date_trunc('day',s.create_date),
date_trunc('day',s.date_closed),
s.state,
s.company_id,
addons/hr_recruitment/report/hr_recruitment_report_view.xml
+10 -6
View File
@@ -10,16 +10,17 @@
<field name="date" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="job_id" invisible="1"/>
<field name="stage_id" invisible="1"/>
<field name="stage_id" invisible="1" widget="selection"/>
<field name="department_id" invisible="1"/>
<field name="type_id" invisible="1"/>
<field name="company_id" groups="base.group_multi_company"/>
<field name="state" invisible="1"/>
<field name="year" invisible="1"/>
<field name="month" invisible="1"/>
<field name="nbr"/>
<field name="salary_prop"/>
<field name="salary_exp"/>
<field name="nbr" sum="# Cases"/>
<field name="salary_prop" sum="Salary Proposed" />
<field name="salary_exp" sum="Salary Expected"/>
<field name="available" sum="Available"/>
</tree>
</field>
</record>
@@ -93,9 +94,12 @@
<filter icon="terp-hr"
string="Refused"
domain="[('state','=','cancel')]"/>
<newline/>
<field name="priority"/>
<newline/>
<field name="date"/>
<field name="stage_id" widget="selection"/>
<field name="job_id" widget="selection"/>
<field name="type_id" widget="selection"/>
<field name="date_closed"/>
</group>
<newline/>
@@ -122,7 +126,7 @@
<field name="res_model">hr.recruitment.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="context">{'search_default_inprogress': 1 }</field>
<field name="context">{'search_default_inprogress': 1, 'search_default_user_id': uid }</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root"/>
addons/project/report/project_report.py
+7 -3
View File
@@ -28,6 +28,7 @@ class report_project_task_user(osv.osv):
_auto = False
_columns = {
'name': fields.char('Task Summary', size=128, readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'year': fields.char('Year',size=64,required=False, readonly=True),
'user_id':fields.many2one('res.users', 'User', readonly=True),
'date_start': fields.datetime('Starting Date',readonly=True),
@@ -57,11 +58,10 @@ class report_project_task_user(osv.osv):
('done', 'Done')],
'State', readonly=True),
'company_id': fields.many2one('res.company', 'Company',readonly=True),
'sprint_id': fields.many2one('scrum.sprint', 'Sprint',readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
'type': fields.many2one('project.task.type', 'Stage',readonly=True),
}
_order = 'name desc, project_id'
def init(self, cr):
@@ -72,6 +72,7 @@ class report_project_task_user(osv.osv):
min(t.id) as id,
to_char(date_start, 'YYYY') as year,
to_char(date_start, 'MM') as month,
to_char(date_start, 'YYYY-MM-DD') as day,
count(distinct t.id) as nbr,
date_trunc('day',t.date_start) as date_start,
date_trunc('day',t.date_end) as date_end,
@@ -79,6 +80,7 @@ class report_project_task_user(osv.osv):
sum(cast(to_char(date_trunc('day',t.date_end) - date_trunc('day',t.date_start),'DD') as int)) as no_of_days,
t.user_id,
t.project_id,
t.sprint_id as sprint_id,
t.state,
t.priority,
t.name,
@@ -104,7 +106,9 @@ class report_project_task_user(osv.osv):
t.partner_id,
t.type,
t.name,
t.project_id
t.sprint_id,
t.project_id,
t.date_start
)
""")
report_project_task_user()
addons/project/report/project_report_view.xml
+25 -12
View File
@@ -19,8 +19,9 @@
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="partner_id" invisible="1"/>
<field name="type" invisible="1"/>
<field name="year" invisible="1"/>
<field name="day" invisible="1"/>
<field name="month" invisible="1"/>
<field name="year" invisible="1"/>
<field name="nbr" sum='#Number of tasks'/>
<field name="no_of_days" sum="#Days"/>
<field name="hours_planned" sum='Planned Hours'/>
@@ -77,16 +78,6 @@
domain="[('state','=','pending')]"
help = "Pending tasks"/>
<separator orientation="vertical"/>
<field name="project_id">
<filter icon="terp-project"
string="My Task"
help="My Tasks"
domain="[('project_id','=',context.get('project_id', False)]"/>
<filter icon="terp-project"
string="Non assigned Tasks"
help ="Non assigned Tasks"
domain="[('project_id','=',False"/>
</field>
<field name="user_id" widget="selection">
<filter icon="terp-project"
string="My Task"
@@ -97,11 +88,31 @@
help="Non Assigned Tasks"
domain="[('user_id','=',False)]"/>
</field>
<field name="project_id">
<filter icon="terp-project"
string="My Task"
help="My Tasks"
domain="[('project_id','=',context.get('project_id', False)]"/>
<filter icon="terp-project"
string="Non assigned Tasks"
help ="Non assigned Tasks"
domain="[('project_id','=',False"/>
</field>
</group>
<newline/>
<group expand="1" string="Extended options..." colspan="10" col="12">
<filter string="Done"
icon="terp-project"
name="done"
domain="[('state','=','done')]"/>
<filter string="Cancelled"
icon="terp-project"
domain="[('state','=','cancelled')]"/>
<field name="type" widget="selection"/>
<field name="priority"/>
<field name="date_deadline"/>
<field name="partner_id"/>
<field name="sprint_id" widget="selection"/>
<newline/>
<field name="date_start"/>
<field name="date_end"/>
@@ -112,10 +123,12 @@
<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}"/>
<filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/>
<filter string="Sprint" icon="terp-project" context="{'group_by':'sprint_id'}"/>
<filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
<filter string="Company" icon="terp-project" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
<filter string="Stage" icon="terp-project" context="{'group_by':'type'}" />
<separator orientation="vertical"/>
<filter string="Day" icon="terp-project" context="{'group_by':'day'}"/>
<filter string="Month" icon="terp-project" context="{'group_by':'month'}"/>
<filter string="Year" icon="terp-project" context="{'group_by':'year'}"/>
</group>
@@ -129,7 +142,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>
<field name="search_view_id" ref="view_task_project_user_search"/>
<field name="context">{'search_default_month':1,'search_default_user_id':uid, 'search_default_project_id':context.get('project_id', False)}</field>
<field name="context">{'search_default_month':1,'search_default_user_id':uid}</field>
</record>
<menuitem action="action_project_task_user_tree" id="menu_project_task_user_tree" parent="base.menu_project_report"/>
addons/project_issue/report/project_issue_report_view.xml
+9 -9
View File
@@ -7,15 +7,14 @@
<field name="model">project.issue.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Project Issue">
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="project_id" invisible="1"/>
<field name="stage_id" invisible="1"/>
<field name="type_id" string="Type" invisible="1"/>
<field name="priority" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="nbr" string="#Project Issue"/>
<tree string="Project Issue">
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="project_id" invisible="1"/>
<field name="stage_id" invisible="1"/>
<field name="type_id" string="Type" invisible="1"/>
<field name="priority" invisible="1"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="delay_close" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="user_id" invisible="1"/>
@@ -23,6 +22,7 @@
<field name="categ_id" invisible="1"/>
<field name="date_closed" invisible="1"/>
<field name="state" invisible="1"/>
<field name="nbr" string="#Project Issue"/>
</tree>
</field>
</record>