Merge pull request #732 from areichmann76/#562_OccurrenceDateTime

#562 OccurrenceDateTime
ZUGFeRD · Feb 7, 2025 · 0132d2f · 0132d2f
2 parents 5dd5258 + e30b4ba
commit 0132d2f
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 9 deletions.
diff --git a/library/src/main/resources/stylesheets/cii-xr.xsl b/library/src/main/resources/stylesheets/cii-xr.xsl
@@ -130,7 +130,7 @@
             <xsl:apply-templates mode="BG-11"
                                  select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:SellerTaxRepresentativeTradeParty"/>
             <xsl:apply-templates mode="BG-13"
-                                 select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty"/>
+                                 select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery"/>
             <xsl:apply-templates mode="BG-14"
                                  select="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:BillingSpecifiedPeriod"/>
             <!--Manuell: angepasst für BG-16-->
@@ -1146,18 +1146,18 @@
         </xr:Tax_representative_country_code>
     </xsl:template>
     <xsl:template mode="BG-13"
-                  match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty">
+                  match="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery">
         <xsl:variable name="bg-contents"
                       as="item()*"><!--Der Pfad /rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ShipToTradeParty der Instanz in konkreter Syntax wird auf 5 Objekte der EN 16931 abgebildet. -->
-            <xsl:apply-templates mode="BT-70" select="./ram:Name"/>
+            <xsl:apply-templates mode="BT-70" select="ram:ShipToTradeParty/ram:Name"/>
             <xsl:apply-templates mode="BT-71"
-                                 select="./ram:ID[empty(following-sibling::ram:GlobalID/@schemeID)]"/>
-            <xsl:apply-templates mode="BT-71" select="./ram:GlobalID[exists(@schemeID)]"/>
+                                 select="ram:ShipToTradeParty/ram:ID[empty(following-sibling::ram:GlobalID/@schemeID)]"/>
+            <xsl:apply-templates mode="BT-71" select="ram:ShipToTradeParty/ram:GlobalID[exists(@schemeID)]"/>
             <xsl:apply-templates mode="BT-72"
-                                 select="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeDelivery/ram:ActualDeliverySupplyChainEvent/ram:OccurrenceDateTime/udt:DateTimeString[@format = '102']"/>
+                                 select="ram:ActualDeliverySupplyChainEvent/ram:OccurrenceDateTime/udt:DateTimeString[@format='102']"/>
             <!--<xsl:apply-templates mode="BG-14"
                                  select="/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:BillingSpecifiedPeriod"/>-->
-            <xsl:apply-templates mode="BG-15" select="./ram:PostalTradeAddress"/>
+            <xsl:apply-templates mode="BG-15" select="ram:ShipToTradeParty/ram:PostalTradeAddress"/>
         </xsl:variable>
         <xsl:if test="$bg-contents">
             <xr:DELIVERY_INFORMATION>

diff --git a/library/src/main/resources/stylesheets/xr-content.xsl b/library/src/main/resources/stylesheets/xr-content.xsl
@@ -789,7 +789,7 @@
             <xsl:apply-templates mode="list-entry" select="xr:DELIVERY_INFORMATION/xr:Deliver_to_location_identifier/@scheme_identifier">
               <xsl:with-param name="field-mapping-identifier" select="'xr:Deliver_to_location_identifier/@scheme_identifier'"/>
             </xsl:apply-templates>
-            <xsl:apply-templates mode="list-entry" select="xr:DELIVERY_INFORMATION/xr:Actual_delivery_date">
+             <xsl:apply-templates mode="list-entry" select="xr:DELIVERY_INFORMATION/xr:Actual_delivery_date">
               <xsl:with-param name="value" select="format-date(xr:DELIVERY_INFORMATION/xr:Actual_delivery_date, xrf:_('date-format'))"/>
             </xsl:apply-templates>
             <xsl:apply-templates mode="list-entry" select="xr:DELIVERY_INFORMATION/xr:Deliver_to_party_name"/>

diff --git a/library/src/test/resources/factur-x-vis.fr.html b/library/src/test/resources/factur-x-vis.fr.html
@@ -1905,6 +1905,55 @@ <h4 id="BG-32" title="BG-32">Propriétés de l'article:</h4>
                         </div>
                      </div>
                      <div class="boxabstand"></div>
+                     <div id="zusaetzeLieferung" class="box boxZweispaltig">
+                        <div id="BG-13" title="BG-13" class="boxtitel">Informations de livraison</div>
+                        <div class="boxtabelle boxinhalt borderSpacing">
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Identification du lieu de livraison:</div>
+                              <div id="BT-71" title="BT-71" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Schéma de l'Identifiant:</div>
+                              <div id="BT-71-scheme-id" title="BT-71-scheme-id" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Date de livraison:</div>
+                              <div id="BT-72" title="BT-72" class="boxdaten wert">10.11.2020</div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Nom du destinataire:</div>
+                              <div id="BT-70" title="BT-70" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Rue / Numéro de maison:</div>
+                              <div id="BT-75" title="BT-75" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Boîte postale:</div>
+                              <div id="BT-76" title="BT-76" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Supplément d'adresse:</div>
+                              <div title="BT-165" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Code postal:</div>
+                              <div id="BT-78" title="BT-78" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Lieu:</div>
+                              <div id="BT-77" title="BT-77" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Région:</div>
+                              <div id="BT-79" title="BT-79" class="boxdaten wert"></div>
+                           </div>
+                           <div class="boxzeile">
+                              <div class="boxdaten legende">Pays:</div>
+                              <div id="BT-80" title="BT-80" class="boxdaten wert"></div>
+                           </div>
+                        </div>
+                     </div>
                   </div>
                </div>
                <div class="boxtabelle boxabstandtop boxtabelleZweispaltig">
@@ -2120,4 +2169,4 @@ <h4 id="BG-32" title="BG-32">Propriétés de l'article:</h4>
 });
 //
 
-            </script></html>
+            </script></html>