This commit is contained in:
Ralph Soika 2020-12-23 17:24:15 +01:00
parent 55f818829b
commit c3ea26a9b3
5 changed files with 66 additions and 28 deletions

File diff suppressed because one or more lines are too long

View file

@ -51,7 +51,6 @@
überschneiden mit dem CargoSoft Belegnummernkreis.
Daher den Nummernkreis vorher mit CargoSoft absprechen. -->
<InvoiceNumber><xsl:value-of select="item[@name='numsequencenumber']/value" /></InvoiceNumber>
<BookingPeriod><xsl:value-of select="item[@name='invoice.period']/value" /></BookingPeriod>
<InvoiceType>
<Codes>
<Code Type="cs">INVOICE</Code>
@ -88,6 +87,9 @@
</VATInformation>
</InvoiceAmount>
<CollectionInvoice>false</CollectionInvoice>
<xsl:if test="string-length(item[@name='invoice.period']/value) > 0">
<BookingPeriod><xsl:value-of select="item[@name='invoice.period']/value" /></BookingPeriod>
</xsl:if>
<Booked>false</Booked>
<InvoiceDate><xsl:value-of select="item[@name='invoice.date']/value" /></InvoiceDate>
@ -140,12 +142,7 @@
</InvoiceRows>
</Invoice>
</xsl:template>
</xsl:stylesheet>

View file

@ -16,7 +16,6 @@
</Codes>
</Client>
<InvoiceNumber>700001</InvoiceNumber>
<BookingPeriod>0303</BookingPeriod>
<InvoiceType>
<Codes>
<Code Type="cs">INVOICE</Code>
@ -53,6 +52,7 @@
</VATInformation>
</InvoiceAmount>
<CollectionInvoice>false</CollectionInvoice>
<BookingPeriod>202103</BookingPeriod>
<Booked>false</Booked>
<InvoiceDate>2020-10-26T00:00:00+01:00</InvoiceDate>
<InvoiceAddress type="CN">
@ -64,7 +64,7 @@
<InvoiceRows>
<InvoiceRow>
<Row>1</Row>
<FileNumber>12234</FileNumber>
<FileNumber>8888888888888888a</FileNumber>
<InvoiceAmount>
<NetAmount>
<Amount>
@ -73,13 +73,13 @@
<Code Type="cs">EUR</Code>
</Codes>
</Currency>
<Value>500.00</Value>
<Value>2000.00</Value>
</Amount>
</NetAmount>
<VATInformation>
<VAT>
<Codes>
<Code Type="cs">16</Code>
<Code Type="cs">0EU</Code>
</Codes>
</VAT>
</VATInformation>
@ -92,7 +92,7 @@
</InvoiceRow>
<InvoiceRow>
<Row>2</Row>
<FileNumber>55566</FileNumber>
<FileNumber>99999999999999999b</FileNumber>
<InvoiceAmount>
<NetAmount>
<Amount>
@ -101,13 +101,13 @@
<Code Type="cs">EUR</Code>
</Codes>
</Currency>
<Value>535.70</Value>
<Value>222.00</Value>
</Amount>
</NetAmount>
<VATInformation>
<VAT>
<Codes>
<Code Type="cs">19</Code>
<Code Type="cs">0EU</Code>
</Codes>
</VAT>
</VATInformation>

View file

@ -100,39 +100,36 @@
<item name="_childitems">
<value xsi:type="xmlItemArray">
<item name="amount">
<value xsi:type="xs:decimal">500.00</value>
<value xsi:type="xs:decimal">2000.00</value>
</item>
<item name="tax">
<value xsi:type="xs:string">16</value>
<value xsi:type="xs:string">0EU</value>
</item>
<item name="numpos">
<value xsi:type="xs:int">1</value>
</item>
<item name="period">
<value xsi:type="xs:string">202004</value>
</item>
<item name="name">
<value xsi:type="xs:string">12234</value>
<value xsi:type="xs:string">8888888888888888a</value>
</item>
</value>
<value xsi:type="xmlItemArray">
<item name="amount">
<value xsi:type="xs:decimal">535.70</value>
<value xsi:type="xs:decimal">222.00</value>
</item>
<item name="tax">
<value xsi:type="xs:string">19</value>
<value xsi:type="xs:string">0EU</value>
</item>
<item name="numpos">
<value xsi:type="xs:int">2</value>
</item>
<item name="period">
<value xsi:type="xs:string">202006</value>
</item>
<item name="name">
<value xsi:type="xs:string">55566</value>
<value xsi:type="xs:string">99999999999999999b</value>
</item>
</value>
</item>
<item name="cargosoft.error">
<value xsi:type="xs:string">missign cargosoft configuration in model event
- please check model configuration</value>
@ -150,7 +147,7 @@
<value xsi:type="xs:string">EUR</value>
</item>
<item name="invoice.period">
<value xsi:type="xs:string">0303</value>
<value xsi:type="xs:string">202103</value>
</item>
<item name="invoice.date">
<value xsi:type="xs:dateTime">2020-10-26T00:00:00+01:00</value>

View file

@ -300,7 +300,7 @@ Bei Fragen wenden Sie sich bitte an info@imixs.com
<bpmn2:task id="Task_5005" imixs:processid="5200" name="Sachprüfung">
<bpmn2:extensionElements>
<imixs:item name="txteditorid" type="xs:string">
<imixs:value><![CDATA[alexander/form_basic_read#alexander/sub_positionen]]></imixs:value>
<imixs:value><![CDATA[alexander/form_basic#alexander/sub_positionen]]></imixs:value>
</imixs:item>
<imixs:item name="txtworkflowabstract" type="xs:string">
<imixs:value><![CDATA[<itemvalue>txtlastcomment</itemvalue>]]></imixs:value>
@ -2124,6 +2124,36 @@ result.isValid=true;
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
</bpmn2:intermediateCatchEvent>
<bpmn2:sequenceFlow id="SequenceFlow_3" sourceRef="IntermediateCatchEvent_5" targetRef="Task_5000"/>
<bpmn2:dataObject id="DataObject_1" name="Invoice Form">
<bpmn2:documentation id="Documentation_11"><![CDATA[<?xml version="1.0"?>
<imixs-form>
<imixs-form-section columns="1" label="Rechnungsdaten">
<item name="cdtr.name" type="text" readonly="true" label="Kreditor:"/>
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.number" type="text" readonly="true" label="Rechnungsnummer:" />
<item name="invoice.date" type="date" readonly="false" label="Rechnungsdatum:" />
<item name="invoice.duedate" type="date" readonly="true" required="true" label="Fälligkeitsdatum:" />
</imixs-form-section>
<imixs-form-section columns="3">
<item name="invoice.total" type="currency" readonly="true" required="true" label="Rechnungsbetrag:" />
<item name="invoice.currency" readonly="true" type="selectOneMenu" required="true" options="EUR;CHF;SEK;RUB;NOK;GBP;USD;CAD" label="Währung:" />
<item name="invoice.exchangerate" type="number" readonly="true" required="true" label="Exchange Rate:" />
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.iban" type="text" readonly="true" label="IBAN:" />
<item name="cdtr.bic" type="text" readonly="true" label="BIC:" />
</imixs-form-section>
<imixs-form-section columns="2">
<item name="cdtr.number" type="text" required="true" label="Kreditorennummer:" />
<item name="invoice.period" type="text" required="false" label="Buchungsperiode (yyyymm):" />
</imixs-form-section>
</imixs-form>]]></bpmn2:documentation>
<bpmn2:dataState id="DataState_2"/>
</bpmn2:dataObject>
<bpmn2:association id="Association_2" sourceRef="DataObject_2" targetRef="Task_2"/>
<bpmn2:textAnnotation id="TextAnnotation_2">
<bpmn2:text>Wurde ein Prozess Manager festgelegt, erfolgt eine Genehmigung.</bpmn2:text>
@ -2146,6 +2176,7 @@ und invioce.total >0 (keine Gutschriften)]]></bpmn2:documentation>
<bpmn2:text>Payment = Sepa
und invoice.total >0 (keine Gutschriften)</bpmn2:text>
</bpmn2:textAnnotation>
<bpmn2:association id="Association_5" sourceRef="DataObject_1" targetRef="Task_5005"/>
</bpmn2:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_Process_1" bpmnElement="Collaboration_1">
@ -2491,6 +2522,12 @@ und invoice.total >0 (keine Gutschriften)</bpmn2:text>
<dc:Bounds height="28.0" width="73.0" x="682.0" y="1010.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_DataObject_2" bpmnElement="DataObject_1">
<dc:Bounds height="50.0" width="36.0" x="210.0" y="683.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_52">
<dc:Bounds height="14.0" width="70.0" x="193.0" y="733.0"/>
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_0" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_ExclusiveGateway_1">
<di:waypoint xsi:type="dc:Point" x="155.0" y="205.0"/>
<di:waypoint xsi:type="dc:Point" x="187.0" y="205.0"/>
@ -2839,6 +2876,13 @@ und invoice.total >0 (keine Gutschriften)</bpmn2:text>
<di:waypoint xsi:type="dc:Point" x="798.0" y="933.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_51"/>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="BPMNEdge_Association_5" bpmnElement="Association_5" sourceElement="BPMNShape_DataObject_2" targetElement="BPMNShape_Task_2">
<di:waypoint xsi:type="dc:Point" x="246.0" y="708.0"/>
<di:waypoint xsi:type="dc:Point" x="308.0" y="708.0"/>
<di:waypoint xsi:type="dc:Point" x="308.0" y="716.0"/>
<di:waypoint xsi:type="dc:Point" x="370.0" y="716.0"/>
<bpmndi:BPMNLabel id="BPMNLabel_70"/>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
<dc:Font name="arial" size="9.0"/>