louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add dates of deliviveries

Browse Source
This commit is contained in:
Sebastian Sieber
2024-11-18 08:37:59 +01:00
parent 86b35857d3
commit 657706b02e
8 changed files with 490 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
library/src/main/resources/stylesheets/cii-xr.xsl
View File

@@ -297,6 +297,14 @@
<xr:Receiving_advice_reference>
<xsl:attribute name="xr:id" select="'BT-15'"/>
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
<xsl:choose>
<xsl:when test="../ram:FormattedIssueDateTime/qdt:DateTimeString[@format = '102']">
<xsl:call-template name="dateAsAttribute">
<xsl:with-param name="dateString" select="../ram:FormattedIssueDateTime/qdt:DateTimeString[@format = '102']"/>
<xsl:with-param name="attributeName" select="'bt-x-201'"/>
</xsl:call-template>
</xsl:when>
</xsl:choose>
<xsl:call-template name="document_reference"/>
</xr:Receiving_advice_reference>
</xsl:template>
@@ -305,6 +313,14 @@
<xr:Despatch_advice_reference>
<xsl:attribute name="xr:id" select="'BT-16'"/>
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
<xsl:choose>
<xsl:when test="../ram:FormattedIssueDateTime/qdt:DateTimeString[@format = '102']">
<xsl:call-template name="dateAsAttribute">
<xsl:with-param name="dateString" select="../ram:FormattedIssueDateTime/qdt:DateTimeString[@format = '102']"/>
<xsl:with-param name="attributeName" select="'bt-x-200'"/>
</xsl:call-template>
</xsl:when>
</xsl:choose>
<xsl:call-template name="document_reference"/>
</xr:Despatch_advice_reference>
</xsl:template>
@@ -313,6 +329,14 @@
<xr:Delivery_note_reference>
<xsl:attribute name="xr:id" select="'BT-X-202'"/>
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
<xsl:choose>
<xsl:when test="../ram:FormattedIssueDateTime/qdt:DateTimeString[@format = '102']">
<xsl:call-template name="dateAsAttribute">
<xsl:with-param name="dateString" select="../ram:FormattedIssueDateTime/qdt:DateTimeString[@format = '102']"/>
<xsl:with-param name="attributeName" select="'bt-x-203'"/>
</xsl:call-template>
</xsl:when>
</xsl:choose>
<xsl:call-template name="document_reference"/>
</xr:Delivery_note_reference>
</xsl:template>
@@ -2447,8 +2471,9 @@
<xsl:template name="text">
<xsl:value-of select="."/>
</xsl:template>
<xsl:template name="date">
<xsl:variable name="normalizeddate" select="normalize-space(replace(., '-', ''))"/>
<xsl:variable name="normalizeddate" select="normalize-space(replace(., '-', ''))"/>
<xsl:choose>
<xsl:when test="matches($normalizeddate, '^[0-9]{8}$')">
<xsl:value-of
@@ -2463,6 +2488,24 @@
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="dateAsAttribute">
<xsl:param name="dateString"/>
<xsl:param name="attributeName" select="'date'"/>
<xsl:variable name="normalizeddate" select="normalize-space(replace($dateString, '-', ''))"/>
<xsl:choose>
<xsl:when test="matches($normalizeddate, '^[0-9]{8}$')">
<xsl:attribute name="{$attributeName}"
select="xs:date( concat(substring($normalizeddate,1,4), '-', substring($normalizeddate,5,2), '-', substring($normalizeddate,7,2) ) )"/>
</xsl:when>
<xsl:otherwise>ILLEGAL DATE FORMAT: &lt;para&gt;Mit diesem Datentyp wird ein kalendarisches Datum
abgebildet, wie es in der ISO 8601 Spezifikation &lt;quote&gt;Calendar date complete representation&lt;/quote&gt;
beschrieben ist (siehe ISO 8601:2004, Abschnitt 5.2.1.1). Das Datum beinhaltet keine Zeitangabe. Das
konkret zu verwendende Format ist abhängig von der genutzten Syntax.&lt;/para&gt;
&lt;para&gt;Der Datentyp basiert auf dem Typ &lt;quote&gt;Date Time. Type&lt;/quote&gt;, wie in ISO
15000-5:2014 Anhang B definiert.&lt;/para&gt;
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="identifier-with-scheme-and-version">
<xsl:param name="schemeID" as="element()?"/>
<xsl:if test="@listID | @schemeID">

1
library/src/main/resources/stylesheets/xrechnung-html.de.xsl
View File

@@ -11,6 +11,7 @@
<xsl:variable name="i18n.history" select="'Bearbeitungshistorie'"/>
<xsl:variable name="i18n.disclaimer" select="'Wir übernehmen keine Haftung für die Richtigkeit der Daten.'"/>
<xsl:variable name="i18n.recipientInfo" select="'Informationen zum Käufer'"/>
<xsl:variable name="i18n.dateOf" select="' vom '"/>
<xsl:variable name="i18n.bt50" select="'Straße / Haus-Nr.'"/>
<xsl:variable name="i18n.bt51" select="'Postfach'"/>
<xsl:variable name="i18n.bt163" select="'Adresszusatz'"/>

1
library/src/main/resources/stylesheets/xrechnung-html.en.xsl
View File

@@ -11,6 +11,7 @@
<xsl:variable name="i18n.history" select="'History'"/>
<xsl:variable name="i18n.disclaimer" select="'We accept no liability for the correctness of the data'"/>
<xsl:variable name="i18n.recipientInfo" select="'Buyer Information'"/>
<xsl:variable name="i18n.dateOf" select="' from '"/>
<xsl:variable name="i18n.bt50" select="'Street / house number'"/>
<xsl:variable name="i18n.bt51" select="'PO Box'"/>
<xsl:variable name="i18n.bt163" select="'Address Addition'"/>

1
library/src/main/resources/stylesheets/xrechnung-html.fr.xsl
View File

@@ -11,6 +11,7 @@
<xsl:variable name="i18n.history" select="'Historique de traitement'"/>
<xsl:variable name="i18n.disclaimer" select="'Nous n''assumons aucune responsabilité quant à l''exactitude des données.'"/>
<xsl:variable name="i18n.recipientInfo" select="'Informations sur l''acheteur'"/>
<xsl:variable name="i18n.dateOf" select="' du '"/>
<xsl:variable name="i18n.bt50" select="'Rue / Numéro de maison'"/>
<xsl:variable name="i18n.bt51" select="'Boîte postale'"/>
<xsl:variable name="i18n.bt163" select="'Supplément d''adresse'"/>

50
library/src/main/resources/stylesheets/xrechnung-html.univ.xsl
View File

@@ -1168,10 +1168,6 @@ function downloadData (element_id) {
</xsl:when>
</xsl:choose>
<div class="boxtabelle boxabstandtop boxtabelleZweispaltig">
<xsl:apply-templates select="./xr:LOGISTICS_SERVICE_CHARGES"/>
</div>
<div class="boxtabelle boxabstandtop boxtabelleZweispaltig first">
<div class="boxzeile">
<xsl:call-template name="uebersichtZahlungsinformationen"/>
@@ -1582,37 +1578,6 @@ function downloadData (element_id) {
</xsl:template>
<xsl:template name="uebersichtVersandkosten" match="xr:LOGISTICS_SERVICE_CHARGES">
<div class="boxzeile">
<div id="uebersichtVersandkosten" class="box">
<div id="BG-X-42" title="BG-X-42" class="boxtitel"><xsl:value-of select="$i18n.bgx42"/></div>
<div class="boxtabelle boxinhalt">
<div class="rechnungsZeile">
<div class="boxdaten rechnungSp1 bold"><xsl:value-of select="$i18n.btx274"/>: <span title="BT-X-274"><xsl:value-of select="xr:Logistics_service_charge_VAT_category_code"/></span></div>
<div class="boxdaten rechnungSp2"></div>
<div class="boxdaten rechnungSp3"></div>
</div>
<div class="rechnungsZeile">
<div class="boxdaten rechnungSp1"><xsl:value-of select="$i18n.btx272"/></div>
<div class="boxdaten rechnungSp2 color2">netto</div>
<div id="BT-X-272" title="BT-X-272" class="boxdaten rechnungSp3 bold"><xsl:value-of select="format-number(xr:Logistics_service_charge_amount,'###.##0,00','decimal')"/></div>
</div>
<div class="rechnungsZeile">
<div class="boxdaten rechnungSp1"><xsl:value-of select="$i18n.btx273"/></div>
<div class="boxdaten rechnungSp2 color2"></div>
<div id="BT-X-273" title="BT-X-273" class="boxdaten rechnungSp3"><xsl:value-of select="xr:Logistics_service_charge_VAT_rate"/></div>
</div>
</div>
<div class="grund">
<div><xsl:value-of select="$i18n.btx271"/>: <span id="BT-X-271" title="BT-X-271" class="bold"><xsl:value-of select="xr:Logistics_service_charge_description"/></span></div>
</div>
</div>
</div>
<div class="boxabstand"></div>
</xsl:template>
<xsl:template name="uebersichtVersandkosten" match="xr:LOGISTICS_SERVICE_CHARGES">
<div class="boxzeile">
<div id="uebersichtVersandkosten" class="box">
@@ -2229,15 +2194,24 @@ function downloadData (element_id) {
</div>
<div class="boxzeile">
<div class="boxdaten legende"><xsl:value-of select="$i18n.bt15"/>:</div>
<div id="BT-15" title="BT-15" class="boxdaten wert"><xsl:value-of select="xr:Receiving_advice_reference"/></div>
<div id="BT-15" title="BT-15" class="boxdaten wert">
<xsl:value-of select="xr:Receiving_advice_reference"/>
<xsl:if test="xr:Receiving_advice_reference/@bt-x-201"><xsl:value-of select="concat($i18n.dateOf, format-date(xr:Receiving_advice_reference/@bt-x-201,'[D].[M].[Y]'))"/></xsl:if>
</div>
</div>
<div class="boxzeile">
<div class="boxdaten legende"><xsl:value-of select="$i18n.bt16"/>:</div>
<div id="BT-16" title="BT-16" class="boxdaten wert"><xsl:value-of select="xr:Despatch_advice_reference"/></div>
<div id="BT-16" title="BT-16" class="boxdaten wert">
<xsl:value-of select="xr:Despatch_advice_reference"/>
<xsl:if test="xr:Despatch_advice_reference/@bt-x-200"><xsl:value-of select="concat($i18n.dateOf, format-date(xr:Despatch_advice_reference/@bt-x-200,'[D].[M].[Y]'))"/></xsl:if>
</div>
</div>
<div class="boxzeile">
<div class="boxdaten legende"><xsl:value-of select="$i18n.btx202"/>:</div>
<div id="BT-X-202" title="BT-X-202" class="boxdaten wert"><xsl:value-of select="xr:Delivery_note_reference"/></div>
<div id="BT-X-202" title="BT-X-202" class="boxdaten wert">
<xsl:value-of select="xr:Delivery_note_reference"/>
<xsl:if test="xr:Delivery_note_reference/@bt-x-203"><xsl:value-of select="concat($i18n.dateOf, format-date(xr:Delivery_note_reference/@bt-x-203,'[D].[M].[Y]'))"/></xsl:if>
</div>
</div>
<div class="boxzeile">
<div class="boxdaten legende"><xsl:value-of select="$i18n.bt23"/>:</div>

3
library/src/test/resources/factur-x-extended.xml
View File

@@ -359,6 +359,9 @@ GLN 4304171000002
</ram:ActualDeliverySupplyChainEvent>
<ram:DeliveryNoteReferencedDocument>
<ram:IssuerAssignedID>L87654321012</ram:IssuerAssignedID>
<ram:FormattedIssueDateTime>
<qdt:DateTimeString format="102">20241031</qdt:DateTimeString>
</ram:FormattedIssueDateTime>
</ram:DeliveryNoteReferencedDocument>
</ram:ApplicableHeaderTradeDelivery>
<ram:ApplicableHeaderTradeSettlement>

2
library/src/test/resources/factur-x-vis-extended.de.html
View File

@@ -2249,7 +2249,7 @@
</div>
<div class="boxzeile">
<div class="boxdaten legende">Kennung des Lieferscheins:</div>
<div id="BT-X-202" title="BT-X-202" class="boxdaten wert">L87654321012</div>
<div id="BT-X-202" title="BT-X-202" class="boxdaten wert">L87654321012 vom 31.10.2024</div>
</div>
<div class="boxzeile">
<div class="boxdaten legende">Prozesskennung:</div>

1
library/src/test/resources/factur-x-vis-ubl.en.html
View File

@@ -2,7 +2,6 @@
<html xmlns:xr="urn:ce.eu:en16931:2017:xoev-de:kosit:standard:xrechnung-1" xmlns:xrv="http://www.example.org/XRechnung-Viewer" xmlns:xs="http://www.w3.org/2001/XMLSchema" lang="de">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta charset="UTF-8">
<title>XRechnung</title>
<meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
<style>