Turkesh Patel (openERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-review-dashboards-sale-tpa into
lp:~openerp-dev/openobject-addons/trunk-review-dashboards.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-dashboards-sale-tpa/+merge/108681
sale
==============================================
[IMP]: improved view of dashboard and remove unnecessary code
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-review-dashboards-sale-tpa/+merge/108681
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-review-dashboards.
=== modified file 'sale/board_sale_view.xml'
--- sale/board_sale_view.xml 2012-05-17 08:39:30 +0000
+++ sale/board_sale_view.xml 2012-06-05 06:49:19 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <!-- Sale user dashboard -->
+ <!-- Sales dashboard -->
<record id="action_quotation_for_sale" model="ir.actions.act_window">
<field name="name">My Quotations</field>
<field name="res_model">sale.order</field>
@@ -15,7 +15,6 @@
<field name="name">turnover.by.month.tree</field>
<field name="model">account.invoice.report</field>
<field name="type">tree</field>
- <!-- Lower priority to avoid conflicting with default accounting views for reports -->
<field name="priority" eval="32"/>
<field name="arch" type="xml">
<tree string="Monthly Turnover">
@@ -27,7 +26,6 @@
<record id="view_turnover_by_month_graph" model="ir.ui.view">
<field name="name">turnover.by.month.graph</field>
<field name="model">account.invoice.report</field>
- <!-- Lower priority to avoid conflicting with default accounting views for reports -->
<field name="priority" eval="32"/>
<field name="type">graph</field>
<field name="arch" type="xml">
@@ -75,6 +73,7 @@
</form>
</field>
</record>
+
<record id="open_board_sales" model="ir.actions.act_window">
<field name="name">Sales</field>
<field name="res_model">board.board</field>
@@ -82,37 +81,8 @@
<field name="view_mode">form</field>
<field name="view_id" ref="board_sales_form"/>
</record>
-
- <menuitem id="menu_dashboard_sales" name="Sales" sequence="20" parent="base.menu_reporting_dashboard"/>
- <menuitem action="open_board_sales" icon="terp-graph" groups="base.group_sale_salesman" id="menu_board_sales" parent="menu_dashboard_sales" sequence="1"/>
-
- <!-- Sale manager dashboard -->
- <record id="board_sales_manager_form" model="ir.ui.view">
- <field name="name">board.sales.manager.form</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Sales Manager Dashboard" layout="manual">
- <board style="2-1">
- <column>
- <action name="%(sale.action_quotation_for_sale)d" string="Quotations" creatable="true"/>
- <action name="%(sale.action_view_sales_by_month)d" string="Sales by Month"/>
- </column>
- <column>
- <action name="%(sale.action_sales_by_salesman)d" string="Sales by Salesman in last 90 days"/>
- <action name="%(sale.action_sales_by_partner)d" string="Sales per Customer in last 90 days"/>
- <action name="%(sale.action_sales_product_total_price)d" string="Sales by Product's Category in last 90 days"/>
- </column>
- </board>
- </form>
- </field>
- </record>
- <record id="open_board_sales_manager" model="ir.actions.act_window">
- <field name="name">Sales Manager</field>
- <field name="res_model">board.board</field>
- <field name="view_type">form</field>
- <field name="view_mode">form</field>
- <field name="view_id" ref="board_sales_manager_form"/>
- </record>
+
+ <menuitem id="menu_dashboard_sales" name="Sales Dashboard" sequence="10" parent="base.menu_reporting_dashboard" action="open_board_sales" groups="base.group_sale_salesman"/>
+
</data>
</openerp>
=== modified file 'sale/report/sale_report_view.xml'
--- sale/report/sale_report_view.xml 2012-05-22 16:10:55 +0000
+++ sale/report/sale_report_view.xml 2012-06-05 06:49:19 +0000
@@ -132,120 +132,22 @@
<menuitem action="action_order_report_all" id="menu_report_product_all" parent="base.next_id_64" sequence="10"/>
<!--This views used in board_sale module -->
- <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">
- <field name="partner_id" />
- <field name="price_total" operator="+"/>
- </graph>
- </field>
- </record>
-
- <record id="action_sales_by_partner" model="ir.actions.act_window">
- <field name="name">Sales per Customer in last 90 days</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','=','done'),('date','<=', time.strftime('%Y-%m-%d')),('date','>',(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">{'search_default_Customer':1}</field>
- </record>
-
- <record id="view_sales_by_salesman_graph" model="ir.ui.view">
- <field name="name">sales.by.salesman.graph</field>
- <field name="model">sale.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Sales by Salesman" type="bar">
- <field name="user_id" />
- <field name="price_total" operator="+"/>
- </graph>
- </field>
- </record>
-
- <record id="action_sales_by_salesman" model="ir.actions.act_window">
- <field name="name">Sales by Salesman in last 90 days</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','<=', time.strftime('%Y-%m-%d')),('date','>',(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">{'search_default_User':1}</field>
- </record>
-
- <record id="view_sales_product_total_price_graph" model="ir.ui.view">
- <field name="name">sold.product.total.price.graph</field>
- <field name="model">sale.report</field>
- <field name="type">graph</field>
- <field name="arch" type="xml">
- <graph string="Sales by Product Category" type="bar">
- <field name="categ_id" />
- <field name="price_total" operator="+"/>
- </graph>
- </field>
- </record>
-
- <record id="action_sales_product_total_price" model="ir.actions.act_window">
- <field name="name">Sales by Product's Category in last 90 days</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','>',(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">{'search_default_Category':1}</field>
- </record>
-
- <record id="view_sales_by_month_tree" model="ir.ui.view">
- <field name="name">view.sales.by.month.tree</field>
- <field name="model">sale.report</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Sales By Month">
- <field name="month" />
- <field name="product_id" />
- <field name="price_total" />
- <field name="user_id" invisible="1"/>
- <field name="partner_id" invisible="1"/>
- <field name="product_uom" invisible="1"/>
- <field name="categ_id" invisible="1"/>
- <field name="analytic_account_id" invisible="1" groups="analytic.group_analytic_accounting"/>
- <field name="state" invisible="1"/>
- <field name="shop_id" invisible="1"/>
- <field name="company_id" invisible="1" groups="base.group_multi_company"/>
- <field name="day" invisible="1"/>
- <field name="year" invisible="1"/>
- <field name="date" invisible="1"/>
- </tree>
- </field>
- </record>
- <record id="action_view_sales_by_month" model="ir.actions.act_window">
- <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>
- <field name="domain">[('state','in',('manual','progress','done')),('year','=', time.strftime('%Y'))]</field>
- <field name="context">{'search_default_order_month':1,'group_by_no_leaf':0,'group_by':['month', 'product_id']}</field>
- <field name="view_id" ref="view_sales_by_month_tree"/>
- </record>
-
- <record id="view_top_quotations_tree" model="ir.ui.view">
- <field name="name">sale.top.quotations.tree</field>
- <field name="model">sale.order</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Quotations">
- <field name="date_order"/>
- <field name="name"/>
- <field name="partner_id"/>
- <field name="user_id" />
- <field name="amount_untaxed" />
- <field name="amount_total"/>
- </tree>
- </field>
- </record>
+
+ <record id="view_top_quotations_tree" model="ir.ui.view">
+ <field name="name">sale.top.quotations.tree</field>
+ <field name="model">sale.order</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Quotations">
+ <field name="date_order"/>
+ <field name="name"/>
+ <field name="partner_id"/>
+ <field name="user_id" />
+ <field name="amount_untaxed" />
+ <field name="amount_total"/>
+ </tree>
+ </field>
+ </record>
<record id="action_quotation_for_sale" model="ir.actions.act_window">
<field name="name">Quotations</field>
@@ -253,7 +155,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('state','=','draft')]</field>
- <field name="view_id" ref="view_top_quotations_tree"/>
+ <field name="view_id" ref="view_top_quotations_tree"/>
</record>
</data>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
