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

*Improved task,picking and invoice reports..Merged from lp:~openerp-dev/openobject-addons/trunk-dev-reporting

Browse Source 
bzr revid: apa@tinyerp.com-20100521133437-q0ko80vtlhbr0yfj
This commit is contained in:
apa-tiny
2010-05-21 19:04:37 +05:30
parent 0424b0a2e6 1bc40f4204
commit 84aa12d0f6
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/report/project_report.py
-1
View File
@@ -96,7 +96,6 @@ class report_project_task_user(osv.osv):
group by
to_char(date_start, 'YYYY'),
to_char(date_start, 'MM'),
to_char(date_start, 'YYYY-MM-DD'),
t.priority,
t.user_id,
t.state,
addons/project/report/project_report_view.xml
+16 -16
View File
@@ -52,13 +52,13 @@
<field name="arch" type="xml">
<search string="Tasks">
<group>
<filter icon="terp-project" string="This Year"
<filter icon="terp-project" string="Last 365 Days"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')),('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in this year"/>
<filter icon="terp-project" string="This Month"
help="Tasks performed in last 365 Days"/>
<filter icon="terp-project" string="Last 30 Days"
name="month"
domain="[('date_start','&lt;=', time.strftime('%%Y-%%m-%%d')), ('date_start','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"
help="Tasks performed in this month"/>
help="Tasks performed in last 30 days"/>
<filter icon="gtk-media-rewind"
string=" 7 Days "
separator="1"
@@ -77,6 +77,10 @@
icon="terp-project"
domain="[('state','=','pending')]"
help = "Pending tasks"/>
<filter string="Done"
icon="terp-project"
name="done"
domain="[('state','=','done')]"/>
<separator orientation="vertical"/>
<field name="user_id" widget="selection">
<filter icon="terp-project"
@@ -88,7 +92,7 @@
help="Non Assigned Tasks to users"
domain="[('user_id','=',False)]"/>
</field>
<field name="project_id">
<field name="project_id" widget="selection">
<filter icon="terp-project"
string="My Task"
help="My Tasks"
@@ -98,25 +102,21 @@
help ="Non assigned tasks to projects"
domain="[('project_id','=',False"/>
</field>
<field name="company_id" groups="base.group_multi_company" widget="selection"/>
</group>
<newline/>
<group expand="0" 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')]"/>
<separator orientation="vertical"/>
<field name="type" widget="selection"/>
<field name="priority"/>
<field name="partner_id" widget="selection"/>
<separator orientation="vertical"/>
<field name="date_start"/>
<separator orientation="vertical"/>
<field name="date_deadline"/>
<newline/>
<field name="date_start"/>
<field name="priority"/>
<separator orientation="vertical"/>
<field name="date_end"/>
<separator orientation="vertical"/>
<field name="partner_id" />
</group>
<newline/>
<group expand="1" string="Group By..." colspan="10" col="11">
addons/project_issue/report/project_issue_report.py
+1 -1
View File
@@ -66,7 +66,7 @@ class project_issue_report(osv.osv):
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
'create_date': fields.datetime('Create Date', readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue')]"),
'nbr': fields.integer('# of Issues', readonly=True),