Merge lp://staging/~jorge-nr/openerp-mexico-localization/7.0-oml-email-template-multicompany-dev-jorge into lp://staging/openerp-mexico-localization
| Status: | Merged |
|---|---|
| Merged at revision: | 219 |
| Proposed branch: | lp://staging/~jorge-nr/openerp-mexico-localization/7.0-oml-email-template-multicompany-dev-jorge |
| Merge into: | lp://staging/openerp-mexico-localization |
| Diff against target: |
116 lines (+76/-2) 5 files modified
email_template_multicompany/__init__.py (+2/-1) email_template_multicompany/__openerp__.py (+3/-1) email_template_multicompany/email_server_view.xml (+17/-0) email_template_multicompany/ir_mail_server.py (+41/-0) email_template_multicompany/security/mail_server_security.xml (+13/-0) |
| To merge this branch: | bzr merge lp://staging/~jorge-nr/openerp-mexico-localization/7.0-oml-email-template-multicompany-dev-jorge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Moisés López - http://www.vauxoo.com | Approve | ||
| Jorge Angel Naranjo Rogel - http://www.vauxoo.com | Needs Resubmitting | ||
| Julio Serna-http://www.vauxoo.com | Pending | ||
| Isaac López Zúñiga | Pending | ||
|
Review via email:
|
|||
Description of the change
Agregar company_id al modelo ir.mail.server
To post a comment you must log in.
Revision history for this message
| Jorge Angel Naranjo Rogel - http://www.vauxoo.com (jorge-nr) wrote | # |
review:
Needs Resubmitting
Revision history for this message
| Moisés López - http://www.vauxoo.com (moylop260) wrote | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Add field company_id to model ir.mail.server