Imixs/office-alexander-logistics
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sepa update

Browse source
This commit is contained in:
Ralph Soika 2020-11-20 15:46:00 +01:00
parent 90b41bb512
commit 394e923a70
3 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
office-alexander-logistics-app/src/main/webapp/pages/workitems/forms/sepa_export.xhtml
View file

@ -11,7 +11,7 @@
<dl>
<dt>IBAN</dt>
<dd>
<h:outputText value="#{workitem.item['_dbtr_iban']}" />
<h:outputText value="#{workitem.item['dbtr.iban']}" />
</dd>
</dl>
@ -19,7 +19,7 @@
<dl>
<dt>BIC</dt>
<dd>
<h:outputText value="#{workitem.item['_dbtr_bic']}" />
<h:outputText value="#{workitem.item['dbtr.bic']}" />
</dd>
</dl>
@ -39,24 +39,24 @@
<th style="">IBAN</th>
<th style="">BIC</th>
</tr>
<c:forEach items="#{workitem.itemList['txtworkitemref']}" var="id">
<c:forEach items="#{workitem.itemList['$workitemref']}" var="id">
<!-- load inovice data by documentController: #{documentController.load(id)} -->
<ui:param name="invoice" value="#{documentController.getDocument()}"></ui:param>
<tr>
<td>#{invoice.item['_kreditor']}</td>
<td>#{invoice.item['_invoicenumber']}</td>
<td><h:outputText value="#{invoice.item['_invoicedate']}">
<td>#{invoice.item['cdtr.name']}</td>
<td>#{invoice.item['invoice.number']}</td>
<td><h:outputText value="#{invoice.item['invoice.date']}">
<f:convertDateTime pattern="#{message.datePatternShort}"
timeZone="#{message.timeZone}" />
</h:outputText></td>
<td style="text-align: right;"><h:outputText
value="#{invoice.item['_amount_brutto']}">
value="#{invoice.item['invoice.total']}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></td>
<td>#{invoice.item['_currency']}</td>
<td>#{invoice.item ['_cdtr_iban']}</td>
<td>#{invoice.item['_cdtr_bic']}</td>
<td>#{invoice.item['invoice.currency']}</td>
<td>#{invoice.item ['cdtr.iban']}</td>
<td>#{invoice.item['cdtr.bic']}</td>
</tr>
</c:forEach>
@ -65,10 +65,10 @@
<td />
<td><strong>Summary</strong></td>
<td style="text-align: right;"><strong><h:outputText
value="#{sepaController.calculateSum(workitem.itemList['txtworkitemref'], '_amount_brutto')}">
value="#{sepaController.calculateSum(workitem.itemList['$workitemref'], 'invoice.total')}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></strong></td>
<td><strong>#{invoice.item['_currency']}</strong></td>
<td><strong>#{invoice.item['invoice.currency']}</strong></td>
<td />
<td />
</tr>

2
reports/sepa/sepa-2.0.1.imixs-report
View file

File diff suppressed because one or more lines are too long

22
reports/sepa/sepa.xsl → reports/sepa/sepa-2.0.1.xsl
View file

@ -23,7 +23,7 @@
select="count(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']/item[@name='$uniqueid']/value)" />
<!-- compute total amount -->
<xsl:variable name="totalsum"
select="xs:decimal(sum(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']/item[@name='_amount_brutto']/value))" />
select="xs:decimal(sum(/data/document[normalize-space(item[@name = '$workflowgroup']/value) = 'Rechnungseingang']/item[@name='invoice.total']/value))" />
<!-- round to 2 digits -->
<xsl:variable name="total"
select="xs:decimal(round-half-to-even($totalsum, 2))" />
@ -48,7 +48,7 @@
<InitgPty>
<Nm>
<xsl:value-of
select="$exportWorkitem/item[@name='_dbtr_name']/value" />
select="$exportWorkitem/item[@name='dbtr.name']/value" />
</Nm>
</InitgPty>
</GrpHdr>
@ -75,14 +75,14 @@
<Dbtr>
<Nm>
<xsl:value-of
select="$exportWorkitem/item[@name='_dbtr_name']/value" />
select="$exportWorkitem/item[@name='dbtr.name']/value" />
</Nm>
</Dbtr>
<DbtrAcct>
<Id>
<IBAN>
<xsl:value-of
select="replace($exportWorkitem/item[@name='_dbtr_iban']/value, ' ', '')" />
select="replace($exportWorkitem/item[@name='dbtr.iban']/value, ' ', '')" />
</IBAN>
</Id>
</DbtrAcct>
@ -90,7 +90,7 @@
<FinInstnId>
<BIC>
<xsl:value-of
select="$exportWorkitem/item[@name='_dbtr_bic']/value" />
select="$exportWorkitem/item[@name='dbtr.bic']/value" />
</BIC>
</FinInstnId>
</DbtrAgt>
@ -133,33 +133,33 @@
<Amt>
<InstdAmt>
<xsl:attribute name="Ccy"><xsl:value-of
select="item[@name='_currency']/value" /></xsl:attribute>
select="item[@name='invoice.currency']/value" /></xsl:attribute>
<xsl:value-of
select="item[@name='_amount_brutto']/value" />
select="item[@name='invoice.total']/value" />
</InstdAmt>
</Amt>
<CdtrAgt>
<FinInstnId>
<BIC>
<xsl:value-of select="item[@name='_cdtr_bic']/value" />
<xsl:value-of select="item[@name='cdtr.bic']/value" />
</BIC>
</FinInstnId>
</CdtrAgt>
<Cdtr>
<Nm>
<xsl:value-of select="item[@name='_cdtr_name']/value" />
<xsl:value-of select="item[@name='cdtr.name']/value" />
</Nm>
</Cdtr>
<CdtrAcct>
<Id>
<IBAN>
<xsl:value-of select="replace(item[@name='_cdtr_iban']/value, ' ', '')" />
<xsl:value-of select="replace(item[@name='cdtr.iban']/value, ' ', '')" />
</IBAN>
</Id>
</CdtrAcct>
<RmtInf>
<Ustrd>
<xsl:value-of select="item[@name='_subject']/value" />
<xsl:value-of select="item[@name='$workflowsummary']/value" />
</Ustrd>
</RmtInf>
</CdtTrfTxInf>