From 91227a4aed0f2e3768025a689411f8b871969909 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Fri, 6 Apr 2018 18:51:26 +0200
Subject: [PATCH] Let both templates work again

---
 xml/templates/offerte/offerte_EN.xml | 29 ++++++++++++++--------------
 xml/templates/offerte/offerte_NL.xml | 16 +++++++--------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/xml/templates/offerte/offerte_EN.xml b/xml/templates/offerte/offerte_EN.xml
index 11024ef..6310904 100644
--- a/xml/templates/offerte/offerte_EN.xml
+++ b/xml/templates/offerte/offerte_EN.xml
@@ -62,7 +62,6 @@
                 <city>...</city>
                 <country>...</country>
             </party>
-            
         </permission_parties>
         <activityinfo>
             <duration>...</duration><!-- duration of pentest, in working DAYS -->
@@ -73,7 +72,7 @@
             <type>...</type><!-- please choose one of the following: black-box, grey-box, crystal-box -->
             <fee denomination="euro">0</fee><!-- euro is added automatically in the document -->
             <target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) -->
-            <target_app_producer>...</target_app_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) -->
+            <target_application_producer>...</target_application_producer><!-- name of application to be tested (if any; if none, delete target_application_producer element) -->
         </activityinfo>
         <version_history><!-- needed for date on frontpage and in signature boxes; add a new <version> after each review and make sure to update the date/time -->
             <version date="2015-06-08T10:00:00" number="auto"><!-- actual date-time here; you can leave the number attribute alone -->
@@ -82,15 +81,15 @@
             </version>
         </version_history>
     </meta>
-    <xi:include href="snippets/offerte/introandscope.xml"/>
-    
+    <xi:include href="snippets/offerte/en/introandscope.xml"/>
+
     <!-- section with some more info on the company -->
     <section>
         <title>About <client_short/></title>
         <p><client_long/> is a ...</p>
         <p>...</p>
     </section>
-    
+
     <!-- section with some more info on the application (if any) -->
     <section>
         <title>The <t_app/>; Application</title>
@@ -105,7 +104,7 @@
     </section>
 
     <!-- Project overview section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/projectoverview.xml"/>
+    <xi:include href="snippets/offerte/en/projectoverview.xml"/>
 
     <section>
         <title>Pentest Scope</title>
@@ -113,28 +112,28 @@
     </section>
 
     <!-- Prerequisites section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/prerequisites.xml"/>
+    <xi:include href="snippets/offerte/en/prerequisites.xml"/>
 
     <!-- Disclaimer section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/disclaimer.xml"/>
+    <xi:include href="snippets/offerte/en/disclaimer.xml"/>
 
     <!-- Pentest Methodology section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/pentestmethodology.xml"/>
-    <xi:include href="snippets/offerte/codeauditmethodology.xml"/>
+    <xi:include href="snippets/offerte/en/methodology.xml"/>
+    <xi:include href="snippets/offerte/en/methodology_code-audit.xml"/>
 
     <!-- Team and Reporting section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/teamandreporting.xml"/>
+    <xi:include href="snippets/offerte/en/teamandreporting.xml"/>
 
     <!-- Planning and payment section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/planningandpayment.xml"/>
+    <xi:include href="snippets/offerte/en/planningandpayment.xml"/>
 
     <!-- About ROS section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/aboutus.xml"/>
+    <xi:include href="snippets/offerte/en/aboutus.xml"/>
     
     <!-- Work condition section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/conditions.xml"/>
+    <xi:include href="snippets/offerte/en/conditions.xml"/>
     
     <!-- General terms and conditions section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/generaltermsandconditions.xml"/>
+    <xi:include href="snippets/offerte/en/generaltermsandconditions.xml"/>
     <generate_waivers/>
 </offerte>
diff --git a/xml/templates/offerte/offerte_NL.xml b/xml/templates/offerte/offerte_NL.xml
index 398e862..256e5e9 100644
--- a/xml/templates/offerte/offerte_NL.xml
+++ b/xml/templates/offerte/offerte_NL.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-
 <!-- variable placeholders that can be used by the report writer throughout the offerte -->
     <!-- NOTE: values are taken from <meta> section below! -->
         
@@ -53,8 +52,9 @@
             <target>...</target>
         </targets>
         <permission_parties>
-            <xi:include href="client_info.xml"/>
-            <party><!-- optional; if no other party needs to give permission, please remove whole party element -->
+        <xi:include href="client_info.xml"/>
+            <!-- the party section is optional; if no other party needs to give permission, please remove whole party element -->
+            <party>
                 <full_name>...</full_name>
                 <short_name>...</short_name><!-- short party name; if no short name: same as long name -->
                 <waiver_rep>...</waiver_rep>
@@ -68,7 +68,7 @@
             <test_planning>...</test_planning><!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
             <report_writing>...</report_writing><!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
             <report_due>...</report_due><!-- date or date range in text, e.g. May 18th until May 25th, 2015 -->
-            <nature></nature>
+            <nature>...</nature>
             <type>...</type><!-- please choose one of the following: black-box, grey-box, crystal-box -->
             <fee denomination="euro">...</fee><!-- euro|dollar -->
             <target_application>...</target_application><!-- name of application to be tested (if any; if none, delete target_application element) -->
@@ -83,15 +83,15 @@
     </meta>
     
     
+    <!-- section with some more info on the application (if any) -->
     <section>
-        <!-- section with some more info on the application (if any) -->
         <title>The <t_app/>; Application</title>
         <p><t_app/> is a ...</p>
         <p>...</p>
     </section>
     
+    <!-- section with some more info on the target infrastructure-->
     <section>
-        <!-- section with some more info on the target infrastructure-->
         <title>The <client_short/> Infrastructure</title>
         <p>...</p>
     </section>
@@ -111,8 +111,8 @@
     <xi:include href="snippets/offerte/nl/disclaimer.xml"/>
 
     <!-- Pentest Methodology section (complete section is in a snippet) -->
-    <xi:include href="snippets/offerte/nl/pentestmethodology.xml"/>
-    <xi:include href="snippets/offerte/nl/codeauditmethodology.xml"/>
+    <xi:include href="snippets/offerte/nl/methodology.xml"/>
+    <xi:include href="snippets/offerte/nl/methodology_basic-scan.xml"/>
 
     <!-- Team and Reporting section (complete section is in a snippet) -->
     <xi:include href="snippets/offerte/nl/teamandreporting.xml"/>