Merge branch 'master' of https://github.com/radicallyopensecurity/pentext into service-breakdown

# Conflicts:
#	xml/xslt/styles_off.xslt
This commit is contained in:
skyanth
2019-06-20 14:36:37 +02:00
7 changed files with 197 additions and 171 deletions

View File

@@ -2,22 +2,15 @@
<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 this letter in duplicate and return it to: </p>
<contact>
<name>
<company_legal_rep/>
@@ -30,7 +23,22 @@
<company_postalcode/>
<company_city/>
</address>
<email><company_email/></email>
<email>
<company_email/>
</email>
</contact>
<generate_offer_signature_box/>
</section>
<signature_box>
<client_side>
<signee><client_legal_rep/></signee>
<date><latest_version_date/></date>
<place><client_city/></place>
</client_side>
<company_side>
<signee><company_legal_rep/></signee>
<signee>Its-a-meee!</signee>
<date><latest_version_date/></date>
<place><company_city/></place>
</company_side>
</signature_box>
</section>