Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-community/openobject-addons/lp727875 into lp:openobject-addons

  1. lp727875
  2. Merge into trunk
Status: Merged
Approved by: Jay Vora (Serpent Consulting Services)
Approved revision: no longer in the source branch.
Merged at revision: 4486
Proposed branch: lp:~openerp-community/openobject-addons/lp727875
Merge into: lp:openobject-addons
Diff against target: 19 lines (+2/-2)
1 file modified
event/event.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-community/openobject-addons/lp727875
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Approve
Review via email: mp+51931@code.launchpad.net

Commit message

[FIX] event lp:727875

Description of the change

[FIX] event lp:727875

To post a comment you must log in.
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) :
review: Approve
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) wrote :

Maxime,

Can you propose a merge for 6.0 as well?
Thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'event/event.py'
2--- event/event.py 2011-01-14 00:11:01 +0000
3+++ event/event.py 2011-03-02 17:55:22 +0000
4@@ -548,7 +548,7 @@
5 tools.email_send(src, email_to, subject, body, email_cc=email_cc, openobject_id=regestration.id)
6 self.history(cr, uid, [regestration], subject, history = True, \
7 email=email_to, details=body, \
8- subjec=subject, email_from=src, \
9+ subject=subject, email_from=src, \
10 email_cc=', '.join(email_cc))
11
12 return True
13@@ -703,4 +703,4 @@
14
15 event_registration_badge()
16
17-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
18\ No newline at end of file
19+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

Subscribers

People subscribed via source and target branches

to all changes: