From 1d94bd49072c223e33718b068f64b5018209a7f6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 14 Jul 2012 18:04:03 +0200
Subject: [PATCH] [IMP] partner kanban, holidays, meeting

bzr revid: fp@openerp.com-20120714160403-if88yyfrqn07xp3t
---
 addons/base_calendar/crm_meeting.py | 3 ++-
 addons/crm/res_partner.py           | 2 +-
 addons/crm/res_partner_view.xml     | 8 ++++----
 addons/hr_holidays/hr_holidays.py   | 2 +-
 addons/sale/res_partner_view.xml    | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 37056961eab..239ab8d0f28 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -50,7 +50,8 @@ class crm_meeting(base_state, osv.Model):
         'write_date': fields.datetime('Write Date', readonly=True),
         'date_open': fields.datetime('Confirmed', readonly=True),
         'date_closed': fields.datetime('Closed', readonly=True),
-        'partner_ids': fields.many2many('res.partner', string='Attendees', states={'done': [('readonly', True)]}),
+        'partner_ids': fields.many2many('res.partner', 'crm_meeting_partner_rel', 'meeting_id','partner_id',
+            string='Attendees', states={'done': [('readonly', True)]}),
         'state': fields.selection(
                     [('draft', 'Unconfirmed'), ('open', 'Confirmed'), ('cancel', 'Cancelled'), ('done', 'Done')],
                     string='Status', size=16, readonly=True),
diff --git a/addons/crm/res_partner.py b/addons/crm/res_partner.py
index 2274cc6bf29..acf212a2305 100644
--- a/addons/crm/res_partner.py
+++ b/addons/crm/res_partner.py
@@ -38,7 +38,7 @@ class res_partner(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
         'opportunity_ids': fields.one2many('crm.lead', 'partner_id',\
             'Leads and Opportunities', domain=[('state','in', ('draft','open','pending'))]),
-        'meeting_ids': fields.one2many('crm.meeting', 'partner_ids',\
+        'meeting_ids': fields.many2many('crm.meeting', 'crm_meeting_partner_rel','partner_id', 'meeting_id',
             'Meetings'),
         'phonecall_ids': fields.one2many('crm.phonecall', 'partner_id',\
             'Phonecalls'),
diff --git a/addons/crm/res_partner_view.xml b/addons/crm/res_partner_view.xml
index 9f39c827536..29e733e2496 100644
--- a/addons/crm/res_partner_view.xml
+++ b/addons/crm/res_partner_view.xml
@@ -107,11 +107,11 @@
                     <field name="meeting_count"/>
                 </field>
                 <xpath expr="//h4[@class='oe_partner_heading']" position="after">
-                    <a name="%(relate_partner_opportunities)d" type="action">
-                        <t t-if="record.opportunity_count.value"><t t-esc="record.opportunity_count.value"/> Opportunities</t>
+                    <a name="%(relate_partner_opportunities)d" type="action" t-if="record.opportunity_count.value>0" class="oe_tag">
+                        <t t-esc="record.opportunity_count.value"/> Opportunities
                     </a>
-                    <a name="%(crm_meeting_partner)d" type="action">
-                        <t t-if="record.meeting_count.value"><t t-esc="record.meeting_count.value"/> Meetings</t>
+                    <a name="%(crm_meeting_partner)d" type="action" t-if="record.meeting_count.value>0" class="oe_tag">
+                        <t t-esc="record.meeting_count.value"/> Meetings
                     </a>
                 </xpath>
             </field>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 879d3ba1495..ef272e4de6a 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -267,7 +267,7 @@ class hr_holidays(osv.osv):
                 meeting_obj = self.pool.get('crm.meeting')
                 meeting_vals = {
                     'name': record.name,
-                    'categ_ids': [(6,0,[record.holiday_status_id.categ_id.id])],
+                    'categ_ids': record.holiday_status_id.categ_id and [(6,0,[record.holiday_status_id.categ_id.id])] or [],
                     'duration': record.number_of_days_temp * 8,
                     'description': record.notes,
                     'user_id': record.user_id.id,
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 3a5799b2a65..bb5695eac39 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -12,8 +12,8 @@
                     <field name="sale_order_count"/>
                 </field>
                 <xpath expr="//h4[@class='oe_partner_heading']" position="after">
-                    <a name="%(sale.act_res_partner_2_sale_order)d" type="action">
-                        <t t-if="record.sale_order_count.value"><t t-esc="record.sale_order_count.value" /> Sales</t>
+                    <a name="%(sale.act_res_partner_2_sale_order)d" type="action" t-if="record.sale_order_count.value>0" class="oe_tag">
+                        <t t-esc="record.sale_order_count.value"/> Sales
                     </a>
                 </xpath>
             </field>