pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] from trunk-salesteams-up-chm

Browse Source 
bzr revid: chm@openerp.com-20130327150907-z3n87y9tzsmn5hh9
This commit is contained in:
Christophe Matthieu
2013-03-27 16:09:07 +01:00
parent 04a9cf6b5d 68c04463a1
commit 95e62c4569
29 changed files with 180 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/crm/crm.py
+13 -2
View File
@@ -129,10 +129,11 @@ class crm_case_section(osv.osv):
help="The email address associated with this team. New emails received will automatically "
"create new leads assigned to the team."),
'open_lead_ids': fields.one2many('crm.lead', 'section_id', 'Leads', readonly=True,
domain=[('type', '!=', 'opportunity'), ('state', 'not in', ['done', 'cancel'])]),
domain=['&', ('type', '!=', 'opportunity'), ('state', 'not in', ['done', 'cancel'])]),
'open_opportunity_ids': fields.one2many('crm.lead', 'section_id', 'Opportunities', readonly=True,
domain=['&', ('type', '=', 'opportunity'), ('type', '=', 'both'), ('state', 'not in', ['done', 'cancel'])]),
domain=['&', '|', ('type', '=', 'opportunity'), ('type', '=', 'both'), ('state', 'not in', ['done', 'cancel'])]),
'color': fields.integer('Color Index'),
'use_leads': fields.boolean('Leads', help="If checked, this sales teams will be available in the sales teams menu and you will be able to manage leads"),
}
def _get_stage_common(self, cr, uid, context):
@@ -142,6 +143,7 @@ class crm_case_section(osv.osv):
_defaults = {
'active': 1,
'stage_ids': _get_stage_common,
'use_leads': True,
}
_sql_constraints = [
@@ -234,4 +236,13 @@ class crm_payment_mode(osv.osv):
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
}
class base_config_settings(osv.osv_memory):
_inherit = 'base.config.settings'
_columns = {
'group_multi_salesteams': fields.boolean("Use mutli sales teams",
implied_group='base.group_multi_salesteams',
help=""" """),
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/crm/crm_case_section_view.xml
+36 -31
View File
@@ -27,20 +27,6 @@
</field>
</record>
<!-- <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_salesteams_all">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view_leads"/>
<field name="act_window_id" ref="crm_case_form_view_salesteams_lead"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_salesteams_all">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view_leads"/>
<field name="act_window_id" ref="crm_case_form_view_salesteams_lead"/>
</record> -->
<!-- CRM opportunity search by Salesteams -->
<record model="ir.actions.act_window" id="crm_case_form_view_salesteams_opportunity">
@@ -74,6 +60,7 @@
<field name="model">crm.case.section</field>
<field name="arch" type="xml">
<kanban version="7.0" class="oe_background_grey">
<field name="use_leads"/>
<field name="name"/>
<field name="user_id"/>
<field name="member_ids"/>
@@ -84,7 +71,7 @@
<field name="open_opportunity_ids"/>
<templates>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_kanban_crm_salesteams" style="width:220px;">
<div t-attf-class="oe_kanban_color_#{kanban_getcolor(record.color.raw_value)} oe_kanban_card oe_kanban_project oe_kanban_global_click oe_kanban_crm_salesteams">
<div class="oe_dropdown_toggle oe_dropdown_kanban" groups="base.group_user">
<span class="oe_e">í</span>
<ul class="oe_dropdown_menu">
@@ -95,18 +82,18 @@
</div>
<div class="oe_kanban_content">
<h4><field name="name"/></h4>
<div class="oe_kanban_crm_salesteams_alias" t-if="record.alias_id.value">
<div class="oe_alias" t-if="record.use_leads.raw_value and record.alias_id.value">
<span class="oe_e">%%</span><small><field name="alias_id"/></small>
</div>
<div class="oe_kanban_crm_salesteams_list">
<a name="%(crm_case_form_view_salesteams_lead)d" type="action" style="margin-right: 10px">
<div class="oe_items_list">
<a t-if="record.use_leads.raw_value" name="%(crm_case_form_view_salesteams_lead)d" type="action">
<t t-raw="record.open_lead_ids.raw_value.length"/>
<t t-if="record.open_lead_ids.raw_value.length &gt;= 1">Leads</t><t t-if="record.open_lead_ids.raw_value.length &lt; 1">Lead</t></a>
<a name="%(crm_case_form_view_salesteams_opportunity)d" type="action" style="margin-right: 10px">
<a name="%(crm_case_form_view_salesteams_opportunity)d" type="action">
<t t-raw="record.open_opportunity_ids.raw_value.length"/>
<t t-if="record.open_opportunity_ids.raw_value.length &gt;= 1">Opportunities</t><t t-if="record.open_opportunity_ids.raw_value.length &lt; 1">Opportunity</t></a>
</div>
<div class="oe_kanban_crm_salesteams_avatars">
<div class="oe_avatars">
<img t-if="record.user_id.raw_value" t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-data-member_id="record.user_id.raw_value"/>
<t t-foreach="record.member_ids.raw_value.slice(0,11)" t-as="member">
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
@@ -147,23 +134,31 @@
<field name="arch" type="xml">
<form string="Sales Team" version="7.0">
<sheet>
<div class="oe_title">
<label for="name" class="oe_edit_only" string="Project Name"/>
<h1>
<field name="name" string="Project Name"/>
</h1>
<div name="options_active">
<field name="use_leads" class="oe_inline"/><label for="use_leads"/>
</div>
</div>
<group>
<group>
<field name="name" colspan="2"/>
<field name="parent_id"/>
<field name="code"/>
</group>
<group>
<field name="user_id"/>
<field name="resource_calendar_id"/>
<field name="active"/>
</group>
<group colspan="4">
<group>
<field name="user_id"/>
<field name="code"/>
</group>
<group colspan="4" attrs="{'invisible': [('use_leads', '=', False)]}">
<label for="alias_id"/>
<div class="oe_inline">
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
<span class="oe_edit_only" name="edit_alias">
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
<field name="alias_name" class="oe_inline" attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain" readonly="1"/>
</span>
</div>
</group>
@@ -271,15 +266,25 @@
</field>
</record>
<!-- <menuitem action="crm_case_section_act"
id="menu_crm_case_section_act" sequence="15"
parent="base.menu_base_config" groups="base.group_sale_manager"/> -->
<record id="view_general_configuration" model="ir.ui.view">
<field name="name">base.config.settings.crm</field>
<field name="model">base.config.settings</field>
<field name="inherit_id" ref="base_setup.view_general_configuration"/>
<field name="arch" type="xml">
<xpath expr='//div[@name="multi_company"]' position="after">
<div name="multi_salesteams">
<field name="group_multi_salesteams" class="oe_inline"/>
<label for="group_multi_salesteams"/>
</div>
</xpath>
</field>
</record>
<menuitem
action="crm_case_section_salesteams_act"
id="crm.menu_crm_case_section_act"
sequence="1"
parent="base.menu_sales"
groups="base.group_sale_manager,base.group_sale_salesman"/>
groups="base.group_multi_salesteams"/>
</data>
</openerp>
addons/crm/crm_lead.py
+2 -2
View File
@@ -85,9 +85,9 @@ class crm_lead(base_stage, format_address, osv.osv):
}
def get_empty_list_help(self, cr, uid, help, context=None):
if context.get('default_type', None) == 'lead':
if context.get('default_type') == 'lead':
context['empty_list_help_model'] = 'crm.case.section'
context['empty_list_help_id'] = context.get('default_section_id', None)
context['empty_list_help_id'] = context.get('default_section_id')
context['empty_list_help_document_name'] = _("leads")
return super(crm_lead, self).get_empty_list_help(cr, uid, help, context=context)
addons/crm/crm_lead_menu.xml
+1 -18
View File
@@ -9,10 +9,7 @@
<field name="domain">['|', ('type','=','lead'), ('type','=',False)]</field>
<field name="view_id" ref="crm_case_tree_view_leads"/>
<field name="search_view_id" ref="crm.view_crm_case_leads_filter"/>
<field name="context">{
'default_type':'lead',
'stage_type':'lead'
}</field>
<field name="context">{'default_type':'lead', 'stage_type':'lead', 'search_default_unassigned':1}</field>
<field name="help" type="html">
<p>
Use leads if you need a qualification step before creating an
@@ -26,20 +23,6 @@
</field>
</record>
<!-- <record model="ir.actions.act_window.view" id="action_crm_tag_tree_view_leads_all">
<field name="sequence" eval="1"/>
<field name="view_mode">tree</field>
<field name="view_id" ref="crm_case_tree_view_leads"/>
<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_form_view_leads_all">
<field name="sequence" eval="3"/>
<field name="view_mode">form</field>
<field name="view_id" ref="crm_case_form_view_leads"/>
<field name="act_window_id" ref="crm_case_category_act_leads_all"/>
</record> -->
<record model="ir.actions.act_window" id="crm_case_category_act_oppor11">
<field name="name">Opportunities</field>
<field name="res_model">crm.lead</field>
addons/crm/crm_lead_view.xml
+10 -10
View File
@@ -153,8 +153,8 @@
<group>
<field name="user_id" on_change="onchange_user_id(section_id, user_id)"
context="{'default_groups_ref': ['base.group_user', 'base.group_sale_salesman_all_leads']}"/>
<label for="section_id"/>
<div>
<label for="section_id" groups="base.group_multi_salesteams"/>
<div groups="base.group_multi_salesteams">
<field name="section_id"/>
<button name="case_escalate" string="Escalate" type="object" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
</div>
@@ -228,7 +228,7 @@
<field name="stage_id"/>
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="section_id" invisible="context.get('invisible_section', True)"/>
<field name="section_id" invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
<field name="state" invisible="1"/>
<field name="type_id" invisible="1"/>
<field name="referred" invisible="1"/>
@@ -326,7 +326,7 @@
<search string="Search Leads">
<field name="name" string="Lead / Customer" filter_domain="['|','|',('partner_name','ilike',self),('email_from','ilike',self),('name','ilike',self)]"/>
<field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike',self)]"/>
<field name="section_id" context="{'invisible_section': False}"/>
<field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<field name="user_id"/>
<field name="partner_id"/>
<field name="create_date"/>
@@ -334,7 +334,7 @@
<separator/>
<filter string="Open" name="open" domain="[('state','!=','cancel')]" help="Open Leads"/>
<filter string="Dead" name="dead" domain="[('state','=','cancel')]"/>
<filter string="Unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
<filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
<filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
<filter string="Assigned to Me"
domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
@@ -428,8 +428,8 @@
<group>
<field name="user_id" on_change="onchange_user_id(section_id, user_id)" context="{'default_groups_ref': ['base.group_user', 'base.group_sale_salesman_all_leads']}"/>
<label for="section_id"/>
<div>
<label for="section_id" groups="base.group_multi_salesteams"/>
<div groups="base.group_multi_salesteams">
<field name="section_id" widget="selection"/>
<button name="case_escalate" string="Escalate" type="object" class="oe_link" attrs="{'invisible': ['|', ('section_id','=',False), ('state', 'not in', ['draft','open','pending'])]}"/>
</div>
@@ -525,7 +525,7 @@
<field name="stage_id"/>
<field name="planned_revenue" sum="Expected Revenues"/>
<field name="probability" avg="Avg. of Probability"/>
<field name="section_id" invisible="context.get('invisible_section', True)"/>
<field name="section_id" invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
<field name="user_id"/>
<field name="referred" invisible="1"/>
<field name="priority" invisible="1"/>
@@ -544,7 +544,7 @@
<search string="Search Opportunities">
<field name="name" string="Opportunity" filter_domain="['|','|','|',('partner_id','ilike',self),('partner_name','ilike',self),('email_from','ilike',self),('name', 'ilike', self)]"/>
<field name="categ_ids" string="Category" filter_domain="[('categ_ids','ilike', self)]"/>
<field name="section_id" context="{'invisible_section': False}"/>
<field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<field name="user_id"/>
<field name="partner_id"/>
<separator/>
@@ -552,7 +552,7 @@
<filter string="In Progress" name="open" domain="[('state','=','open')]" help="Open Opportunities"/>
<filter string="Won" name="won" domain="[('state','=','done')]"/>
<filter string="Lost" name="lost" domain="[('state','=','cancel')]"/>
<filter string="Unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
<filter string="Unassigned" name="unassigned" domain="[('user_id','=', False)]" help="No salesperson"/>
<filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]" help="Unread messages"/>
<filter string="Assigned to Me"
domain="[('user_id','=',uid)]" context="{'invisible_section': False}"
addons/crm/crm_phonecall_view.xml
+2 -2
View File
@@ -103,7 +103,7 @@
<field name="date"/>
<field name="user_id"/>
<field name="duration" widget="float_time"/>
<field name="section_id" colspan="1" widget="selection"/>
<field name="section_id" colspan="1" widget="selection" groups="base.group_multi_salesteams"/>
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
<field name="email_from" invisible="1"/> <!--not needed because of the chatter, thus invisible, but must be in the view as it's returned by onchange_partner_id()-->
<field name="categ_id" widget="selection"
@@ -187,7 +187,7 @@
help="Phone Calls Assigned to the current user or with a team having the current user as team leader"/>
<field name="partner_id"/>
<field name="user_id"/>
<field name="section_id" string="Sales Team"/>
<field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
<filter string="Responsible" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
addons/crm/crm_report_view.xml
+16 -16
View File
@@ -12,7 +12,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="category2_id"/>
<field name="stage_id"/>
<field name="amount_revenue"/>
@@ -33,7 +33,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" widget="selection"/>
<field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
<field name="category2_id" />
<field name="stage_id"/>
<field name="amount_revenue"/>
@@ -53,7 +53,7 @@
<graph string="Cases by Teams and Type" type="bar" orientation="horizontal">
<field name="category2_id"/>
<field name="amount_revenue" operator="+"/>
<field name="section_id" group="True"/>
<field name="section_id" group="True" groups="base.group_multi_salesteams"/>
</graph>
</field>
</record>
@@ -69,7 +69,7 @@
<field name="month"/>
<field name="nbr"/>
<field name="state"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="category2_id"/>
</search>
</field>
@@ -95,7 +95,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="stage_id"/>
<field name="amount_revenue"/>
<field name="nbr"/>
@@ -115,7 +115,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" widget="selection"/>
<field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
<field name="stage_id"/>
<field name="amount_revenue"/>
<field name="nbr" />
@@ -134,7 +134,7 @@
<graph string="Cases by Team and Stage" type="bar" orientation="horizontal">
<field name="stage_id"/>
<field name="amount_revenue" operator="+"/>
<field name="section_id" group="True"/>
<field name="section_id" group="True" groups="base.group_multi_salesteams"/>
</graph>
</field>
</record>
@@ -150,7 +150,7 @@
<field name="month"/>
<field name="nbr"/>
<field name="state"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</search>
</field>
</record>
@@ -175,7 +175,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="categ_id"/>
<field name="stage_id"/>
<field name="nbr"/>
@@ -195,7 +195,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" widget="selection"/>
<field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
<field name="categ_id"/>
<field name="stage_id"/>
<field name="nbr" />
@@ -216,7 +216,7 @@
<field name="month"/>
<field name="nbr"/>
<field name="state"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</search>
</field>
</record>
@@ -230,7 +230,7 @@
<graph string="Cases by Section, Category and Stage" type="bar" orientation="horizontal">
<field name="categ_id"/>
<field name="nbr" operator="+"/>
<field name="section_id" group="True"/>
<field name="section_id" group="True" groups="base.group_multi_salesteams"/>
</graph>
</field>
</record>
@@ -255,7 +255,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="categ_id"/>
<field name="category2_id"/>
<field name="stage_id"/>
@@ -276,7 +276,7 @@
<field name="name"/>
<field name="month"/>
<field name="user_id"/>
<field name="section_id" widget="selection"/>
<field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
<field name="categ_id"/>
<field name="category2_id"/>
<field name="stage_id"/>
@@ -298,7 +298,7 @@
<field name="month"/>
<field name="nbr"/>
<field name="state"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</search>
</field>
</record>
@@ -312,7 +312,7 @@
<graph string="Cases by Section, Category and Type" type="bar" orientation="horizontal">
<field name="category2_id"/>
<field name="nbr" operator="+"/>
<field name="section_id" group="True"/>
<field name="section_id" group="True" groups="base.group_multi_salesteams"/>
</graph>
</field>
</record>
addons/crm/crm_view.xml
+6 -6
View File
@@ -130,7 +130,7 @@
<form string="Case Category" version="7.0">
<group>
<field name="name"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="object_id" invisible="1"/>
</group>
</form>
@@ -145,7 +145,7 @@
<field name="arch" type="xml">
<tree string="Case Category">
<field name="name"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</tree>
</field>
</record>
@@ -158,7 +158,7 @@
<field name="arch" type="xml">
<tree string="Campaign">
<field name="name"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</tree>
</field>
</record>
@@ -172,7 +172,7 @@
<form string="Campaign" version="7.0">
<group>
<field name="name"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</group>
</form>
</field>
@@ -324,7 +324,7 @@
<field name="arch" type="xml">
<tree string="Payment Mode">
<field name="name"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</tree>
</field>
</record>
@@ -338,7 +338,7 @@
<form string="Payment Mode" version="7.0">
<group>
<field name="name"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</group>
</form>
</field>
addons/crm/report/crm_lead_report_view.xml
+3 -3
View File
@@ -19,7 +19,7 @@
<field name="channel_id" invisible="1"/>
<field name="type" invisible="1"/>
<field name="priority" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="user_id" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
@@ -77,7 +77,7 @@
help="Leads/Opportunities that are assigned to one of the sale teams I manage"/>
<separator/>
<filter icon="terp-personal" string="My Case(s)" help="Leads/Opportunities that are assigned to me" domain="[('user_id','=',uid)]"/>
<field name="section_id" context="{'invisible_section': False}"/>
<field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<field name="user_id" string="Salesperson"/>
<group expand="0" string="Extended Filters...">
<field name="partner_id"/>
@@ -134,7 +134,7 @@
<field name="creation_month" invisible="1"/>
<field name="creation_day" invisible="1"/>
<field name="deadline_month" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="user_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
<field name="country_id" invisible="1"/>
addons/crm/report/crm_phonecall_report_view.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<tree string="Phone calls" create="false">
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="priority" invisible="1"/>
<field name="user_id" invisible="1"/>
<field name="company_id" invisible="1"/>
@@ -59,7 +59,7 @@
help="Phone calls that are assigned to one of the sale teams I manage"/>
<separator/>
<filter icon="terp-personal" string="My Phone Calls" help="Phone Calls that are assigned to me" domain="[('user_id','=',uid)]" />
<field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
<field name="section_id" string="Sales Team" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<field name="user_id" string="Salesperson"/>
<group expand="0" string="Extended Filters...">
<field name="partner_id"/>
addons/crm/res_partner_view.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<field eval="18" name="priority"/>
<field name="arch" type="xml">
<field name="user_id" position="after">
<field name="section_id" completion="1"/>
<field name="section_id" completion="1" groups="base.group_multi_salesteams"/>
</field>
</field>
</record>
addons/crm/security/crm_security.xml
+5
View File
@@ -22,6 +22,11 @@
<field name="implied_ids" eval="[(4, ref('base.group_sale_salesman_all_leads'))]"/>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
</record>
<record id="base.group_multi_salesteams" model="res.groups">
<field name="name">Use mutli sales teams</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_fund_raising" model="res.groups">
<field name="name">Manage Fund Raising</field>
addons/crm/static/src/css/crm.css
+29 -12
View File
@@ -1,12 +1,12 @@
.oe_kanban_crm_salesteams {
width: 220px;
min-height: 160px;
.openerp .oe_kanban_view .oe_kanban_crm_salesteams {
width: 300px;
}
.oe_kanban_crm_salesteams_avatars {
margin-top: 8px;
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars {
text-align: right;
margin: -5px 0 -10px 0;
}
.oe_kanban_crm_salesteams_avatars img {
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_avatars img {
width: 30px;
height: 30px;
padding-left: 0px;
@@ -19,11 +19,11 @@
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
.oe_kanban_crm_salesteams_alias {
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias {
margin: -8px 0 8px 0;
}
.oe_kanban_crm_salesteams_alias .oe_e {
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias .oe_e {
font-size: 30px;
line-height: 6px;
vertical-align: top;
@@ -32,10 +32,27 @@
text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
float: left;
}
.oe_kanban_crm_salesteams_list a {
white-space: nowrap;
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
margin: 10px 0;
}
.oe_kanban_crm_salesteams_list a:hover {
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a {
width: 96px;
display: inline-block;
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list a:hover {
text-decoration: underline !important;
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center {
text-align: center;
margin: 3px 0;
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_sum {
margin: 0;
font-size: 40px;
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_center .oe_subsum {
font-size: 10px;
}
.openerp .oe_form_editable .oe_form .oe_read_only {
display: none;
}
addons/crm/wizard/crm_lead_to_opportunity_view.xml
+3 -3
View File
@@ -22,7 +22,7 @@
<field name="phone"/>
<field name="stage_id"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</tree>
</field>
</group>
@@ -68,13 +68,13 @@
<field name="phone"/>
<field name="stage_id"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</tree>
</field>
</group>
<group string="Assign opportunities to" attrs="{'invisible': [('name', '=', '')]}">
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="user_ids" widget="many2many_tags"/>
</group>
addons/crm/wizard/crm_merge_opportunities_view.xml
+1 -1
View File
@@ -19,7 +19,7 @@
<field name="phone"/>
<field name="stage_id"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</tree>
</field>
<footer>
addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<field name="partner_id" readonly="True"/>
<field name="phone"/>
<field name="user_id" attrs="{'invisible': [('action','=','log')]}"/>
<field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/>
<field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}" groups="base.group_multi_salesteams"/>
</group>
</group>
<field name="note" placeholder="Call Description" />
addons/crm/wizard/crm_phonecall_to_phonecall_view.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/>
<field name="partner_id" readonly="True"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</group>
<footer>
<button name="action_schedule" type="object" string="Log Call" attrs="{'invisible' : [('action', '!=', 'log')]}" class="oe_highlight"/>
addons/crm_claim/crm_claim_view.xml
+1 -1
View File
@@ -116,7 +116,7 @@
<group colspan="4" col="4" groups="base.group_user">
<field name="user_id"/>
<field name="priority"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="date_deadline"/>
<field name="state" groups="base.group_no_one"/>
</group>
addons/crm_claim/report/crm_claim_report_view.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<tree string="Claims" create="false">
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="user_id" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
@@ -61,7 +61,7 @@
<filter icon="terp-personal" string="My Case(s)" help="My Case(s)" domain="[('user_id','=',uid)]" />
<field name="company_id" groups="base.group_multi_company"/>
<field name="user_id" string="Salesperson"/>
<field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
<field name="section_id" string="Sales Team" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<group expand="0" string="Extended Filters...">
<field name="partner_id"/>
<field name="stage_id" domain="[('section_ids', '=', 'section_id')]"/>
addons/crm_helpdesk/crm_helpdesk_view.xml
+3 -3
View File
@@ -48,7 +48,7 @@
<sheet string="Helpdesk Support">
<group col="4" class="oe_header">
<field name="name" string="Query"/>
<field name="section_id" widget="selection"/>
<field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
<field name="user_id"/>
<field name="date"/>
<field name="date_deadline"/>
@@ -115,7 +115,7 @@
<field name="date" string="Date"/>
<field name="date_deadline"/>
<field name="user_id"/>
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="priority"/>
<field name="state"/>
</tree>
@@ -154,7 +154,7 @@
help="Helpdesk requests that are assigned to me or to one of the sale teams I manage" />
<field name="partner_id" />
<field name="user_id"/>
<field name="section_id" string="Sales Team"/>
<field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
<group expand="0" string="Group By...">
<filter string="Partner" icon="terp-partner" domain="[]" help="Partner" context="{'group_by':'partner_id'}" />
<filter string="Responsible" icon="terp-personal" domain="[]" help="Responsible User" context="{'group_by':'user_id'}" />
addons/crm_helpdesk/report/crm_helpdesk_report_view.xml
+2 -2
View File
@@ -11,7 +11,7 @@
<tree string="Helpdesk" create="false">
<field name="name" invisible="1"/>
<field name="month" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="user_id" invisible="1"/>
<field name="company_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
@@ -60,7 +60,7 @@
<separator/>
<filter string="My Company" icon="terp-go-home" context="{'invisible_section': False}" domain="[('section_id.user_id.company_id','=',uid)]" help="My company"/>
<field name="user_id" string="Salesperson"/>
<field name="section_id" string="Sales Team" context="{'invisible_section': False}"/>
<field name="section_id" string="Sales Team" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<field name="company_id" groups="base.group_multi_company"/>
<group expand="0" string="Extended Filters..." groups="base.group_no_one">
<field name="priority" string="Priority"/>
addons/crm_partner_assign/report/crm_lead_report_view.xml
+2 -2
View File
@@ -10,7 +10,7 @@
<search string="Leads Analysis">
<filter icon="terp-check" string="Current" domain="[('state','in',('draft','open'))]"/>
<filter icon="terp-dialog-close" string="Closed" domain="[('state','=','done')]"/>
<field name="section_id" context="{'invisible_section': False}"/>
<field name="section_id" context="{'invisible_section': False}" groups="base.group_multi_salesteams"/>
<field name="grade_id"/>
<field name="user_id"/>
<field name="partner_assigned_id"/>
@@ -69,7 +69,7 @@
<field name="year" invisible="1"/>
<field name="month" invisible="1"/>
<field name="date_assign" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="user_id" invisible="1"/>
<field name="grade_id" invisible="1" widget="selection"/>
<field name="partner_assigned_id" invisible="1"/>
addons/crm_partner_assign/report/crm_partner_report_view.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<field name="model">crm.partner.report.assign</field>
<field name="arch" type="xml">
<search string="Partner assigned Analysis">
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="user_id"/>
<field name="grade_id"/>
<field name="activation"/>
@@ -49,7 +49,7 @@
<field name="date_review" invisible="1"/>
<field name="date_partnership" invisible="1"/>
<field name="period_id" invisible="1"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="user_id" invisible="1"/>
<field name="opp"/>
<field name="turnover"/>
addons/crm_partner_assign/res_partner_view.xml
+1 -1
View File
@@ -145,7 +145,7 @@
states="open,pending" type="object"
icon="gtk-go-forward" />
<field name="section_id"
invisible="context.get('invisible_section', True)" />
invisible="context.get('invisible_section', True)" groups="base.group_multi_salesteams"/>
<field name="user_id" />
<field name="state" />
<button name="case_cancel" string="Cancel"
addons/project_issue/report/project_issue_report_view.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<field name="version_id" string="Version" invisible="1"/>
<field name="priority" invisible="1"/>
<field name="company_id" invisible="1" groups="base.group_multi_company"/>
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
<field name="user_id" invisible="1"/>
<field name="channel_id" invisible="1"/>
<field name="partner_id" invisible="1"/>
addons/sale/sale_view.xml
+2 -2
View File
@@ -328,7 +328,7 @@
<field name="view_type">form</field>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="context">{'show_address': 1}</field>
<field name="context">{'show_address': 1, 'search_default_my_sale_orders_filter': 1}</field>
<field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
@@ -372,7 +372,7 @@
<field name="view_type">form</field>
<field name="view_id" ref="view_quotation_tree"/>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{'show_address': 1}</field>
<field name="context">{'show_address': 1, 'search_default_my_sale_orders_filter': 1}</field>
<field name="domain">[('state','in',('draft','sent','cancel'))]</field>
<field name="search_view_id" ref="view_sales_order_filter"/>
<field name="help" type="html">
addons/sale_crm/report/sale_crm_account_invoice_report_view.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='date']" position="after">
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</xpath>
</data>
</field>
addons/sale_crm/sale_crm.py
+13
View File
@@ -20,6 +20,8 @@
##############################################################################
from openerp.osv import osv, fields
from datetime import datetime
from openerp import tools
class sale_order(osv.osv):
_inherit = 'sale.order'
@@ -53,10 +55,21 @@ class crm_case_section(osv.osv):
res[section_id] = obj.search(cr, uid, [("section_id", "=", section_id),('state','not in',['draft','cancel'])], count=True, context=context)
return res
def _get_sum_month_invoice(self, cr, uid, ids, field_name, arg, context=None):
res = dict.fromkeys(ids, 0)
obj = self.pool.get('account.invoice.report')
when = datetime.today()
for section_id in ids:
invoice_ids = obj.search(cr, uid, [("section_id", "=", section_id), ('state', 'not in', ['draft', 'cancel']), ('year', '=', when.year), ('month', '=', when.month > 9 and when.month or "0%s" % when.month)], context=context)
for invoice in obj.browse(cr, uid, invoice_ids, context=context):
res[section_id] += invoice.price_total
return res
_columns = {
'number_saleorder': fields.function(_get_number_saleorder, type='integer', readonly=True),
'number_quotation': fields.function(_get_number_quotation, type='integer', readonly=True),
'number_invoice': fields.function(_get_number_invoice, type='integer', readonly=True),
'sum_month_invoice': fields.function(_get_sum_month_invoice, type='integer', readonly=True),
}
class res_users(osv.Model):
addons/sale_crm/sale_crm_view.xml
+18 -11
View File
@@ -22,7 +22,7 @@
<field name="inherit_id" ref="sale.view_order_form"/>
<field name="arch" type="xml">
<field name="user_id" position="after">
<field name="section_id" widget="selection"/>
<field name="section_id" widget="selection" groups="base.group_multi_salesteams"/>
<field name="categ_ids" widget="many2many_tags"/>
</field>
</field>
@@ -41,7 +41,7 @@
help="My Sales Team(s)"/>
</xpath>
<xpath expr="//field[@name='user_id']" position="after">
<field name="section_id" string="Sales Team"/>
<field name="section_id" string="Sales Team" groups="base.group_multi_salesteams"/>
</xpath>
</field>
</record>
@@ -54,7 +54,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='date_invoice']" position="after">
<field name="section_id" invisible="1"/>
<field name="section_id" invisible="1" groups="base.group_multi_salesteams"/>
</xpath>
</data>
</field>
@@ -79,7 +79,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//field[@name='user_id']" position="after">
<field name="section_id"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
</xpath>
</data>
</field>
@@ -124,7 +124,8 @@
<field name="search_view_id" ref="sale.view_sales_order_filter"/>
<field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
<field name="context">{
'search_default_section_id': [active_id], 'default_section_id': active_id
'search_default_section_id': [active_id], 'default_section_id': active_id,
'search_default_my_sale_orders_filter': 1
}</field>
<field name="help" type="html">
<p class="oe_view_nocontent_create">
@@ -145,7 +146,8 @@
<field name="view_id" ref="sale.view_quotation_tree"/>
<field name="view_mode">tree,form,calendar,graph</field>
<field name="context">{
'search_default_section_id': [active_id], 'default_section_id': active_id, 'show_address': 1
'search_default_section_id': [active_id], 'default_section_id': active_id, 'show_address': 1,
'search_default_my_sale_orders_filter': 1
}</field>
<field name="domain">[('state','in',('draft','sent','cancel'))]</field>
<field name="search_view_id" ref="sale.view_sales_order_filter"/>
@@ -186,20 +188,25 @@
<field name="number_saleorder"/>
<field name="number_invoice"/>
</xpath>
<xpath expr="//div[@class='oe_kanban_crm_salesteams_list']" position="inside">
<a name="%(action_quotations_salesteams)d" type="action" style="margin-right: 10px">
<xpath expr="//div[@class='oe_items_list']" position="inside">
<a name="%(action_quotations_salesteams)d" type="action">
<t t-raw="record.number_quotation.raw_value"/>
<t t-if="record.number_quotation.raw_value &gt;= 1">Quotation</t><t t-if="record.number_quotation.raw_value &lt; 1">Quotations</t></a>
<a name="%(action_orders_salesteams)d" type="action" style="margin-right: 10px">
<a name="%(action_orders_salesteams)d" type="action">
<t t-raw="record.number_saleorder.raw_value"/>
<t t-if="record.number_saleorder.raw_value &gt;= 1">Sales Order</t><t t-if="record.number_saleorder.raw_value &lt; 1">Sales Orders</t></a>
<a name="%(action_invoice_salesteams)d" type="action" style="margin-right: 10px">
<a name="%(action_invoice_salesteams)d" type="action" groups="account.group_account_invoice">
<t t-raw="record.number_invoice.raw_value"/>
<t t-if="record.number_invoice.raw_value &gt;= 1">Invoice</t><t t-if="record.number_invoice.raw_value &lt; 1">Invoices</t></a>
</xpath>
<xpath expr="//div[@class='oe_items_list']" position="after">
<div class="oe_center">
<div class="oe_sum"><field name="sum_month_invoice"/></div>
<div class="oe_subsum">Invoiced this month</div>
</div>
</xpath>
</data>
</field>
</record>
</data>
</openerp>