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

[MERGE]:lp:~openerp-report/openobject-addons/report-dev

Browse Source 
bzr revid: apa@tinyerp.com-20101026110118-ggdpx16c3mxcwtr7
This commit is contained in:
apa-tiny
2010-10-26 16:31:18 +05:30
parent 5efae23a39 93d5118017
commit b9cfc607ef
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/board_crm_view.xml
+24
View File
@@ -18,6 +18,17 @@
</field>
</record>
<record id="view_report_crm_oppor_tree" model="ir.ui.view">
<field name="name">crm.lead.report.tree</field>
<field name="model">crm.lead.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Opportunity Analysis">
<field name="stage_id"/>
<field name="planned_revenue"/>
</tree>
</field>
</record>
<record id="view_report_crm_oppor_graph" model="ir.ui.view">
<field name="name">crm.lead.report.graph</field>
<field name="model">crm.lead.report</field>
@@ -100,7 +111,20 @@
<field name="view_mode">graph,tree,form</field>
<field name="view_id" ref="view_report_crm_oppor_graph"/>
<field name="domain">['&amp;', '&amp;', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&amp;', ('state', '=', 'done'), ('date_closed','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
<field name="context">{'group_by_no_leaf':1,'group_by':['stage_id']}</field>
</record>
<record id="open_view_report_crm_oppor_graph" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_report_crm_oppor_graph"/>
<field name="act_window_id" ref="act_my_oppor_stage"/>
</record>
<record id="open_view_report_crm_oppor_tree" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_report_crm_oppor_tree"/>
<field name="act_window_id" ref="act_my_oppor_stage"/>
</record>
<record model="ir.actions.act_window" id="act_sales_pipeline">
<field name="res_model">crm.lead.report</field>
addons/crm/report/crm_lead_report_view.xml
+4 -3
View File
@@ -29,6 +29,7 @@
<field name="email" sum="# Mails"/>
<field name="delay_open"/>
<field name="delay_close"/>
<field name="planned_revenue"/>
</tree>
</field>
</record>
@@ -79,7 +80,7 @@
<filter icon="terp-go-month" string=" Month-1 " separator="1"
domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
help="Leads/Opportunities created in last month"/>
<separator orientation="vertical" />
<filter icon="terp-check"
string="Active"
@@ -93,7 +94,7 @@
string="Closed"
domain="[('state','=','done')]"
help="Leads/Opportunities which are in done state"/>
<separator orientation="vertical" />
<field name="section_id"
default="context.get('section_id', False)"
@@ -127,7 +128,7 @@
<filter string="Salesman" name="user" icon="terp-personal"
domain="[]" context="{'group_by':'user_id'}" />
<filter string="Sales Team" icon="terp-personal+"
domain="[]"
domain="[]"
context="{'group_by':'section_id'}" />
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
<filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
addons/sale/report/sale_report_view.xml
+4 -1
View File
@@ -163,6 +163,7 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('state','in',('manual','progress')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
<field name="view_id" ref="view_sales_by_partner_graph"/>
<field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field>
</record>
<record id="open_view_sales_by_partner_graph" model="ir.actions.act_window.view">
<field eval="1" name="sequence"/>
@@ -208,6 +209,7 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('state','in',('manual','progress','done')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
<field name="view_id" ref="view_sales_by_salesman_graph"/>
<field name="context">{'group_by_no_leaf':1,'group_by':['user_id']}</field>
</record>
<record id="open_view_sales_by_salesman_graph" model="ir.actions.act_window.view">
<field eval="7" name="sequence"/>
@@ -227,7 +229,7 @@
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sales by Product Category">
<field name="product_id"/>
<field name="categ_id"/>
<field name="price_total"/>
</tree>
</field>
@@ -252,6 +254,7 @@
<field name="view_mode">graph,tree</field>
<field name="domain">[('state','in',('manual','progress','done')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
<field name="view_id" ref="view_sales_product_total_price_graph"/>
<field name="context">{'group_by_no_leaf':1,'group_by':['categ_id']}</field>
</record>
<record id="open_view_sales_product_total_price_graph" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>