[MERGE] latest trunk (and again and again and again and again...)
bzr revid: abo@openerp.com-20120814152714-kql81gjivwtv6mz0
This commit is contained in:
commit
8d705b3a4b
|
@ -1,7 +1,7 @@
|
||||||
openerp.edi = function(openerp) {
|
openerp.edi = function(openerp) {
|
||||||
openerp.edi = {}
|
openerp.edi = {}
|
||||||
|
|
||||||
openerp.edi.EdiView = openerp.web.OldWidget.extend({
|
openerp.edi.EdiView = openerp.web.Widget.extend({
|
||||||
init: function(parent, db, token) {
|
init: function(parent, db, token) {
|
||||||
this._super();
|
this._super();
|
||||||
this.db = db;
|
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) {
|
init: function(parent,url) {
|
||||||
this._super();
|
this._super();
|
||||||
this.url = url;
|
this.url = url;
|
||||||
|
|
|
@ -129,7 +129,7 @@ class mail_message_common(osv.TransientModel):
|
||||||
help="Type of message, usually 'html' or 'plain', used to select "\
|
help="Type of message, usually 'html' or 'plain', used to select "\
|
||||||
"plain-text or rich-text contents accordingly"),
|
"plain-text or rich-text contents accordingly"),
|
||||||
'body_text': fields.text('Text Contents', help="Plain-text version of the message"),
|
'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',
|
'body': fields.function(get_body, fnct_search = search_body, type='text',
|
||||||
string='Message Content', store=True,
|
string='Message Content', store=True,
|
||||||
help="Content of the message. This content equals the body_text field "\
|
help="Content of the message. This content equals the body_text field "\
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
</group>
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
<page string="Body (Rich)">
|
<page string="Body (Rich)">
|
||||||
<field name="body_html" widget="text_html"/>
|
<field name="body_html"/>
|
||||||
</page>
|
</page>
|
||||||
<page string="Body (Plain)">
|
<page string="Body (Plain)">
|
||||||
<field name="body_text" widget="text"/>
|
<field name="body_text" widget="text"/>
|
||||||
|
@ -133,7 +133,7 @@
|
||||||
</group>
|
</group>
|
||||||
<notebook>
|
<notebook>
|
||||||
<page string="Body (Rich)">
|
<page string="Body (Rich)">
|
||||||
<field name="body_html" widget="text_html"/>
|
<field name="body_html"/>
|
||||||
</page>
|
</page>
|
||||||
<page string="Body (Plain)">
|
<page string="Body (Plain)">
|
||||||
<field name="body_text" widget="text"/>
|
<field name="body_text" widget="text"/>
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
<field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
|
<field name="body_text" colspan="2" nolabel="1" placeholder="What are you working on ?"
|
||||||
class="oe_mail_compose_message_body_text"/>
|
class="oe_mail_compose_message_body_text"/>
|
||||||
<field name="body_html" colspan="2" nolabel="1" placeholder="What are you working on HTML ?"
|
<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"
|
<field name="dest_partner_ids" colspan="2" nolabel="1" widget="many2many_tags"
|
||||||
placeholder="Add contacts to notify..."
|
placeholder="Add contacts to notify..."
|
||||||
class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
|
class="oe_mail_compose_message_partner_ids oe_mail_compose_message_invisible"/>
|
||||||
|
|
Loading…
Reference in New Issue