From 504e7688d64ccb5f89cf5b5d66c6bf079bbf5c96 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Fri, 21 Jun 2019 17:04:53 +0200
Subject: [PATCH] continuing fix of faulty merge

---
 xml/dtd/invoice.xsd                           |  1 -
 xml/dtd/offerte.xsd                           | 15 +++++-----
 xml/dtd/pentestreport.xsd                     |  4 ++-
 xml/dtd/quickscope.xsd                        |  1 -
 xml/dtd/servicebreakdown.xsd                  |  6 ++--
 xml/source/servicebreakdown.xml               | 28 +++++++++----------
 .../snippets/offerte/en/engagementtime.xml    |  4 +--
 .../offerte/en/planningandpayment.xml         |  2 +-
 .../snippets/offerte/en/projectoverview.xml   |  5 ++--
 .../offerte/en/projectoverview_code-audit.xml |  3 +-
 .../offerte/en/projectoverview_retest.xml     |  2 +-
 .../snippets/offerte/nl/engagementtime.xml    |  4 +--
 .../offerte/nl/planningandpayment.xml         |  2 +-
 .../snippets/offerte/nl/projectoverview.xml   |  4 +--
 xml/xslt/functions_params_vars.xslt           |  4 +--
 xml/xslt/off2rep.xsl                          |  4 ++-
 xml/xslt/placeholders.xslt                    |  6 ----
 xml/xslt/styles.xslt                          |  4 +++
 xml/xslt/styles_off.xslt                      |  3 +-
 19 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/xml/dtd/invoice.xsd b/xml/dtd/invoice.xsd
index ab1797a..ded70fc 100644
--- a/xml/dtd/invoice.xsd
+++ b/xml/dtd/invoice.xsd
@@ -92,7 +92,6 @@
             <xs:element name="company_poc1"/>
             <xs:element name="t_app"/>
             <xs:element name="t_app_producer"/>
-            <xs:element name="p_duration"/>
         </xs:choice>
     </xs:group>
 </xs:schema>
diff --git a/xml/dtd/offerte.xsd b/xml/dtd/offerte.xsd
index a93633f..7023c56 100644
--- a/xml/dtd/offerte.xsd
+++ b/xml/dtd/offerte.xsd
@@ -48,7 +48,6 @@
   <xs:element name="activityinfo">
     <xs:complexType>
       <xs:all>
-        <xs:element ref="duration" minOccurs="1"/>
         <xs:element ref="persondays" minOccurs="1"/>
         <xs:element ref="planning" minOccurs="1"/>
         <xs:element ref="report_due" minOccurs="1"/>
@@ -188,7 +187,7 @@
           <xs:element ref="contact"/>
           <xs:element ref="generate_targets"/>
           <xs:element name="generate_teammembers"/>
-          <xs:element ref="signature_box"/>
+          <xs:element name="generate_service_breakdown">
             <xs:complexType>
               <xs:attribute name="format" use="required">
                 <xs:simpleType>
@@ -200,7 +199,7 @@
               </xs:attribute>
             </xs:complexType>
           </xs:element>
-          <xs:element ref="generate_offer_signature_box"/>
+          <xs:element ref="signature_box"/>
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" use="optional" type="xs:ID"/>
@@ -213,11 +212,11 @@
 
   <xs:element name="contact">
     <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="name"/>
-        <xs:element ref="address"/>
-        <xs:element ref="email"/>
-      </xs:sequence>
+      <xs:all>
+        <xs:element ref="name" minOccurs="0"/>
+        <xs:element ref="address" minOccurs="0"/>
+        <xs:element ref="email" minOccurs="0"/>
+      </xs:all>
     </xs:complexType>
   </xs:element>
   <xs:element name="generate_permission_parties"/>
diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd
index 8b493a0..80c71d7 100644
--- a/xml/dtd/pentestreport.xsd
+++ b/xml/dtd/pentestreport.xsd
@@ -6,6 +6,7 @@
     schemaLocation="http://www.w3.org/2001/xml.xsd"/>
   <xs:import namespace="http://www.w3.org/2001/XInclude"
     schemaLocation="http://www.w3.org/2001/XInclude/XInclude.xsd"/>
+  <xs:include schemaLocation="servicebreakdown.xsd"/>
   <xs:include schemaLocation="common.xsd"/>
 
   <xs:element name="pentest_report">
@@ -59,7 +60,6 @@
   <xs:element name="activityinfo">
     <xs:complexType>
       <xs:all>
-        <xs:element ref="duration"/>
         <xs:element ref="persondays"/>
         <xs:element ref="planning"/>
         <xs:element ref="report_due"/>
@@ -67,6 +67,7 @@
         <xs:element ref="type"/>
         <xs:element minOccurs="0" ref="target_application"/>
         <xs:element minOccurs="0" ref="target_application_producer"/>
+        <xs:element ref="breakdown" minOccurs="0"/>
       </xs:all>
     </xs:complexType>
   </xs:element>
@@ -174,6 +175,7 @@
           <xs:element minOccurs="0" maxOccurs="unbounded" ref="generate_findings"/>
           <xs:element minOccurs="0" maxOccurs="unbounded" ref="finding"/>
           <xs:element minOccurs="0" maxOccurs="unbounded" ref="non-finding"/>
+          <xs:element minOccurs="0" name="generate_service_breakdown"/>
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" use="required" type="xs:ID"/>
diff --git a/xml/dtd/quickscope.xsd b/xml/dtd/quickscope.xsd
index cb8287c..5078402 100644
--- a/xml/dtd/quickscope.xsd
+++ b/xml/dtd/quickscope.xsd
@@ -42,7 +42,6 @@
     <xs:complexType>
       <xs:sequence>
         <xs:element ref="targets"/>
-        <xs:element ref="days"/>
         <xs:element ref="persondays"/>
         <xs:element ref="nature"/>
         <xs:element ref="type"/>
diff --git a/xml/dtd/servicebreakdown.xsd b/xml/dtd/servicebreakdown.xsd
index 9fd68fc..cabf698 100644
--- a/xml/dtd/servicebreakdown.xsd
+++ b/xml/dtd/servicebreakdown.xsd
@@ -16,7 +16,7 @@
   <xs:element name="service">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="description"/>
+        <xs:element ref="specification"/>
         <xs:element minOccurs="0" ref="effort"/>
         <xs:element minOccurs="0" ref="hourly_rate"/>
         <xs:element ref="fee"/>
@@ -47,14 +47,14 @@
   <xs:element name="extra">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="description"/>
+        <xs:element ref="specification"/>
         <xs:element minOccurs="0" ref="effort"/>
         <xs:element minOccurs="0" ref="hourly_rate"/>
         <xs:element ref="fee"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="description" type="xs:string"/>
+  <xs:element name="specification" type="xs:string"/>
   <xs:element name="effort">
     <xs:complexType mixed="true">
       <xs:all minOccurs="0">
diff --git a/xml/source/servicebreakdown.xml b/xml/source/servicebreakdown.xml
index b96cd2d..a272325 100644
--- a/xml/source/servicebreakdown.xml
+++ b/xml/source/servicebreakdown.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <breakdown xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../dtd/servicebreakdown.xsd">
   <service>
-    <description>Example Service 1: set duration in days and with hourly rate.</description>
+    <specification>Example Service 1: set duration in days and with hourly rate.</specification>
     <effort in="days">2</effort>
     <hourly_rate>10</hourly_rate>
     <fee denomination="eur">
@@ -9,8 +9,8 @@
     </fee>
   </service>
   <service>
-    <description>Example Service 2: variable duration with min/max parameters and with hourly
-      rate.</description>
+    <specification>Example Service 2: variable duration with min/max parameters and with hourly
+      rate.</specification>
     <effort in="days">
       <min>3</min>
       <max>4</max>
@@ -21,14 +21,14 @@
     </fee>
   </service>
   <service>
-    <description>Example Service 3: set duration in days with CUSTOM (non-computed) set
-      fee.</description>
+    <specification>Example Service 3: set duration in days with CUSTOM (non-computed) set
+      fee.</specification>
     <effort in="days">5</effort>
     <fee denomination="eur">500</fee>
   </service>
   <service>
-    <description>Example Service 4: set duration in hours with CUSTOM (non-computed) variable fee
-      (min/max).</description>
+    <specification>Example Service 4: set duration in hours with CUSTOM (non-computed) variable fee
+      (min/max).</specification>
     <effort in="hours">4</effort>
     <fee denomination="eur">
       <min>100</min>
@@ -36,13 +36,13 @@
     </fee>
   </service>
   <service>
-    <description>Example Service 5: set duration in days with CUSTOM (non-computed) estimated
-      fee.</description>
+    <specification>Example Service 5: set duration in days with CUSTOM (non-computed) estimated
+      fee.</specification>
     <effort in="hours">4</effort>
     <fee denomination="eur" estimate="yes">1000</fee>
   </service>
   <service optional="yes">
-    <description>Example Service 6: optional service</description>
+    <specification>Example Service 6: optional service</specification>
     <effort in="days">
       <min>1</min>
       <max>2</max>
@@ -53,22 +53,22 @@
     </fee>
   </service>
   <extra>
-    <description>Example Extra Cost 1: set fee</description>
+    <specification>Example Extra Cost 1: set fee</specification>
     <fee denomination="eur">1000</fee>
   </extra>
   <extra>
-    <description>Example Extra Cost 2: variable min/max fee</description>
+    <specification>Example Extra Cost 2: variable min/max fee</specification>
     <fee denomination="eur">
       <min>1000</min>
       <max>1200</max>
     </fee>
   </extra>
   <extra>
-    <description>Example Extra Cost 3: estimated fee</description>
+    <specification>Example Extra Cost 3: estimated fee</specification>
     <fee denomination="eur" estimate="yes">600</fee>
   </extra>
   <extra>
-    <description>Example Extra Cost 4: with duration</description>
+    <specification>Example Extra Cost 4: with duration</specification>
     <effort in="days">6</effort>
     <fee denomination="eur">600</fee>
   </extra>
diff --git a/xml/source/snippets/offerte/en/engagementtime.xml b/xml/source/snippets/offerte/en/engagementtime.xml
index 34c625b..9aa0db5 100644
--- a/xml/source/snippets/offerte/en/engagementtime.xml
+++ b/xml/source/snippets/offerte/en/engagementtime.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<p>Based on the information provided, we expect this to be a <p_duration/>-day
-  engagement. The planning of this engagement is as follows:
+<p>Based on the information provided, we expect this engagement to take <p_persondays/>
+  persondays. The planning of this engagement is as follows:
 </p>
\ No newline at end of file
diff --git a/xml/source/snippets/offerte/en/planningandpayment.xml b/xml/source/snippets/offerte/en/planningandpayment.xml
index 186b51d..02c14a0 100644
--- a/xml/source/snippets/offerte/en/planningandpayment.xml
+++ b/xml/source/snippets/offerte/en/planningandpayment.xml
@@ -5,7 +5,7 @@
     <company_short/> will uphold the following schedule for the services:
   </p>
   <ul>
-    <li><company_short/> performs a <p_duration/>-day <company_svc_short/> starting <p_startdate/>.</li>
+    <li><company_short/> performs a <company_svc_short/> starting <p_startdate/>.</li>
     <li><company_short/> delivers the final report on 
       <p_reportdue/>.</li>
   </ul>
diff --git a/xml/source/snippets/offerte/en/projectoverview.xml b/xml/source/snippets/offerte/en/projectoverview.xml
index 42ca7a1..6a6f422 100644
--- a/xml/source/snippets/offerte/en/projectoverview.xml
+++ b/xml/source/snippets/offerte/en/projectoverview.xml
@@ -18,10 +18,9 @@
   <p>
     <company_short/> will test for the presence of the most common
     vulnerabilities, using both publicly available vulnerability scanning
-    tools and manual testing. <company_short/> shall perform a
-    <p_duration/>-day 
+    tools and manual testing. <company_short/> shall perform a 
     <p_boxtype/> intrusive test via the
-    internet (total estimated effort is <p_persondays/> persondays). A breakdown of the requested services can be found below:
+    internet (total estimated effort: <p_persondays/> persondays). A breakdown of the requested services can be found below:
   </p>
   
  
diff --git a/xml/source/snippets/offerte/en/projectoverview_code-audit.xml b/xml/source/snippets/offerte/en/projectoverview_code-audit.xml
index 79e8caa..c73977e 100644
--- a/xml/source/snippets/offerte/en/projectoverview_code-audit.xml
+++ b/xml/source/snippets/offerte/en/projectoverview_code-audit.xml
@@ -16,8 +16,7 @@
     <p>
         <company_short/> will test for the presence of the most common vulnerabilities using a
         combination of publicly available (static, dynamic and concolic) analytic tools, fuzzing and
-        code reading. <company_short/> will perform this code audit in <p_duration/> days
-        (<p_persondays/> persondays). </p>
+        code reading. <company_short/> will need <p_persondays/> persondays for this code audit. </p>
     
 
     <!--Not Needed if Disclaimer is Included; Duplicate Text-->
diff --git a/xml/source/snippets/offerte/en/projectoverview_retest.xml b/xml/source/snippets/offerte/en/projectoverview_retest.xml
index 732c9c8..ae6d5e2 100644
--- a/xml/source/snippets/offerte/en/projectoverview_retest.xml
+++ b/xml/source/snippets/offerte/en/projectoverview_retest.xml
@@ -15,7 +15,7 @@
   <p>
     <company_short/> will test using both publicly available vulnerability
     scanning tools and manual testing. <company_short/> shall perform a
-    <p_duration/>-day, <p_boxtype/> follow-up penetration test via the internet.
+   <p_boxtype/> follow-up penetration test via the internet between <p_startdate/> and <p_enddate/>.
   </p>
 
   <!--Not Needed if Disclaimer is Included; Duplicate Text-->
diff --git a/xml/source/snippets/offerte/nl/engagementtime.xml b/xml/source/snippets/offerte/nl/engagementtime.xml
index 5cac4af..e8084bc 100644
--- a/xml/source/snippets/offerte/nl/engagementtime.xml
+++ b/xml/source/snippets/offerte/nl/engagementtime.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<p>Op basis van de verstrekte informatie verwachten wij dat het uitvoeren van de
-  opdracht <p_duration/> dagen zal duren. De planning van de opdracht is als volgt:
+<p>Op basis van de verstrekte informatie verwachten wij <p_persondays/> persoondagen nodig te hebben voor het uitvoeren van de
+  opdracht. De planning van de opdracht is als volgt:
 </p>
\ No newline at end of file
diff --git a/xml/source/snippets/offerte/nl/planningandpayment.xml b/xml/source/snippets/offerte/nl/planningandpayment.xml
index 1019b10..6c1d601 100644
--- a/xml/source/snippets/offerte/nl/planningandpayment.xml
+++ b/xml/source/snippets/offerte/nl/planningandpayment.xml
@@ -4,7 +4,7 @@
   <p><company_short/> houdt de volgende planning aan voor haar werkzaamheden:</p>  
   
     <ul>
-      <li><company_short/> voert een <p_duration/>-daagse <company_svc_short/> uit op het doelwit: <p_startdate/>.</li>
+      <li><company_short/> voert een <company_svc_short/> uit op het doelwit: <p_startdate/>.</li>
       <li><company_short/> levert het definitieve rapport: <p_reportdue/>.</li>
     </ul>
   
diff --git a/xml/source/snippets/offerte/nl/projectoverview.xml b/xml/source/snippets/offerte/nl/projectoverview.xml
index e2e6e94..fa81fcd 100644
--- a/xml/source/snippets/offerte/nl/projectoverview.xml
+++ b/xml/source/snippets/offerte/nl/projectoverview.xml
@@ -19,8 +19,8 @@
   <p>
     <company_short/> zal testen op de aanwezigheid van de meest voorkomende
     kwetsbaarheden, gebruik makend van zowel publiek beschikbare scanning tools,
-    als door handmatig testen. <company_short/> zal een grondige <p_duration/>-daagse
-    (<p_persondays/> persoondagen), <p_boxtype/> test uitvoeren via internet.
+    als door handmatig testen. <company_short/> zal een grondige 
+    <p_boxtype/> test van <p_persondays/> persoondagen uitvoeren via internet.
   </p>
 
   <section todo="yes">
diff --git a/xml/xslt/functions_params_vars.xslt b/xml/xslt/functions_params_vars.xslt
index 8d9db6f..78a7924 100644
--- a/xml/xslt/functions_params_vars.xslt
+++ b/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">
diff --git a/xml/xslt/off2rep.xsl b/xml/xslt/off2rep.xsl
index d5f8da8..4e54ed4 100644
--- a/xml/xslt/off2rep.xsl
+++ b/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>
diff --git a/xml/xslt/placeholders.xslt b/xml/xslt/placeholders.xslt
index 2b45c3e..a3123ed 100644
--- a/xml/xslt/placeholders.xslt
+++ b/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>
diff --git a/xml/xslt/styles.xslt b/xml/xslt/styles.xslt
index 89d2afe..2bec35a 100644
--- a/xml/xslt/styles.xslt
+++ b/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>
diff --git a/xml/xslt/styles_off.xslt b/xml/xslt/styles_off.xslt
index 5f8bfaf..42a2bb9 100644
--- a/xml/xslt/styles_off.xslt
+++ b/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>