Merge branch '144-refine-display-of-multiple-bt-29-and-bt-158' into '…

…master' Resolve "refine display of multiple BT-29 and BT-158" Closes #144 See merge request xrechnung/xrechnung-visualization!106
itplr-kosit · Nov 14, 2023 · a3a95e5 · a3a95e5
2 parents a57787e + e8c5008
commit a3a95e5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ This release is compatible with XRechnung ?.?.x
 
 ### Changed
 
+* Display of BT-29 and BT-158 in HTML
 * BG-3 "PRECEDING INVOICE REFERENCE" was added to test files `maxRechnung_ubl.xml` and `maxRechnung_creditnote.xml`
 * BT-11 "Project reference" with Document Type Code `50` was added to test file `maxRechnung_creditnote.xml`
 

diff --git a/src/xsl/l10n/de.xml b/src/xsl/l10n/de.xml
@@ -232,6 +232,7 @@
   <entry key="laufzettelHistorie">Bearbeitungshistorie</entry>
   <entry key="anlagen">Anlagen</entry>
   <entry key="anlagenListe">Rechnungsbegründende Unterlagen</entry>
+  <entry key="artikelklassifizierung">Artikelklassifizierung</entry>
   <entry key="date-format">[D].[M].[Y,4]</entry>
   <entry key="datetime-format">[D].[M].[Y,4] [H]:[m]:[s]</entry>
   <entry key="amount-format">###.##0,00</entry>

diff --git a/src/xsl/l10n/en.xml b/src/xsl/l10n/en.xml
@@ -230,6 +230,7 @@
   <entry key="laufzettelHistorie">Processing history</entry>
   <entry key="anlagen">Attachments</entry>
   <entry key="anlagenListe">Documents justifying the invoice</entry>
+  <entry key="artikelklassifizierung">Item classification</entry>
   <entry key="date-format">[Y,4]-[M,2]-[D,2]</entry>
   <entry key="datetime-format">[Y,4]-[M,2]-[D,2] [H]:[m]:[s]</entry>
   <entry key="amount-format">###,##0.00</entry>

diff --git a/src/xsl/xrechnung-html.xsl b/src/xsl/xrechnung-html.xsl
@@ -358,19 +358,14 @@
           <div class="boxzeile" role="listitem">
             <div class="boxdaten legende">
               <xsl:value-of select="xrf:_('xr:Seller_identifier')" />:
-            </div>
-            <div data-title="BT-29" class="BT-29 boxdaten wert">
-              <xsl:value-of select="." />
-            </div>
-          </div>
-          <div class="boxzeile" role="listitem">
-            <div class="boxdaten legende">
+              <br/>
               <xsl:value-of select="xrf:_('xr:Seller_identifier/@scheme_identifier')" />:
             </div>
-            <div data-title="BT-29-scheme-id" class="BT-29-scheme-id boxdaten wert">
-              <xsl:value-of select="./@scheme_identifier" />
-            </div>
-          </div>
+            <div class="boxdaten wert">
+              <div data-title="BT-29" class="BT-29"><xsl:value-of select="." /></div>
+              <div data-title="BT-29-scheme-id" class="BT-29-scheme-id"><xsl:value-of select="./@scheme_identifier" /></div>
+            </div>            
+          </div>          
         </xsl:for-each>
         <div class="boxzeile" role="listitem">
           <div class="boxdaten legende">
@@ -1533,7 +1528,19 @@
                         select="xr:ITEM_INFORMATION/xr:Item_standard_identifier/@scheme_identifier" />
                     </div>
                   </div>
+                  <div class="boxzeile" role="listitem">
+                    <div class="boxdaten legende">
+                      <xsl:value-of select="xrf:_('xr:Item_country_of_origin')" />:
+                    </div>
+                    <div data-title="BT-159" class="BT-159 boxdaten wert">
+                      <xsl:value-of select="xr:ITEM_INFORMATION/xr:Item_country_of_origin" />
+                    </div>
+                  </div>
                   <xsl:for-each select="xr:ITEM_INFORMATION/xr:Item_classification_identifier">
+                    <div class="boxzeile" role="listitem">
+                      <div class="boxdaten legende"><b><xsl:value-of select="xrf:_('artikelklassifizierung')" /></b>
+                      </div>                                          
+                    </div>
                     <div class="boxzeile" role="listitem">
                       <div class="boxdaten legende">
                         <xsl:value-of select="xrf:_('xr:Item_classification_identifier')" />:
@@ -1560,15 +1567,7 @@
                           select="./@scheme_version_identifier" />
                       </div>
                     </div>
-                  </xsl:for-each>
-                  <div class="boxzeile" role="listitem">
-                    <div class="boxdaten legende">
-                      <xsl:value-of select="xrf:_('xr:Item_country_of_origin')" />:
-                    </div>
-                    <div data-title="BT-159" class="BT-159 boxdaten wert">
-                      <xsl:value-of select="xr:ITEM_INFORMATION/xr:Item_country_of_origin" />
-                    </div>
-                  </div>
+                  </xsl:for-each>                  
                 </div>
               </div>
             </div>