Merge lp:~openerp-dev/openobject-addons/6.1-opw-573332-skh into lp:openobject-addons/6.1
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Naresh(OpenERP) | ||||
Proposed branch: | lp:~openerp-dev/openobject-addons/6.1-opw-573332-skh | ||||
Merge into: | lp:openobject-addons/6.1 | ||||
Diff against target: |
74 lines (+19/-1) 2 files modified
email_template/email_template.py (+5/-0) email_template/wizard/mail_compose_message.py (+14/-1) |
||||
To merge this branch: | bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-573332-skh | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Naresh(OpenERP) | Pending | ||
Review via email: mp+103620@code.launchpad.net |
Description of the change
Hello Sir,
[Fix]: Issue : No attachment on email_template
Steps to reproduce the issue,
1. Go to Settings | Configuration | Email | Outgoing Mail Server |
2. Configure Email server
3. Go to Settings | Configuration | Email | Templates | Sale Order
4. Click on Advanced tab and Attach Report select "Quotation/ Order" and enter Report FileName
5. Create Sale Order
6. E-Mail received without attachment
Expected behavior: Receive email should have Quotation/Order attachment.
Back-ported the code from the trunk.
Kindly review the branch and please share your views on it.
Thanks.
Unmerged revisions
- 6766. By Somesh Khare
-
[FIX]email_template : Backported the code from trunk bug: 941428 for the issue of no attachment on email_template (Case: ref 57332)
Hello,
I am rejecting the fix for the following reasons:
As the Customer works with the patch provided and didn't ask explicitly to merge it into stable version
In fact its not necessary to merge it into stable version as 6.1 will not be maintained anymore after the release of v7.0
Thanks,
Naresh