odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REF] crm, hr, project: refactored kanban/form html/css to be cleaner and remove custom CSS. kanban specific css for aliases has been moved into web_kanban. 

bzr revid: tde@openerp.com-20130405110737-xhdgxodrffqtfrzp
This commit is contained in:
Thibault Delavallée 2013-04-05 13:07:37 +02:00
parent 1804c558e7
commit 034d244be6
8 changed files with 47 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/crm/crm.py
View File

@ -160,7 +160,7 @@ class crm_case_section(osv.osv):
def name_get(self, cr, uid, ids, context=None):
"""Overrides orm name_get method"""
if not isinstance(ids, list) :
if not isinstance(ids, list):
ids = [ids]
res = []
if not ids:
@ -177,20 +177,20 @@ class crm_case_section(osv.osv):
def create(self, cr, uid, vals, context=None):
mail_alias = self.pool.get('mail.alias')
if not vals.get('alias_id'):
vals.pop('alias_name', None) # prevent errors during copy()
alias_name = vals.pop('alias_name', None) or vals.get('name') # prevent errors during copy()
alias_id = mail_alias.create_unique_alias(cr, uid,
{'alias_name': vals['name']},
{'alias_name': alias_name},
model_name="crm.lead",
context=context)
vals['alias_id'] = alias_id
res = super(crm_case_section, self).create(cr, uid, vals, context)
mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type':'lead'}}, context)
mail_alias.write(cr, uid, [vals['alias_id']], {'alias_defaults': {'section_id': res, 'type': 'lead'}}, context)
return res
def unlink(self, cr, uid, ids, context=None):
# Cascade-delete mail aliases as well, as they should not exist without the sales team.
mail_alias = self.pool.get('mail.alias')
alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id ]
alias_ids = [team.alias_id.id for team in self.browse(cr, uid, ids, context=context) if team.alias_id]
res = super(crm_case_section, self).unlink(cr, uid, ids, context=context)
mail_alias.unlink(cr, uid, alias_ids, context=context)
return res

10
addons/crm/crm_case_section_view.xml
View File

@ -94,7 +94,7 @@
</div>
<div class="oe_kanban_content">
<h4><field name="name"/></h4>
<div class="oe_alias" t-if="record.use_leads.raw_value and record.alias_id.value">
<div class="oe_kanban_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_items_list">
@ -151,11 +151,13 @@
<h1>
<field name="name" string="Project Name"/>
</h1>
<div name="group_alias">
<div name="group_alias"
attrs="{'invisible': [('alias_domain', '=', False)]}">
<label for="alias_id" string="Email Alias"/>
<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': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>
<span name="edit_alias" class="oe_edit_only">
<field name="alias_name" class="oe_inline"
attrs="{'required': [('use_leads', '=', True), ('alias_id', '!=', False)]}"/>
@
<field name="alias_domain" class="oe_inline" readonly="1"/>
</span>

2
addons/crm/crm_data.xml
View File

@ -27,7 +27,7 @@
</record>
<record model="crm.case.section" id="section_sales_department">
<field name="name">Sales Department</field>
<field name="name">Sales</field>
<field name="code">Sales</field>
</record>

13
addons/crm/static/src/css/crm.css
View File

@ -19,19 +19,6 @@
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias {
margin: 0px 0 8px 0;
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_alias .oe_e {
font-size: 30px;
line-height: 6px;
vertical-align: top;
margin-right: 3px;
color: white;
text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
float: left;
}
.openerp .oe_kanban_view .oe_kanban_crm_salesteams .oe_items_list {
margin: 10px 0;
}

15
addons/hr_recruitment/hr_recruitment_view.xml
View File

@ -313,12 +313,15 @@
</div>
</field>
<xpath expr="//div[@class='oe_title']//h1" position="after">
<div attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_id" class="oe_inline" required="0" invisible="1"/>
<label for="alias_id" string='Email'
attrs="{'invisible': [('alias_domain', '=', False)]}"/>
<span name="edit_alias">
<field name="alias_name" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field class="oe_inline" name="alias_domain"/>
<div name="group_alias"
attrs="{'invisible': [('alias_domain', '=', False)]}">
<label for="alias_id" string="Email Alias"/>
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
<span name="edit_alias" class="oe_edit_only">
<field name="alias_name" class="oe_inline"
attrs="{'required': [('alias_id', '!=', False)]}"/>
@
<field name="alias_domain" class="oe_inline" readonly="1"/>
</span>
</div>
</xpath>

18
addons/mail/mail_group_view.xml
View File

@ -30,6 +30,7 @@
<field name="message_is_follower"/>
<field name="message_summary"/>
<field name="description"/>
<field name="alias_id"/>
<templates>
<t t-name="kanban-description">
<div class="oe_group_description" t-if="record.description.raw_value">
@ -43,6 +44,9 @@
</div>
<div class="oe_group_details">
<h4><a type="open"><field name="name"/></a></h4>
<div class="oe_kanban_alias" t-if="record.alias_id.value">
<span class="oe_e">%%</span><small><field name="alias_id"/></small>
</div>
<div class="oe_grey">
<field name="description"/>
</div>
@ -75,10 +79,16 @@
<label for="name" string="Group Name"/>
</div>
<h1><field name="name" readonly="0"/></h1>
<div name="alias_box" colspan="4" attrs="{'invisible': [('alias_domain', '=', False)]}">
<field name="alias_id" class="oe_read_only" required="0" invisible="1"/>
<label for="alias_name" string="Email"/>
<field name="alias_name" nolabel="1" class="oe_inline" attrs="{'required': [('alias_id', '!=', False)]}"/>@<field name="alias_domain" nolabel="1" class="oe_inline" style="padding-left:0;"/>
<div name="group_alias"
attrs="{'invisible': [('alias_domain', '=', False)]}">
<label for="alias_id" string="Email Alias"/>
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
<span name="edit_alias" class="oe_edit_only">
<field name="alias_name" class="oe_inline"
attrs="{'required': [('alias_id', '!=', False)]}"/>
@
<field name="alias_domain" class="oe_inline" readonly="1"/>
</span>
</div>
</div>
<field name="description" placeholder="Topics discussed in this group..."/>

22
addons/project/project_view.xml
View File

@ -88,15 +88,17 @@
<h1>
<field name="name" string="Project Name"/>
</h1>
<div name="group_alias">
<label for="alias_id"/>
<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"/>
</span>
</div>
<div name="group_alias"
attrs="{'invisible': [('alias_domain', '=', False)]}">
<label for="alias_id" string="Email Alias"/>
<field name="alias_id" class="oe_inline oe_read_only" required="0" nolabel="1"/>
<span name="edit_alias" class="oe_edit_only">
<field name="alias_name" class="oe_inline"
attrs="{'required': [('alias_id', '!=', False)]}"/>
@
<field name="alias_domain" class="oe_inline" readonly="1"/>
</span>
</div>
<div name="options_active">
<field name="use_tasks" class="oe_inline"/>
<label for="use_tasks"/>
@ -248,7 +250,7 @@
</div>
<div class="oe_kanban_content">
<h4><field name="name"/></h4>
<div class="oe_kanban_project_alias" t-if="record.alias_id.value">
<div class="oe_kanban_alias" t-if="record.alias_id.value">
<span class="oe_e">%%</span><small><field name="alias_id"/></small>
</div>
<div class="oe_kanban_project_list">

19
addons/project/static/src/css/project.css
View File

@ -61,22 +61,3 @@
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
}
.oe_kanban_project_alias {
margin: 0px 0 8px 0;
}
.oe_kanban_project_alias .oe_e {
font-size: 30px;
line-height: 6px;
vertical-align: top;
margin-right: 3px;
color: white;
text-shadow: 0px 0px 2px rgba(0, 0, 0, 1);
float: left;
}
.oe_kanban_project_alias small {
display: block;
margin-left: 20px;
}