Forward port of branch saas-3 up to 6d41af4
This commit is contained in:
commit
b303613f85
|
@ -652,8 +652,8 @@ openerp.mail = function (session) {
|
||||||
if (self.flag_post) {
|
if (self.flag_post) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
self.flag_post = true;
|
|
||||||
if (this.do_check_attachment_upload() && (this.attachment_ids.length || this.$('textarea').val().match(/\S+/))) {
|
if (this.do_check_attachment_upload() && (this.attachment_ids.length || this.$('textarea').val().match(/\S+/))) {
|
||||||
|
self.flag_post = true;
|
||||||
if (this.is_log) {
|
if (this.is_log) {
|
||||||
this.do_send_message_post([], this.is_log);
|
this.do_send_message_post([], this.is_log);
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@
|
||||||
<barCode><xsl:value-of select="ean13" /></barCode>
|
<barCode><xsl:value-of select="ean13" /></barCode>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<para style="nospace"><xsl:value-of select="substring(product, 1, pmaxChars)"/></para><xsl:text>, </xsl:text>
|
<para style="nospace"><xsl:value-of select="substring(product, 1, $pmaxChars)"/></para><xsl:text>, </xsl:text>
|
||||||
<para style="nospace"><xsl:value-of select="variant"/></para>
|
<para style="nospace"><xsl:value-of select="variant"/></para>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in New Issue