From 075cf97e5f9845d0a4cf2587f42e7b447fa3f017 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Fri, 21 Jun 2019 15:38:59 +0200
Subject: [PATCH] updating conditions

---
 xml/source/snippets/offerte/en/conditions.xml | 30 +++++++++----------
 xml/xslt/block.xslt                           |  2 --
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/xml/source/snippets/offerte/en/conditions.xml b/xml/source/snippets/offerte/en/conditions.xml
index 1f8f503..81905cf 100644
--- a/xml/source/snippets/offerte/en/conditions.xml
+++ b/xml/source/snippets/offerte/en/conditions.xml
@@ -2,22 +2,21 @@
 <section>
   <title>Terms and Conditions</title>
   <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>
+    <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>
 
   <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 this letter in duplicate and
-    return it to:
-  </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>
+  <contact>
+    <email>
+      <company_email/>
+    </email>
+  </contact>
+  <p>or:</p>
   <contact>
     <name>
       <company_legal_rep/>
@@ -30,7 +29,6 @@
       <company_postalcode/>
       <company_city/>
     </address>
-    <email><company_email/></email>
   </contact>
   <generate_offer_signature_box/>
-</section>
\ No newline at end of file
+</section>
diff --git a/xml/xslt/block.xslt b/xml/xslt/block.xslt
index dffbbfd..658e7ba 100644
--- a/xml/xslt/block.xslt
+++ b/xml/xslt/block.xslt
@@ -49,8 +49,6 @@
     <xsl:template match="p" mode="summarytable">
         <xsl:apply-templates mode="summarytable"/>
     </xsl:template>
-    
-    
 
     <xsl:template match="pre">
         <fo:block xsl:use-attribute-sets="pre">