From 07434a305db1490bc79fdbb3ef869e31d0bf40e4 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Wed, 4 Dec 2024 18:53:20 +0100
Subject: [PATCH 1/6] Futurework cleanup

---
 source/futurework.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/source/futurework.xml b/source/futurework.xml
index 7e6cb75..35d7d94 100644
--- a/source/futurework.xml
+++ b/source/futurework.xml
@@ -4,14 +4,12 @@
   <ul>
     <li>
       <b>Retest of findings</b>
-      <br/> When mitigations for the vulnerabilities described in this report have been deployed, a
-      repeat test should be performed to ensure that they are effective and have not introduced
-      other security problems. </li>
+      <br/>When mitigations for the vulnerabilities described in this report have been deployed, perform a
+      repeat test to ensure that they are effective and have not introduced other security problems.
+    </li>
     <li>
       <b>Regular security assessments</b>
-      <br/>
-      Let us emphasize that security is a process, and this penetration test is just a single snapshot.
-      Security must be continuously evaluated and improved.
+      <br/>Security is a process that must be continuously evaluated and improved; this penetration test is just a single snapshot.
       Regular audits and ongoing improvements are essential in order to maintain control of your corporate information security.
     </li>
     <li>

From 173fa8ffb1e6562a3e2bcfd1d4f7d0ced1f313cc Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Wed, 4 Dec 2024 18:55:51 +0100
Subject: [PATCH 2/6] No caps needed

---
 templates/pentestreport/report.xml | 2 +-
 xslt/off2rep.xsl                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/pentestreport/report.xml b/templates/pentestreport/report.xml
index 7532759..054f0aa 100644
--- a/templates/pentestreport/report.xml
+++ b/templates/pentestreport/report.xml
@@ -58,7 +58,7 @@
     </section>
     <section id="timeline">
       <title>Timeline</title>
-      <p>The Security Audit took place between X and Y, 2016.</p>
+      <p>The security audit took place between X and Y, 2016.</p>
     </section>
     <xi:include href="resultsinanutshell.xml"/>
     <section id="findingSummary">
diff --git a/xslt/off2rep.xsl b/xslt/off2rep.xsl
index d5a5266..7c2f913 100644
--- a/xslt/off2rep.xsl
+++ b/xslt/off2rep.xsl
@@ -184,7 +184,7 @@
                 </section>
                 <section id="timeline">
                     <title>Timeline</title>
-                    <p>The Security Audit took place between <p_startdate/> and <p_enddate/>.</p>
+                    <p>The security audit took place between <p_startdate/> and <p_enddate/>.</p>
                 </section>
                 <xsl:element name="xi:include">
                     <xsl:attribute name="href">resultsinanutshell.xml</xsl:attribute>

From aeca5e3048f43c7ec4e8e06b54169d8534b50ec4 Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Wed, 4 Dec 2024 19:05:20 +0100
Subject: [PATCH 3/6] Excess spaces

---
 doc/RELEASE_NOTES.html                        |  6 +++---
 doc/examples/examplereport.xml                |  6 +++---
 source/conclusion.xml                         | 10 ++++-----
 source/snippets/offerte/en/conditions.xml     |  6 +++---
 .../offerte/en/conditions_code-audit.xml      |  6 +++---
 .../offerte/en/methodology_code-audit.xml     | 21 ++++++++++---------
 source/snippets/offerte/en/phishing.xml       |  2 +-
 .../offerte/en/projectoverview_code-audit.xml |  6 +++---
 .../snippets/offerte/nl/teamandreporting.xml  |  2 +-
 .../nl/teamandreporting_basic-scan.xml        |  2 +-
 xslt/off2rep.xsl                              |  2 +-
 11 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/doc/RELEASE_NOTES.html b/doc/RELEASE_NOTES.html
index 8a6ea1d..60dc157 100644
--- a/doc/RELEASE_NOTES.html
+++ b/doc/RELEASE_NOTES.html
@@ -1014,7 +1014,7 @@ <h3 id="finding-status"><a name="user-content-finding-status" href="#finding-sta
 </ul>
 <p>The <code>&lt;generate_findings/&gt;</code> element now likewise has this optional <code>@status</code> attribute with the same possible values. You can add it to generate a finding summary table containing only the findings with a specific status.</p>
 <h2 id="june-15-2016"><a name="user-content-june-15-2016" href="#june-15-2016" class="headeranchor-link" aria-hidden="true"><span class="headeranchor"></span></a>June 15, 2016</h2>
-<p>Giant update to celebrate these xml templates having been elevated to OWASP project status. Because how better to do that than through introducing a load of bugs. :) </p>
+<p>Giant update to celebrate these xml templates having been elevated to OWASP project status. Because how better to do that than through introducing a load of bugs. :)</p>
 <h3 id="multilingual-workflow"><a name="user-content-multilingual-workflow" href="#multilingual-workflow" class="headeranchor-link" aria-hidden="true"><span class="headeranchor"></span></a>Multilingual workflow</h3>
 <p>You can now set the desired language in quickscope, using the offer_language element. This will generate the proper offer with the proper language snippets.</p>
 <p>Note: language stuff is defined in two places:</p>
@@ -1041,7 +1041,7 @@ <h3 id="customizable-waivers"><a name="user-content-customizable-waivers" href="
 <li>if not, it uses the standard waiver</li>
 </ol>
 <p>Now isn&rsquo;t that simple!</p>
-<p>Note: to support this functionality, a bunch of waiver-only placeholders have been introduced, to wit: <code>&lt;signee_long&gt;</code>, <code>&lt;signee_short&gt;</code>, <code>&lt;signee_street&gt;</code>, <code>&lt;signee_city&gt;</code>, <code>&lt;signee_country&gt;</code>, <code>&lt;signee_waiver_rep&gt;</code>. Don&rsquo;t use them anywhere else though (they will fail and anyway it wouldn&rsquo;t make sense). </p>
+<p>Note: to support this functionality, a bunch of waiver-only placeholders have been introduced, to wit: <code>&lt;signee_long&gt;</code>, <code>&lt;signee_short&gt;</code>, <code>&lt;signee_street&gt;</code>, <code>&lt;signee_city&gt;</code>, <code>&lt;signee_country&gt;</code>, <code>&lt;signee_waiver_rep&gt;</code>. Don&rsquo;t use them anywhere else though (they will fail and anyway it wouldn&rsquo;t make sense).</p>
 <h2 id="may-23-2016"><a name="user-content-may-23-2016" href="#may-23-2016" class="headeranchor-link" aria-hidden="true"><span class="headeranchor"></span></a>May 23, 2016</h2>
 <h3 id="offerte-pentest-report"><a name="user-content-offerte-pentest-report" href="#offerte-pentest-report" class="headeranchor-link" aria-hidden="true"><span class="headeranchor"></span></a>Offerte &ndash;&gt; Pentest-report</h3>
 <p>Last step in the document chain has been completed: you can now generate a (bare bones) Pentest report from any offerte the client has accepted, using the following command:</p>
@@ -1095,7 +1095,7 @@ <h3 id="client-info-now-has-its-own-file"><a name="user-content-client-info-now-
 <p>Note that there are some new fields in the client section, <code>&lt;invoice_rep&gt;</code> and <code>&lt;invoice_mail&gt;</code> for use in the&hellip; (see next section)</p>
 <h3 id="invoices"><a name="user-content-invoices" href="#invoices" class="headeranchor-link" aria-hidden="true"><span class="headeranchor"></span></a>Invoices!</h3>
 <p>w00t. You can now generate a pdf invoice directly from offerte.xml. Use:</p>
-<p><code>java  -jar saxon9he.jar -s:/path/to/offerte/source/offerte.xml -xsl:/path/to/offerte/xslt/generate_invoice.xsl -o:/path/to/report/target/invoice.fo INVOICE_NO=[invoice number] -xi</code> </p>
+<p><code>java  -jar saxon9he.jar -s:/path/to/offerte/source/offerte.xml -xsl:/path/to/offerte/xslt/generate_invoice.xsl -o:/path/to/report/target/invoice.fo INVOICE_NO=[invoice number] -xi</code></p>
 <p>And then:</p>
 <p><code>fop -c conf/rosfop.xconf /path/to/offerte/target/invoice.fo path/to/offerte/target/invoice.pdf</code></p>
 <h2 id="march-9-2016"><a name="user-content-march-9-2016" href="#march-9-2016" class="headeranchor-link" aria-hidden="true"><span class="headeranchor"></span></a>March 9, 2016</h2>
diff --git a/doc/examples/examplereport.xml b/doc/examples/examplereport.xml
index 724dc33..5fb5057 100644
--- a/doc/examples/examplereport.xml
+++ b/doc/examples/examplereport.xml
@@ -196,7 +196,7 @@ who is also the co-founder/CEO of Radically Open Security.</bio>
 fishinabarrel.sittingduck.com</pre>
 
                         <p>Outcome:</p>
-                        <pre> Nmap scan report for fishinabarrel.sittingduck.com (10.10.10.1)
+                        <pre>Nmap scan report for fishinabarrel.sittingduck.com (10.10.10.1)
 Starting Nmap 4.11 ( http://www.insecure.org/nmap/ ) at 2013-11-11 15:43 EST
 Initiating ARP Ping Scan against 10.10.10.1 [1 port] at 15:43
 The ARP Ping Scan took 0.01s to scan 1 total hosts.
@@ -309,11 +309,11 @@ Raw packets sent: 1681 (73.962KB) | Rcvd: 1681 (77.322KB)</pre>
                         <title>Mail Server</title>
                         <p>The server was running Mailserver XYZ, the most recent version of this
                                 particular piece of software. No relevant vulnerabilities or
-                                exploits were found. </p>
+                                exploits were found.</p>
                 </non-finding>
                 <non-finding id="sqlInjection">
                         <title>SQL Code Injection</title>
-                        <p>The following parameters are not vulnerable to SQL injection. </p>
+                        <p>The following parameters are not vulnerable to SQL injection.</p>
                         <p>All parameters have been checked manually.</p>
                         <pre>-file1.php
 -file2.php
diff --git a/source/conclusion.xml b/source/conclusion.xml
index 39828d0..19bac16 100644
--- a/source/conclusion.xml
+++ b/source/conclusion.xml
@@ -6,13 +6,13 @@
   <p><todo desc="Add some paragraphs describing in high level the impact of these findings on the organization, priorities in fixing them"/></p>
 
   <p>We recommend fixing all of the issues found and then performing a retest in order to ensure
-    that mitigations are effective and that no new vulnerabilities have been introduced. </p>
-  <p> Finally, we want to emphasize that security is a process – this penetration test is just a
+    that mitigations are effective and that no new vulnerabilities have been introduced.</p>
+  <p>Finally, we want to emphasize that security is a process – this penetration test is just a
     one-time snapshot. Security posture must be continuously evaluated and improved. Regular audits
     and ongoing improvements are essential in order to maintain control of your corporate
     information security. We hope that this pentest report (and the detailed explanations of our
-    findings) will contribute meaningfully towards that end. </p>
-  <p> Please don't hesitate to let us know if you have any further questions, or need further
-    clarification on anything in this report. </p>
+    findings) will contribute meaningfully towards that end.</p>
+  <p>Please don't hesitate to let us know if you have any further questions, or need further
+    clarification on anything in this report.</p>
 
 </section>
diff --git a/source/snippets/offerte/en/conditions.xml b/source/snippets/offerte/en/conditions.xml
index 52fc245..6f4a582 100644
--- a/source/snippets/offerte/en/conditions.xml
+++ b/source/snippets/offerte/en/conditions.xml
@@ -4,13 +4,13 @@
   <p>
     <company_short/> will only perform the <company_svc_short/> if it has obtained the permission
     from <generate_permission_parties/> as set out in the penetration testing waiver, attached as
-      <b>Annex 2</b>, or provided in a separate document. </p>
+      <b>Annex 2</b>, or provided in a separate document.</p>
 
   <p>
     <company_short/> performs this assignment on the basis of its general terms and conditions,
     which are attached to this offer as Annex 1. <company_short/> rejects any general terms and
-    conditions used by <client_short/>. </p>
-  <p>In order to agree to this offer, please sign the quote and waiver and return it to: </p>
+    conditions used by <client_short/>.</p>
+  <p>In order to agree to this offer, please sign the quote and waiver and return it to:</p>
   <contact>
     <email>
       <company_email/>
diff --git a/source/snippets/offerte/en/conditions_code-audit.xml b/source/snippets/offerte/en/conditions_code-audit.xml
index 4fd7615..f96767a 100644
--- a/source/snippets/offerte/en/conditions_code-audit.xml
+++ b/source/snippets/offerte/en/conditions_code-audit.xml
@@ -4,13 +4,13 @@
   <p>
     <company_short/> will only perform the <company_svc_short/> if it has obtained the permission
     from <generate_permission_parties/> as set out in the waiver, attached as <b>Annex 2</b>, or
-    provided in a separate document. </p>
+    provided in a separate document.</p>
 
   <p>
     <company_short/> performs this assignment on the basis of its general terms and conditions,
     which are attached to this offer as Annex 1. <company_short/> rejects any general terms and
-    conditions used by <client_short/>. </p>
-  <p>In order to agree to this offer, please sign the quote and waiver and return it to: </p>
+    conditions used by <client_short/>.</p>
+  <p>In order to agree to this offer, please sign the quote and waiver and return it to:</p>
   <contact>
     <email>
       <company_email/>
diff --git a/source/snippets/offerte/en/methodology_code-audit.xml b/source/snippets/offerte/en/methodology_code-audit.xml
index 18fe9ee..7bc5dca 100644
--- a/source/snippets/offerte/en/methodology_code-audit.xml
+++ b/source/snippets/offerte/en/methodology_code-audit.xml
@@ -7,7 +7,7 @@
     vulnerabilities are found, we determine the threat level by assessing the likelihood of
     exploitation of this vulnerability and the impact on the Confidentiality, Integrity and
     Availability (CIA) of the system. We will describe how an attacker would exploit the
-    vulnerability and suggest ways of fixing it. </p>
+    vulnerability and suggest ways of fixing it.</p>
   <p>This requires an extensive knowledge of the platform the application is running on, as well as
     the extensive knowledge of the language the application in written in and patterns that have
     been used. Therefore a code audit done by highly-trained specialists with a strong background in
@@ -15,35 +15,36 @@
   <p> During the code audit, we take the following approach: </p>
   <ol>
     <li><b>Thorough comprehension of functionality</b>
-      <br/> We try to get a thorough comprehension of how the application works and how it interacts
+      <br/>We try to get a thorough comprehension of how the application works and how it interacts
       with the user and other systems. Having detailed documentation (manuals, flow charts, system
       sequence diagrams, design documentation) at this stage is very helpful, as they aid the
       understanding of the application </li>
-    <li><b>Comprehensive code reading</b><br/> goals of the comprehensive code reading are:
+    <li><b>Comprehensive code reading</b><br/>goals of the comprehensive code reading are:
           <ul><li>to get an understanding of the whole code</li>
         <li>identify adversary controlled inputs and trace their paths</li>
         <li>identify issues</li></ul></li>
     <li><b>Static analysis</b>
-      <br/> Using the understanding we gained in the previous step, we will use static code analysis
+      <br/>Using the understanding we gained in the previous step, we will use static code analysis
       to uncover any vulnerabilities. Static analysis means the specialist will analyze the code and
       implementation of security controls to get an understanding of the security of the
       application, rather than running the application to reach the same goal. This is primarily a
       manual process, where the specialist relies on his knowledge and expertise to find the flaws
       in the application. The specialist may be aided in this process by automatic analysis tools,
-      but his or her skills are the driving force. <br/> Depending on the type of application, we
+      but his or her skills are the driving force.<br/>
+      Depending on the type of application, we
       will identify the endpoints. In this case, it means where data enters and leaves the
       application. The data is then followed through the application and is leading in determining
-      if assessing the quality of the security measures. </li>
+      if assessing the quality of the security measures.</li>
     <li><b>Dynamic analysis</b>
-      <br/> Dynamic analysis can also be performed. In this case, the program is run and actively
+      <br/>Dynamic analysis can also be performed. In this case, the program is run and actively
       exploited by the specialist. This is usually done to confirm a vulnerability and as such
-      follows the result of the static analysis. </li>
+      follows the result of the static analysis.</li>
     <li><b>Fuzzing</b>
-      <br/> Fuzz testing or Fuzzing is a software testing technique which in essence consists of
+      <br/>Fuzz testing or Fuzzing is a software testing technique which in essence consists of
       finding implementation bugs using malformed/semi-malformed data injection in an automated
       fashion.</li>
     <li><b>Concolic analysis</b>
-      <br/> If the specialist thinks it useful, additional concolic analysis may be performed on
+      <br/>If the specialist thinks it useful, additional concolic analysis may be performed on
       selected subsets of the code.</li>
   </ol>
 </section>
diff --git a/source/snippets/offerte/en/phishing.xml b/source/snippets/offerte/en/phishing.xml
index 8f084da..61aa0ce 100644
--- a/source/snippets/offerte/en/phishing.xml
+++ b/source/snippets/offerte/en/phishing.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <section>
   <title>Social Engineering: Phishing</title>
-  <p> <company_short/>
+  <p><company_short/>
     will engage in social-engineering-based attacks. As requested,
     the focus will be on sending phishing emails to test how vulnerable
     the selected targets are to this approach.
diff --git a/source/snippets/offerte/en/projectoverview_code-audit.xml b/source/snippets/offerte/en/projectoverview_code-audit.xml
index c73977e..f807624 100644
--- a/source/snippets/offerte/en/projectoverview_code-audit.xml
+++ b/source/snippets/offerte/en/projectoverview_code-audit.xml
@@ -6,17 +6,17 @@
         for <client_short/>. The code audit is intended to gain insight into the security of the
         source code. To do so, <company_short/> will analyze the code, attempt to find
         vulnerabilities, and gain further access and elevated privileges by exploiting any
-        vulnerabilities found. </p>
+        vulnerabilities found.</p>
 
     <p>
-        <company_short/> will test the following code (the “<b>Targets</b>”): </p>
+        <company_short/> will test the following code (the “<b>Targets</b>”):</p>
 
     <generate_targets/>
 
     <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 need <p_persondays/> persondays for this code audit. </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/source/snippets/offerte/nl/teamandreporting.xml b/source/snippets/offerte/nl/teamandreporting.xml
index d01cf41..7ad47fd 100644
--- a/source/snippets/offerte/nl/teamandreporting.xml
+++ b/source/snippets/offerte/nl/teamandreporting.xml
@@ -19,7 +19,7 @@
                         klant uit te nodigen om op vrijwillige basis samen te werken met ons
                         pentestteam. Uiteraard geldt deze uitnodiging ook voor <client_short/>.</p>
 
-                <p> <company_short/> betrekt <client_short/> actief bij het project door tussentijds 
+                <p><company_short/> betrekt <client_short/> actief bij het project door tussentijds
     overleg te voeren over de voortgang van de <company_svc_short/> en over het proces. 
     Door deze manier van werken wordt het project een doorlopende leerervaring voor 
     zowel u als voor <company_short/>. <company_short/> heeft ervaren dat een 
diff --git a/source/snippets/offerte/nl/teamandreporting_basic-scan.xml b/source/snippets/offerte/nl/teamandreporting_basic-scan.xml
index e37699a..ec35315 100644
--- a/source/snippets/offerte/nl/teamandreporting_basic-scan.xml
+++ b/source/snippets/offerte/nl/teamandreporting_basic-scan.xml
@@ -22,7 +22,7 @@
       uitnodiging ook voor <generate_permission_parties/>.
     </p>
 
-    <p> <company_short/> betrekt <client_short/> actief bij het project door tussentijds 
+    <p><company_short/> betrekt <client_short/> actief bij het project door tussentijds
     overleg te voeren over de voortgang van de <company_svc_short/> en over het proces. 
     Door deze manier van werken wordt het project een doorlopende leerervaring voor 
     zowel u als voor <company_short/>. <company_short/> heeft ervaren dat een 
diff --git a/xslt/off2rep.xsl b/xslt/off2rep.xsl
index 7c2f913..4e7348c 100644
--- a/xslt/off2rep.xsl
+++ b/xslt/off2rep.xsl
@@ -170,7 +170,7 @@
                     <title>Scope of work</title>
                     <p>The scope of the penetration test was limited to the following target(s):</p>
                     <generate_targets/>
-                    <p>The scoped services are broken down as follows: </p>
+                    <p>The scoped services are broken down as follows:</p>
                     <generate_service_breakdown format="list"/>
                 </section>
                 <section id="objectives">

From 1cd657aa959cba1229e76947f4d92b399f11affb Mon Sep 17 00:00:00 2001
From: Marcus Bointon <marcus@synchromedia.co.uk>
Date: Wed, 4 Dec 2024 19:06:08 +0100
Subject: [PATCH 4/6] Rephrase to make sense

---
 source/snippets/offerte/en/methodology_code-audit.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/source/snippets/offerte/en/methodology_code-audit.xml b/source/snippets/offerte/en/methodology_code-audit.xml
index 7bc5dca..dd9a4ef 100644
--- a/source/snippets/offerte/en/methodology_code-audit.xml
+++ b/source/snippets/offerte/en/methodology_code-audit.xml
@@ -10,9 +10,8 @@
     vulnerability and suggest ways of fixing it.</p>
   <p>This requires an extensive knowledge of the platform the application is running on, as well as
     the extensive knowledge of the language the application in written in and patterns that have
-    been used. Therefore a code audit done by highly-trained specialists with a strong background in
-    programming. </p>
-  <p> During the code audit, we take the following approach: </p>
+    been used. Therefore, a code audit is performed by highly-trained specialists with a strong programming background.</p>
+  <p>During the code audit, we take the following approach:</p>
   <ol>
     <li><b>Thorough comprehension of functionality</b>
       <br/>We try to get a thorough comprehension of how the application works and how it interacts

From 44d0f0c5f6faafbcd61c1d1e9b64debfea685437 Mon Sep 17 00:00:00 2001
From: Matei <142297275+4akk1@users.noreply.github.com>
Date: Tue, 17 Dec 2024 12:35:08 +0100
Subject: [PATCH 5/6] New structural changes for summary of finding and
 recommendations

---
 xslt/auto.xslt | 216 ++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 168 insertions(+), 48 deletions(-)

diff --git a/xslt/auto.xslt b/xslt/auto.xslt
index 42815e2..816936c 100644
--- a/xslt/auto.xslt
+++ b/xslt/auto.xslt
@@ -71,28 +71,18 @@
         <fo:block>
             <fo:table xsl:use-attribute-sets="fwtable table borders">
                 <xsl:call-template name="checkIfLast"/>
-                <fo:table-column column-width="proportional-column-width(12)"
-                    xsl:use-attribute-sets="borders"/>
-                <fo:table-column column-width="proportional-column-width(22)"
+                <fo:table-column column-width="proportional-column-width(16)"
                     xsl:use-attribute-sets="borders"/>
                 <fo:table-column column-width="proportional-column-width(50)"
                     xsl:use-attribute-sets="borders"/>
-                <fo:table-column column-width="proportional-column-width(16)"
-                    xsl:use-attribute-sets="borders"/>
                 <fo:table-body>
                     <fo:table-row keep-with-next.within-column="always">
                         <fo:table-cell xsl:use-attribute-sets="th">
-                            <fo:block>ID</fo:block>
-                        </fo:table-cell>
-                        <fo:table-cell xsl:use-attribute-sets="th">
-                            <fo:block>Type</fo:block>
+                            <fo:block>Info</fo:block>
                         </fo:table-cell>
                         <fo:table-cell xsl:use-attribute-sets="th">
                             <fo:block>Description</fo:block>
                         </fo:table-cell>
-                        <fo:table-cell xsl:use-attribute-sets="th">
-                            <fo:block>Threat level</fo:block>
-                        </fo:table-cell>
                     </fo:table-row>
                     <xsl:choose>
                         <xsl:when test="@status and @Ref">
@@ -128,14 +118,16 @@
     </xsl:template>
 
     <xsl:template name="findingsSummaryContent">
-        <fo:table-row xsl:use-attribute-sets="TableFont">
+        <fo:table-row xsl:use-attribute-sets="TableFont" keep-together.within-column="always">
             <xsl:if test="position() mod 2 != 0">
                 <xsl:attribute name="background-color">#ededed</xsl:attribute>
             </xsl:if>
+            
+            <!-- First Table Cell -->
             <fo:table-cell xsl:use-attribute-sets="td">
-                <fo:block>
+               <fo:block>
                     <fo:inline>
-                        <!-- attach id to first finding of each threatLevel so pie charts can link to it -->
+                        <!-- attach id to first finding so internal links can point to it -->
                         <xsl:if test="@id">
                             <xsl:attribute name="id">
                                 <xsl:value-of select="@id"/>
@@ -149,27 +141,90 @@
                         </fo:basic-link>
                     </fo:inline>
                 </fo:block>
-            </fo:table-cell>
-            <fo:table-cell xsl:use-attribute-sets="td">
+
+                <fo:block>
+                    <fo:inline xsl:use-attribute-sets="bold">
+                        <xsl:value-of select="findingThreatLevel"/>
+                    </fo:inline>
+                </fo:block>
                 <fo:block>
+                    <fo:inline xsl:use-attribute-sets="bold">Type: </fo:inline>
                     <xsl:value-of select="findingType"/>
                 </fo:block>
-            </fo:table-cell>
-            <fo:table-cell xsl:use-attribute-sets="td">
+   
+                <!-- Status Section -->
+                <xsl:if test="@status">
+                    <fo:block>
+                        <fo:inline xsl:use-attribute-sets="bold">Status: </fo:inline>
+                        <xsl:choose>
+                            <xsl:when test="@status = 'new' or @status = 'unresolved'">
+                                <fo:inline>
+                                    <xsl:attribute name="color">
+                                        <xsl:value-of select="$color_new"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:when>
+                            <xsl:when test="@status = 'not_retested'">
+                                <fo:inline>
+                                    <xsl:attribute name="color">
+                                        <xsl:value-of select="$color_notretested"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:when>
+                            <xsl:when test="@status = 'resolved'">
+                                <fo:inline>
+                                    <xsl:attribute name="color">
+                                        <xsl:value-of select="$color_resolved"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <fo:inline>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </fo:block>
+                </xsl:if>
+
+                <!-- Labels Section -->
                 <fo:block>
-                    <xsl:value-of select="findingDescription"/>
+                    <fo:block xsl:use-attribute-sets="labels p">
+                        <xsl:for-each select="findingLabel">
+                            <fo:inline xsl:use-attribute-sets="label">
+                                <xsl:attribute name="background-color">
+                                    <xsl:value-of select="@color"/>
+                                </xsl:attribute>
+                                <xsl:attribute name="color">
+                                    <xsl:value-of select="@text"/>
+                                </xsl:attribute>
+                                <xsl:value-of select="."/>
+                            </fo:inline>
+                            <xsl:text> </xsl:text>
+                        </xsl:for-each>
+                    </fo:block>
                 </fo:block>
             </fo:table-cell>
+
+            <!-- Second Table Cell -->
             <fo:table-cell xsl:use-attribute-sets="td">
-                <fo:block>
-                    <xsl:value-of select="findingThreatLevel"/>
+                <fo:block xsl:use-attribute-sets="p">
+                    <xsl:value-of select="findingDescription"/>
                 </fo:block>
+                <xsl:if test="findingImpact">
+                    <fo:block xsl:use-attribute-sets="p">
+                        <fo:inline xsl:use-attribute-sets="bold">Impact:</fo:inline>
+                        <xsl:value-of select="findingImpact"/>
+                    </fo:block>
+                </xsl:if>
             </fo:table-cell>
         </fo:table-row>
     </xsl:template>
 
     <xsl:template match="generate_recommendations">
-        <xsl:variable name="match-labels" select="@match-labels"/>
         <xsl:variable name="Ref" select="@Ref"/>
         <xsl:variable name="statusSequence" as="item()*">
             <xsl:for-each select="@status">
@@ -181,19 +236,14 @@
         <fo:block>
             <fo:table xsl:use-attribute-sets="fwtable table borders">
                 <xsl:call-template name="checkIfLast"/>
-                <fo:table-column column-width="proportional-column-width(12)"
-                    xsl:use-attribute-sets="borders"/>
-                <fo:table-column column-width="proportional-column-width(22)"
+                <fo:table-column column-width="proportional-column-width(16)"
                     xsl:use-attribute-sets="borders"/>
-                <fo:table-column column-width="proportional-column-width(66)"
+                <fo:table-column column-width="proportional-column-width(50)"
                     xsl:use-attribute-sets="borders"/>
                 <fo:table-body>
                     <fo:table-row keep-with-next.within-column="always">
                         <fo:table-cell xsl:use-attribute-sets="th">
-                            <fo:block>ID</fo:block>
-                        </fo:table-cell>
-                        <fo:table-cell xsl:use-attribute-sets="th">
-                            <fo:block>Type</fo:block>
+                            <fo:block>Info</fo:block>
                         </fo:table-cell>
                         <fo:table-cell xsl:use-attribute-sets="th">
                             <fo:block>Recommendation</fo:block>
@@ -221,14 +271,6 @@
                                 <xsl:call-template name="recommendationsSummaryContent"/>
                             </xsl:for-each>
                         </xsl:when>
-                        <xsl:when test="not(@Ref) and not(@status) and $match-labels">
-                            <xsl:for-each select="/pentest_report/descendant::finding[matches(
-                                concat('//', string-join(labels/label, '//')),
-                                concat('//', $match-labels))]
-                            ">
-                                <xsl:call-template name="recommendationsSummaryContent"/>
-                            </xsl:for-each>
-                        </xsl:when>
                         <xsl:otherwise>
                             <xsl:for-each select="/pentest_report/descendant::finding">
                                 <xsl:call-template name="recommendationsSummaryContent"/>
@@ -241,11 +283,14 @@
     </xsl:template>
 
     <xsl:template name="recommendationsSummaryContent">
-        <fo:table-row xsl:use-attribute-sets="TableFont">
+        <fo:table-row xsl:use-attribute-sets="TableFont" keep-together.within-column="always">
             <xsl:if test="position() mod 2 != 0">
                 <xsl:attribute name="background-color">#ededed</xsl:attribute>
             </xsl:if>
+
+            <!-- First Table Cell -->
             <fo:table-cell xsl:use-attribute-sets="td">
+                <!-- ID as a Link -->
                 <fo:block>
                     <fo:basic-link xsl:use-attribute-sets="link">
                         <xsl:attribute name="internal-destination">
@@ -254,18 +299,93 @@
                         <xsl:apply-templates select="." mode="number"/>
                     </fo:basic-link>
                 </fo:block>
+
+                <!-- Threat Level -->
+                <xsl:if test="@threatLevel">
+                    <fo:block>
+                        <fo:inline xsl:use-attribute-sets="bold">
+                            <xsl:choose>
+                                <xsl:when test="@threatLevel">
+                                    <xsl:value-of select="@threatLevel"/>
+                                </xsl:when>
+                            </xsl:choose>
+                        </fo:inline>                            
+                    </fo:block>
+                </xsl:if>
+
+                <!-- Type -->
+                <xsl:if test="@type">
+                    <fo:block>
+                        <fo:inline xsl:use-attribute-sets="bold">Type: </fo:inline>
+                        <xsl:value-of select="@type"/>
+                    </fo:block>
+                </xsl:if>
+
+                <!-- Status -->
+                <xsl:if test="@status">
+                    <fo:block>
+                        <fo:inline xsl:use-attribute-sets="bold">Status: </fo:inline>
+                        <xsl:choose>
+                            <xsl:when test="@status = 'new' or @status = 'unresolved'">
+                                <fo:inline>
+                                    <xsl:attribute name="color">
+                                        <xsl:value-of select="$color_new"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:when>
+                            <xsl:when test="@status = 'not_retested'">
+                                <fo:inline>
+                                    <xsl:attribute name="color">
+                                        <xsl:value-of select="$color_notretested"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:when>
+                            <xsl:when test="@status = 'resolved'">
+                                <fo:inline>
+                                    <xsl:attribute name="color">
+                                        <xsl:value-of select="$color_resolved"/>
+                                    </xsl:attribute>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <fo:inline>
+                                    <xsl:value-of select="@status"/>
+                                </fo:inline>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </fo:block>
+                </xsl:if>
+
+                <!-- Labels Section -->
+                <xsl:if test="labels/label">
+                    <fo:block>
+                        <xsl:for-each select="labels/label">
+                            <fo:inline xsl:use-attribute-sets="label">
+                                <xsl:attribute name="background-color">
+                                    <xsl:value-of select="/pentest_report/meta/labels/label[@name = current()]/@color"/>
+                                </xsl:attribute>
+                                <xsl:attribute name="color">
+                                    <xsl:value-of select="/pentest_report/meta/labels/label[@name = current()]/@text"/>
+                                </xsl:attribute>
+                                <xsl:value-of select="."/>
+                            </fo:inline>
+                            <xsl:text> </xsl:text> <!-- Add space between labels -->
+                        </xsl:for-each>
+                    </fo:block>
+                </xsl:if>
+
             </fo:table-cell>
+
+            <!-- Second Table Cell: Recommendation -->
             <fo:table-cell xsl:use-attribute-sets="td">
                 <fo:block>
-                    <xsl:value-of select="@type"/>
-                </fo:block>
-            </fo:table-cell>
-            <fo:table-cell xsl:use-attribute-sets="td">
-                <fo:block>
+                    <!-- Check for recommendation_summary first -->
                     <xsl:choose>
                         <xsl:when test="recommendation_summary">
-                            <xsl:apply-templates select="recommendation_summary" mode="summarytable"
-                            />
+                            <xsl:apply-templates select="recommendation_summary" mode="summarytable"/>
                         </xsl:when>
                         <xsl:otherwise>
                             <xsl:apply-templates select="recommendation" mode="summarytable"/>
@@ -602,4 +722,4 @@
 
     <xsl:template match="labels"/>
 
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>

From bb2bfffeebfb796601d1814f27a49deaaf610d2b Mon Sep 17 00:00:00 2001
From: Matei Runcanu <mateiruncanu@gmail.com>
Date: Mon, 1 Jun 2026 14:38:33 +0200
Subject: [PATCH 6/6] wording change for planning and payment

---
 source/snippets/offerte/en/planningandpayment.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/snippets/offerte/en/planningandpayment.xml b/source/snippets/offerte/en/planningandpayment.xml
index 02c14a0..264efeb 100644
--- a/source/snippets/offerte/en/planningandpayment.xml
+++ b/source/snippets/offerte/en/planningandpayment.xml
@@ -6,8 +6,7 @@
   </p>
   <ul>
     <li><company_short/> performs a <company_svc_short/> starting <p_startdate/>.</li>
-    <li><company_short/> delivers the final report on 
-      <p_reportdue/>.</li>
+    <li><company_short/> delivers the final report within 2 weeks after the final testing.</li>
   </ul>
   <p>
     Our fixed-fee price quote for the above described <company_svc_short/> is 
@@ -17,8 +16,8 @@
     <client_short/> will pay the agreed amount within 14 days of the invoice date.
   </p>
   <p>
-    Any additional work will be charged separately. An hourly 
-    rate for additional work will be agreed upon before starting this work.
+    Any additional work will be agreed upon before starting this work. 
+    In case less hours are used, less hours will be invoiced.
   </p>
   <p>A detailed breakdown of the requested services can be found below:</p>