Hardik Ansodariya (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-usability2-sales_dashboard-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_dashboard-han/+merge/78963
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-usability2-sales_dashboard-han/+merge/78963
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-11 13:34:28 +0000
@@ -110,59 +110,52 @@
<field name="domain">['&', ('user_id', '=', uid),'&', ('state', '=', 'done') , '&', ('create_date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%Y-%m-%d')), ('type', '=', 'opportunity')]</field>
</record>
- <record model="ir.ui.view" id="board_crm_form">
- <field name="name">Sales Dashboard Form</field>
- <field name="model">board.board</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Sales Dashboard">
- <hpaned>
- <child1>
- <action
- string="My Open Opportunities"
- name="%(act_my_oppor)d"
- colspan="4"
- height="150"
- groups="base.group_sale_salesman,base.group_sale_manager"
- width="510"/>
- <action
- string="My Meetings"
- name="%(act_my_meetings)d"
- height="150"
- colspan="4"/>
- </child1>
- <child2>
- <action
- string="My Planned Revenues by Stage"
- name="%(act_my_oppor_stage)d"
- groups="base.group_sale_salesman,base.group_sale_manager"
- colspan="4"/>
- <action
- string="My Win/Lost Ratio for the Last Year"
- name="%(act_sales_pipeline)d"
- groups="base.group_sale_salesman,base.group_sale_manager"
- colspan="4"/>
- </child2>
- </hpaned>
- </form>
- </field>
- </record>
- <record model="ir.actions.act_window" id="open_board_crm">
- <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="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"/>
+ <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="sale.board_sale_my_qoatation"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/hpaned/child1/action[@string='My Quotations']" position="before">
+ <action
+ string="My Open Opportunities"
+ name="%(act_my_oppor)d"
+ groups="base.group_sale_salesman,account.group_account_manager"
+ colspan="4"/>
+ </xpath>
+ </field>
+ </record>
+ <record model="ir.ui.view" id="board_crm_form_inherit_replace2">
+ <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_sale_my_qoatation"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/hpaned/child1/action[@string='My Quotations']" position="after">
+ <action
+ string="My Meetings"
+ name="%(act_my_meetings)d"
+ groups="base.group_sale_salesman,account.group_account_manager"
+ colspan="4"/>
+ </xpath>
+ </field>
+ </record>
+
- <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_crm"/>
+ <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_sale_my_qoatation"/>
+ <field name="arch" type="xml">
+ <xpath expr="/form/hpaned/child2/action[@string='Monthly Turnover']" position="before">
+ <action
+ string="Planned Revenue By Stage"
+ name="%(act_my_oppor_stage)d"
+ groups="base.group_sale_salesman,account.group_account_manager"
+ colspan="4"/>
+ </xpath>
+ </field>
+ </record>
</data>
</openerp>
=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml 2011-09-17 11:03:17 +0000
+++ resource/resource_view.xml 2011-10-11 13:34:28 +0000
@@ -256,7 +256,7 @@
<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 id="menu_resource_config" name="Resource" parent="hr.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"/>
</data>
</openerp>
=== modified file 'sale/__openerp__.py'
--- sale/__openerp__.py 2011-09-29 12:15:12 +0000
+++ sale/__openerp__.py 2011-10-11 13:34:28 +0000
@@ -83,6 +83,7 @@
'stock_view.xml',
'board_sale_view.xml',
'process/sale_process.xml',
+ 'board_my_quotation.xml',
],
'demo_xml': ['sale_demo.xml'],
'test': [
=== added file 'sale/board_my_quotation.xml'
--- sale/board_my_quotation.xml 1970-01-01 00:00:00 +0000
+++ sale/board_my_quotation.xml 2011-10-11 13:34:28 +0000
@@ -0,0 +1,108 @@
+<?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_sale_my_qoatation">
+ <field name="name">board.crm.form.inherit.child1</field>
+ <field name="model">board.board</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Sales Dashboard">
+ <hpaned>
+ <child1>
+ <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"/>
+ </child1>
+ <child2>
+ <action
+ string="Monthly Turnover"
+ name="%(action_turnover_by_month)d"
+ groups="base.group_sale_salesman,base.group_sale_manager"
+ colspan="4"/>
+ </child2>
+ </hpaned>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="open_board_quotation">
+ <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="usage">menu</field>
+ <field name="view_id" ref="board_sale_my_qoatation"/>
+ </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_quotation"
+ 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_quotation"/>
+ </data>
+</openerp>
=== modified file 'sale/report/sale_report.py'
--- sale/report/sale_report.py 2011-09-24 13:09:15 +0000
+++ sale/report/sale_report.py 2011-10-11 13:34:28 +0000
@@ -32,7 +32,7 @@
'date_confirm': fields.date('Date Confirm', readonly=True),
'shipped': fields.boolean('Shipped', readonly=True),
'shipped_qty_1': fields.integer('Shipped', readonly=True),
- 'year': fields.char('Year', size=4, readonly=True),
+ #'year': fields.char('Year', size=4, readonly=True),
'month': fields.selection([('01', 'January'), ('02', 'February'), ('03', 'March'), ('04', 'April'),
('05', 'May'), ('06', 'June'), ('07', 'July'), ('08', 'August'), ('09', 'September'),
('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
=== modified file 'sale/report/sale_report_view.xml'
--- sale/report/sale_report_view.xml 2011-09-25 21:00:20 +0000
+++ sale/report/sale_report_view.xml 2011-10-11 13:34:28 +0000
@@ -11,7 +11,6 @@
<tree string="Sales Analysis">
<field name="date" invisible="1"/>
<field name="user_id" invisible="1"/>
- <field name="year" invisible="1"/>
<field name="day" invisible="1"/>
<field name="month" invisible="1"/>
<field name="shop_id" invisible="1"/>
@@ -22,7 +21,7 @@
<field name="nbr" sum="# of Lines"/>
<field name="product_uom_qty" sum="# of Qty"/>
<field name="shipped_qty_1" sum="Shipped"/>
- <field name="uom_name" invisible="not context.get('set_visible',False)"/>
+ <!--<field name="uom_name" invisible="not context.get('set_visible',False)"/>-->
<field name="price_total" sum="Total Price"/>
<field name="delay" sum="Commitment Delay"/>
<field name="state" invisible="1"/>
@@ -51,9 +50,6 @@
<field name="arch" type="xml">
<search string="Sales Analysis">
<group>
- <filter icon="terp-go-year" string=" Year "
- domain="[('date','<=', time.strftime('%%Y-%%m-%%d')),('date','>=',time.strftime('%%Y-01-01'))]"
- help="Sales order created in current year"/>
<filter icon="terp-go-month" string=" Month "
name="month"
domain="[('date','<=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('date','>=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
@@ -110,7 +106,6 @@
<separator orientation="vertical"/>
<filter string="Day" icon="terp-go-today" context="{'group_by':'day'}" help="Ordered date of the sales order"/>
<filter string="Month" name="order_month" icon="terp-go-month" context="{'group_by':'month'}" help="Ordered month of the sales order"/>
- <filter string="Year" icon="terp-go-year" context="{'group_by':'year'}" help="Ordered Year of the sales order"/>
</group>
</search>
</field>
@@ -208,14 +203,13 @@
<field name="price_total" />
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
- <field name="uom_name" invisible="1"/>
+ <!--<field name="uom_name" 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>
@@ -225,7 +219,7 @@
<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="domain">[('state','in',('manual','progress','done'))]</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>
=== modified file 'sale_crm/__openerp__.py'
--- sale_crm/__openerp__.py 2011-10-05 14:19:02 +0000
+++ sale_crm/__openerp__.py 2011-10-11 13:34:28 +0000
@@ -43,7 +43,6 @@
'init_xml': [],
'update_xml': ['wizard/crm_make_sale_view.xml',
'sale_crm_view.xml',
- 'board_sale_crm_view.xml',
'process/sale_crm_process.xml',
'security/sale_crm_security.xml',
'security/ir.model.access.csv'
=== removed 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 1970-01-01 00:00:00 +0000
@@ -1,110 +0,0 @@
-<?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">
- <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="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>
- </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>
-
- </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
