From e81194c0aadc81fbff15a9f0810423ddd35f8628 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Wed, 21 Nov 2012 18:45:01 +0530
Subject: [PATCH 01/11] [IMP]solve problem can't installing sale_journal module

bzr revid: pja@tinyerp.com-20121121131501-81uff3hw37angf60
---
 addons/sale_journal/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py
index 30a6a281c49..b5da06419c1 100644
--- a/addons/sale_journal/__openerp__.py
+++ b/addons/sale_journal/__openerp__.py
@@ -51,7 +51,7 @@ Some statistics by journals are provided.
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/invoice_type.jpeg'],
-    'depends': ['sale'],
+    'depends': ['sale_stock'],
     'data': [
         'security/ir.model.access.csv',
         'sale_journal_view.xml',

From 9c53158d0226eada60855dd1888853cd02f66f7b Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Thu, 22 Nov 2012 10:33:12 +0530
Subject: [PATCH 02/11] [IMP] traceback when merge leads after delete all leads

bzr revid: shp@tinyerp.com-20121122050312-rg63jnvfiuzcfxw0
---
 addons/crm/wizard/crm_merge_opportunities.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index edfefb5e5bc..38deba8cd77 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -32,12 +32,13 @@ class crm_merge_opportunity(osv.osv_memory):
         lead = self.pool.get('crm.lead')
         record = self.browse(cr, uid, ids[0], context=context)
         opportunities = record.opportunity_ids
-        #TOFIX: why need to check lead_ids here
-        lead_ids = [opportunities[0].id]
-        self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context)
-        context['lead_ids'] = lead_ids
-        merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context)
-        return lead.redirect_opportunity_view(cr, uid, merge_id, context=context)
+        if opportunities:
+            #TOFIX: why need to check lead_ids here
+            lead_ids = [opportunities[0].id]
+            self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context)
+            context['lead_ids'] = lead_ids
+            merge_id = lead.merge_opportunity(cr, uid, [x.id for x in opportunities], context=context)
+            return lead.redirect_opportunity_view(cr, uid, merge_id, context=context)
 
     _columns = {
         'opportunity_ids': fields.many2many('crm.lead', rel='merge_opportunity_rel', id1='merge_id', id2='opportunity_id', string='Leads/Opportunities'),

From a63e244dcabe82870f13752b7b9d5dff49fb6759 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Thu, 22 Nov 2012 15:35:35 +0530
Subject: [PATCH 03/11] [IMP] add condiction for opportunities

bzr revid: shp@tinyerp.com-20121122100535-3u7wqjof7znk3kxq
---
 addons/crm/wizard/crm_merge_opportunities.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/wizard/crm_merge_opportunities.py b/addons/crm/wizard/crm_merge_opportunities.py
index 38deba8cd77..93b163f3d27 100644
--- a/addons/crm/wizard/crm_merge_opportunities.py
+++ b/addons/crm/wizard/crm_merge_opportunities.py
@@ -32,7 +32,7 @@ class crm_merge_opportunity(osv.osv_memory):
         lead = self.pool.get('crm.lead')
         record = self.browse(cr, uid, ids[0], context=context)
         opportunities = record.opportunity_ids
-        if opportunities:
+        if len(opportunities):
             #TOFIX: why need to check lead_ids here
             lead_ids = [opportunities[0].id]
             self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, lead_ids)]}, context=context)

From 7e7fb82a04d131001a57d154d888972b1333c423 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Tue, 27 Nov 2012 16:04:37 +0530
Subject: [PATCH 04/11] [IMP]solve problem of create a recurrent meeting and
 reload the page try to open that meeting in calendar from

bzr revid: pja@tinyerp.com-20121127103437-3drxidi21g0bbet3
---
 addons/base_calendar/crm_meeting.py | 47 +++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 9ceaea671ca..bd15666def6 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -66,6 +66,15 @@ class crm_meeting(base_state, osv.Model):
         'state': 'open',
     }
 
+    def message_get_subscription_data(self, cr, uid, ids, context=None):
+        res = {}
+        for virtual_id in ids:
+            real_id = base_calendar.base_calendar_id2real_id(virtual_id)
+            result = super(crm_meeting, self).message_get_subscription_data(cr, uid, [real_id], context=context)
+            res[virtual_id] = result[real_id]
+        return res
+
+    
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
         default['attendee_ids'] = False
@@ -115,3 +124,41 @@ class crm_meeting(base_state, osv.Model):
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_("Meeting <b>completed</b>."), context=context)
+    
+class mail_message(osv.osv):
+    _inherit = "mail.message"
+    
+    def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
+         cal_event_pool = self.pool.get('calendar.event')
+         for arg in args:
+             if arg[0] == "res_id":
+                 if isinstance(arg[2], (str)):
+                     args[1][2] = cal_event_pool.remove_virtual_id(arg[2])
+         res = super(mail_message, self).search(cr, uid, args, offset, limit, order, context, count=False)
+         if count:
+             return len(res)
+         elif limit:
+             return res[offset:offset+limit]
+         else:
+             return res
+        
+mail_message()
+
+class ir_attachment(osv.osv):
+    _inherit = "ir.attachment"
+
+    def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
+         cal_event_pool = self.pool.get('calendar.event')
+         for arg in args:
+             if arg[0] == "res_id":
+                 if isinstance(arg[2], (str)):
+                     args[1][2] = cal_event_pool.remove_virtual_id(arg[2])
+         res = super(ir_attachment, self).search(cr, uid, args, offset, limit, order, context, count=False)
+         if count:
+             return len(res)
+         elif limit:
+             return res[offset:offset+limit]
+         else:
+             return res
+            
+    
\ No newline at end of file

From c6475a4cf62e14995fb8e7f64bb7c2c9c37d5383 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 10 Dec 2012 15:26:30 +0100
Subject: [PATCH 05/11] [REF] base_calendar

bzr revid: qdp-launchpad@openerp.com-20121210142630-7x0nvai3txoe3ba6
---
 addons/base_calendar/base_calendar.py                 |  4 ++--
 addons/base_calendar/base_calendar_view.xml           |  2 +-
 addons/base_calendar/crm_meeting.py                   | 11 +++--------
 addons/base_calendar/crm_meeting_view.xml             |  2 +-
 .../test/test_crm_recurrent_meeting_case2.yml         |  2 +-
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index d225c3f90d9..4602c85ba2a 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1034,7 +1034,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                         help="Set an alarm at this time, before the event occurs" ),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
         'recurrent_uid': fields.integer('Recurrent ID'),
-        'recurrent_id': fields.datetime('Recurrent ID date'),
+        'recurrent_id_date': fields.datetime('Recurrent ID date'),
         'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
         'organizer': fields.char("Organizer", size=256, states={'done': [('readonly', True)]}), # Map with organizer attribute of VEvent.
@@ -1392,7 +1392,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                 data.update(
                     vals,
                     recurrent_uid=real_event_id,
-                    recurrent_id=data.get('date'),
+                    recurrent_id_date=data.get('date'),
                     rrule_type=False,
                     rrule='',
                     recurrency=False,
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index a922521d970..00c41332553 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -100,7 +100,7 @@
                              <field name="user_id" string="Responsible User"/>
                              <field name="show_as" string="Show Time as"/>
                              <field name="class" string="Privacy"/>
-                             <field name="recurrent_id" invisible="1"/>
+                             <field name="recurrent_id_date" invisible="1"/>
                              <field name="recurrent_uid" invisible="1"/>
                         </group>
                         <separator string="Description"/>
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index bd15666def6..dfe0c509318 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -67,14 +67,9 @@ class crm_meeting(base_state, osv.Model):
     }
 
     def message_get_subscription_data(self, cr, uid, ids, context=None):
-        res = {}
-        for virtual_id in ids:
-            real_id = base_calendar.base_calendar_id2real_id(virtual_id)
-            result = super(crm_meeting, self).message_get_subscription_data(cr, uid, [real_id], context=context)
-            res[virtual_id] = result[real_id]
-        return res
+        real_ids = [base_calendar.base_calendar_id2real_id(virtual_id) for virtual_id in ids]
+        return super(crm_meeting, self).message_get_subscription_data(cr, uid, real_ids, context=context)
 
-    
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
         default['attendee_ids'] = False
@@ -161,4 +156,4 @@ class ir_attachment(osv.osv):
          else:
              return res
             
-    
\ No newline at end of file
+    
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 8590bcb8b49..0c11189d505 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -166,7 +166,7 @@
                                 <field name="class"/>
                                 <field name="show_as"/>
                                 <field name="rrule" invisible="1" readonly="1"/>
-                                <field name="recurrent_id" invisible="1"/>
+                                <field name="recurrent_id_date" invisible="1"/>
                                 <field name="recurrent_uid" invisible="1"/>
                             </group>
                         </group>
diff --git a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
index 693f0d81c6b..a2c68a31c6b 100644
--- a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
+++ b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
@@ -92,6 +92,6 @@
   I check whether the record is edited perfectly or not.
 -
   !python {model: crm.meeting}: |
-     meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id','=','2011-04-25 12:47:00')], context)
+     meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id_date','=','2011-04-25 12:47:00')], context)
      assert meeting_ids, 'Meeting is not edited !'
 

From 9e9b0cc8b4da97c7de2b677ac8f8166585915a5b Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 10 Dec 2012 15:29:12 +0100
Subject: [PATCH 06/11] [REF] base_calendar

bzr revid: qdp-launchpad@openerp.com-20121210142912-9pisd030jhmf8tqy
---
 addons/base_calendar/base_calendar.py                     | 8 ++++----
 addons/base_calendar/base_calendar_view.xml               | 4 ++--
 addons/base_calendar/crm_meeting_view.xml                 | 4 ++--
 .../test/test_crm_recurrent_meeting_case2.yml             | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 4602c85ba2a..6f09e533917 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -949,13 +949,13 @@ class calendar_event(osv.osv):
 
     def unlink_events(self, cr, uid, ids, context=None):
         """
-        This function deletes event which are linked with the event with recurrent_uid
+        This function deletes event which are linked with the event with recurrent_id
                 (Removes the events which refers to the same UID value)
         """
         if context is None:
             context = {}
         for event_id in ids:
-            cr.execute("select id from %s where recurrent_uid=%%s" % (self._table), (event_id,))
+            cr.execute("select id from %s where recurrent_id=%%s" % (self._table), (event_id,))
             r_ids = map(lambda x: x[0], cr.fetchall())
             self.unlink(cr, uid, r_ids, context=context)
         return True
@@ -1033,7 +1033,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
         'alarm_id': fields.many2one('res.alarm', 'Reminder', states={'done': [('readonly', True)]},
                         help="Set an alarm at this time, before the event occurs" ),
         'base_calendar_alarm_id': fields.many2one('calendar.alarm', 'Alarm'),
-        'recurrent_uid': fields.integer('Recurrent ID'),
+        'recurrent_id': fields.integer('Recurrent ID'),
         'recurrent_id_date': fields.datetime('Recurrent ID date'),
         'vtimezone': fields.selection(_tz_get, size=64, string='Timezone'),
         'user_id': fields.many2one('res.users', 'Responsible', states={'done': [('readonly', True)]}),
@@ -1391,7 +1391,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             if data.get('rrule'):
                 data.update(
                     vals,
-                    recurrent_uid=real_event_id,
+                    recurrent_id=real_event_id,
                     recurrent_id_date=data.get('date'),
                     rrule_type=False,
                     rrule='',
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 00c41332553..e3ad980dae7 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -101,7 +101,7 @@
                              <field name="show_as" string="Show Time as"/>
                              <field name="class" string="Privacy"/>
                              <field name="recurrent_id_date" invisible="1"/>
-                             <field name="recurrent_uid" invisible="1"/>
+                             <field name="recurrent_id" invisible="1"/>
                         </group>
                         <separator string="Description"/>
                         <field name="description"/>
@@ -162,7 +162,7 @@
                         <group col="4" colspan="4" name="rrule">
                             <group col="4" colspan="4">
                                 <field name="rrule_type" string="Recurrency period"
-                                   attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                                   attrs="{'readonly':[('recurrent_id','!=',False)]}"/>
                                 <field name="interval"/>
                                 <separator string="End of Recurrence" colspan="4"/>
                                 <field name="end_type"/>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 0c11189d505..110ee509e14 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -120,7 +120,7 @@
                             <group col="1">
                                 <group>
                                     <field name="recurrency"
-                                        attrs="{'readonly': [('recurrent_uid','!=',False)]}"/>
+                                        attrs="{'readonly': [('recurrent_id','!=',False)]}"/>
                                 </group>
                                 <group attrs="{'invisible': [('recurrency','=',False)]}">
                                     <label for="interval"/>
@@ -167,7 +167,7 @@
                                 <field name="show_as"/>
                                 <field name="rrule" invisible="1" readonly="1"/>
                                 <field name="recurrent_id_date" invisible="1"/>
-                                <field name="recurrent_uid" invisible="1"/>
+                                <field name="recurrent_id" invisible="1"/>
                             </group>
                         </group>
                     </page>
diff --git a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
index a2c68a31c6b..0fd34fdd010 100644
--- a/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
+++ b/addons/base_calendar/test/test_crm_recurrent_meeting_case2.yml
@@ -11,7 +11,7 @@
     duration: 1.0
     name: Test Meeting
     recurrency: true
-    recurrent_uid: 0.0
+    recurrent_id: 0.0
     rrule_type: daily
     sequence: 0.0
 -
@@ -37,7 +37,7 @@
     we: true
     name: Review code with programmer
     recurrency: true
-    recurrent_uid: 0.0
+    recurrent_id: 0.0
     rrule_type: weekly
     sequence: 0.0
 -
@@ -57,7 +57,7 @@
     duration: 1.0
     name: Sprint Review
     recurrency: true
-    recurrent_uid: 0.0
+    recurrent_id: 0.0
     rrule_type: monthly
     sequence: 0.0
 -
@@ -92,6 +92,6 @@
   I check whether the record is edited perfectly or not.
 -
   !python {model: crm.meeting}: |
-     meeting_ids = self.search(cr, uid, [('recurrent_uid', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id_date','=','2011-04-25 12:47:00')], context)
+     meeting_ids = self.search(cr, uid, [('recurrent_id', '=', ref('crm_meeting_reviewcodewithprogrammer0')), ('recurrent_id_date','=','2011-04-25 12:47:00')], context)
      assert meeting_ids, 'Meeting is not edited !'
 

From 5bc8ed05f4408f832e4ee74d38bc4133e996972f Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 10 Dec 2012 15:58:03 +0100
Subject: [PATCH 07/11] [REF] base_calendar

bzr revid: qdp-launchpad@openerp.com-20121210145803-4r9k0w264clsdyc9
---
 addons/base_calendar/crm_meeting_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index 110ee509e14..2a6ad56526f 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -119,8 +119,7 @@
                         <group>
                             <group col="1">
                                 <group>
-                                    <field name="recurrency"
-                                        attrs="{'readonly': [('recurrent_id','!=',False)]}"/>
+                                    <field name="recurrency"/>
                                 </group>
                                 <group attrs="{'invisible': [('recurrency','=',False)]}">
                                     <label for="interval"/>

From f1ef5b7f370cfa91d2a9eecfe8319895c820fd13 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Mon, 10 Dec 2012 17:39:13 +0100
Subject: [PATCH 08/11] [FIX] base_calendar: virtual ids

bzr revid: qdp-launchpad@openerp.com-20121210163913-yo38g08n0lfn450j
---
 addons/base_calendar/crm_meeting.py | 66 +++++++++++++++--------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index dfe0c509318..80d50e8a1df 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -67,8 +67,12 @@ class crm_meeting(base_state, osv.Model):
     }
 
     def message_get_subscription_data(self, cr, uid, ids, context=None):
-        real_ids = [base_calendar.base_calendar_id2real_id(virtual_id) for virtual_id in ids]
-        return super(crm_meeting, self).message_get_subscription_data(cr, uid, real_ids, context=context)
+        res = {}
+        for virtual_id in ids:
+            real_id = base_calendar.base_calendar_id2real_id(virtual_id)
+            result = super(crm_meeting, self).message_get_subscription_data(cr, uid, [real_id], context=context)
+            res[virtual_id] = result[real_id]
+        return res
 
     def copy(self, cr, uid, id, default=None, context=None):
         default = default or {}
@@ -119,41 +123,39 @@ class crm_meeting(base_state, osv.Model):
 
     def case_close_send_note(self, cr, uid, ids, context=None):
         return self.message_post(cr, uid, ids, body=_("Meeting <b>completed</b>."), context=context)
-    
+
+    def message_post(self, cr, uid, thread_id, body='', subject=None, type='notification',
+                        subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
+        cal_event_pool = self.pool.get('calendar.event')
+        if isinstance(thread_id, str):
+            thread_id = cal_event_pool.remove_virtual_id(thread_id)
+        return super(crm_meeting, self).message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
+
 class mail_message(osv.osv):
     _inherit = "mail.message"
-    
+
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
-         cal_event_pool = self.pool.get('calendar.event')
-         for arg in args:
-             if arg[0] == "res_id":
-                 if isinstance(arg[2], (str)):
-                     args[1][2] = cal_event_pool.remove_virtual_id(arg[2])
-         res = super(mail_message, self).search(cr, uid, args, offset, limit, order, context, count=False)
-         if count:
-             return len(res)
-         elif limit:
-             return res[offset:offset+limit]
-         else:
-             return res
-        
-mail_message()
+        '''
+        convert the search on real ids in the case it was asked on virtual ids, then call super()
+        '''
+        cal_event_pool = self.pool.get('calendar.event')
+        for index in range(len(args)):
+            if args[index][0] == "res_id":
+                if isinstance(args[index][2], (str)):
+                    args[index][2] = cal_event_pool.remove_virtual_id(args[index][2])
+        return super(mail_message, self).search(cr, uid, args, offset, limit, order, context, count=False)
 
 class ir_attachment(osv.osv):
     _inherit = "ir.attachment"
 
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
-         cal_event_pool = self.pool.get('calendar.event')
-         for arg in args:
-             if arg[0] == "res_id":
-                 if isinstance(arg[2], (str)):
-                     args[1][2] = cal_event_pool.remove_virtual_id(arg[2])
-         res = super(ir_attachment, self).search(cr, uid, args, offset, limit, order, context, count=False)
-         if count:
-             return len(res)
-         elif limit:
-             return res[offset:offset+limit]
-         else:
-             return res
-            
-    
+        '''
+        convert the search on real ids in the case it was asked on virtual ids, then call super()
+        '''
+        cal_event_pool = self.pool.get('calendar.event')
+        for index in range(len(args)):
+            if args[index][0] == "res_id":
+                if isinstance(args[index][2], (str)):
+                    args[index][2] = cal_event_pool.remove_virtual_id(args[index][2])
+        return super(ir_attachment, self).search(cr, uid, args, offset, limit, order, context, count=False)
+

From 1cd8e2c45b70d201cc15bc85b2f280b494cf1b36 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 11 Dec 2012 16:56:27 +0100
Subject: [PATCH 09/11] [FIX/REF] base_calendar: virtual ids management

bzr revid: qdp-launchpad@openerp.com-20121211155627-xx33ah96xmpp47ca
---
 addons/base_calendar/base_calendar.py | 39 ++++++++++++++++++---------
 addons/base_calendar/crm_meeting.py   | 38 +++++++++++++++++---------
 2 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index f95b8fb19c7..9cf07a4b73e 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -88,6 +88,16 @@ def base_calendar_id2real_id(base_calendar_id=None, with_date=False):
 
     return base_calendar_id and int(base_calendar_id) or base_calendar_id
 
+def get_real_ids(ids):
+    if isinstance(ids, (str, int, long)):
+        return base_calendar_id2real_id(ids)
+
+    if isinstance(ids, (list, tuple)):
+        res = []
+        for id in ids:
+            res.append(base_calendar_id2real_id(id))
+        return res
+
 def real_id2base_calendar_id(real_id, recurrent_date):
     """
     Convert a real event id (type int) into a "virtual/recurring event id" (type string).
@@ -1328,16 +1338,6 @@ rule or repeating pattern of time to exclude from the recurring rule."),
             data['end_type'] = 'end_date'
         return data
 
-    def remove_virtual_id(self, ids):
-        if isinstance(ids, (str, int, long)):
-            return base_calendar_id2real_id(ids)
-
-        if isinstance(ids, (list, tuple)):
-            res = []
-            for id in ids:
-                res.append(base_calendar_id2real_id(id))
-            return res
-
     def search(self, cr, uid, args, offset=0, limit=0, order=None, context=None, count=False):
         context = context or {}
         args_without_date = []
@@ -1387,6 +1387,13 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                 return True
 
     def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True):
+        def _only_changes_to_apply_on_real_ids(field_names):
+            ''' return True if changes are only to be made on the real ids'''
+            for field in field_names:
+                if field not in ['message_follower_ids']:
+                    return False
+            return True
+
         context = context or {}
         if isinstance(ids, (str, int, long)):
             ids = [ids]
@@ -1398,7 +1405,11 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                 continue
             ids.remove(event_id)
             real_event_id = base_calendar_id2real_id(event_id)
-            if not vals.get('recurrency', True):
+
+            # if we are setting the recurrency flag to False or if we are only changing fields that
+            # should be only updated on the real ID and not on the virtual (like message_follower_ids):
+            # then set real ids to be updated.
+            if not vals.get('recurrency', True) or _only_changes_to_apply_on_real_ids(vals.keys()):
                 ids.append(real_event_id)
                 continue
 
@@ -1414,7 +1425,9 @@ rule or repeating pattern of time to exclude from the recurring rule."),
                     rrule='',
                     recurrency=False,
                 )
-
+                #do not copy the id
+                if data.get('id'):
+                    del(data['id'])
                 new_id = self.copy(cr, uid, real_event_id, default=data, context=context)
 
                 date_new = event_id.split('-')[1]
@@ -1507,7 +1520,7 @@ rule or repeating pattern of time to exclude from the recurring rule."),
 
         for r in result:
             for k in EXTRAFIELDS:
-                if (k in r) and ((not fields) or (k not in fields)):
+                if (k in r) and (fields and (k not in fields)):
                     del r[k]
         if isinstance(ids, (str, int, long)):
             return result and result[0] or False
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 80d50e8a1df..8e4ab2341ab 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -23,9 +23,8 @@ from osv import osv, fields
 import tools
 from tools.translate import _
 
-import base_calendar
+from base_calendar import get_real_ids, base_calendar_id2real_id
 from base_status.base_state import base_state
-
 #
 # crm.meeting is defined here so that it may be used by modules other than crm,
 # without forcing the installation of crm.
@@ -69,7 +68,7 @@ class crm_meeting(base_state, osv.Model):
     def message_get_subscription_data(self, cr, uid, ids, context=None):
         res = {}
         for virtual_id in ids:
-            real_id = base_calendar.base_calendar_id2real_id(virtual_id)
+            real_id = base_calendar_id2real_id(virtual_id)
             result = super(crm_meeting, self).message_get_subscription_data(cr, uid, [real_id], context=context)
             res[virtual_id] = result[real_id]
         return res
@@ -128,7 +127,7 @@ class crm_meeting(base_state, osv.Model):
                         subtype=None, parent_id=False, attachments=None, context=None, **kwargs):
         cal_event_pool = self.pool.get('calendar.event')
         if isinstance(thread_id, str):
-            thread_id = cal_event_pool.remove_virtual_id(thread_id)
+            thread_id = get_real_ids(thread_id)
         return super(crm_meeting, self).message_post(cr, uid, thread_id, body=body, subject=subject, type=type, subtype=subtype, parent_id=parent_id, attachments=attachments, context=context, **kwargs)
 
 class mail_message(osv.osv):
@@ -138,11 +137,9 @@ class mail_message(osv.osv):
         '''
         convert the search on real ids in the case it was asked on virtual ids, then call super()
         '''
-        cal_event_pool = self.pool.get('calendar.event')
         for index in range(len(args)):
-            if args[index][0] == "res_id":
-                if isinstance(args[index][2], (str)):
-                    args[index][2] = cal_event_pool.remove_virtual_id(args[index][2])
+            if args[index][0] == "res_id" and isinstance(args[index][2], (str)):
+                args[index][2] = get_real_ids(args[index][2])
         return super(mail_message, self).search(cr, uid, args, offset, limit, order, context, count=False)
 
 class ir_attachment(osv.osv):
@@ -152,10 +149,27 @@ class ir_attachment(osv.osv):
         '''
         convert the search on real ids in the case it was asked on virtual ids, then call super()
         '''
-        cal_event_pool = self.pool.get('calendar.event')
         for index in range(len(args)):
-            if args[index][0] == "res_id":
-                if isinstance(args[index][2], (str)):
-                    args[index][2] = cal_event_pool.remove_virtual_id(args[index][2])
+            if args[index][0] == "res_id" and isinstance(args[index][2], (str)):
+                args[index][2] = get_real_ids(args[index][2])
         return super(ir_attachment, self).search(cr, uid, args, offset, limit, order, context, count=False)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        '''
+        when posting an attachment (new or not), convert the virtual ids in real ids.
+        '''
+        if isinstance(vals.get('res_id'), str):
+            vals['res_id'] = get_real_ids(vals.get('res_id'))
+        return super(ir_attachment, self).write(cr, uid, ids, vals, context)
+
+class invite_wizard(osv.osv_memory):
+    _inherit = 'mail.wizard.invite'
+
+    def default_get(self, cr, uid, fields, context=None):
+        '''
+        in case someone clicked on 'invite others' wizard in the followers widget, transform virtual ids in real ids
+        '''
+        result = super(invite_wizard, self).default_get(cr, uid, fields, context=context)
+        if 'res_id' in result:
+            result['res_id'] = get_real_ids(result['res_id'])
+        return result

From fa357bbc3d15ec6ff22b89621a2891b732283ffa Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Tue, 11 Dec 2012 17:32:22 +0100
Subject: [PATCH 10/11] [FIX] base_calendar: stupid copy/paste fixed

bzr revid: qdp-launchpad@openerp.com-20121211163222-opvx2iwhp19w1jzk
---
 addons/base_calendar/crm_meeting.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 8e4ab2341ab..96fc1413e2e 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -140,7 +140,7 @@ class mail_message(osv.osv):
         for index in range(len(args)):
             if args[index][0] == "res_id" and isinstance(args[index][2], (str)):
                 args[index][2] = get_real_ids(args[index][2])
-        return super(mail_message, self).search(cr, uid, args, offset, limit, order, context, count=False)
+        return super(mail_message, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
 
 class ir_attachment(osv.osv):
     _inherit = "ir.attachment"
@@ -152,7 +152,7 @@ class ir_attachment(osv.osv):
         for index in range(len(args)):
             if args[index][0] == "res_id" and isinstance(args[index][2], (str)):
                 args[index][2] = get_real_ids(args[index][2])
-        return super(ir_attachment, self).search(cr, uid, args, offset, limit, order, context, count=False)
+        return super(ir_attachment, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
 
     def write(self, cr, uid, ids, vals, context=None):
         '''
@@ -160,7 +160,7 @@ class ir_attachment(osv.osv):
         '''
         if isinstance(vals.get('res_id'), str):
             vals['res_id'] = get_real_ids(vals.get('res_id'))
-        return super(ir_attachment, self).write(cr, uid, ids, vals, context)
+        return super(ir_attachment, self).write(cr, uid, ids, vals, context=context)
 
 class invite_wizard(osv.osv_memory):
     _inherit = 'mail.wizard.invite'

From 1f4f6c27b9138968520369db81c184152901569d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 12 Dec 2012 11:34:50 +0100
Subject: [PATCH 11/11] [REF] base_calendar: refactoring

bzr revid: qdp-launchpad@openerp.com-20121212103450-x4jguy82cv1ya0tg
---
 addons/base_calendar/crm_meeting.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index 96fc1413e2e..4745d6c5896 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -138,7 +138,7 @@ class mail_message(osv.osv):
         convert the search on real ids in the case it was asked on virtual ids, then call super()
         '''
         for index in range(len(args)):
-            if args[index][0] == "res_id" and isinstance(args[index][2], (str)):
+            if args[index][0] == "res_id" and isinstance(args[index][2], str):
                 args[index][2] = get_real_ids(args[index][2])
         return super(mail_message, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)
 
@@ -150,7 +150,7 @@ class ir_attachment(osv.osv):
         convert the search on real ids in the case it was asked on virtual ids, then call super()
         '''
         for index in range(len(args)):
-            if args[index][0] == "res_id" and isinstance(args[index][2], (str)):
+            if args[index][0] == "res_id" and isinstance(args[index][2], str):
                 args[index][2] = get_real_ids(args[index][2])
         return super(ir_attachment, self).search(cr, uid, args, offset=offset, limit=limit, order=order, context=context, count=count)