Skip to content

Commit 4a70cb0

Browse files
coreequipBolZer
coreequip
and
BolZer
authored
🔧 Fix SpecifiedTradePaymentTerms issue (#17)
* Add new files from kosit Add new test file Add new case in http * 🔄update version to 0.1.13 and improve documentation * 📄 Add test XML for multiple SpecifiedTradePaymentTerms * 🛠️ Update workflows to use ubuntu-latest --------- Co-authored-by: Jan Nöhles <[email protected]>
1 parent ba450bc commit 4a70cb0

17 files changed

+282
-37
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
1414

‎.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-20.04
10+
runs-on: ubuntu-latest
1111
steps:
1212
- uses: actions/checkout@v4
1313

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ To build a new version follow these steps:
8181

8282
1. Increase the version number in the `gradle.properties` file.
8383
2. Run `./gradlew createVersionBadge` to create updated version badge.
84-
3. In necessary, `make` to update external dependencies.
84+
3. If necessary, `make` to update external dependencies.
8585
4. Push changes to the repository.
8686
5. Create, review and merge a pull request.
8787
6. Create a new release in GitHub with the new version number as tag.

‎data/xsl/cii-xr.xsl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,6 @@
4747
</xsl:if>
4848
<xsl:apply-templates mode="BT-8"
4949
select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:ApplicableTradeTax/ram:DueDateTypeCode"/>
50-
<xsl:if test="count(./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString[@format = '102']) > 0">
51-
<xr:Payment_due_date><xsl:attribute name="xr:id" select="'BT-9'"/>
52-
<xsl:attribute name="xr:src" select="'/rsm:CrossIndustryInvoice/rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime'"/>
53-
<xsl:apply-templates mode="BT-9"
54-
select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeSettlement/ram:SpecifiedTradePaymentTerms/ram:DueDateDateTime/udt:DateTimeString[@format = '102']"/>
55-
</xr:Payment_due_date>
56-
</xsl:if>
5750
<xsl:apply-templates mode="BT-10"
5851
select="./rsm:SupplyChainTradeTransaction/ram:ApplicableHeaderTradeAgreement/ram:BuyerReference"/>
5952
<xsl:apply-templates mode="BT-11"
@@ -335,11 +328,11 @@
335328
</xsl:template>
336329
<xsl:template mode="BT-23"
337330
match="/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext/ram:BusinessProcessSpecifiedDocumentContextParameter/ram:ID">
338-
<xr:Business_process_type_identifier>
331+
<xr:Business_process_type>
339332
<xsl:attribute name="xr:id" select="'BT-23'"/>
340333
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
341334
<xsl:call-template name="text"/>
342-
</xr:Business_process_type_identifier>
335+
</xr:Business_process_type>
343336
</xsl:template>
344337
<xsl:template mode="BT-24"
345338
match="/rsm:CrossIndustryInvoice/rsm:ExchangedDocumentContext/ram:GuidelineSpecifiedDocumentContextParameter/ram:ID">

‎data/xsl/l10n/de.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<entry key="xr:Buyer_country_code" id="BT-55">Ländercode</entry>
1111
<entry key="xr:Buyer_identifier" id="BT-46">Kennung</entry>
1212
<entry key="xr:Buyer_identifier/@scheme_identifier" id="BT-46_scheme">Schema der Kennung</entry>
13-
<entry key="xr:Buyer_contact_point" id="BT-56">Name</entry>
13+
<entry key="xr:Buyer_contact_point" id="BT-56">Kontaktstelle </entry>
1414
<entry key="xr:Buyer_contact_telephone_number" id="BT-57">Telefon</entry>
1515
<entry key="xr:Buyer_contact_email_address" id="BT-58">E-Mail-Adresse</entry>
1616
<entry key="xr:Seller_name" id="BT-27">Firmenname</entry>
@@ -136,7 +136,7 @@
136136
<entry key="xr:Tender_or_lot_reference" id="BT-17">Vergabenummer</entry>
137137
<entry key="xr:Receiving_advice_reference" id="BT-15">Kennung der Empfangsbestätigung</entry>
138138
<entry key="xr:Despatch_advice_reference" id="BT-16">Kennung der Versandanzeige</entry>
139-
<entry key="xr:Business_process_type_identifier" id="BT-23">Prozesskennung</entry>
139+
<entry key="xr:Business_process_type" id="BT-23">Prozesskennung</entry>
140140
<entry key="xr:Specification_identifier" id="BT-24">Spezifikationskennung</entry>
141141
<entry key="xr:Invoiced_object_identifier" id="BT-18">Objektkennung</entry>
142142
<entry key="xr:Invoiced_object_identifier/@scheme_identifier" id="BT-18_scheme">Schema der Objektkennung</entry>
@@ -180,7 +180,7 @@
180180
<entry key="xr:Item_Sellers_identifier" id="BT-155">Artikelnummer</entry>
181181
<entry key="xr:Item_Buyers_identifier" id="BT-156">Artikelkennung des Käufers</entry>
182182
<entry key="xr:Item_standard_identifier" id="BT-157">Artikelkennung</entry>
183-
<entry key="xr:Item_standard_identifier/@scheme_identifier" class="BT-157_scheme">Schema der Artikelkennung</entry>
183+
<entry key="xr:Item_standard_identifier/@scheme_identifier" id="BT-157_scheme">Schema der Artikelkennung</entry>
184184
<entry key="xr:Item_classification_identifier" id="BT-158">Code der Artikelklassifizierung</entry>
185185
<entry key="xr:Item_classification_identifier/@scheme_identifier" id="BT-158_scheme">Kennung zur Bildung des Schemas</entry>
186186
<entry key="xr:Item_classification_identifier/@scheme_version_identifier" id="BT-158_scheme_version">Version zur Bildung des Schemas</entry>

‎data/xsl/l10n/en.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<entry key="xr:Seller_name" id="BT-27">Company name</entry>
1717
<entry key="xr:Seller_address_line_1" id="BT-35">Address line 1</entry>
1818
<entry key="xr:Seller_address_line_2" id="BT-36">Address line 2</entry>
19-
<entry key="xr:Seller_address_line_3">Address line 3</entry>
19+
<entry key="xr:Seller_address_line_3" id="BT-162">Address line 3</entry>
2020
<entry key="xr:Seller_post_code" id="BT-38">ZIP</entry>
2121
<entry key="xr:Seller_city" id="BT-37">Location</entry>
2222
<entry key="xr:Seller_country_subdivision" id="BT-39">State</entry>
@@ -151,8 +151,8 @@
151151
<entry key="xr:Attached_document" id="BT-125">Attached document</entry>
152152
<entry key="xr:Attached_document/@mime_code" id="BT-125_mime_code">MIME type of the attached document</entry>
153153
<entry key="xr:Attached_document/@filename" id="BT-125_filename">Name of the attachment document</entry>
154-
<entry key="xrv:timestamp">Date / time</entry>
155-
<entry key="xrv:subject">Subject</entry>
154+
<entry key="xrv:zeitstempel">Date / time</entry>
155+
<entry key="xrv:betreff">Subject</entry>
156156
<entry key="xrv:text">Text</entry>
157157
<entry key="xrv:details">Details</entry>
158158
<entry key="xr:Invoice_line_identifier" id="BT-126">Identifier</entry>

‎data/xsl/ubl-creditnote-xr.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,11 @@
7373
<xsl:attribute name="xr:id" select="'BG-2'"/>
7474
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
7575
<xsl:if test="./cbc:ProfileID">
76-
<xr:Business_process_type_identifier>
76+
<xr:Business_process_type>
7777
<xsl:attribute name="xr:id" select="'BT-23'"/>
7878
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
7979
<xsl:value-of select="./cbc:ProfileID"/>
80-
</xr:Business_process_type_identifier>
80+
</xr:Business_process_type>
8181
</xsl:if>
8282
<xr:Specification_identifier>
8383
<xsl:attribute name="xr:id" select="'BT-24'"/>

‎data/xsl/ubl-invoice-xr.xsl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@
7777
<xsl:attribute name="xr:id" select="'BG-2'"/>
7878
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
7979
<xsl:if test="./cbc:ProfileID">
80-
<xr:Business_process_type_identifier>
80+
<xr:Business_process_type>
8181
<xsl:attribute name="xr:id" select="'BT-23'"/>
8282
<xsl:attribute name="xr:src" select="xr:src-path(.)"/>
8383
<xsl:value-of select="./cbc:ProfileID"/>
84-
</xr:Business_process_type_identifier>
84+
</xr:Business_process_type>
8585
</xsl:if>
8686
<xr:Specification_identifier>
8787
<xsl:attribute name="xr:id" select="'BT-24'"/>

‎data/xsl/xr-content.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@
821821
<xsl:apply-templates mode="list-entry" select="xr:PROCESS_CONTROL/xr:Specification_identifier">
822822
<xsl:with-param name="value" select="xrf:handle-specification-identifier(xr:PROCESS_CONTROL/xr:Specification_identifier)"></xsl:with-param>
823823
</xsl:apply-templates>
824-
<xsl:apply-templates mode="list-entry" select="xr:PROCESS_CONTROL/xr:Business_process_type_identifier"/>
824+
<xsl:apply-templates mode="list-entry" select="xr:PROCESS_CONTROL/xr:Business_process_type"/>
825825
<xsl:apply-templates mode="list-entry" select="xr:Invoiced_object_identifier"/>
826826
<xsl:apply-templates mode="list-entry" select="xr:Invoiced_object_identifier/@scheme_identifier">
827827
<xsl:with-param name="field-mapping-identifier" select="'xr:Invoiced_object_identifier/@scheme_identifier'"/>

‎data/xsl/xr-pdf.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<x:xmpmeta xmlns:x="adobe:ns:meta/">
6565
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
6666
<rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/">
67-
<dc:title><xsl:value-of select="xr:Invoice_number"/></dc:title>
67+
<dc:title><rdf:Alt><rdf:li xml:lang="x-default"><xsl:value-of select="xr:Invoice_number"/></rdf:li></rdf:Alt></dc:title>
6868
<!--
6969
<dc:creator></dc:creator>
7070
<dc:description></dc:description>

‎data/xsl/xrechnung-html.xsl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@
912912

913913
<xsl:template name="uebersichtZuschlaege" match="xr:DOCUMENT_LEVEL_CHARGES">
914914
<div class="boxzeile">
915-
<div id="uebersichtZuschlaege" class="box">
915+
<div class="box uebersichtZuschlaege">
916916
<div data-title="BG-21" class="BG-21 boxtitel" role="heading" aria-level="2">
917917
<xsl:value-of select="xrf:_('uebersichtZuschlaege')" />
918918
</div>
@@ -1755,7 +1755,7 @@
17551755
<div class="boxdaten legende">
17561756
<xsl:value-of select="xrf:_('xr:Tax_representative_address_line_2')" />:
17571757
</div>
1758-
<div data-title="BT-65" class="BT-65boxdaten wert">
1758+
<div data-title="BT-65" class="BT-65 boxdaten wert">
17591759
<xsl:value-of
17601760
select="xr:SELLER_TAX_REPRESENTATIVE_POSTAL_ADDRESS/xr:Tax_representative_address_line_2" />
17611761
</div>
@@ -1958,7 +1958,7 @@
19581958
<div class="boxdaten legende">
19591959
<xsl:value-of select="xrf:_('xr:Deliver_to_post_code')" />:
19601960
</div>
1961-
<div data-itle="BT-78" class="BT-78 boxdaten wert">
1961+
<div data-title="BT-78" class="BT-78 boxdaten wert">
19621962
<xsl:value-of select="xr:DELIVER_TO_ADDRESS/xr:Deliver_to_post_code" />
19631963
</div>
19641964
</div>
@@ -2023,10 +2023,10 @@
20232023
</div>
20242024
<div class="boxzeile" role="listitem">
20252025
<div class="boxdaten legende">
2026-
<xsl:value-of select="xrf:_('xr:Business_process_type_identifier')" />:
2026+
<xsl:value-of select="xrf:_('xr:Business_process_type')" />:
20272027
</div>
20282028
<div data-title="BT-23" class="BT-23 boxdaten wert">
2029-
<xsl:value-of select="xr:PROCESS_CONTROL/xr:Business_process_type_identifier" />
2029+
<xsl:value-of select="xr:PROCESS_CONTROL/xr:Business_process_type" />
20302030
</div>
20312031
</div>
20322032
<div class="boxzeile" role="listitem">

‎data/xsl/xrechnung-viewer.css

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -644,13 +644,11 @@ button
644644
{
645645
display: block;
646646
float: left;
647-
width: 100%;
647+
width: calc(100% - 170px);
648648
padding: 11px 10px !important;
649649
line-height: 1.3;
650650
min-height: 38px;
651651
height: auto;
652-
max-width: calc(100vw - 100px);
653-
overflow-x: auto;
654652
}
655653

656654
.boxdaten .legende

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
currentVersion=0.1.12
1+
currentVersion=0.1.13
22
mainClassName=io.github.easybill.xrviz.App

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎src/test/http/api-test.http

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,16 @@ Accept-Language: de
106106
client.assert(response.status === 400, "Response status is not 400");
107107
client.assert(response.body.toString().includes('SXXP0003'), "Response body does not contain SXXP0003");
108108
});
109+
%}
110+
111+
### Generate a PDF file from a XML with UTF-16 LE
112+
POST {{baseUrl}}/convert.pdf
113+
Content-Type: application/xml
114+
Accept-Language: de
115+
116+
< ./issue_with_multiple_specifiedtradepaymentterms.xml
117+
> {%
118+
client.test("Request executed with 200", function () {
119+
client.assert(response.status === 200, "Response status is not 200");
120+
});
109121
%}

0 commit comments

Comments
 (0)