Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-traceback_issue1-nco into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-traceback_issue1-nco/+merge/136661
Hello,
Fix the following issues:
1) recurrent meeting issues.
2) Merge leads/opportunities issues.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-traceback_issue1-nco/+merge/136661
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-traceback_issue1-nco.
=== modified file 'base_calendar/crm_meeting.py'
--- base_calendar/crm_meeting.py 2012-10-24 19:59:39 +0000
+++ base_calendar/crm_meeting.py 2012-11-28 13:31:24 +0000
@@ -66,6 +66,15 @@
'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 @@
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
=== modified file 'crm/wizard/crm_merge_opportunities.py'
--- crm/wizard/crm_merge_opportunities.py 2012-09-27 13:45:13 +0000
+++ crm/wizard/crm_merge_opportunities.py 2012-11-28 13:31:24 +0000
@@ -32,12 +32,13 @@
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 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)
+ 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'),
=== modified file 'sale_journal/__openerp__.py'
--- sale_journal/__openerp__.py 2012-09-26 12:16:27 +0000
+++ sale_journal/__openerp__.py 2012-11-28 13:31:24 +0000
@@ -51,7 +51,7 @@
'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',
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
