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

[IMP]Improved typo. Css of address. put if condition before value. Removed strong from description. Improved code for search. 

bzr revid: bth@tinyerp.com-20131021104122-jsbra3e8f2efwbxu
This commit is contained in:
bth-openerp 2013-10-21 16:11:22 +05:30
parent 686d671012
commit 5b50ea85d7
7 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/crm_partner_assign/res_partner_demo.xml
View File

@ -14,7 +14,7 @@
<field name="sequence">3</field>
</record>
<record id="res_partner_grade_platinium" model="res.partner.grade">
<field name="name">Platinium</field>
<field name="name">Platinum</field>
<field name="sequence">4</field>
</record>
@ -56,7 +56,11 @@
<field name="grade_id" ref="res_partner_grade_gold"/>
<field name="partner_weight">10</field>
</record>
<record id="base.res_partner_12" model="res.partner">
<field name="grade_id" ref="res_partner_grade_gold"/>
<field name="partner_weight">10</field>
</record>
<record id="base.res_partner_9" model="res.partner">
<field name="grade_id" ref="res_partner_grade_platinium"/>
<field name="partner_weight">10</field>

8
addons/website/static/src/css/website.css
View File

@ -440,3 +440,11 @@ a[data-publish][data-publish='on']:hover .css_published {
::selection {
background: rgba(150, 150, 220, 0.3);
}
.texttop {
vertical-align: top;
}
table.well tr th {
text-align: right;
padding-right: 10px;
}

7
addons/website/static/src/css/website.sass
View File

@ -335,3 +335,10 @@ a[data-publish]
::selection
background: rgba(150, 150, 220, 0.3)
.texttop
vertical-align: top
table.well tr th
text-align: right
padding-right: 10px

2
addons/website_crm_partner_assign/controllers/main.py
View File

@ -28,7 +28,7 @@ class WebsiteCrmPartnerAssign(http.Controller):
if request.context['is_public_user']:
base_partner_domain += [('website_published', '=', True)]
partner_domain = list(base_partner_domain)
if grade_id:
if grade_id and grade_id != 'all':
partner_domain += [('grade_id', '=', int(grade_id))] # try/catch int
if country_id:
country = country_obj.browse(request.cr, request.uid, country_id, request.context)

2
addons/website_crm_partner_assign/views/website_crm_partner_assign.xml
View File

@ -85,7 +85,7 @@
<img class="media-object" t-att-src="partner_id.img('image_small')"/>
</a>
<div class="media-body" style="min-height: 64px;">
<a class="media-heading" t-href="/partners/#{ partner_id.id }/"><span t-field="partner_id.parent_id"/> <span t-field="partner_id.name"/></a> - <span t-field="partner_id.grade_id"/>
<a class="media-heading" t-href="/partners/#{ partner_id.id }/"><span t-field="partner_id.parent_id"/> <span t-field="partner_id.name"/></a> <t t-if="partner_id.grade_id"> - <span t-field="partner_id.grade_id"/> </t>
<t t-if="partner_id.website_short_description"><div t-field="partner_id.website_short_description"/></t>
</div>
</div>

19
addons/website_partner/views/website_partner_view.xml
View File

@ -17,12 +17,17 @@
</colgroup>
<tbody>
<t t-set="address" t-value="'&lt;br/&gt;'.join(partner_id.name_get()[0][1].split('\n')[1:])"/>
<tr t-if="address or editable"><th>Address</th><td class="span2" t-raw="address"/></tr>
<tr t-if="partner_id.website or editable"><th>Website</th><td class="span2"><span t-field="partner_id.website"/></td></tr>
<tr t-if="partner_id.phone or editable"><th>Tel</th><td class="span2"><span t-field="partner_id.phone"/></td></tr>
<tr t-if="partner_id.mobile or editable"><th>Tel</th><td class="span2"><span t-field="partner_id.mobile"/></td></tr>
<tr t-if="partner_id.fax or editable"><th>Fax</th><td class="span2"><span t-field="partner_id.fax"/></td></tr>
<tr t-if="partner_id.email or editable"><th>Email</th><td class="span2"><span t-field="partner_id.email"/></td></tr>
<tr t-if="address or editable"><th class="texttop">Address</th><td class="span2" t-raw="address"/></tr>
<tr t-if="partner_id.website or editable"><th>Website</th><td class="span2">
<t t-if="partner_id.website"><span t-field="partner_id.website"/></t></td></tr>
<tr t-if="partner_id.phone or editable"><th>Phone</th><td class="span2">
<t t-if="partner_id.phone"><span t-field="partner_id.phone"/></t></td></tr>
<tr t-if="partner_id.mobile or editable"><th>Tel</th><td class="span2">
<t t-if="partner_id.mobile"><span t-field="partner_id.mobile"/></t></td></tr>
<tr t-if="partner_id.fax or editable"><th>Fax</th><td class="span2">
<t t-if="partner_id.fax"><span t-field="partner_id.fax"/></t></td></tr>
<tr t-if="partner_id.email or editable"><th>Email</th><td class="span2">
<t t-if="partner_id.email"><span t-field="partner_id.email"/></t></td></tr>
</tbody>
</table>
</address>
@ -31,4 +36,4 @@
</template>
</data>
</openerp>
</openerp>

4
addons/website_partner/website_partner_demo.xml
View File

@ -247,9 +247,9 @@ Roadmap Development </li>
<record id="base.res_partner_18" model="res.partner">
<field name="website_short_description">We are a technology consulting &amp; strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide. At Think Big Systems we bring operational experience combined...</field>
<field name="website_description"><![CDATA[<strong>We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide.</strong>
<field name="website_description"><![CDATA[We are a technology consulting & strategic advisory firm that creates value enhancing solutions through the use of advanced software for our clients worldwide.
<br/> <br/>
<strong>At Think Big Systems we bring operational experience combined with technological acumen. We understand that any software that supports business operations needs to be designed in such a way that facilitates the execution of critical operational processes, and serves as a tool to the users rather than a barrier. Our approach is focused on the process first, ensuring that it contributes to the goals of the company, we then optimize it, and design the software solutions to best support it.</strong>]]></field>
At Think Big Systems we bring operational experience combined with technological acumen. We understand that any software that supports business operations needs to be designed in such a way that facilitates the execution of critical operational processes, and serves as a tool to the users rather than a barrier. Our approach is focused on the process first, ensuring that it contributes to the goals of the company, we then optimize it, and design the software solutions to best support it.]]></field>
</record>
<record id="base.res_partner_9" model="res.partner">