DeforaNetworks/pentext
DeforaNetworks/pentext
3
0
Fork 0
Code Releases Activity

Improved signing boxes & text in waiver & condition snippets

Browse Source
This commit is contained in:
skyanth 2019-06-24 10:51:43 +02:00
parent 2792152a10
commit 35038a1465
5 changed files with 122 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xml/source/snippets/localisationstrings.xml
View File

@ -204,9 +204,9 @@
<translation xml:lang="nl">namens</translation> <translation xml:lang="nl">namens</translation>
<translation xml:lang="en">for</translation> <translation xml:lang="en">for</translation>
</string> </string>
<string id="signed_dupe"> <string id="signed">
<translation xml:lang="nl">In duplicaat getekend</translation> <translation xml:lang="nl">Getekend</translation>
<translation xml:lang="en">Signed in duplicate</translation> <translation xml:lang="en">Signed</translation>
</string> </string>
<!-- CONTRACTS --> <!-- CONTRACTS -->
<string id="contract_title"> <string id="contract_title">

25
xml/source/snippets/offerte/en/conditions.xml
View File

@ -30,19 +30,30 @@
<company_city/> <company_city/>
</address> </address>
</contact> </contact>
<signature_box> <signature_box>
<client_side> <client_side>
<signee><client_legal_rep/></signee> <signee>
<client_legal_rep/>
</signee>
<!--<signee>Second signee for company</signee>--> <!--<signee>Second signee for company</signee>-->
<date><latest_version_date/></date> <date>
<place><client_city/></place> <latest_version_date/>
</date>
<place>
<client_city/>
</place>
</client_side> </client_side>
<company_side> <company_side>
<signee><company_legal_rep/></signee> <signee>
<company_legal_rep/>
</signee>
<!--<signee>Second signee for company</signee>--> <!--<signee>Second signee for company</signee>-->
<date><latest_version_date/></date> <date>
<place><company_city/></place> <latest_version_date/>
</date>
<place>
<company_city/>
</place>
</company_side> </company_side>
</signature_box> </signature_box>
</section> </section>

68
xml/source/snippets/offerte/en/conditions_code-audit.xml
View File

@ -2,26 +2,58 @@
<section> <section>
<title>Terms and Conditions</title> <title>Terms and Conditions</title>
<p> <p>
<company_short/> will only perform the <company_svc_short/> <company_short/> will only perform the <company_svc_short/> if it has obtained the permission
if it has obtained the permission from <generate_permission_parties/> from <generate_permission_parties/> as set out in the waiver, attached as <b>Annex 2</b>, or
as set out in the waiver, attached as <b>Annex 2</b>, provided in a separate document. </p>
or provided in a separate document.
</p>
<p> <p>
<company_short/> performs this assignment on the basis of its general <company_short/> performs this assignment on the basis of its general terms and conditions,
terms and conditions, which are attached to this offer as Annex 1. which are attached to this offer as Annex 1. <company_short/> rejects any general terms and
<company_short/> rejects any general terms and conditions used by conditions used by <client_short/>. </p>
<client_short/>. <p>In order to agree to this offer, please sign the quote and waiver and return it to: </p>
</p>
<p>
In order to agree to this offer, please sign this letter in duplicate
and return it to:
</p>
<contact> <contact>
<name><company_legal_rep/></name> <email>
<address><company_long/><br/><company_address/><br/><company_postalcode/> <company_city/></address> <company_email/>
<email><company_email/></email> </email>
</contact> </contact>
<generate_offer_signature_box/> <p>or:</p>
<contact>
<name>
<company_legal_rep/>
</name>
<address>
<company_long/>
<br/>
<company_address/>
<br/>
<company_postalcode/>
<company_city/>
</address>
</contact>
<signature_box>
<client_side>
<signee>
<client_legal_rep/>
</signee>
<!--<signee>Second signee for company</signee>-->
<date>
<latest_version_date/>
</date>
<place>
<client_city/>
</place>
</client_side>
<company_side>
<signee>
<company_legal_rep/>
</signee>
<!--<signee>Second signee for company</signee>-->
<date>
<latest_version_date/>
</date>
<place>
<company_city/>
</place>
</company_side>
</signature_box>
</section> </section>

2
xml/xslt/block.xslt
View File

@ -73,7 +73,7 @@
<fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox"> <fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox">
<fo:block xsl:use-attribute-sets="title-client"> <fo:block xsl:use-attribute-sets="title-client">
<xsl:call-template name="getString"> <xsl:call-template name="getString">
<xsl:with-param name="stringID" select="'signed_dupe'"/> <xsl:with-param name="stringID" select="'signed'"/>
</xsl:call-template> </xsl:call-template>
</fo:block> </fo:block>
<fo:block> <fo:block>

77
xml/xslt/waiver.xslt
View File

@ -140,67 +140,58 @@
<xsl:param name="signee_long" tunnel="yes"/> <xsl:param name="signee_long" tunnel="yes"/>
<xsl:param name="signee_waiver_rep" tunnel="yes"/> <xsl:param name="signee_waiver_rep" tunnel="yes"/>
<xsl:param name="signee_city" tunnel="yes"/> <xsl:param name="signee_city" tunnel="yes"/>
<fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox"> <fo:block keep-together.within-page="always" xsl:use-attribute-sets="signaturebox">
<fo:table width="100%" table-layout="fixed"> <fo:block xsl:use-attribute-sets="title-client">
<fo:table-column column-width="proportional-column-width(10)"/>
<fo:table-column column-width="proportional-column-width(90)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell xsl:use-attribute-sets="td" number-rows-spanned="4">
<fo:block>
<xsl:call-template name="getString"> <xsl:call-template name="getString">
<xsl:with-param name="stringID" select="'waiver_signed'"/> <xsl:with-param name="stringID" select="'signed'"/>
</xsl:call-template> </xsl:call-template>
</fo:block> </fo:block>
</fo:table-cell> <fo:block>
<fo:table xsl:use-attribute-sets="fwtable borders">
<fo:table-column column-width="proportional-column-width(50)"/>
<fo:table-column column-width="proportional-column-width(50)"/>
<fo:table-body>
<fo:table-row>
<fo:table-cell xsl:use-attribute-sets="td"> <fo:table-cell xsl:use-attribute-sets="td">
<fo:block xsl:use-attribute-sets="p"><xsl:call-template name="getString"> <fo:block>For <fo:inline xsl:use-attribute-sets="bold"><xsl:value-of
<xsl:with-param name="stringID" select="'waiver_signed_on'"/> select="$signee_long"/></fo:inline></fo:block>
</xsl:call-template> &#160;&#160;&#160;<xsl:value-of
select="$latestVersionDate"/></fo:block>
</fo:table-cell> </fo:table-cell>
<fo:table-cell><fo:block></fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
<!-- client side -->
<fo:table-cell xsl:use-attribute-sets="td">
<xsl:for-each select="$signee_waiver_rep">
<xsl:call-template name="signeeBlock"/>
</xsl:for-each>
</fo:table-cell>
<fo:table-cell><fo:block></fo:block></fo:table-cell>
</fo:table-row> </fo:table-row>
<fo:table-row> <fo:table-row>
<fo:table-cell xsl:use-attribute-sets="td"> <fo:table-cell xsl:use-attribute-sets="td">
<fo:block xsl:use-attribute-sets="p"><xsl:call-template name="getString"> <xsl:for-each select="$signee_city">
<xsl:with-param name="stringID" select="'waiver_signed_in'"/> <fo:block>
</xsl:call-template> &#160;&#160;&#160; <xsl:value-of <xsl:apply-templates/>
select="$signee_city"/></fo:block> </fo:block>
</xsl:for-each>
</fo:table-cell> </fo:table-cell>
<fo:table-cell><fo:block></fo:block></fo:table-cell>
</fo:table-row> </fo:table-row>
<fo:table-row> <fo:table-row>
<fo:table-cell xsl:use-attribute-sets="td"> <fo:table-cell xsl:use-attribute-sets="td">
<xsl:choose> <xsl:for-each select="$latestVersionDate">
<xsl:when test="$signee_waiver_rep"> <fo:block>
<fo:block xsl:use-attribute-sets="p"><xsl:call-template <xsl:apply-templates/>
name="getString"> </fo:block>
<xsl:with-param name="stringID" </xsl:for-each>
select="'waiver_signed_by'"/>
</xsl:call-template> &#160;&#160;&#160;<xsl:value-of
select="$signee_waiver_rep"/></fo:block>
</xsl:when>
<xsl:otherwise>
<fo:block xsl:use-attribute-sets="p"><xsl:call-template
name="getString">
<xsl:with-param name="stringID"
select="'waiver_signed_by'"/>
</xsl:call-template>
&#160;&#160;&#160;__________________________________</fo:block>
</xsl:otherwise>
</xsl:choose>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
<fo:table-cell xsl:use-attribute-sets="td">
<fo:block xsl:use-attribute-sets="p"><xsl:call-template name="getString">
<xsl:with-param name="stringID" select="'waiver_signed_for'"/>
</xsl:call-template> &#160;&#160;&#160;<xsl:value-of
select="$signee_long"/></fo:block>
</fo:table-cell> </fo:table-cell>
<fo:table-cell><fo:block></fo:block></fo:table-cell>
</fo:table-row> </fo:table-row>
</fo:table-body> </fo:table-body>
</fo:table> </fo:table>
</fo:block> </fo:block>
</fo:block>
</xsl:template> </xsl:template>
<!-- deprecated element; ignore if still there --> <!-- deprecated element; ignore if still there -->