OpenERP Community Backports (Addons)

Merge lp://staging/~camptocamp/ocb-addons/7.0-fix-1311087-rgo into lp://staging/ocb-addons

7.0-fix-1311087-rgo
Merge into 7.0

Proposed by Yannick Vaucher @ Camptocamp on 2014-06-24

Status:

Rejected

Rejected by:

Holger Brunn (Therp) on 2014-11-24

Proposed branch:

lp://staging/~camptocamp/ocb-addons/7.0-fix-1311087-rgo

Merge into:

lp://staging/ocb-addons

Diff against target:

17 lines (+4/-2)

1 file modified

mail/mail_message.py (+4/-2)

To merge this branch:

bzr merge lp://staging/~camptocamp/ocb-addons/7.0-fix-1311087-rgo

Undecided

Fix Committed

Link a bug report

Reviewer	Date Requested	Status
Holger Brunn (Therp)		Disapprove on 2014-11-24
Leonardo Pistone	2014-06-24	Approve on 2014-06-30
Review via email: mp+224247@code.staging.launchpad.net

Description of the change

Fix delay issue when sending message.

This is the replication to ocb from official opw patch:

http://bazaar.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-606994-rgo/revision/10065

This was also applied on master
https://github.com/odoo/odoo/blob/master/addons/mail/mail_message.py#L856-864

And also on 7.0
https://github.com/odoo/odoo/blob/7.0/addons/mail/mail_message.py#L881-888

Revision history for this message

Leonardo Pistone (lepistone) wrote on 2014-06-30:

Hi Yannick,

so this is already on the v7 on github. Now that OCB migration to github is in progress,
should we merge that in ocb on launchpad?

Other than that, I would approve the change.

Thanks!

review: Needs Information

Revision history for this message

Yannick Vaucher @ Camptocamp (yvaucher-c2c) wrote on 2014-06-30:

Replay isn't working yet and passing from lp to github will make us having to replay all the MP we did.

I think that while we don't have OCB fully working on github we can fill the gap by merging that kind of MP in OCB on launchpad.

Revision history for this message

Stefan Rijnhart (Opener) (stefan-opener) wrote on 2014-06-30:

Please merge here on LP for the coming days, not on GitHub. The OCB branches will be overwritten by the final migration.

Revision history for this message

Leonardo Pistone (lepistone) wrote on 2014-06-30:

Thanks a lot Stefan.

review: Approve

Revision history for this message

Holger Brunn (Therp) (hbrunn) wrote on 2014-11-24:

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

10218. By Ravi Gohil (OpenERP) on 2014-06-24: [FIX] mail: speed improvement in the process of sending an email through 'Send by email' option, fix backported from trunk rev: 9345(issue reproduced with client's db which has 6 million records for 'subtype_ids' o2m table). (Maintenance Case: 606994)