Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability2-sales_dashboards-han into
lp:~openerp-dev/openobject-addons/trunk-usability2.
Requested reviews:
Amit (Open ERP) (apa-tiny)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability2-sales_dashboards-han/+merge/79362
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability2-sales_dashboards-han/+merge/79362
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-usability2.
=== modified file 'crm/board_crm_view.xml'
--- crm/board_crm_view.xml 2011-08-04 14:47:42 +0000
+++ crm/board_crm_view.xml 2011-10-14 05:37:28 +0000
@@ -155,14 +155,5 @@
<field name="usage">menu</field>
<field name="view_id" ref="board_crm_form"/>
</record>
- <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
- <menuitem
- name="Sales Dashboard" parent="board.menu_dasboard"
- action="open_board_crm"
- sequence="1"
- id="menu_board_crm" icon="terp-graph"
- groups="base.group_sale_salesman"/>
-
- <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_crm"/>
</data>
</openerp>
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2011-10-02 17:31:16 +0000
+++ hr/hr_view.xml 2011-10-14 05:37:28 +0000
@@ -10,6 +10,10 @@
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
+ <menuitem id="menu_resource_config" name="Resource" parent="menu_hr_configuration" sequence="5" groups="base.group_extended"/>
+ <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="1"/>
+ <!-- menu for the working time -->
+ <menuitem action="resource.action_resource_calendar_form" id="menu_action_resource_calendar_form" parent="menu_resource_config" sequence="1"/>
<!--
==========
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2011-09-17 11:03:17 +0000
+++ resource/resource_view.xml 2011-10-14 05:37:28 +0000
@@ -256,7 +256,5 @@
<field name="view_mode">tree,form,calendar</field>
<field name="search_view_id" ref="view_resource_calendar_leaves_search"/>
</record>
- <menuitem id="menu_resource_config" name="Resource" parent="base.menu_base_config" sequence="5" groups="base.group_extended"/>
- <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="1"/>
</data>
</openerp>
=== modified file 'sale/board_sale_view.xml'
--- sale/board_sale_view.xml 2011-07-26 10:46:13 +0000
+++ sale/board_sale_view.xml 2011-10-14 05:37:28 +0000
@@ -32,5 +32,104 @@
<menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
<menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
+
+
+ <record id="action_quotation_for_sale" model="ir.actions.act_window">
+ <field name="name">My Quotations</field>
+ <field name="res_model">sale.order</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
+ <field name="view_id" ref="sale.view_order_tree"/>
+ </record>
+
+ <record id="view_turnover_by_month_tree" model="ir.ui.view">
+ <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">
+ <field name="month"/>
+ <field name="price_total"/>
+ </tree>
+ </field>
+ </record>
+
+ <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">
+ <graph string="Monthly Turnover" type="bar">
+ <field name="month"/>
+ <field name="price_total" operator="+"/>
+ </graph>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="action_turnover_by_month">
+ <field name="name">Monthly Turnover</field>
+ <field name="res_model">account.invoice.report</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">graph,tree</field>
+ <field name="view_id" ref="view_turnover_by_month_graph"/>
+ <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
+ <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
+ <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
+ </record>
+
+ <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
+ <field name="act_window_id" ref="action_turnover_by_month"/>
+ <field name="view_mode">graph</field>
+ <field name="view_id" ref="view_turnover_by_month_graph"/>
+ </record>
+
+ <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
+ <field name="act_window_id" ref="action_turnover_by_month"/>
+ <field name="view_mode">tree</field>
+ <field name="view_id" ref="view_turnover_by_month_tree"/>
+ </record>
+
+ <record id="board_sales_form" model="ir.ui.view">
+ <field name="name">board.sales.form</field>
+ <field name="model">board.board</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Sales Dashboard">
+ <hpaned position="100">
+ <child1>
+ <action
+ name="%(action_quotation_for_sale)d"
+ string="My Quotations"
+ height="150"
+ width="510"
+ groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"/>
+ </child1>
+ <child2>
+ <action
+ string="Monthly Turnover"
+ name="%(action_turnover_by_month)d"
+ groups="base.group_sale_salesman,account.group_account_manager"
+ colspan="4"/>
+ </child2>
+ </hpaned>
+ </form>
+ </field>
+ </record>
+
+ <record id="open_board_sales" model="ir.actions.act_window">
+ <field name="name">Sales Dashboard</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_form"/>
+ </record>
+
+ <menuitem action="open_board_sales" icon="terp-graph" id="menu_board_sales" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
+
</data>
</openerp>
=== modified file 'sale_crm/board_sale_crm_view.xml'
--- sale_crm/board_sale_crm_view.xml 2011-03-15 08:38:26 +0000
+++ sale_crm/board_sale_crm_view.xml 2011-10-14 05:37:28 +0000
@@ -1,110 +1,70 @@
<?xml version="1.0"?>
<openerp>
- <data>
-
- <record id="action_quotation_for_sale_crm" model="ir.actions.act_window">
- <field name="name">Quotations</field>
- <field name="res_model">sale.order</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="domain">[('state','=','draft'),('user_id','=',uid)]</field>
- <field name="view_id" ref="sale.view_order_tree"/>
- </record>
-
- <record id="view_turnover_by_month_tree" model="ir.ui.view">
- <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">
- <field name="month"/>
- <field name="price_total"/>
- </tree>
- </field>
- </record>
-
- <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">
- <graph string="Monthly Turnover" type="bar">
- <field name="month"/>
- <field name="price_total" operator="+"/>
- </graph>
- </field>
- </record>
-
- <record model="ir.actions.act_window" id="action_turnover_by_month">
- <field name="name">Monthly Turnover</field>
- <field name="res_model">account.invoice.report</field>
- <field name="view_type">form</field>
- <field name="view_mode">graph,tree</field>
- <field name="view_id" ref="view_turnover_by_month_graph"/>
- <field name="domain">[('year','ilike',time.strftime('%Y')),('user_id','=',uid)]</field>
- <field name="context">{'group_by_no_leaf':1,'group_by':['month']}</field>
- <field name="search_view_id" ref="account.view_account_invoice_report_search"/>
- </record>
- <record model="ir.actions.act_window.view" id="action_turnover_by_month_graph_view">
- <field name="act_window_id" ref="action_turnover_by_month"/>
- <field name="view_mode">graph</field>
- <field name="view_id" ref="view_turnover_by_month_graph"/>
- </record>
- <record model="ir.actions.act_window.view" id="action_turnover_by_month_tree_view">
- <field name="act_window_id" ref="action_turnover_by_month"/>
- <field name="view_mode">tree</field>
- <field name="view_id" ref="view_turnover_by_month_tree"/>
- </record>
-
- <record model="ir.ui.view" id="board_crm_form_inherit_child1">
- <field name="name">board.crm.form.inherit.child1</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="crm.board_crm_form"/>
- <field name="arch" type="xml">
- <xpath expr="/form/hpaned/child1/action[@string='My Open Opportunities']" position="after">
- <action
- string="My Quotations"
- name="%(action_quotation_for_sale_crm)d"
- colspan="4"
- height="150"
- groups="base.group_sale_salesman,base.group_sale_manager,account.group_account_user,stock.group_stock_user"
- width="510"/>
- </xpath>
- </field>
- </record>
-
- <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
+ <data>
+ <record model="ir.ui.view" id="board_crm_form_inherit_replace1">
<field name="name">board.crm.form.inherit.replace1</field>
<field name="model">board.board</field>
<field name="type">form</field>
- <field name="inherit_id" ref="crm.board_crm_form"/>
+ <field name="inherit_id" ref="sale.board_sales_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/hpaned/child2/action[@string='My Win/Lost Ratio for the Last Year']" position="replace">
- <action
- string="Monthly Turnover"
- name="%(action_turnover_by_month)d"
- groups="base.group_sale_salesman,account.group_account_manager"
- colspan="4"/>
- </xpath>
+ <xpath expr="/form/hpaned/child1/action[@string='My Quotations']" position="before">
+ <action
+ string="My Open Opportunities"
+ name="%(crm.act_my_oppor)d"
+ colspan="4"
+ height="150"
+ groups="base.group_sale_salesman,base.group_sale_manager"
+ width="510"/>
+ </xpath>
</field>
</record>
<record model="ir.ui.view" id="board_crm_form_inherit_replace2">
- <field name="name">board.crm.form.inherit.replace2</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="crm.board_crm_form"/>
- <field name="arch" type="xml">
- <xpath expr="/form/hpaned/child2/action[@string='My Planned Revenues by Stage']" position="attributes">
- <attribute name="string">Opportunities by Stage</attribute>
- </xpath>
- </field>
- </record>
-
+ <field name="name">board.crm.form.inherit.replace1</field>
+ <field name="model">board.board</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="sale.board_sales_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/hpaned/child1/action[@string='My Quotations']" position="after">
+ <action
+ string="My Meetings"
+ name="%(crm.act_my_meetings)d"
+ height="150"
+ colspan="4"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="board_crm_form_inherit_replace3">
+ <field name="name">board.crm.form.inherit.replace1</field>
+ <field name="model">board.board</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="sale.board_sales_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/hpaned/child2/action[@string='Monthly Turnover']" position="before">
+ <action
+ string="My Planned Revenues by Stage"
+ name="%(crm.act_my_oppor_stage)d"
+ groups="base.group_sale_salesman,base.group_sale_manager"
+ colspan="4"/>
+ </xpath>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="board_crm_form_inherit_replace4">
+ <field name="name">board.crm.form.inherit.replace1</field>
+ <field name="model">board.board</field>
+ <field name="type">form</field>
+ <field name="inherit_id" ref="sale.board_sales_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/hpaned/child2/action[@string='Monthly Turnover']" position="after">
+ <action
+ string="My Win/Lost Ratio for the Last Year"
+ name="%(crm.act_sales_pipeline)d"
+ groups="base.group_sale_salesman,base.group_sale_manager"
+ colspan="4"/>
+ </xpath>
+ </field>
+ </record>
</data>
</openerp>
_______________________________________________
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
