Twinkle Christian(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam-imp-tch into
lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam.
Requested reviews:
Jigar Amin (OpenERP) (jam-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-for-caribou-jam-imp-tch/+merge/126666
Hello sir,
I have make changes in base_calendar and in account_analytic_defaults.
kindly review this.
Thanks,
TCH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-for-caribou-jam-imp-tch/+merge/126666
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-for-caribou-jam.
=== modified file 'account_analytic_default/__openerp__.py'
--- account_analytic_default/__openerp__.py 2012-09-26 12:16:27 +0000
+++ account_analytic_default/__openerp__.py 2012-09-27 11:39:24 +0000
@@ -38,7 +38,7 @@
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'images': ['images/analytic_defaults.jpeg'],
- 'depends': ['sale'],
+ 'depends': ['sale_stock'],
'data': [
'security/ir.model.access.csv',
'security/account_analytic_default_security.xml',
=== modified file 'base_calendar/base_calendar.py'
--- base_calendar/base_calendar.py 2012-09-27 07:31:55 +0000
+++ base_calendar/base_calendar.py 2012-09-27 11:39:24 +0000
@@ -1071,25 +1071,26 @@
attendees[att.partner_id.id] = True
new_attendees = []
mail_to = []
- for partner in event.partner_ids:
- if partner.id in attendees:
- continue
- att_id = self.pool.get('calendar.attendee').create(cr, uid, {
- 'partner_id': partner.id,
- 'user_id': partner.user_ids and partner.user_ids[0].id or False,
- 'ref': self._name+','+str(event.id),
- 'email': partner.email
- }, context=context)
- if partner.email:
- mail_to.append(partner.email)
- self.write(cr, uid, [event.id], {
- 'attendee_ids': [(4, att_id)]
- }, context=context)
- new_attendees.append(att_id)
+ if "partner_ids" in self._columns:
+ for partner in event.partner_ids:
+ if partner.id in attendees:
+ continue
+ att_id = self.pool.get('calendar.attendee').create(cr, uid, {
+ 'partner_id': partner.id,
+ 'user_id': partner.user_ids and partner.user_ids[0].id or False,
+ 'ref': self._name+','+str(event.id),
+ 'email': partner.email
+ }, context=context)
+ if partner.email:
+ mail_to.append(partner.email)
+ self.write(cr, uid, [event.id], {
+ 'attendee_ids': [(4, att_id)]
+ }, context=context)
+ new_attendees.append(att_id)
- if mail_to and current_user.email:
- att_obj._send_mail(cr, uid, new_attendees, mail_to,
- email_from = current_user.email)
+ if mail_to and current_user.email:
+ att_obj._send_mail(cr, uid, new_attendees, mail_to,
+ email_from = current_user.email)
return True
def default_organizer(self, cr, uid, context=None):
_______________________________________________
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
