[MERGE] migration of product_email_template to the new API
This commit is contained in:
Martin Trigaux
@@ -15,9 +15,7 @@ For instance when invoicing a training, the training agenda and materials will a
|
||||
'data/product_demo.xml',
|
||||
],
|
||||
'data': [
|
||||
'views/product_view.xml',
|
||||
'views/email_template_view.xml',
|
||||
],
|
||||
'installable': True,
|
||||
'auto_install': False,
|
||||
'views/product_views.xml',
|
||||
'views/mail_template_views.xml',
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<odoo>
|
||||
<record id="product_online_training_email_template" model="mail.template">
|
||||
<field name="name">Online Training</field>
|
||||
<field name="subject">Online Training</field>
|
||||
@@ -8,13 +7,12 @@
|
||||
<field name="auto_delete" eval="True"/>
|
||||
<field name="body_html"><![CDATA[
|
||||
<div style="height:auto;text-align: center;font-size : 40px;color: #333333;margin-top:30px;font-weight: 300;">
|
||||
Online Training + Certification
|
||||
Online Training
|
||||
</div>
|
||||
<div style="height:auto;text-left: center;font-size : 16px;color: #646464;margin-top:30px;margin-left:15px;margin-right:5px;">
|
||||
These courses feature the same high quality course content found in our traditional classroom trainings, supplemented with
|
||||
modular sessions and cloud-based labs. Many of our online learning courses also include dozens of recorded webinars and live
|
||||
sessions by our senior instructors. At the end of the training, you can pass the Odoo Certification exam in one of the 5000+
|
||||
Pearson VUE test centers worldwide.
|
||||
sessions by our senior instructors.
|
||||
</div>
|
||||
<div style="height: auto;margin-top:30px;margin-bottom:10px;margin-left:20px;color: #646464;font-size:16px;">
|
||||
<strong>Your advantages</strong>
|
||||
@@ -23,7 +21,6 @@
|
||||
<li>New interactive learning experience</li>
|
||||
<li>Lower training budget for the same quality courses</li>
|
||||
<li>Better comfort to facilitate your learning process</li>
|
||||
<li>Odoo <a href="https://www.openerp.com/certification">Certification Exam</a> included (Pre-Ordered, available as of November 1st, 2013)</li>
|
||||
</ul>
|
||||
</div>
|
||||
<hr color="DCDCFB"/>
|
||||
@@ -66,57 +63,27 @@
|
||||
Each day of the week is dedicated to specific applications in Odoo as per the following planning:
|
||||
<ul style="color: #6d57e0">
|
||||
<li>
|
||||
<strong><a href="https://www.openerp.com/online-training#Monday" style="text-decoration:none;" target=_new>Monday: </a></strong>
|
||||
<a href="https://www.openerp.com/online-training#Monday_1" style="text-decoration:none;" target=_new>Introduction</a>,
|
||||
<a href="https://www.openerp.com/online-training#Monday_2" style="text-decoration:none;" target=_new>CRM</a>,
|
||||
<a href="https://www.openerp.com/online-training#Monday_3" style="text-decoration:none;" target=_new>Sales Management</a>
|
||||
<strong>Monday: </strong>
|
||||
Introduction, CRM, Sales Management
|
||||
</li>
|
||||
<li>
|
||||
<strong><a href="https://www.openerp.com/online-training#Tuesday" style="text-decoration:none;" target=_new>Tuesday: </a></strong>
|
||||
<a href="https://www.openerp.com/online-training#Tuesday_1" style="text-decoration:none;" target=_new>Access rights</a>,
|
||||
<a href="https://www.openerp.com/online-training#Tuesday_2" style="text-decoration:none;" target=_new>Purchase</a>,
|
||||
<a href="https://www.openerp.com/online-training#Tuesday_2" style="text-decoration:none;" target=_new>Sales & Purchase management</a>,
|
||||
<a href="https://www.openerp.com/online-training#Tuesday_4" style="text-decoration:none;" target=_new>Financial accounting</a>
|
||||
<strong>Tuesday: </strong>
|
||||
Access rights, Purchase, Sales & Purchase management, Financial accounting
|
||||
</li>
|
||||
<li>
|
||||
<strong><a href="https://www.openerp.com/online-training#Wednesday" style="text-decoration:none;" target=_new>Wednesday: </a></strong>
|
||||
<a href="https://www.openerp.com/online-training#Wednesday_1" style="text-decoration:none;" target=_new>Project management</a>,
|
||||
<a href="https://www.openerp.com/online-training#Wednesday_2" style="text-decoration:none;" target=_new>Human resources</a>,
|
||||
<a href="https://www.openerp.com/online-training#Wednesday_3" style="text-decoration:none;" target=_new>Contract management</a>
|
||||
<strong>Wednesday: </strong>
|
||||
Project management, Human resources, Contract management
|
||||
</li>
|
||||
<li>
|
||||
<strong><a href="https://www.openerp.com/online-training#Thursday" style="text-decoration:none;" target=_new>Thursday: </a></strong>
|
||||
<a href="https://www.openerp.com/online-training#Thursday_1" style="text-decoration:none;" target=_new>Warehouse management</a>,
|
||||
<a href="https://www.openerp.com/online-training#Thursday_2" style="text-decoration:none;" target=_new>Manufacturing (MRP) & Sales</a>,
|
||||
<a href="https://www.openerp.com/online-training#Thursday_4" style="text-decoration:none;" target=_new>Import/Export</a>
|
||||
<strong>Thursday: </strong>
|
||||
Warehouse management, Manufacturing (MRP) & Sales, Import/Export
|
||||
</li>
|
||||
<li>
|
||||
<strong><a href="https://www.openerp.com/online-training#Friday" style="text-decoration:none;" target=_new>Friday: </a></strong>
|
||||
<a href="https://www.openerp.com/online-training#Friday_1" style="text-decoration:none;" target=_new>Pricelists</a>,
|
||||
<a href="https://www.openerp.com/online-training#Friday_2" style="text-decoration:none;" target=_new>Point of Sale (POS)</a>,
|
||||
<a href="https://www.openerp.com/online-training#Friday_3" style="text-decoration:none;" target=_new>Introduction to report customization</a>
|
||||
<strong>Friday: </strong>
|
||||
Pricelists, Point of Sale (POS), Introduction to report customization
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div style="text-align: center;margin-top:30px;" >
|
||||
<table cellspacing="5" align="center" cellpadding="5">
|
||||
<tr style="font-size : 20px;color: #333333;margin-top:30px;">
|
||||
<td>English</td></td>
|
||||
<td>English</td></td>
|
||||
<td>Spanish</td>
|
||||
</tr>
|
||||
<tr style="font-size : 10px;color: #646464;">
|
||||
<td>Europe</td>
|
||||
<td>USA & Canada</td>
|
||||
<td>USA & Latin America</td>
|
||||
</tr>
|
||||
<tr style="font-size : 10px;color: #FFFFFF;background-color:#8b5bdd;">
|
||||
<td><a href="http://onlinetrainingencet.eventbrite.com" style="text-decoration:none;color:#FFFFFF;" target=_new>Register</a></td>
|
||||
<td><a href="http://onlinetrainingenpst.eventbrite.com" style="text-decoration:none;color:#FFFFFF;" target=_new>Register</a></td>
|
||||
<td><a href="http://onlinetrainingespst.eventbrite.com" style="text-decoration:none;color:#FFFFFF;" target=_new>Register</a></td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<hr color="DCDCFB"/>
|
||||
<div style="height:auto;text-align: center;font-size : 40px;color: #333333;margin-top:40px;font-weight: 300;">
|
||||
Content of the Training
|
||||
@@ -642,5 +609,4 @@
|
||||
<field name="email_template_id" ref="product_online_training_email_template"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
@@ -1,4 +1,4 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import product
|
||||
import invoice
|
||||
import account_invoice
|
||||
@@ -0,0 +1,24 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from odoo import api, models
|
||||
|
||||
|
||||
class AccountInvoice(models.Model):
|
||||
_inherit = 'account.invoice'
|
||||
|
||||
def invoice_validate_send_email(self):
|
||||
for invoice in self.filtered(lambda x: x.type == 'out_invoice'):
|
||||
# send template only on customer invoice
|
||||
# subscribe the partner to the invoice
|
||||
if invoice.partner_id not in invoice.message_partner_ids:
|
||||
invoice.message_subscribe([invoice.partner_id.id])
|
||||
for line in invoice.invoice_line_ids:
|
||||
if line.product_id.email_template_id:
|
||||
invoice.message_post_with_template(line.product_id.email_template_id.id, composition_mode='comment')
|
||||
return True
|
||||
|
||||
@api.multi
|
||||
def invoice_validate(self):
|
||||
res = super(AccountInvoice, self).invoice_validate()
|
||||
self.invoice_validate_send_email()
|
||||
return res
|
||||
@@ -1,26 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from openerp.osv import osv
|
||||
|
||||
|
||||
class account_invoice(osv.Model):
|
||||
_inherit = 'account.invoice'
|
||||
|
||||
def invoice_validate_send_email(self, cr, uid, ids, context=None):
|
||||
Composer = self.pool['mail.compose.message']
|
||||
for invoice in self.browse(cr, uid, ids, context=context):
|
||||
# send template only on customer invoice
|
||||
if invoice.type != 'out_invoice':
|
||||
continue
|
||||
# subscribe the partner to the invoice
|
||||
if invoice.partner_id not in invoice.message_partner_ids:
|
||||
self.message_subscribe(cr, uid, [invoice.id], [invoice.partner_id.id], context=context)
|
||||
for line in invoice.invoice_line_ids:
|
||||
if line.product_id.email_template_id:
|
||||
invoice.message_post_with_template(line.product_id.email_template_id.id, composition_mode='comment')
|
||||
return True
|
||||
|
||||
def invoice_validate(self, cr, uid, ids, context=None):
|
||||
res = super(account_invoice, self).invoice_validate(cr, uid, ids, context=context)
|
||||
self.invoice_validate_send_email(cr, uid, ids, context=context)
|
||||
return res
|
||||
@@ -1,19 +1,16 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from openerp.osv import fields, osv
|
||||
from odoo import fields, models
|
||||
|
||||
|
||||
class product_template(osv.Model):
|
||||
class ProductTemplate(models.Model):
|
||||
""" Product Template inheritance to add an optional email.template to a
|
||||
product.template. When validating an invoice, an email will be send to the
|
||||
customer based on this template. The customer will receive an email for each
|
||||
product linked to an email template. """
|
||||
_inherit = "product.template"
|
||||
|
||||
_columns = {
|
||||
'email_template_id': fields.many2one(
|
||||
'mail.template', 'Product Email Template',
|
||||
help='When validating an invoice, an email will be sent to the customer '
|
||||
'based on this template. The customer will receive an email for each '
|
||||
'product linked to an email template.'),
|
||||
}
|
||||
email_template_id = fields.Many2one('mail.template', string='Product Email Template',
|
||||
help='When validating an invoice, an email will be sent to the customer '
|
||||
'based on this template. The customer will receive an email for each '
|
||||
'product linked to an email template.')
|
||||
|
||||
+4
-6
@@ -1,8 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<record model="ir.ui.view" id="email_template_form_simplified">
|
||||
<field name="name">email.template.form.simplified</field>
|
||||
<odoo>
|
||||
<record id="email_template_form_simplified" model="ir.ui.view">
|
||||
<field name="name">mail.template.form.simplified</field>
|
||||
<field name="model">mail.template</field>
|
||||
<field name="priority">100</field>
|
||||
<field name="arch" type="xml">
|
||||
@@ -19,5 +18,4 @@
|
||||
</form>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
+3
-5
@@ -1,8 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data>
|
||||
<odoo>
|
||||
<record id="product_template_form_view" model="ir.ui.view">
|
||||
<field name="name">product.template.form.inherit</field>
|
||||
<field name="name">product.template.form.inherit.email.template</field>
|
||||
<field name="model">product.template</field>
|
||||
<field name="inherit_id" ref="product.product_template_form_view"/>
|
||||
<field name="arch" type="xml">
|
||||
@@ -23,5 +22,4 @@
|
||||
</group>
|
||||
</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user