odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: Group by works correctly when zoom on graph view of Sale Manager Dashboard. 

bzr revid: rch@tinyerp.com-20101119121739-uz7pyth9i8dj23mf
This commit is contained in:
rch-openerp 2010-11-19 17:47:39 +05:30
parent dfeb04e372
commit 314aba5757
2 changed files with 13 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/sale/board_sale_view.xml
View File

@ -14,11 +14,11 @@
<hpaned position="100">
<child1>
<action name="%(sale.action_quotation_for_sale)d" string="Quotations"/>
<action width="510" name="%(sale.action_view_sales_by_month)d" string="Sales By Month"/>
<action width="510" name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
</child1>
<child2>
<action name="%(sale.action_sales_by_salesman)d" string="Sales By Salesman"/>
<action name="%(sale.action_sales_by_partner)d" string="Sales By Customer"/>
<action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman"/>
<action name="%(sale.action_sales_by_partner)d" string="Sales by Customer"/>
<action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category"/>
</child2>
</hpaned>

91
addons/sale/report/sale_report_view.xml
View File

@ -97,11 +97,11 @@
<newline/>
<group expand="1" string="Group By..." colspan="10" col="12">
<filter string="Salesman" icon="terp-personal" name="User" context="{'group_by':'user_id'}"/>
<filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}"/>
<filter string="Partner" icon="terp-partner" name="Customer" context="{'group_by':'partner_id'}"/>
<separator orientation="vertical"/>
<filter string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id','set_visible':True}"/>
<filter string="Default UoM" icon="terp-mrp" context="{'group_by':'uom_name'}"/>
<filter string="Category of Product" icon="terp-stock_symbol-selection" context="{'group_by':'categ_id'}"/>
<filter string="Category of Product" icon="terp-stock_symbol-selection" name="Category" context="{'group_by':'categ_id'}"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
<filter string="Analytic Account" icon="terp-folder-green" context="{'group_by':'analytic_account_id'}" groups="analytic.group_analytic_accounting"/>
<separator orientation="vertical" groups="analytic.group_analytic_accounting"/>
@ -133,24 +133,12 @@
<menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="1" groups="base.group_sale_manager"/>
<!--This views used in board_sale module -->
<record id="view_sales_by_partner_tree" model="ir.ui.view">
<field name="name">sales.by.partner.tree</field>
<field name="model">sale.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sales By Partner">
<field name="partner_id"/>
<field name="price_total"/>
</tree>
</field>
</record>
<record id="view_sales_by_partner_graph" model="ir.ui.view">
<field name="name">sales.by.partner.graph</field>
<field name="model">sale.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Sales By Partner" type="bar">
<graph string="Sales by Partner" type="bar">
<field name="partner_id" />
<field name="price_total" operator="+"/>
</graph>
@ -158,37 +146,13 @@
</record>
<record id="action_sales_by_partner" model="ir.actions.act_window">
<field name="name">Sales By Partner</field>
<field name="name">Sales by Partner</field>
<field name="res_model">sale.report</field>
<field name="view_type">form</field>
<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"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_sales_by_partner_graph"/>
<field name="act_window_id" ref="action_sales_by_partner"/>
</record>
<record id="open_view_sales_by_partner_tree" model="ir.actions.act_window.view">
<field eval="2" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_sales_by_partner_tree"/>
<field name="act_window_id" ref="action_sales_by_partner"/>
</record>
<record id="view_sales_by_salesman_tree" model="ir.ui.view">
<field name="name">sales.by.salesman.tree</field>
<field name="model">sale.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sales By Salesman">
<field name="user_id"/>
<field name="price_total"/>
</tree>
</field>
<field name="context">{'search_default_Customer':1}</field>
</record>
<record id="view_sales_by_salesman_graph" model="ir.ui.view">
@ -196,7 +160,7 @@
<field name="model">sale.report</field>
<field name="type">graph</field>
<field name="arch" type="xml">
<graph string="Sales By Salesman" type="bar">
<graph string="Sales by Salesman" type="bar">
<field name="user_id" />
<field name="price_total" operator="+"/>
</graph>
@ -204,36 +168,13 @@
</record>
<record id="action_sales_by_salesman" model="ir.actions.act_window">
<field name="name">Sales By Salesman</field>
<field name="name">Sales by Salesman</field>
<field name="res_model">sale.report</field>
<field name="view_type">form</field>
<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"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_sales_by_salesman_graph"/>
<field name="act_window_id" ref="action_sales_by_salesman"/>
</record>
<record id="open_view_sales_by_salesman_tree" model="ir.actions.act_window.view">
<field eval="9" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_sales_by_salesman_tree"/>
<field name="act_window_id" ref="action_sales_by_salesman"/>
</record>
<record id="view_sales_product_total_price_tree" model="ir.ui.view">
<field name="name">sold.product.total.price.tree</field>
<field name="model">sale.report</field>
<field name="type">tree</field>
<field name="arch" type="xml">
<tree string="Sales by Product Category">
<field name="categ_id"/>
<field name="price_total"/>
</tree>
</field>
<field name="context">{'search_default_User':1}</field>
</record>
<record id="view_sales_product_total_price_graph" model="ir.ui.view">
@ -255,20 +196,8 @@
<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>
<field name="context">{'search_default_Category':1}</field>
</record>
<record id="open_view_sales_product_total_price_graph" model="ir.actions.act_window.view">
<field eval="3" name="sequence"/>
<field name="view_mode">graph</field>
<field name="view_id" ref="view_sales_product_total_price_graph"/>
<field name="act_window_id" ref="action_sales_product_total_price"/>
</record>
<record id="open_view_sales_product_total_price_tree" model="ir.actions.act_window.view">
<field eval="4" name="sequence"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="view_sales_product_total_price_tree"/>
<field name="act_window_id" ref="action_sales_product_total_price"/>
</record>
<record id="view_sales_by_month_tree" model="ir.ui.view">
<field name="name">view.sales.by.month.tree</field>
@ -283,7 +212,7 @@
</field>
</record>
<record id="action_view_sales_by_month" model="ir.actions.act_window">
<field name="name">Sales By Month</field>
<field name="name">Sales by Month</field>
<field name="res_model">sale.report</field>
<field name="view_type">form</field>
<field name="view_mode">tree,graph</field>