diff options
| author | mra (Open ERP) <mra@tinyerp.com> | 2010-06-01 09:51:47 +0530 |
|---|---|---|
| committer | mra (Open ERP) <mra@tinyerp.com> | 2010-06-01 09:51:47 +0530 |
| commit | b746d3531ef9ab1d9b0a940a0f083fefcd7a4e89 (patch) | |
| tree | 33c60503ead12e8d7aa46f2142c612f1727c4c24 /addons/project | |
| parent | d0f33c1efb6d078ab23e801fed6319db158d97f7 (diff) | |
| parent | a8b4f5b484235436c08402bba66488e1dde6e7b6 (diff) | |
[MERGE] Merge with main branch
bzr revid: mra@tinyerp.com-20100531115020-3ovzr43zgicrphr0
bzr revid: mra@tinyerp.com-20100601042147-1x5sag3tdzk9lkb5
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/report/project_report.py | 3 | ||||
| -rw-r--r-- | addons/project/report/project_report_view.xml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py index dc9ad3adb22..7984441b460 100644 --- a/addons/project/report/project_report.py +++ b/addons/project/report/project_report.py @@ -31,6 +31,7 @@ class report_project_task_user(osv.osv): 'day': fields.char('Day', size=128, readonly=True), 'year': fields.char('Year',size=64,required=False, readonly=True), 'user_id':fields.many2one('res.users', 'Assigned To', readonly=True), + 'done_by':fields.many2one('res.users', 'Done By', readonly=True), 'date_start': fields.date('Starting Date',readonly=True), 'no_of_days': fields.integer('# of Days', size=128, readonly=True), 'description': fields.text('Description',readonly=True), @@ -90,6 +91,7 @@ class report_project_task_user(osv.osv): t.company_id, t.partner_id, t.type, + w.user_id as done_by, sum(remaining_hours) as remaining_hours, sum(total_hours) as total_hours, sum(planned_hours) as hours_planned, @@ -104,6 +106,7 @@ class report_project_task_user(osv.osv): to_char(date_start, 'MM'), t.priority, t.user_id, + w.user_id, t.state, date_trunc('day',t.date_end), to_date(to_char(t.date_deadline, 'dd-MM-YYYY'),'dd-MM-YYYY'), diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 5955cb810a2..f40fc218a9e 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -12,6 +12,7 @@ <field name="name" invisible="1"/> <field name="project_id" invisible="1"/> <field name="user_id" invisible="1"/> + <field name="done_by"/> <field name="date_deadline" invisible="1"/> <field name="state" invisible="1"/> <field name="date_start" invisible="1"/> @@ -110,6 +111,7 @@ <separator orientation="vertical"/> <filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" /> <filter string="Task" icon="terp-project" context="{'group_by':'name'}" /> + <filter string="Done By" icon="terp-project" context="{'group_by':'done_by'}" /> <separator orientation="vertical"/> <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"/> @@ -122,6 +124,7 @@ <newline/> <group expand="0" string="Extended options..." colspan="10" col="12" groups="base.group_extended"> <field name="type" widget="selection"/> + <field name="done_by" widget="selection"/> <separator orientation="vertical"/> <field name="date_start"/> <field name="date_deadline"/> |