continuing fix of faulty merge

xml/xslt/functions_params_vars.xslt

@@ -104,7 +104,7 @@
                     <xsl:if test="$optional">
                         <xsl:text>(Optional) </xsl:text>
                     </xsl:if>
-                    <xsl:value-of select="description"/>
+                    <xsl:value-of select="specification"/>
                 </desc>
                 <xsl:if test="$effortPresent">
                     <d>
@@ -189,7 +189,7 @@
                                 <xsl:when test="not($effortPresent) or not(hourly_rate)">
                                     <xsl:message terminate="yes">ERROR: cannot compute fee for
                                             <xsl:value-of select="local-name(.)"/> "<xsl:value-of
-                                            select="description"/>" - effort and/or hourly rate
+                                            select="specification"/>" - effort and/or hourly rate
                                         missing </xsl:message>
                                 </xsl:when>
                                 <xsl:when test="$effortPresent and $minmaxeffortPresent">

xml/xslt/off2rep.xsl

@@ -167,10 +167,12 @@
                     <title>Scope of work</title>
                     <p>The scope of the penetration test was limited to the following target:</p>
                     <generate_targets/>
+                    <p>A breakdown of the scoped services can be found below: </p>
+                    <generate_service_breakdown format="list"/>
                 </section>
                 <section id="objectives">
                     <title>Project objectives</title>
-                    <p>...</p>
+                    <p><todo/></p>
                 </section>
                 <section id="timeline">
                     <title>Timeline</title>

xml/xslt/placeholders.xslt

@@ -184,12 +184,6 @@
             <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
         </xsl:call-template>
     </xsl:template>
-    <xsl:template match="p_duration">
-        <xsl:param name="placeholderElement" select="/*/meta/activityinfo/duration"/>
-        <xsl:call-template name="checkPlaceholder">
-            <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
-        </xsl:call-template>
-    </xsl:template>
     <xsl:template match="p_persondays">
         <xsl:param name="placeholderElement" select="/*/meta/activityinfo/persondays"/>
         <xsl:choose>

xml/xslt/styles.xslt

@@ -451,4 +451,8 @@
     </xsl:attribute-set>
     <xsl:attribute-set name="totalRow"/>
     <xsl:attribute-set name="totalcell"/>
+    <xsl:attribute-set name="signee"/>
+    <xsl:attribute-set name="signee_name"/>
+    <xsl:attribute-set name="signee_dottedline"/>
+    
 </xsl:stylesheet>

xml/xslt/styles_off.xslt

@@ -38,7 +38,8 @@
     <!-- Signature box -->
     <xsl:attribute-set name="signee">
         <xsl:attribute name="height">2.75cm</xsl:attribute>
-    </xsl:attribute-set><xsl:attribute-set name="signee_name">
+    </xsl:attribute-set>
+    <xsl:attribute-set name="signee_name">
         <xsl:attribute name="text-align">right</xsl:attribute>
         <xsl:attribute name="margin-right">0.75cm</xsl:attribute>
     </xsl:attribute-set>