Merge lp:~therp-nl/server-env-tools/7.0-add_email_template_conditional_attachment into lp:~server-env-tools-core-editors/server-env-tools/7.0
Proposed by
Stefan Rijnhart (Opener)
Status: | Work in progress |
---|---|
Proposed branch: | lp:~therp-nl/server-env-tools/7.0-add_email_template_conditional_attachment |
Merge into: | lp:~server-env-tools-core-editors/server-env-tools/7.0 |
Diff against target: |
409 lines (+345/-0) 11 files modified
email_template_conditional_attachment/__init__.py (+1/-0) email_template_conditional_attachment/__openerp__.py (+58/-0) email_template_conditional_attachment/i18n/email_template_conditional_attachment.pot (+52/-0) email_template_conditional_attachment/i18n/nl.po (+64/-0) email_template_conditional_attachment/model/__init__.py (+3/-0) email_template_conditional_attachment/model/email_template.py (+51/-0) email_template_conditional_attachment/model/email_template_conditional_attachment.py (+35/-0) email_template_conditional_attachment/model/ir_attachment.py (+30/-0) email_template_conditional_attachment/security/ir.model.access.csv (+3/-0) email_template_conditional_attachment/view/email_template.xml (+22/-0) email_template_conditional_attachment/view/ir_attachment.xml (+26/-0) |
To merge this branch: | bzr merge lp:~therp-nl/server-env-tools/7.0-add_email_template_conditional_attachment |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Holger Brunn (Therp) | code review | Needs Fixing | |
Nicolas Bessi - Camptocamp (community) | no test, code review | Needs Fixing | |
Graeme Gellatly | code review, no test | Abstain | |
Review via email: mp+202740@code.launchpad.net |
Description of the change
See the description in __openerp__.py
To post a comment you must log in.
Unmerged revisions
- 64. By Stefan Rijnhart (Opener)
-
[FIX] Pep8
- 63. By Stefan Rijnhart (Opener)
-
[ADD] Allow configuration from the attachment itself
Thanks to Graeme Gellatly for this suggestion - 62. By Stefan Rijnhart (Opener)
-
[IMP] Module description
- 61. By Stefan Rijnhart (Opener)
-
[IMP] Manifest
- 60. By Stefan Rijnhart (Opener)
-
[FIX] XML indentation
[ADD] Model access rules
[IMP] Translation
[IMP] Docstring - 59. By Stefan Rijnhart (Opener)
-
[IMP] Module description
- 58. By Stefan Rijnhart (Opener)
-
[IMP] Module description
- 57. By Stefan Rijnhart (Opener)
-
[ADD] Module for conditional attachments on email templates
I suppose that you mean 'object' instead of 'invoice' in the module description in the part "...as a regular domain expression against the invoice model."
Regards.