[IMP] alias: make chatter and aliases feature more user friendly and visible to the users. Delete res_config for display option: create leads/issue from incoming emails
bzr revid: chm@openerp.com-20130129100756-40z640jwo18z9qcj
This commit is contained in:
parent
1e9cf860ae
commit
a92bacb55c
|
@ -71,6 +71,7 @@
|
||||||
<field name="member_ids"/>
|
<field name="member_ids"/>
|
||||||
<field name="note"/>
|
<field name="note"/>
|
||||||
<field name="alias_id"/>
|
<field name="alias_id"/>
|
||||||
|
<field name="alias_domain"/>
|
||||||
<field name="number_lead"/>
|
<field name="number_lead"/>
|
||||||
<field name="number_opportunity"/>
|
<field name="number_opportunity"/>
|
||||||
<templates>
|
<templates>
|
||||||
|
@ -110,10 +111,12 @@
|
||||||
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
|
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
|
||||||
</t>
|
</t>
|
||||||
</div>
|
</div>
|
||||||
<br/>
|
<t t-if="record.alias_domain.raw_value">
|
||||||
<small style="position: absolute; bottom: 5px;">
|
<br/>
|
||||||
<field name="alias_id"/>
|
<small style="position: absolute; bottom: 5px;">
|
||||||
</small>
|
<field name="alias_id"/>
|
||||||
|
</small>
|
||||||
|
</t>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</t>
|
</t>
|
||||||
|
|
|
@ -83,6 +83,12 @@
|
||||||
<field name="name" colspan="2"/>
|
<field name="name" colspan="2"/>
|
||||||
<field name="parent_id"/>
|
<field name="parent_id"/>
|
||||||
<field name="code"/>
|
<field name="code"/>
|
||||||
|
|
||||||
|
<field name="alias_id" invisible="1" required="0"/>
|
||||||
|
<label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||||
|
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||||
|
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
|
||||||
|
</div>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<group>
|
<group>
|
||||||
|
@ -94,11 +100,6 @@
|
||||||
<notebook colspan="4">
|
<notebook colspan="4">
|
||||||
<page string="Sales Team">
|
<page string="Sales Team">
|
||||||
<group>
|
<group>
|
||||||
<field name="alias_id" invisible="1" required="0"/>
|
|
||||||
<label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
|
||||||
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
|
|
||||||
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
|
|
||||||
</div>
|
|
||||||
<field name="change_responsible"/>
|
<field name="change_responsible"/>
|
||||||
</group>
|
</group>
|
||||||
<separator string="Team Members"/>
|
<separator string="Team Members"/>
|
||||||
|
|
|
@ -26,9 +26,6 @@ class crm_configuration(osv.osv_memory):
|
||||||
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
|
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
|
||||||
|
|
||||||
_columns = {
|
_columns = {
|
||||||
'fetchmail_lead': fields.boolean("Create leads from incoming mails",
|
|
||||||
fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
|
|
||||||
help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
|
|
||||||
'group_fund_raising': fields.boolean("Manage Fund Raising",
|
'group_fund_raising': fields.boolean("Manage Fund Raising",
|
||||||
implied_group='crm.group_fund_raising',
|
implied_group='crm.group_fund_raising',
|
||||||
help="""Allows you to trace and manage your activities for fund raising."""),
|
help="""Allows you to trace and manage your activities for fund raising."""),
|
||||||
|
|
|
@ -23,19 +23,6 @@
|
||||||
</div>
|
</div>
|
||||||
</group>
|
</group>
|
||||||
</div>
|
</div>
|
||||||
<group name="On Mail Client" version="7.0" position="after">
|
|
||||||
<group>
|
|
||||||
<label for="id" string="On Mail Server"/>
|
|
||||||
<div>
|
|
||||||
<div name="fetchmail_lead">
|
|
||||||
<field name="fetchmail_lead" class="oe_inline"/>
|
|
||||||
<label for="fetchmail_lead"/>
|
|
||||||
<button name="configure_fetchmail_lead" type="object" string="Configure" icon="gtk-go-forward"
|
|
||||||
attrs="{'invisible': [('fetchmail_lead','=',False)]}" class="oe_link"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</group>
|
|
||||||
</group>
|
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
|
|
||||||
import crm_claim
|
import crm_claim
|
||||||
import report
|
import report
|
||||||
import res_config
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,6 @@ automatically new claims based on incoming emails.
|
||||||
'crm_claim_menu.xml',
|
'crm_claim_menu.xml',
|
||||||
'security/ir.model.access.csv',
|
'security/ir.model.access.csv',
|
||||||
'report/crm_claim_report_view.xml',
|
'report/crm_claim_report_view.xml',
|
||||||
'res_config_view.xml',
|
|
||||||
'crm_claim_data.xml',
|
'crm_claim_data.xml',
|
||||||
],
|
],
|
||||||
'demo': ['crm_claim_demo.xml'],
|
'demo': ['crm_claim_demo.xml'],
|
||||||
|
|
|
@ -1,32 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# OpenERP, Open Source Business Applications
|
|
||||||
# Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
from openerp.osv import fields, osv
|
|
||||||
|
|
||||||
class crm_claim_settings(osv.osv_memory):
|
|
||||||
_name = 'sale.config.settings'
|
|
||||||
_inherit = ['sale.config.settings', 'fetchmail.config.settings']
|
|
||||||
|
|
||||||
_columns = {
|
|
||||||
'fetchmail_claim': fields.boolean("Create claims from incoming mails",
|
|
||||||
fetchmail_model='crm.claim', fetchmail_name='Incoming Claims',
|
|
||||||
help="""Allows you to configure your incoming mail server, and create claims from incoming emails."""),
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<openerp>
|
|
||||||
<data>
|
|
||||||
|
|
||||||
<record id="view_project_config_claim" model="ir.ui.view">
|
|
||||||
<field name="name">crm_claim settings</field>
|
|
||||||
<field name="model">sale.config.settings</field>
|
|
||||||
<field name="inherit_id" ref="base_setup.view_sale_config_settings"/>
|
|
||||||
<field name="priority" eval="20"/>
|
|
||||||
<field name="arch" type="xml">
|
|
||||||
<div name="fetchmail_lead" position="after">
|
|
||||||
<div>
|
|
||||||
<field name="fetchmail_claim" class="oe_inline"/>
|
|
||||||
<label for="fetchmail_claim"/>
|
|
||||||
<button type="object" name="configure_fetchmail_claim" string="Configure" icon="gtk-go-forward"
|
|
||||||
attrs="{'invisible': [('fetchmail_claim','=',False)]}" class="oe_link"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</field>
|
|
||||||
</record>
|
|
||||||
|
|
||||||
</data>
|
|
||||||
</openerp>
|
|
|
@ -336,7 +336,8 @@
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
<field name="company_id" widget="selection" groups="base.group_multi_company"/>
|
||||||
<field name="department_id"/> </group>
|
<field name="department_id"/>
|
||||||
|
</group>
|
||||||
</group>
|
</group>
|
||||||
<div>
|
<div>
|
||||||
<label for="description"/>
|
<label for="description"/>
|
||||||
|
|
|
@ -307,12 +307,12 @@
|
||||||
attrs="{'invisible':[('survey_id','=',False)]}"/>
|
attrs="{'invisible':[('survey_id','=',False)]}"/>
|
||||||
</div>
|
</div>
|
||||||
</field>
|
</field>
|
||||||
<xpath expr="//div[@class='oe_title']" version="7.0" position="after">
|
<xpath expr="//group//group" version="7.0" position="inside">
|
||||||
|
<field name="alias_id" invisible="1" required="0"/>
|
||||||
|
<label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||||
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
|
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||||
<field name="alias_id" invisible="1" required="0"/>
|
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
|
||||||
<label for="alias_name" class="oe_edit_only"/>
|
</div>
|
||||||
<field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
|
|
||||||
</div>
|
|
||||||
</xpath>
|
</xpath>
|
||||||
</field>
|
</field>
|
||||||
</record>
|
</record>
|
||||||
|
|
|
@ -69,39 +69,38 @@
|
||||||
<field name="arch" type="xml">
|
<field name="arch" type="xml">
|
||||||
<form string="Group Form" version="7.0">
|
<form string="Group Form" version="7.0">
|
||||||
<sheet class="openerp_mail_group_sheet">
|
<sheet class="openerp_mail_group_sheet">
|
||||||
<field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_medium"}'/>
|
<field name="image" widget='image' class="oe_avatar oe_left" options='{"preview_image": "image_small"}'/>
|
||||||
<div class="oe_title">
|
<div class="oe_title">
|
||||||
<div class="oe_edit_only">
|
<div class="oe_edit_only">
|
||||||
<label for="name" string="Group Name"/>
|
<label for="name" string="Group Name"/>
|
||||||
</div>
|
</div>
|
||||||
<h1><field name="name" readonly="0"/></h1>
|
<h1><field name="name" readonly="0"/></h1>
|
||||||
|
|
||||||
<div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
|
<div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||||
<field name="alias_id" invisible="1" required="0"/>
|
<field name="alias_id" invisible="1" required="0"/>
|
||||||
<label for="alias_name" class="oe_edit_only"/>
|
<label for="alias_name" class="oe_edit_only"/>
|
||||||
<field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
|
<field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline"/>
|
||||||
</div>
|
</div>
|
||||||
<field name="description" placeholder="Topics discussed in this group..."/>
|
|
||||||
</div>
|
</div>
|
||||||
|
<field name="description" placeholder="Topics discussed in this group..."/>
|
||||||
<div class="oe_clear"/>
|
<div class="oe_clear"/>
|
||||||
<group>
|
<group class="oe_edit_only">
|
||||||
<group class="oe_edit_only">
|
<field name="public"/>
|
||||||
<field name="public"/>
|
<field name="group_public_id"
|
||||||
<field name="group_public_id"
|
attrs="{'invisible': [('public','<>','groups')], 'required': [('public','=','groups')]}"
|
||||||
attrs="{'invisible': [('public','<>','groups')], 'required': [('public','=','groups')]}"
|
/>
|
||||||
/>
|
<field name="group_ids" widget="many2many_tags"/>
|
||||||
<field name="group_ids" widget="many2many_tags"/>
|
</group>
|
||||||
</group>
|
<group attrs="{'invisible': [('public','not in',['public','private'])]}">
|
||||||
<group>
|
<div class="oe_grey" attrs="{'invisible': [('public','<>','public')]}">
|
||||||
<div class="oe_grey" attrs="{'invisible': [('public','<>','public')]}">
|
This group is visible by everyone,
|
||||||
This group is visible by everyone,
|
including your customers if you installed
|
||||||
including your customers if you installed
|
the portal module.
|
||||||
the portal module.
|
</div>
|
||||||
</div>
|
<div class="oe_grey" attrs="{'invisible': [('public','<>','private')]}">
|
||||||
<div class="oe_grey" attrs="{'invisible': [('public','<>','private')]}">
|
Only the invited followers can read the
|
||||||
Only the invited followers can read the
|
discussions on this group.
|
||||||
discussions on this group.
|
</div>
|
||||||
</div>
|
|
||||||
</group>
|
|
||||||
</group>
|
</group>
|
||||||
</sheet>
|
</sheet>
|
||||||
<div class="oe_chatter">
|
<div class="oe_chatter">
|
||||||
|
|
|
@ -14,6 +14,10 @@
|
||||||
padding: 0px 18px;
|
padding: 0px 18px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.openerp .oe_form_sheetbg.openerp_mail_group_sheet .oe_avatar {
|
||||||
|
padding-top: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
/* Resize footer width */
|
/* Resize footer width */
|
||||||
.openerp .oe_form div.oe_mail_group_footer {
|
.openerp .oe_form div.oe_mail_group_footer {
|
||||||
max-width: 80%;
|
max-width: 80%;
|
||||||
|
@ -21,7 +25,7 @@
|
||||||
|
|
||||||
/* Resize group description */
|
/* Resize group description */
|
||||||
.openerp .oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea {
|
.openerp .oe_form_sheetbg.openerp_mail_group_sheet .oe_form_field_text > textarea {
|
||||||
height: 40px;
|
height: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ------------------------------ */
|
/* ------------------------------ */
|
||||||
|
|
|
@ -105,6 +105,12 @@
|
||||||
<group>
|
<group>
|
||||||
<field name="privacy_visibility"/>
|
<field name="privacy_visibility"/>
|
||||||
<field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
|
<field name="user_id" string="Project Manager" attrs="{'readonly':[('state','in',['close', 'cancelled'])]}"/>
|
||||||
|
|
||||||
|
<field name="alias_id" invisible="1" required="0"/>
|
||||||
|
<label for="alias_name" attrs="{'invisible': [('alias_domain', '=', False)]}"/>
|
||||||
|
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
|
||||||
|
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
|
||||||
|
</div>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
<field name="partner_id" on_change="onchange_partner_id(partner_id)"/>
|
||||||
|
@ -135,13 +141,6 @@
|
||||||
</page>
|
</page>
|
||||||
<page string="Other Info">
|
<page string="Other Info">
|
||||||
<group>
|
<group>
|
||||||
<group string="Email Interface" attrs="{'invisible': [('alias_domain', '=', False)]}">
|
|
||||||
<div>
|
|
||||||
<field name="alias_id" invisible="1" required="0"/>
|
|
||||||
<label for="alias_name" class="oe_edit_only "/>
|
|
||||||
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" class="oe_inline"/>
|
|
||||||
</div>
|
|
||||||
</group>
|
|
||||||
<group string="Administration" groups="project.group_time_work_estimation_tasks">
|
<group string="Administration" groups="project.group_time_work_estimation_tasks">
|
||||||
<field name="planned_hours" widget="float_time"/>
|
<field name="planned_hours" widget="float_time"/>
|
||||||
<field name="effective_hours" widget="float_time"/>
|
<field name="effective_hours" widget="float_time"/>
|
||||||
|
@ -273,6 +272,12 @@
|
||||||
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
|
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
|
||||||
</t>
|
</t>
|
||||||
</div>
|
</div>
|
||||||
|
<t t-if="record.alias_domain.raw_value">
|
||||||
|
<br/>
|
||||||
|
<small style="position: absolute; bottom: 5px;">
|
||||||
|
<field name="alias_id"/>
|
||||||
|
</small>
|
||||||
|
</t>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</t>
|
</t>
|
||||||
|
|
Loading…
Reference in New Issue