admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCHX#64259 Notities mailen bij nieuwe-stijl vanuit facturen

Browse Source 
svn path=/Website/trunk/; revision=49881
This commit is contained in:
Erik Groener
2021-02-17 08:55:11 +00:00
parent 4956508a1b
commit a912d21c7b
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
APPL/Shared/default.xsl
View File

@@ -3553,6 +3553,24 @@ END:VCALENDAR
</xsl:when>
<xsl:otherwise>
<table border="0" cellpadding="1">
<xsl:if test="extra_key">
<xsl:variable name="mx_key"><xsl:value-of select="extra_key"/></xsl:variable>
<tr>
<td align="right" valign="top" style="padding-top:10px;" class="label">
<b><xsl:value-of select="//lcl/FAC/bericht"/>:</b>
</td>
<td colspan="3" style="padding-top:10px;" class="value">
<xsl:call-template name="linebreaks">
<xsl:with-param name="string" select="notes/note[key=$mx_key]/omschrijving"/>
</xsl:call-template>
</td>
</tr>
<tr>
<td colspan="4" style="padding-bottom:20px;">
<hr/>
</td>
</tr>
</xsl:if>
<tr>
<td colspan="4" class="caption"><strong><xsl:value-of select="//lcl/FIN/factuur"/> <xsl:value-of select="key"/></strong></td>
</tr>

7
APPL/Shared/queuemail.asp
View File

@@ -210,13 +210,14 @@ function bestandenlijstALL(pmodule, pniveau, pkey, pnoWorkflow)
else
{
<%
if (pcode == "MLDMAI" || pcode == "ORDMAI" || pcode == "CNTMAI")
if (pcode == "MLDMAI" || pcode == "ORDMAI" || pcode == "CNTMAI" || pcode == "FINMAI")
{
var save_note_url;
switch (pcode) {
case "MLDMAI": save_note_url = "../mld/mld_edit_note_save.asp?mailed=1&mld_key=" + pkey; break;
case "ORDMAI": save_note_url = "../mld/opdr_edit_note_save.asp?mailed=1&opdr_key=" + pkey; break;
case "CNTMAI": save_note_url = "../cnt/cnt_edit_note_save.asp?mailed=1&cnt_key=" + pkey; break;
case "FINMAI": save_note_url = "../fin/fin_edit_note_save.asp?mailed=1&fin_key=" + pkey; break;
}
%>
if ($.trim($("#notes").val()) != "")
@@ -490,7 +491,7 @@ function bestandenlijstALL(pmodule, pniveau, pkey, pnoWorkflow)
}
// Notitie
if ((pcode == "MLDMAI" && canWriteNote) || pcode == "ORDMAI" || pcode == "CNTMAI")
if ((pcode == "MLDMAI" && canWriteNote) || pcode == "ORDMAI" || pcode == "CNTMAI" || pcode == "FINMAI")
{
RWTEXTAREATR("notes",
"fldmaillist",
@@ -545,7 +546,7 @@ function bestandenlijstALL(pmodule, pniveau, pkey, pnoWorkflow)
// Bijlagen meesturen.
if (isProfessional)
{
checklist = ( (pcode == "MLDMAI" || pcode == "ORDMAI" || pcode == "CNTMAI")
checklist = ( (pcode == "MLDMAI" || pcode == "ORDMAI" || pcode == "CNTMAI" || pcode == "FINMAI")
? bestandenlijstALL(pmodule, pniveau, pkey, mld_info.noWorkflow)
: bestandenlijstALL(pmodule, pniveau, pkey, true)
);