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

[IMP]:If Location and description is not added put - and change color of label

Browse Source 
bzr revid: aja@tinyerp.com-20131010045946-58i7kxd2611q2agj
This commit is contained in:
ajay javiya (OpenERP)
2013-10-10 10:29:46 +05:30
parent f0351273dd
commit 3fae74635b
2 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_calendar/crm_meeting_data.xml
+41 -13
View File
@@ -72,26 +72,54 @@
</td>
<td colspan="1">
<div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px" >
: ${object.location or ''}
: ${object.location}
<span style= "color:#A9A9A9; ">(<a href="http://maps.google.com/maps?oi=map&q=${object.location}">View Map</a>)
</span>
</div>
</td>
</tr>
% endif
% if not object.location :
<tr style=" height: 30px;color:#909090">
<td>
<div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
Where
</div>
</td>
<td colspan="1">
<div style = "font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 14px;" >
: -
</div>
</td>
</tr>
% endif
% if object.description :
<tr style=" height: 30px;">
<td>
<div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
What
</div>
</td>
<td colspan="3">
<div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
: ${object.description or ''}
</div>
</td>
</tr>
<tr style=" height: 30px;">
<td>
<div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
What
</div>
</td>
<td colspan="3">
<div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
: ${object.description or ''}
</div>
</td>
</tr>
% endif
% if not object.description :
<tr style=" height: 30px;color:#909090">
<td>
<div style="height: 25px; width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
What
</div>
</td>
<td colspan="3">
<div style="font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
: -
</div>
</td>
</tr>
% endif
<tr style=" height: 30px;">
<td style="height: 25px;width: 120px; background : # CCCCCC; font-family: Lucica Grande', Ubuntu, Arial, Verdana, sans-serif;">
addons/base_calendar/static/src/xml/base_calender.xml
+2 -2
View File
@@ -23,9 +23,9 @@
<td class="cal_lable">When</td>
<td>: <t t-esc="invitation['meeting'].when"/></td>
</tr>
<tr t-if="invitation['meeting'].where">
<tr>
<td class="cal_lable">Where</td>
<td>: <t t-esc="invitation['meeting'].where or ''"/></td>
<td>: <t t-esc="invitation['meeting'].where or '-'"/></td>
</tr>
<tr>
<td class="cal_lable">Who</td>