Forward port of branch 7.0 up to d80c0ff
This commit is contained in:
commit
6d41af4432
|
@ -90,6 +90,8 @@ class hr_holidays_status(osv.osv):
|
|||
}
|
||||
|
||||
def name_get(self, cr, uid, ids, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
|
||||
if not context.get('employee_id',False):
|
||||
# leave counts is based on employee_id, would be inaccurate if not based on correct employee
|
||||
|
|
|
@ -655,8 +655,8 @@ openerp.mail = function (session) {
|
|||
if (self.flag_post) {
|
||||
return;
|
||||
}
|
||||
self.flag_post = true;
|
||||
if (this.do_check_attachment_upload() && (this.attachment_ids.length || this.$('textarea').val().match(/\S+/))) {
|
||||
self.flag_post = true;
|
||||
if (this.is_log) {
|
||||
this.do_send_message_post([], this.is_log);
|
||||
}
|
||||
|
|
|
@ -77,7 +77,7 @@
|
|||
<barCode><xsl:value-of select="ean13" /></barCode>
|
||||
</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>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
Loading…
Reference in New Issue