odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] latest trunk (and again and again and again and again...) 

bzr revid: abo@openerp.com-20120814152714-kql81gjivwtv6mz0
This commit is contained in:
Antonin Bourguignon 2012-08-14 17:27:14 +02:00
parent 97bdebbfce caa053c252
commit 8d705b3a4b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/edi/static/src/js/edi.js
View File

@ -1,7 +1,7 @@
openerp.edi = function(openerp) {
openerp.edi = {}
openerp.edi.EdiView = openerp.web.OldWidget.extend({
openerp.edi.EdiView = openerp.web.Widget.extend({
init: function(parent, db, token) {
this._super();
this.db = db;
@ -113,7 +113,7 @@ openerp.edi.edi_view = function (db, token) {
});
}
openerp.edi.EdiImport = openerp.web.OldWidget.extend({
openerp.edi.EdiImport = openerp.web.Widget.extend({
init: function(parent,url) {
this._super();
this.url = url;

2
addons/mail/mail_message.py
View File

@ -129,7 +129,7 @@ class mail_message_common(osv.TransientModel):
help="Type of message, usually 'html' or 'plain', used to select "\
"plain-text or rich-text contents accordingly"),
'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
'body_html': fields.text('Rich-text Contents', help="Rich-text/HTML version of the message"),
'body_html': fields.html('Rich-text Contents', help="Rich-text/HTML version of the message"),
'body': fields.function(get_body, fnct_search = search_body, type='text',
string='Message Content', store=True,
help="Content of the message. This content equals the body_text field "\

4
addons/mail/mail_message_view.xml
View File

@ -42,7 +42,7 @@
</group>
<notebook>
<page string="Body (Rich)">
<field name="body_html" widget="text_html"/>
<field name="body_html"/>
</page>
<page string="Body (Plain)">
<field name="body_text" widget="text"/>
@ -133,7 +133,7 @@
</group>
<notebook>
<page string="Body (Rich)">
<field name="body_html" widget="text_html"/>
<field name="body_html"/>
</page>
<page string="Body (Plain)">
<field name="body_text" widget="text"/>

2
addons/mail/wizard/mail_compose_message_view.xml
View File

@ -48,7 +48,7 @@
<field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
class="oe_mail_compose_message_body_text"/>
<field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible" widget="text_html"/>
class="oe_mail_compose_message_body_html oe_mail_compose_message_invisible"/>
<field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
placeholder="Add contacts to notify..."
class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>