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

[MERGE] Merged with server/trunk. 

bzr revid: tde@openerp.com-20120831073840-4cidj68qd2rubkjs
This commit is contained in:
Thibault Delavallée 2012-08-31 09:38:40 +02:00
parent e46c266ec4 a99e5cae0a
commit fed157bcad
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/module/module_view.xml
View File

@ -69,7 +69,7 @@
<t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
<img t-attf-src="#{record.icon.value}" class="oe_module_icon"/>
<div class="oe_module_desc">
<h4><a type="edit"><field name="shortdesc"/></a></h4>
<h4><a type="open"><field name="shortdesc"/></a></h4>
<p class="oe_module_name">
<t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
<i><field name="name" groups="base.group_no_one"/></i>

8
openerp/addons/base/res/res_partner_view.xml
View File

@ -176,7 +176,7 @@
<div t-att-class="color + (record.title.raw_value == 1 ? ' oe_kanban_color_alert' : '')" style="position: relative">
<a t-if="! read_only_mode" type="delete" style="position: absolute; right: 0; padding: 4px; diplay: inline-block">X</a>
<div class="oe_module_vignette">
<a type="edit">
<a type="open">
<img t-att-src="kanban_image('res.partner', 'image', record.id.value, {'preview_image': 'image_small'})" class="oe_avatar oe_kanban_avatar_smallbox"/>
</a>
<div class="oe_module_desc">
@ -184,7 +184,7 @@
<table class="oe_kanban_table">
<tr>
<td class="oe_kanban_title1" align="left" valign="middle">
<h4><a type="edit"><field name="name"/></a></h4>
<h4><a type="open"><field name="name"/></a></h4>
<i><div t-if="record.function.raw_value">
<field name="function"/></div></i>
<div><a t-if="record.email.raw_value" title="Mail" t-att-href="'mailto:'+record.email.value">
@ -299,11 +299,11 @@
<templates>
<t t-name="kanban-box">
<div class="oe_kanban_vignette">
<a type="edit">
<a type="open">
<img t-att-src="kanban_image('res.partner', 'image_small', record.id.value)" class="oe_kanban_image"/>
</a>
<div class="oe_kanban_details">
<h4 class="oe_partner_heading"><a type="edit"><field name="name"/></a></h4>
<h4 class="oe_partner_heading"><a type="open"><field name="name"/></a></h4>
<div class="oe_kanban_partner_categories"/>
<div class="oe_kanban_partner_links"/>
<ul>

2
setup.py
View File

@ -95,7 +95,7 @@ setuptools.setup(
'docutils',
'feedparser',
'gdata',
'lxml',
'lxml < 3',
'mako',
'psycopg2',
'pydot',