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

zahlungsavis - gutschriften

Browse source
This commit is contained in:
Ralph Soika 2022-02-08 07:45:48 +01:00
parent 9fc18496bd
commit fa8d6b9990
5 changed files with 7566 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisController.java Normal file
View file

@ -0,0 +1,80 @@
package com.alexanderlogistics;
import java.io.Serializable;
import java.util.List;
import java.util.logging.Logger;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import org.imixs.workflow.ItemCollection;
import org.imixs.workflow.engine.DocumentService;
import org.imixs.workflow.faces.data.WorkflowController;
/**
* Der ZahlungsavisController dient dazu eine bereits zugewiesene Rechnung
* wieder aus dem Zahlugnsavis zu entfernen.
* <p>
* Zusätzlich bietet er die Summenberechnung an, bei der die Gutschriften
* abgezogen werden.
*
* @author rsoika
*
*/
@Named
@ConversationScoped
public class ZahlungsavisController implements Serializable {
private static final long serialVersionUID = 1L;
private static Logger logger = Logger.getLogger(ZahlungsavisController.class.getName());
@Inject
protected WorkflowController workflowController;
@Inject
protected DocumentService documentService;
/**
* This method computes the sum for a given item in a list of workitems. The
* result is rounded to 2 digits.
* <p>
* Gutschriften werden abgezogen
*
* @param refids - list of workitem uniqueIds
* @param item - name of the item to summarize
* @return sum rounded to 2 digits
*/
public double calculateSum(List<String> refids, String item) {
double result = 0;
for (String id : refids) {
ItemCollection doc = documentService.load(id);
if (doc != null) {
if ("credit".equals(doc.getItemValueString("payment.type"))) {
result = result + doc.getItemValueDouble(item);
} else {
result = result - doc.getItemValueDouble(item);
}
} else {
logger.warning("invalid read access to calculate sum");
}
}
// rond with 2 digits
return Math.round(result * 100.0) / 100.0;
}
/**
* This method removes an uniqueid form the item $workitemref
*/
@SuppressWarnings("unchecked")
public void removeInvoice(String id) {
List<String> refList = workflowController.getWorkitem().getItemValue("$workitemref");
refList.remove(id);
workflowController.getWorkitem().setItemValue("$workitemref", refList);
}
}

16
office-alexander-logistics-app/src/main/java/com/alexanderlogistics/ZahlungsavisExportAdapter.java
View file

@ -41,8 +41,10 @@ import org.imixs.workflow.poi.POIFindReplaceAdapter;
* (siehe POIFineReplaceAdapter).
*
* <p>
* Der Adapter copiert die Rechnungsdaten in neue Zeilen, welche ab Zeilnenummer
* Der Adapter kopiert die Rechnungsdaten in neue Zeilen, welche ab Zeilnenummer
* 16 eingefügt werden.
* <p>
* Dabei werden Gutschriften in spalte E und Rechnungen in Spalte F eingetrgen.
* <p>
* Abschliessend wird die Zelle 'TOTAL' noch aktualisiert.
*
@ -151,8 +153,16 @@ public class ZahlungsavisExportAdapter extends POIFindReplaceAdapter {
row.getCell(1).setCellValue(invoice.getItemValueDate("invoice.date"));
row.getCell(2).setCellValue(invoice.getItemValueString("invoice.number"));
row.getCell(3).setCellValue(invoice.getItemValueDate("invoice.duedate"));
row.getCell(4).setCellValue(0.00);
row.getCell(5).setCellValue(invoice.getItemValueDouble("invoice.total"));
if ("credit".equals(invoice.getItemValueString("payment.type"))) {
// Gutschrift
row.getCell(4).setCellValue(invoice.getItemValueDouble("invoice.total"));
row.getCell(5).setCellValue(0.00);
} else {
// Rechnung
row.getCell(4).setCellValue(0.00);
row.getCell(5).setCellValue(invoice.getItemValueDouble("invoice.total"));
}
rowPos++;
}

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

@ -25,8 +25,8 @@
</dl>
</div>
<h:panelGroup styleClass="imixs-form-section" id="zahlungsavis-table" binding="#{zahlungsavislistContainer}">
<div class="imixs-form-section">
<h3>Invoices</h3>
<table class="" style="width:100%">
@ -35,10 +35,12 @@
<th style="text-align: left;">#{message['form.invoicenumber']}</th>
<th style="text-align: left;">#{message['form.date']}</th>
<th style="text-align: left;">#{message['form.deadline']}</th>
<th style="text-align: right;">#{message['form.amount']}</th>
<th style="text-align: right;">Debit</th>
<th style="text-align: right;">Credit</th>
<th style=""></th>
<th style="width:40px;"></th>
</tr>
<c:forEach items="#{workitem.itemList['$workitemref']}" var="id">
<ui:repeat value="#{workitem.itemList['$workitemref']}" var="id">
<!-- load inovice data by documentController: #{documentController.load(id)} -->
<ui:param name="invoice" value="#{documentController.getDocument()}"></ui:param>
<tr>
@ -61,29 +63,79 @@
timeZone="#{message.timeZone}" />
</h:outputText>
</td>
<td style="text-align: right;"><h:outputText
<!-- debit -->
<ui:fragment rendered="#{invoice.item['payment.type'] eq 'credit'}">
<td style="text-align: right;"><h:outputText
value="#{invoice.item['invoice.total']}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></td>
<td>#{invoice.item['invoice.currency']}</td>
<td />
</ui:fragment>
<!-- credit -->
<ui:fragment rendered="#{invoice.item['payment.type'] ne 'credit'}">
<td />
<td style="text-align: right;"><h:outputText
value="#{invoice.item['invoice.total']}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></td>
</ui:fragment>
<td><h:commandLink
actionListener="#{zahlungsavisController.removeInvoice(id)}">
<span class="typcn typcn-trash imixs-state-info"></span>
<f:ajax render="#{zahlungsavislistContainer.clientId}" />
</h:commandLink>
</td>
</tr>
</c:forEach>
</ui:repeat>
<tr style="border-top: 1px solid #ccc;">
<td />
<td />
<td />
<td />
<td><strong>Summary</strong></td>
<td style="text-align: right;"><strong><h:outputText
value="#{sepaController.calculateSum(workitem.itemList['$workitemref'], 'invoice.total')}">
value="#{zahlungsavisController.calculateSum(workitem.itemList['$workitemref'], 'invoice.total')}">
<f:convertNumber minFractionDigits="2" locale="de" />
</h:outputText></strong></td>
<td><strong>#{invoice.item['invoice.currency']}</strong></td>
<td />
</tr>
</table>
</div>
<h:inputTextarea converter="org.imixs.VectorConverter"
style="display:none;"
value="#{workitem.itemList['$workitemref']}">
</h:inputTextarea>
</h:panelGroup>
<script type="text/javascript">
/*<![CDATA[*/
// This method refreshs the layout
function updateItems(data) {
if (data.status === 'success') {
$('form').imixsLayout();
}
}
/*]]>*/
</script>
</ui:composition>

7407
workflow/rechnungseingang-de-1.2.21.bpmn Normal file
View file

File diff suppressed because it is too large Load diff

8
workflow/zahlungsavis-1.0.0.bpmn
View file

@ -152,7 +152,7 @@ result.isValid=true;
<bpmn2:task id="Task_2" imixs:processid="1900" name="Abgeschlossen">
<bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[<itemvalue>cdtr.name</itemvalue> <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>cdtr.number</itemvalue>)]]></imixs:value>
<imixs:value><![CDATA[<itemvalue>cdtr.name.cargosoft</itemvalue> <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$modified</itemvalue> (<itemvalue>cdtr.number</itemvalue>)]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>true</imixs:value>
@ -195,7 +195,7 @@ result.isValid=true;
<bpmn2:task id="Task_1" imixs:processid="1000" name="Offen">
<bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[<itemvalue>cdtr.name</itemvalue> <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>cdtr.number</itemvalue>)]]></imixs:value>
<imixs:value><![CDATA[<itemvalue>cdtr.name.cargosoft</itemvalue> <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$modified</itemvalue> (<itemvalue>cdtr.number</itemvalue>)]]></imixs:value>
</imixs:item>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[form_basic#zahlungsavis]]></imixs:value>
@ -233,7 +233,7 @@ result.isValid=true;
<bpmn2:task id="Task_6" imixs:processid="1800" name="Storniert">
<bpmn2:extensionElements>
<imixs:item name="txtworkflowsummary" type="xs:string">
<imixs:value><![CDATA[<itemvalue>cdtr.name</itemvalue> <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$created</itemvalue> (<itemvalue>cdtr.number</itemvalue>)]]></imixs:value>
<imixs:value><![CDATA[<itemvalue>cdtr.name.cargosoft</itemvalue> <itemvalue format="EEEE, d. MMMM yyyy" locale="de_DE">$modified</itemvalue> (<itemvalue>cdtr.number</itemvalue>)]]></imixs:value>
</imixs:item>
<imixs:item name="keyupdateacl" type="xs:boolean">
<imixs:value>true</imixs:value>
@ -330,7 +330,7 @@ result.isValid=true;
<imixs:value><![CDATA[]]></imixs:value>
</imixs:item>
<imixs:item name="txtactivityresult" type="xs:string">
<imixs:value><![CDATA[ <zahlungsavis name="textblock">Zahlugnsavis Template</zahlungsavis>
<imixs:value><![CDATA[<zahlungsavis name="textblock">Zahlugnsavis Template</zahlungsavis>
<zahlungsavis name="template">zahlungsavis_template.xlsx</zahlungsavis>
<zahlungsavis name="target-name">zahlungsavis_<itemvalue>numsequencenumber</itemvalue>.xlsx</zahlungsavis>