Merge lp:~openerp-dev/openobject-addons/trunk-bug-1112985-cga into lp:openobject-addons

[Chandni Gandhi(OpenERP)]

Hello,

Add the condition in view.

Thanks

Unmerged revisions

8531. By Chandni Gandhi(OpenERP) on 2013-02-04

[FIX]:Add the condition in view

=== modified file 'crm/res_partner_view.xml'
--- crm/res_partner_view.xml	2012-11-29 22:26:45 +0000
+++ crm/res_partner_view.xml	2013-02-04 09:55:40 +0000
@@ -78,12 +78,18 @@
                     <field name="meeting_count"/>
                 </field>
                 <xpath expr="//div[@class='oe_kanban_partner_links']" position="inside">
-                    <a name="%(relate_partner_opportunities)d" type="action" t-if="record.opportunity_count.value>0">
+                    <a name="%(relate_partner_opportunities)d" type="action" t-if="record.opportunity_count.value&gt;1">
                         <t t-esc="record.opportunity_count.value"/> Opportunities
                     </a>
-                    <a name="%(crm_meeting_partner)d" type="action" t-if="record.meeting_count.value>0">
+                    <a name="%(relate_partner_opportunities)d" type="action" t-if="record.opportunity_count.value==1">
+                        <t t-esc="record.opportunity_count.value"/> Opportunity
+                    </a>
+                    <a name="%(crm_meeting_partner)d" type="action" t-if="record.meeting_count.value&gt;1">
                         <t t-esc="record.meeting_count.value"/> Meetings
                     </a>
+                    <a name="%(crm_meeting_partner)d" type="action" t-if="record.meeting_count.value==1">
+                        <t t-esc="record.meeting_count.value"/> Meeting
+                    </a>
                 </xpath>
             </field>
         </record>
 
=== modified file 'purchase/partner_view.xml'
--- purchase/partner_view.xml	2012-11-29 22:26:45 +0000
+++ purchase/partner_view.xml	2013-02-04 09:55:40 +0000
@@ -41,9 +41,12 @@
                     <field name="purchase_order_count"/>
                 </field>
                 <xpath expr="//div[@class='oe_kanban_partner_links']" position="inside">
-                    <a name="%(purchase.act_res_partner_2_purchase_order)d" type="action" t-if="record.purchase_order_count.value>0">
+                    <a name="%(purchase.act_res_partner_2_purchase_order)d" type="action" t-if="record.purchase_order_count.value&gt;1">
                         <t t-esc="record.purchase_order_count.value"/> Purchases
                     </a>
+                    <a name="%(purchase.act_res_partner_2_purchase_order)d" type="action" t-if="record.purchase_order_count.value==1">
+                        <t t-esc="record.purchase_order_count.value"/> Purchase
+                    </a>
                 </xpath>
             </field>
         </record>
 
=== modified file 'sale/res_partner_view.xml'
--- sale/res_partner_view.xml	2012-12-20 11:43:56 +0000
+++ sale/res_partner_view.xml	2013-02-04 09:55:40 +0000
@@ -34,9 +34,12 @@
                     <field name="sale_order_count"/>
                 </field>
                 <xpath expr="//div[@class='oe_kanban_partner_links']" position="inside">
-                    <a name="%(sale.act_res_partner_2_sale_order)d" type="action" t-if="record.sale_order_count.value>0">
+                    <a name="%(sale.act_res_partner_2_sale_order)d" type="action" t-if="record.sale_order_count.value&gt;1">
                         <t t-esc="record.sale_order_count.value"/> Sales
                     </a>
+                    <a name="%(sale.act_res_partner_2_sale_order)d" type="action" t-if="record.sale_order_count.value==1">
+                        <t t-esc="record.sale_order_count.value"/> Sale
+                    </a>
                 </xpath>
             </field>
         </record>