From 3026a390e9ee896928b7e2a3b68ab994f1c85e56 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Mon, 27 Feb 2017 14:21:35 +0100
Subject: [PATCH] Optional extra field for customer data in invoice

---
 xml/dtd/common.xsd            |   2 +
 xml/source/client_info.xml    |  10 +-
 xml/xslt/generate_invoice.xsl | 323 +++++++++++++++++++++++++---------
 3 files changed, 246 insertions(+), 89 deletions(-)

diff --git a/xml/dtd/common.xsd b/xml/dtd/common.xsd
index e16abb7..44071e2 100644
--- a/xml/dtd/common.xsd
+++ b/xml/dtd/common.xsd
@@ -97,6 +97,7 @@
         <xs:element ref="coc"/>
         <xs:element ref="invoice_rep"/>
         <xs:element ref="invoice_mail"/>
+        <xs:element ref="invoice_extra_field" minOccurs="0"/>
         <xs:element ref="vat_no"/>
       </xs:sequence>
       <xs:attribute ref="xml:base"/>
@@ -128,6 +129,7 @@
 
   <xs:element name="invoice_rep" type="xs:string"/>
   <xs:element name="invoice_mail" type="emailAddress"/>
+  <xs:element name="invoice_extra_field" type="xs:string"/>
 
   <xs:element name="duration" type="xs:nonNegativeInteger"/>
   <xs:element name="mandays" type="xs:nonNegativeInteger"/>
diff --git a/xml/source/client_info.xml b/xml/source/client_info.xml
index cfadfff..c09af69 100644
--- a/xml/source/client_info.xml
+++ b/xml/source/client_info.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- This file contains all known information for this client. All elements are MANDATORY. If any piece of information is not available, leave the element empty --><!-- Example <invoice_rep></invoice_rep> -->
+<!-- This file contains all known information for this client. 
+        
+        All elements are MANDATORY. If any piece of information is not available, leave the element empty 
+        
+        Example <invoice_rep></invoice_rep> -->
+
 <client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../dtd/offerte.xsd" id="client">
   <full_name>Sitting Duck B.V.</full_name>
@@ -18,7 +23,8 @@
   <country>Amazonia</country>
   <coc nationality="Dutch">9999999</coc>
   <!-- chamber of commerce number; if no chamber of commerce number, please delete the whole element -->
-  <invoice_rep>D. Ollars</invoice_rep>
+  <invoice_rep></invoice_rep>
   <invoice_mail>freemoney@sittingduck.com</invoice_mail>
+  <invoice_extra_field></invoice_extra_field>
   <vat_no>0000000000B01</vat_no>
 </client>
diff --git a/xml/xslt/generate_invoice.xsl b/xml/xslt/generate_invoice.xsl
index b9e8954..1a7a991 100644
--- a/xml/xslt/generate_invoice.xsl
+++ b/xml/xslt/generate_invoice.xsl
@@ -19,10 +19,10 @@
     <xsl:import href="generic.xslt"/>
     <xsl:import href="numbering.xslt"/>
     <xsl:import href="waiver.xslt"/>-->
-    
+
     <xsl:include href="styles_inv.xslt"/>
     <xsl:include href="localisation.xslt"/>
-    
+
     <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes"/>
 
     <xsl:variable name="lang" select="/*/@xml:lang"/>
@@ -53,9 +53,9 @@
         <fo:root>
             <xsl:call-template name="layout-master-set"/>
             <xsl:call-template name="Content"/>
-      </fo:root>
+        </fo:root>
     </xsl:template>
-    
+
     <!-- CONTENT -->
     <xsl:template name="invoice_from_offerte">
         <xsl:variable name="fee" select="/offerte/meta/pentestinfo/fee * 1"/>
@@ -69,41 +69,79 @@
         </xsl:variable>
         <xsl:call-template name="invoiceStart">
             <xsl:with-param name="INVOICE_NO" select="$INVOICE_NO"/>
-            <xsl:with-param name="DATE" select="format-date($DATE, '[MNn] [D1], [Y]', 'en', (), ())"/>
+            <xsl:with-param name="DATE" select="format-date($DATE, '[MNn] [D1], [Y]', 'en', (), ())"
+            />
         </xsl:call-template>
         <fo:block>
-            <fo:table width="100%" table-layout="fixed" xsl:use-attribute-sets="big-space-below table-shading">
+            <fo:table width="100%" table-layout="fixed"
+                xsl:use-attribute-sets="big-space-below table-shading">
                 <fo:table-column column-width="proportional-column-width(90)"/>
                 <fo:table-column column-width="proportional-column-width(10)"/>
                 <fo:table-body>
                     <fo:table-row>
                         <fo:table-cell xsl:use-attribute-sets="td">
                             <fo:block><xsl:value-of select="/offerte/meta/pentestinfo/duration"/>-
-                                <xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_days'"/></xsl:call-template>&#160;<xsl:value-of select="/offerte/meta/offered_service_short"/>&#160;<xsl:value-of select="/offerte/meta/permission_parties/client/short_name"/></fo:block>
+                                    <xsl:call-template name="getString"><xsl:with-param
+                                        name="stringID" select="'invoice_days'"
+                                    /></xsl:call-template>&#160;<xsl:value-of
+                                    select="/offerte/meta/offered_service_short"
+                                    />&#160;<xsl:value-of
+                                    select="/offerte/meta/permission_parties/client/short_name"
+                                /></fo:block>
                         </fo:table-cell>
                         <fo:table-cell xsl:use-attribute-sets="td align-right">
-                            <fo:block xsl:use-attribute-sets="p"><xsl:value-of select="$denomination"/>&#160;<xsl:number value="$fee" grouping-separator="," grouping-size="3"/>.--</fo:block>
+                            <fo:block xsl:use-attribute-sets="p"><xsl:value-of
+                                    select="$denomination"/>&#160;<xsl:number value="$fee"
+                                    grouping-separator="," grouping-size="3"/>.--</fo:block>
                         </fo:table-cell>
                     </fo:table-row>
                     <fo:table-row>
                         <fo:table-cell xsl:use-attribute-sets="td">
-                            <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_vat'"/></xsl:call-template> 21%</fo:block>
+                            <fo:block><xsl:call-template name="getString"><xsl:with-param
+                                        name="stringID" select="'invoice_vat'"/></xsl:call-template>
+                                21%</fo:block>
                         </fo:table-cell>
                         <fo:table-cell xsl:use-attribute-sets="td align-right">
-                            <fo:block xsl:use-attribute-sets="p"><xsl:value-of select="$denomination"/>&#160;<xsl:number value="$vat" grouping-separator="," grouping-size="3"/>.--</fo:block>
+                            <fo:block xsl:use-attribute-sets="p"><xsl:value-of
+                                    select="$denomination"/>&#160;<xsl:number value="$vat"
+                                    grouping-separator="," grouping-size="3"/>.--</fo:block>
                         </fo:table-cell>
                     </fo:table-row>
                     <fo:table-row xsl:use-attribute-sets="border-top bold">
                         <fo:table-cell xsl:use-attribute-sets="td">
-                            <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_total'"/></xsl:call-template></fo:block>
+                            <fo:block>
+                                <xsl:call-template name="getString">
+                                    <xsl:with-param name="stringID" select="'invoice_total'"/>
+                                </xsl:call-template>
+                            </fo:block>
                         </fo:table-cell>
                         <fo:table-cell xsl:use-attribute-sets="td align-right">
-                            <fo:block xsl:use-attribute-sets="p"><xsl:value-of select="$denomination"/>&#160;<xsl:number value="$vat + $fee" grouping-separator="," grouping-size="3"/>.--</fo:block>
+                            <fo:block xsl:use-attribute-sets="p"><xsl:value-of
+                                    select="$denomination"/>&#160;<xsl:number value="$vat + $fee"
+                                    grouping-separator="," grouping-size="3"/>.--</fo:block>
                         </fo:table-cell>
                     </fo:table-row>
                 </fo:table-body>
             </fo:table>
         </fo:block>
+            <xsl:if
+            test="/*/meta//client/invoice_extra_field and normalize-space(/*/meta//client/invoice_extra_field) != ''">
+            <fo:block>
+                <fo:table width="100%" table-layout="fixed"
+                    xsl:use-attribute-sets="big-space-below table-shading">
+                    <fo:table-column column-width="proportional-column-width(100)"/>
+                    <fo:table-body>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <fo:block xsl:use-attribute-sets="bold">
+                                    <xsl:value-of select="/*/meta//client/invoice_extra_field"/>
+                                </fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                    </fo:table-body>
+                </fo:table>
+            </fo:block>
+        </xsl:if>
         <xsl:call-template name="invoiceEnd">
             <xsl:with-param name="INVOICE_NO" select="$INVOICE_NO"/>
         </xsl:call-template>
@@ -122,7 +160,8 @@
             <xsl:with-param name="DATE" select="$DATE"/>
         </xsl:call-template>
         <fo:block>
-            <fo:table width="100%" table-layout="fixed" xsl:use-attribute-sets="big-space-below table-shading">
+            <fo:table width="100%" table-layout="fixed"
+                xsl:use-attribute-sets="big-space-below table-shading">
                 <fo:table-column column-width="proportional-column-width(90)"/>
                 <fo:table-column column-width="proportional-column-width(10)"/>
                 <fo:table-body>
@@ -130,17 +169,26 @@
                         <xsl:variable name="fee" select="fee * 1"/>
                         <fo:table-row>
                             <fo:table-cell xsl:use-attribute-sets="td">
-                                <fo:block><xsl:value-of select="description"/></fo:block>
+                                <fo:block>
+                                    <xsl:value-of select="description"/>
+                                </fo:block>
                             </fo:table-cell>
                             <fo:table-cell xsl:use-attribute-sets="td align-right">
-                                <fo:block xsl:use-attribute-sets="p"><xsl:value-of select="$denomination"/>&#160;<xsl:number value="$fee" grouping-separator="," grouping-size="3"/>.--</fo:block>
+                                <fo:block xsl:use-attribute-sets="p"><xsl:value-of
+                                        select="$denomination"/>&#160;<xsl:number value="$fee"
+                                        grouping-separator="," grouping-size="3"/>.--</fo:block>
                             </fo:table-cell>
                         </fo:table-row>
                     </xsl:for-each>
                     <xsl:if test="additionalcosts">
                         <fo:table-row>
                             <fo:table-cell xsl:use-attribute-sets="td padding-top">
-                                <fo:block xsl:use-attribute-sets="bold"><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_additional'"/></xsl:call-template></fo:block>
+                                <fo:block xsl:use-attribute-sets="bold">
+                                    <xsl:call-template name="getString">
+                                        <xsl:with-param name="stringID"
+                                            select="'invoice_additional'"/>
+                                    </xsl:call-template>
+                                </fo:block>
                             </fo:table-cell>
                             <fo:table-cell xsl:use-attribute-sets="td align-right padding-top">
                                 <fo:block xsl:use-attribute-sets="p">&#160;</fo:block>
@@ -151,57 +199,101 @@
                         <xsl:variable name="fee" select="fee * 1"/>
                         <fo:table-row>
                             <fo:table-cell xsl:use-attribute-sets="td" padding-left="8mm">
-                                <fo:block><xsl:value-of select="description"/></fo:block>
+                                <fo:block>
+                                    <xsl:value-of select="description"/>
+                                </fo:block>
                             </fo:table-cell>
                             <fo:table-cell xsl:use-attribute-sets="td align-right">
-                                <fo:block xsl:use-attribute-sets="p"><xsl:value-of select="$denomination"/>&#160;<xsl:number value="$fee" grouping-separator="," grouping-size="3"/>.--</fo:block>
+                                <fo:block xsl:use-attribute-sets="p"><xsl:value-of
+                                        select="$denomination"/>&#160;<xsl:number value="$fee"
+                                        grouping-separator="," grouping-size="3"/>.--</fo:block>
                             </fo:table-cell>
                         </fo:table-row>
                     </xsl:for-each>
                     <!-- TODO -->
-                    <xsl:for-each-group select="servicesdelivered/service | additionalcosts/cost" group-by="fee/@vat[.='yes']">
+                    <xsl:for-each-group select="servicesdelivered/service | additionalcosts/cost"
+                        group-by="fee/@vat[. = 'yes']">
                         <xsl:variable name="vat">
-                            <xsl:value-of select="sum(current-group()/fee) div 100 * 21" />
+                            <xsl:value-of select="sum(current-group()/fee) div 100 * 21"/>
                         </xsl:variable>
                         <xsl:variable name="total">
-                            <xsl:value-of select="sum(current-group()/fee) + $vat" />
+                            <xsl:value-of select="sum(current-group()/fee) + $vat"/>
                         </xsl:variable>
                         <fo:table-row>
                             <fo:table-cell xsl:use-attribute-sets="td padding-top">
-                               <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_vat'"/></xsl:call-template> 21%</fo:block>
-                           </fo:table-cell>
+                                <fo:block><xsl:call-template name="getString"><xsl:with-param
+                                            name="stringID" select="'invoice_vat'"
+                                        /></xsl:call-template> 21%</fo:block>
+                            </fo:table-cell>
                             <fo:table-cell xsl:use-attribute-sets="td align-right padding-top">
-                               <fo:block xsl:use-attribute-sets="p"><xsl:value-of select="$denomination"/>&#160;<xsl:number value="$vat" grouping-separator="," grouping-size="3"/>.--</fo:block>
-                           </fo:table-cell>
+                                <fo:block xsl:use-attribute-sets="p"><xsl:value-of
+                                        select="$denomination"/>&#160;<xsl:number value="$vat"
+                                        grouping-separator="," grouping-size="3"/>.--</fo:block>
+                            </fo:table-cell>
                         </fo:table-row>
                         <fo:table-row xsl:use-attribute-sets="border-top bold">
-                           <fo:table-cell xsl:use-attribute-sets="td">
-                               <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_total'"/></xsl:call-template></fo:block>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <fo:block>
+                                    <xsl:call-template name="getString">
+                                        <xsl:with-param name="stringID" select="'invoice_total'"/>
+                                    </xsl:call-template>
+                                </fo:block>
                             </fo:table-cell>
                             <fo:table-cell xsl:use-attribute-sets="td align-right">
-                              <fo:block xsl:use-attribute-sets="p"><xsl:value-of select="$denomination"/>&#160;<xsl:number value="$total" grouping-separator="," grouping-size="3"/>.--</fo:block>
+                                <fo:block xsl:use-attribute-sets="p"><xsl:value-of
+                                        select="$denomination"/>&#160;<xsl:number value="$total"
+                                        grouping-separator="," grouping-size="3"/>.--</fo:block>
                             </fo:table-cell>
-                         </fo:table-row>
+                        </fo:table-row>
                     </xsl:for-each-group>
                 </fo:table-body>
             </fo:table>
         </fo:block>
+        <xsl:if
+            test="/*/meta//client/invoice_extra_field and normalize-space(/*/meta//client/invoice_extra_field) != ''">
+            <fo:block>
+                <fo:table width="100%" table-layout="fixed"
+                    xsl:use-attribute-sets="big-space-below table-shading">
+                    <fo:table-column column-width="proportional-column-width(100)"/>
+                    <fo:table-body>
+                        <fo:table-row>
+                            <fo:table-cell xsl:use-attribute-sets="td">
+                                <fo:block xsl:use-attribute-sets="bold">
+                                    <xsl:value-of select="/*/meta//client/invoice_extra_field"/>
+                                </fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                    </fo:table-body>
+                </fo:table>
+            </fo:block>
+        </xsl:if>
         <xsl:call-template name="invoiceEnd">
             <xsl:with-param name="INVOICE_NO" select="$INVOICE_NO"/>
         </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="invoiceStart">
         <xsl:param name="INVOICE_NO"/>
         <xsl:param name="DATE"/>
-        <fo:block xsl:use-attribute-sets="title-0"><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_no'"/></xsl:call-template><xsl:text>&#160;</xsl:text><xsl:value-of select="$INVOICE_NO"
-            /></fo:block>
+        <fo:block xsl:use-attribute-sets="title-0">
+            <xsl:call-template name="getString">
+                <xsl:with-param name="stringID" select="'invoice_no'"/>
+            </xsl:call-template>
+            <xsl:text>&#160;</xsl:text>
+            <xsl:value-of select="$INVOICE_NO"/>
+        </fo:block>
         <fo:block>
             <fo:block>
                 <xsl:value-of select="/*/meta//client/full_name"/>
             </fo:block>
             <fo:block>
-                <xsl:if test="/*/meta//client/invoice_rep"><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_fao'"/></xsl:call-template><xsl:text>&#160;</xsl:text><xsl:value-of
-                        select="/offerte/meta/permission_parties/client/invoice_rep"/></xsl:if>
+                <xsl:if test="/*/meta//client/invoice_rep and normalize-space(//client/invoice_rep) != ''">
+                    <xsl:call-template name="getString">
+                        <xsl:with-param name="stringID" select="'invoice_fao'"/>
+                    </xsl:call-template>
+                    <xsl:text>&#160;</xsl:text>
+                    <xsl:value-of select="/offerte/meta/permission_parties/client/invoice_rep"/>
+                </xsl:if>
             </fo:block>
             <fo:block>
                 <xsl:value-of select="/*/meta//client/address"/>
@@ -220,31 +312,53 @@
         <fo:block xsl:use-attribute-sets="p big-space-below" text-align="right">
             <xsl:value-of select="$DATE"/>
         </fo:block>
-        <fo:block xsl:use-attribute-sets="title-2"><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_svcdeliv'"/></xsl:call-template></fo:block>
+        <fo:block xsl:use-attribute-sets="title-2">
+            <xsl:call-template name="getString">
+                <xsl:with-param name="stringID" select="'invoice_svcdeliv'"/>
+            </xsl:call-template>
+        </fo:block>
     </xsl:template>
 
-<xsl:template name="invoiceEnd">
-    <xsl:param name="INVOICE_NO"/>
-    <fo:block xsl:use-attribute-sets="big-space-below"><xsl:value-of
-        select="/*/meta/company/full_name"/><xsl:text>&#160;</xsl:text><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_donation'"/></xsl:call-template></fo:block>
-    <fo:block xsl:use-attribute-sets="big-space-below"><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_pleasepay'"/></xsl:call-template></fo:block>
-    
-    <fo:block xsl:use-attribute-sets="big-space-below" margin-left="1.3cm">
+    <xsl:template name="invoiceEnd">
+        <xsl:param name="INVOICE_NO"/>
+        <fo:block xsl:use-attribute-sets="big-space-below">
+            <xsl:value-of select="/*/meta/company/full_name"/>
+            <xsl:text>&#160;</xsl:text>
+            <xsl:call-template name="getString">
+                <xsl:with-param name="stringID" select="'invoice_donation'"/>
+            </xsl:call-template>
+        </fo:block>
+        <fo:block xsl:use-attribute-sets="big-space-below">
+            <xsl:call-template name="getString">
+                <xsl:with-param name="stringID" select="'invoice_pleasepay'"/>
+            </xsl:call-template>
+        </fo:block>
+
+        <fo:block xsl:use-attribute-sets="big-space-below" margin-left="1.3cm">
+            <fo:block>
+                <xsl:value-of select="/*/meta/company/full_name"/>
+            </fo:block>
+            <fo:block>
+                <xsl:call-template name="getString"><xsl:with-param name="stringID"
+                        select="'invoice_iban'"/></xsl:call-template>: <xsl:value-of
+                    select="/*/meta/company/iban"/></fo:block>
+            <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID"
+                        select="'invoice_ref'"/></xsl:call-template>: <xsl:value-of
+                    select="$INVOICE_NO"/></fo:block>
+        </fo:block>
+
+        <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID"
+                    select="'invoice_regards'"/></xsl:call-template>,</fo:block>
         <fo:block>
+            <xsl:call-template name="getString">
+                <xsl:with-param name="stringID" select="'invoice_team'"/>
+            </xsl:call-template>
+        </fo:block>
+        <fo:block font-style="italic">
             <xsl:value-of select="/*/meta/company/full_name"/>
         </fo:block>
-        <fo:block>
-            <xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_iban'"/></xsl:call-template>: <xsl:value-of select="/*/meta/company/iban"/></fo:block>
-        <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_ref'"/></xsl:call-template>: <xsl:value-of select="$INVOICE_NO"/></fo:block>
-    </fo:block>
-    
-    <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_regards'"/></xsl:call-template>,</fo:block>
-    <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_team'"/></xsl:call-template></fo:block>
-    <fo:block font-style="italic">
-        <xsl:value-of select="/*/meta/company/full_name"/>
-    </fo:block>
-</xsl:template>
-    
+    </xsl:template>
+
     <!-- overrules for pages.xslt -->
     <xsl:template name="Content">
         <fo:page-sequence master-reference="Report">
@@ -264,56 +378,91 @@
             </fo:flow>
         </fo:page-sequence>
     </xsl:template>
-    
+
     <xsl:template name="page_header">
         <fo:static-content flow-name="region-before-cover" xsl:use-attribute-sets="HeaderFont">
             <fo:block>
-            <fo:table width="100%" table-layout="fixed">
-                <fo:table-column column-width="proportional-column-width(40)"/>
-                <fo:table-column column-width="proportional-column-width(20)"/>
-                <fo:table-column column-width="proportional-column-width(40)"/>
-                <fo:table-body>
-                    <fo:table-row>
-                        <fo:table-cell text-align="right" display-align="after" padding-bottom="5mm">
-                            <fo:block xsl:use-attribute-sets="TinyFont">
-                                <fo:block xsl:use-attribute-sets="bold orange-text"><xsl:value-of select="/*/meta/company/full_name"/></fo:block>
-                                <fo:block><xsl:value-of select="/*/meta/company/address"/></fo:block>
-                                <fo:block><xsl:value-of select="/*/meta/company/postal_code"/>&#160;<xsl:value-of select="/*/meta/company/city"/></fo:block>
-                                <fo:block><xsl:value-of select="/*/meta/company/country"/></fo:block>
-                            </fo:block>
-                        </fo:table-cell>
-                        <fo:table-cell text-align="center">
-                            <fo:block><fo:external-graphic xsl:use-attribute-sets="logo"/></fo:block>
-                        </fo:table-cell>
-                        <fo:table-cell display-align="after" padding-bottom="5mm">
-                            <fo:block xsl:use-attribute-sets="TinyFont">
-                                <fo:block xsl:use-attribute-sets="bold orange-text"><xsl:value-of select="/*/meta/company/website"/></fo:block>
-                                <fo:block><xsl:value-of select="/*/meta/company/email"/></fo:block>
-                                <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'page_kvk'"/></xsl:call-template><xsl:text>&#160;</xsl:text><xsl:value-of select="/*/meta/company/coc"/></fo:block>
-                                <fo:block><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_vatno'"/></xsl:call-template><xsl:text>&#160;</xsl:text><xsl:value-of select="/*/meta/company/vat_no"/></fo:block>
-                            </fo:block>
-                        </fo:table-cell>
-                    </fo:table-row>
-                </fo:table-body>
-            </fo:table>
-        </fo:block>
+                <fo:table width="100%" table-layout="fixed">
+                    <fo:table-column column-width="proportional-column-width(40)"/>
+                    <fo:table-column column-width="proportional-column-width(20)"/>
+                    <fo:table-column column-width="proportional-column-width(40)"/>
+                    <fo:table-body>
+                        <fo:table-row>
+                            <fo:table-cell text-align="right" display-align="after"
+                                padding-bottom="5mm">
+                                <fo:block xsl:use-attribute-sets="TinyFont">
+                                    <fo:block xsl:use-attribute-sets="bold orange-text">
+                                        <xsl:value-of select="/*/meta/company/full_name"/>
+                                    </fo:block>
+                                    <fo:block>
+                                        <xsl:value-of select="/*/meta/company/address"/>
+                                    </fo:block>
+                                    <fo:block><xsl:value-of select="/*/meta/company/postal_code"
+                                            />&#160;<xsl:value-of select="/*/meta/company/city"
+                                        /></fo:block>
+                                    <fo:block>
+                                        <xsl:value-of select="/*/meta/company/country"/>
+                                    </fo:block>
+                                </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell text-align="center">
+                                <fo:block>
+                                    <fo:external-graphic xsl:use-attribute-sets="logo"/>
+                                </fo:block>
+                            </fo:table-cell>
+                            <fo:table-cell display-align="after" padding-bottom="5mm">
+                                <fo:block xsl:use-attribute-sets="TinyFont">
+                                    <fo:block xsl:use-attribute-sets="bold orange-text">
+                                        <xsl:value-of select="/*/meta/company/website"/>
+                                    </fo:block>
+                                    <fo:block>
+                                        <xsl:value-of select="/*/meta/company/email"/>
+                                    </fo:block>
+                                    <fo:block>
+                                        <xsl:call-template name="getString">
+                                            <xsl:with-param name="stringID" select="'page_kvk'"/>
+                                        </xsl:call-template>
+                                        <xsl:text>&#160;</xsl:text>
+                                        <xsl:value-of select="/*/meta/company/coc"/>
+                                    </fo:block>
+                                    <fo:block>
+                                        <xsl:call-template name="getString">
+                                            <xsl:with-param name="stringID" select="'invoice_vatno'"
+                                            />
+                                        </xsl:call-template>
+                                        <xsl:text>&#160;</xsl:text>
+                                        <xsl:value-of select="/*/meta/company/vat_no"/>
+                                    </fo:block>
+                                </fo:block>
+                            </fo:table-cell>
+                        </fo:table-row>
+                    </fo:table-body>
+                </fo:table>
+            </fo:block>
         </fo:static-content>
         <fo:static-content flow-name="region-before-content" xsl:use-attribute-sets="HeaderFont">
             <fo:block xsl:use-attribute-sets="header"/>
         </fo:static-content>
     </xsl:template>
-    
+
     <xsl:template name="page_footer">
         <fo:static-content flow-name="region-after-cover" xsl:use-attribute-sets="FooterFont">
             <fo:block xsl:use-attribute-sets="footer">
-                <fo:inline xsl:use-attribute-sets="TinyFont orange-text"><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_yaygreen'"/></xsl:call-template></fo:inline>
+                <fo:inline xsl:use-attribute-sets="TinyFont orange-text">
+                    <xsl:call-template name="getString">
+                        <xsl:with-param name="stringID" select="'invoice_yaygreen'"/>
+                    </xsl:call-template>
+                </fo:inline>
             </fo:block>
         </fo:static-content>
         <fo:static-content flow-name="region-after-content" xsl:use-attribute-sets="FooterFont">
             <fo:block xsl:use-attribute-sets="footer">
-                <fo:inline xsl:use-attribute-sets="TinyFont orange-text"><xsl:call-template name="getString"><xsl:with-param name="stringID" select="'invoice_yaygreen'"/></xsl:call-template></fo:inline>
+                <fo:inline xsl:use-attribute-sets="TinyFont orange-text">
+                    <xsl:call-template name="getString">
+                        <xsl:with-param name="stringID" select="'invoice_yaygreen'"/>
+                    </xsl:call-template>
+                </fo:inline>
             </fo:block>
         </fo:static-content>
     </xsl:template>
 </xsl:stylesheet>
-