[IMP] useability and dasboards of sale and crm

bzr revid: fp@tinyerp.com-20111211110956-ygyrsdjo2ocq5wxn
This commit is contained in:
Fabien Pinckaers 2011-12-11 12:09:56 +01:00
parent a6fe76ed65
commit 02cc517482
4 changed files with 6 additions and 34 deletions

View File

@ -83,16 +83,6 @@
<field name="act_window_id" ref="act_my_oppor"/>
</record>
<record model="ir.actions.act_window" id="act_my_meetings">
<field name="name">My Meetings</field>
<field name="res_model">crm.meeting</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="view_id" ref="crm.crm_case_tree_view_meet"/>
<field name="domain">[('user_id','=',uid),('state','not in',('cancel','done'))]</field>
<field name="context">{'default_user_id': uid}</field>
</record>
<record model="ir.actions.act_window" id="act_my_oppor_stage">
<field name="name">Planned Revenue By Stage</field>
<field name="res_model">crm.lead.report</field>
@ -111,11 +101,8 @@
<form string="Sales Dashboard">
<board style="1-1">
<column>
<action string="My Open Opportunities"
<action string="My Opportunities"
name="%(act_my_oppor)d" creatable="true"/>
<action
string="My Meetings"
name="%(act_my_meetings)d" creatable="true"/>
</column>
<column>
<action string="My Planned Revenues by Stage"

View File

@ -206,8 +206,8 @@ class sale_order(osv.osv):
('invoice_except', 'Invoice Exception'),
('done', 'Done'),
('cancel', 'Cancelled')
], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the date 'Ordered Date'.", select=True),
'date_order': fields.date('Ordered Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
], 'Order State', readonly=True, help="Givwizard = self.browse(cr, uid, ids)[0]es the state of the quotation or sales order. \nThe exception state is automatically set when a cancel operation occurs in the invoice validation (Invoice Exception) or in the picking list process (Shipping Exception). \nThe 'Waiting Schedule' state is set when the invoice is confirmed but waiting for the scheduler to run on the order date.", select=True),
'date_order': fields.date('Date', required=True, readonly=True, select=True, states={'draft': [('readonly', False)]}),
'create_date': fields.datetime('Creation Date', readonly=True, select=True, help="Date on which sales order is created."),
'date_confirm': fields.date('Confirmation Date', readonly=True, select=True, help="Date on which sales order is confirmed."),
'user_id': fields.many2one('res.users', 'Salesman', states={'draft': [('readonly', False)]}, select=True),

View File

@ -84,7 +84,6 @@
<tree string="Sales Orders" colors="grey:state=='cancel';blue:state in ('waiting_date','manual');red:state in ('invoice_except','shipping_except')">
<field name="name"/>
<field name="date_order"/>
<field name="client_order_ref" groups="base.group_extended"/>
<field name="partner_id"/>
<field name="user_id"/>
<field name="picked_rate" widget="progressbar"/>
@ -259,7 +258,8 @@
<separator orientation="vertical"/>
<filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
<separator orientation="vertical"/>
<field name="name"/>
<field name="name"
filter_domain="['|', ('name','ilike',self),('client_order_ref','ilike',self)]"/>
<field name="partner_id"/>
<field name="user_id">
<filter domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal"/>

View File

@ -9,22 +9,8 @@
<field name="arch" type="xml">
<xpath expr="/form/board/column/action[@string='My Quotations']" position="before">
<action name="%(crm.act_my_oppor)d"
string="My Open Opportunities"
string="My Opportunities"
/>
<!--groups="base.group_sale_salesman,base.group_sale_manager"-->
</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_sales_form"/>
<field name="arch" type="xml">
<xpath expr="/form/board/column/action[@string='My Quotations']" position="after">
<action name="%(crm.act_my_meetings)d"
string="My Meetings"/>
</xpath>
</field>
</record>
@ -39,7 +25,6 @@
<action name="%(crm.act_my_oppor_stage)d"
string="My Planned Revenues by Stage"
/>
<!--groups="base.group_sale_salesman,base.group_sale_manager"-->
</xpath>
</field>
</record>