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

[IMP] reports

Browse Source 
bzr revid: nel@tinyerp.com-20100409143205-5u3zohlcv4x3qwma
This commit is contained in:
nel@tinyerp.com
2010-04-09 16:32:05 +02:00
parent 866bc67d15
commit fb3b0dd8f8
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/report/crm_report_view.xml
+2 -2
View File
@@ -75,10 +75,10 @@
<filter string="Current" icon="terp-hr"
domain="[('state','in',('open','draft'))]" />
<filter string="Won" icon="terp-hr"
<filter string="Done" icon="terp-hr"
domain="[('state','=','done')]" />
<filter string="Lost" icon="terp-hr"
<filter string="Cancel" icon="terp-hr"
domain="[('state','=','cancel')]" />
<separator orientation="vertical" />
addons/project/project_view.xml
+3
View File
@@ -122,6 +122,9 @@
<field name="user_id" string="Project Manager" default="1"/>
<field name="partner_id" string="Partner"/>
</group>
<group expand="1" string="Group By..." colspan="4" col="20">
<filter string="Users" icon="terp-project" domain = "[]" context="{'group_by':'user_id'}"/>
</group>
</search>
</field>
</record>
addons/project/report/project_report_view.xml
+7 -6
View File
@@ -45,31 +45,31 @@
<separator orientation="vertical"/>
<field name="project_id"/>
<field name="user_id" widget="selection">
<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]" default="1"/>
<filter icon="terp-project" string="My Task" domain="[('user_id','=',uid)]"/>
</field>
</group>
<newline/>
<group expand="1" string="Extended options..." colspan="10" col="12">
<filter string="Draft" icon="terp-project" domain="[('state','=','draft')]"/>
<filter string="In Progress" icon="terp-project" domain="[('state','=','open')]"/>
<filter string="Current" icon="terp-project" domain="['|', ('state','=','draft'),('state', '=' ,'open')]" help = "Draft and opened tasks"/>
<filter string="Pending" icon="terp-project" domain="[('state','=','pending')]"/>
<filter string="Done" icon="terp-project" domain="[('state','=','done')]"/>
<filter string="Cancelled" icon="terp-project" domain="[('state','=','cancelled')]"/>
<separator orientation="vertical"/>
<field name="date_start"/>
<newline/>
<newline/>
<filter icon="terp-project" string="Very Low" domain="[('priority','=','4')]"/>
<filter icon="terp-project" string="Low" domain="[('priority','=','3')]"/>
<filter icon="terp-project" string="Medium" domain="[('priority','=','2')]"/>
<filter icon="terp-project" string="Urgent" domain="[('priority','=','1')]"/>
<filter icon="terp-project" string="Very Urgent" domain="[('priority','=','0')]"/>
<separator orientation="vertical"/>
<newline/>
<field name="date_start"/>
<field name="date_end"/>
</group>
<newline/>
<group expand="1" string="Group By..." colspan="10" col="11">
<filter string="User" icon="terp-project" context="{'group_by':'user_id'}" />
<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" />
<filter string="Project" icon="terp-project" context="{'group_by':'project_id'}" default = "1" />
<filter string="Partner" icon="terp-project" context="{'group_by':'partner_id'}" />
<separator orientation="vertical"/>
<filter string="State" icon="terp-project" context="{'group_by':'state'}"/>
@@ -159,6 +159,7 @@
<field name="res_model">task.by.days</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="domain">[('day','&gt;=',time.strftime('%Y-%m-%d')),('day','&lt;=', time.strftime('%Y-%m-%d', time.localtime(time.time()-(15*24*3600))))]</field>
<field name="view_id" ref="view_task_by_days_graph"/>
</record>
addons/project_issue/report/project_issue_report.py
+1 -1
View File
@@ -9,7 +9,7 @@ class project_issue_report(osv.osv):
_columns = {
'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue.report')]"),
'stage_id': fields.many2one ('crm.case.stage', 'Stage', domain="[('object_id.model', '=', 'project.issue.report')]"),
'nbr': fields.integer('# of Issues', reaadonly=True),
'nbr': fields.integer('# of Issues', readonly=True),
'delay_close': fields.char('Delay to close', size=20, readonly=True),
'company_id' : fields.many2one('res.company', 'Company'),
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
addons/project_issue/report/project_issue_report_view.xml
+3 -2
View File
@@ -51,7 +51,7 @@
<xpath expr='//search[@string="Search"]/group[1]/filter[@string="This Month"]' position='replace'>
<filter string="This Month" icon="terp-sale" domain="[('month','=',time.strftime('%%m'))]" />
</xpath>
<xpath expr='//search[@string="Search"]/group[1]/filter[@string="Lost"]' position='after'>
<xpath expr='//search[@string="Search"]/group[1]/filter[@string="Cancel"]' position='after'>
<separator orientation="vertical"/>
<filter string="Closed Today" icon="terp-sale" domain="[('date_closed','=',time.strftime('%%Y/%%m/%%d'))]" />
</xpath>
@@ -76,6 +76,7 @@
<filter icon="terp-sale"
string="Lowest"
domain="[('priority','=','5')]"/>
<field name="date_closed" string="Date Closed"/>
</group>
<newline/>
</xpath>
@@ -85,7 +86,7 @@
<xpath expr='//search[@string="Search"]/group[@string="Group By..."]/filter[@string="Category"]' position='after'>
<filter string="Stage" icon="terp-sale" domain="[]" context="{'group_by':'stage_id'}"/>
<separator orientation="vertical"/>
<filter string="Project" icon="terp-sale" domain="[]" context="{'group_by':'project_id'}"/>
<filter string="Project" icon="terp-sale" domain="[]" context="{'group_by':'project_id'}" default = "1"/>
<filter string="Type" icon="terp-sale" domain="[]" context="{'group_by':'type_id'}"/>
</xpath>
</data>