From 8d71c11811e44c8433446bd20ed3ddc81b6e4b4a Mon Sep 17 00:00:00 2001
From: takwaiwang <tak.wai.wang@nav.no>
Date: Mon, 2 Dec 2024 09:06:33 +0100
Subject: [PATCH] TOB-4415 - oppdater oppdrag simulering med ID157 og ID118

---
 .../nav/system/os/entiteter/oppdragSkjema.xsd | 841 +++++++++---------
 .../simulerFpServiceServiceTypes.xsd          | 215 ++---
 .../skjema/oppdrag/oppdragskjema-1.xsd        |   4 +-
 3 files changed, 549 insertions(+), 511 deletions(-)

diff --git a/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/entiteter/oppdragSkjema.xsd b/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/entiteter/oppdragSkjema.xsd
index fb8b268c..3bdb6bf3 100644
--- a/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/entiteter/oppdragSkjema.xsd
+++ b/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/entiteter/oppdragSkjema.xsd
@@ -1,429 +1,466 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema targetNamespace="http://nav.no/system/os/entiteter/oppdragSkjema"
-		   version="1.0"
-		   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-		   xmlns:typer="http://nav.no/system/os/entiteter/typer/simpleTypes"
-		   xmlns:oppdragSkjema="http://nav.no/system/os/entiteter/oppdragSkjema"
+           version="1.0"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:typer="http://nav.no/system/os/entiteter/typer/simpleTypes"
+           xmlns:oppdragSkjema="http://nav.no/system/os/entiteter/oppdragSkjema"
 
 >
 
-	<xs:import namespace="http://nav.no/system/os/entiteter/typer/simpleTypes" schemaLocation="typer/simpleTypes.xsd"/>
+    <xs:import namespace="http://nav.no/system/os/entiteter/typer/simpleTypes" schemaLocation="typer/simpleTypes.xsd"/>
 
-	<xs:annotation>
-		<xs:documentation>Oppdrag entiteter</xs:documentation>
-		<xs:documentation>For hver entitet er det lagt til en referanse ID.</xs:documentation>
-		<xs:documentation>Disse IDene korresponderer med entitetene som er implementert i baksystemet og kan forenkle kommunikasjon.</xs:documentation>
-	</xs:annotation>
+    <xs:annotation>
+        <xs:documentation>Oppdrag entiteter</xs:documentation>
+        <xs:documentation>For hver entitet er det lagt til en referanse ID.</xs:documentation>
+        <xs:documentation>Disse IDene korresponderer med entitetene som er implementert i baksystemet og kan forenkle kommunikasjon.</xs:documentation>
+    </xs:annotation>
 
-	<xs:element name="enhet">
-		<xs:annotation>
-			<xs:documentation>Entitet enhet</xs:documentation>
-			<xs:documentation>Referanse ID 120 dersom enhet på nivå oppdrag</xs:documentation>
-			<xs:documentation>Referanse ID 160 dersom enhet på nivå oppdragslinje</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="typeEnhet" type="typer:typeEnhet" />
-				<xs:element name="enhet" type="typer:enhet" minOccurs="0" />
-				<xs:element name="datoEnhetFom" type="typer:dato" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="belopsgrense">
-		<xs:annotation>
-			<xs:documentation>Entitet Beløpsgrense</xs:documentation>
-			<xs:documentation>Referanse ID 130</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="typeGrense">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1" />
-							<xs:maxLength value="4" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="belopGrense" type="typer:belop" />
-				<xs:element name="datoGrenseFom" type="typer:dato" />
-				<xs:element name="datoGrenseTom" type="typer:dato" minOccurs="0" />
-				<xs:element name="feilreg" type="typer:feilreg" minOccurs="0" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="tekst">
-		<xs:annotation>
-			<xs:documentation>Entitet Tekst</xs:documentation>
-			<xs:documentation>Referanse ID 140 dersom tekst tihørende oppdrag</xs:documentation>
-			<xs:documentation>Referanse ID 158 dersom tekst tihørende oppdragslinje</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="tekstLnr" type="typer:tekstLnr" />
-				<xs:element name="tekstKode" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:maxLength value="4" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="tekst" minOccurs="0">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:maxLength value="40" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="datoTekstFom" type="typer:dato" />
-				<xs:element name="datoTekstTom" type="typer:dato" minOccurs="0" />
-				<xs:element name="feilreg" type="typer:feilreg" minOccurs="0" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="enhet">
+        <xs:annotation>
+            <xs:documentation>Entitet enhet</xs:documentation>
+            <xs:documentation>Referanse ID 120 dersom enhet på nivå oppdrag</xs:documentation>
+            <xs:documentation>Referanse ID 160 dersom enhet på nivå oppdragslinje</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="typeEnhet" type="typer:typeEnhet"/>
+                <xs:element name="enhet" type="typer:enhet" minOccurs="0"/>
+                <xs:element name="datoEnhetFom" type="typer:dato"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="belopsgrense">
+        <xs:annotation>
+            <xs:documentation>Entitet Beløpsgrense</xs:documentation>
+            <xs:documentation>Referanse ID 130</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="typeGrense">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:maxLength value="4"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="belopGrense" type="typer:belop"/>
+                <xs:element name="datoGrenseFom" type="typer:dato"/>
+                <xs:element name="datoGrenseTom" type="typer:dato" minOccurs="0"/>
+                <xs:element name="feilreg" type="typer:feilreg" minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="tekst">
+        <xs:annotation>
+            <xs:documentation>Entitet Tekst</xs:documentation>
+            <xs:documentation>Referanse ID 140 dersom tekst tihørende oppdrag</xs:documentation>
+            <xs:documentation>Referanse ID 158 dersom tekst tihørende oppdragslinje</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="tekstLnr" type="typer:tekstLnr"/>
+                <xs:element name="tekstKode" minOccurs="0">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:maxLength value="4"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="tekst" minOccurs="0">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:maxLength value="40"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="datoTekstFom" type="typer:dato"/>
+                <xs:element name="datoTekstTom" type="typer:dato" minOccurs="0"/>
+                <xs:element name="feilreg" type="typer:feilreg" minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
 
-	<xs:element name="grad">
-		<xs:annotation>
-			<xs:documentation>Entitet Grad</xs:documentation>
-			<xs:documentation>Referanse ID 170</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="typeGrad">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1" />
-							<xs:maxLength value="4" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="grad" type="typer:grad" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="grad">
+        <xs:annotation>
+            <xs:documentation>Entitet Grad</xs:documentation>
+            <xs:documentation>Referanse ID 170</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="typeGrad">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:maxLength value="4"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="grad" type="typer:grad"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="attestant">
-		<xs:annotation>
-			<xs:documentation>Entitet Attestasjon</xs:documentation>
-			<xs:documentation>Referanse ID 180</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="attestantId">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1" />
-							<xs:maxLength value="8" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="datoUgyldigFom" type="typer:dato" minOccurs="0" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="attestant">
+        <xs:annotation>
+            <xs:documentation>Entitet Attestasjon</xs:documentation>
+            <xs:documentation>Referanse ID 180</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="attestantId">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:maxLength value="8"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="datoUgyldigFom" type="typer:dato" minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="valuta">
-		<xs:annotation>
-			<xs:documentation>Entitet Valuta</xs:documentation>
-			<xs:documentation>Referanse ID 190</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="typeValuta">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="FAKT" />
-							<xs:enumeration value="FRAM" />
-							<xs:enumeration value="UTB" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="valuta">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1" />
-							<xs:maxLength value="3" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="datoValutaFom" type="typer:dato" minOccurs="1" />
-				<xs:element name="feilreg" type="typer:feilreg" minOccurs="0" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="valuta">
+        <xs:annotation>
+            <xs:documentation>Entitet Valuta</xs:documentation>
+            <xs:documentation>Referanse ID 190</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="typeValuta">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:enumeration value="FAKT"/>
+                            <xs:enumeration value="FRAM"/>
+                            <xs:enumeration value="UTB"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="valuta">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:maxLength value="3"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="datoValutaFom" type="typer:dato" minOccurs="1"/>
+                <xs:element name="feilreg" type="typer:feilreg" minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
 
-	<xs:element name="linjeStatus">
-		<xs:annotation>
-			<xs:documentation>Entitet linjestatus</xs:documentation>
-			<xs:documentation>Referanse ID 151</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="kodeStatusLinje" type="typer:kodeStatusLinje" />
-				<xs:element name="datoStatusFom" type="typer:dato" />
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="linjeStatus">
+        <xs:annotation>
+            <xs:documentation>Entitet linjestatus</xs:documentation>
+            <xs:documentation>Referanse ID 151</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="kodeStatusLinje" type="typer:kodeStatusLinje"/>
+                <xs:element name="datoStatusFom" type="typer:dato"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="klassifikasjon">
-		<xs:annotation>
-			<xs:documentation>Entitet klassifikasjon</xs:documentation>
-			<xs:documentation>Referanse ID 152</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="kodeKlassifik" type="typer:kodeKlassifik" />
-				<xs:element name="datoKlassifikFom" type="typer:dato" />
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="klassifikasjon">
+        <xs:annotation>
+            <xs:documentation>Entitet klassifikasjon</xs:documentation>
+            <xs:documentation>Referanse ID 152</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="kodeKlassifik" type="typer:kodeKlassifik"/>
+                <xs:element name="datoKlassifikFom" type="typer:dato"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="skyldner">
-		<xs:annotation>
-			<xs:documentation>Entitet skyldner</xs:documentation>
-			<xs:documentation>Referanse ID 153</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="skyldnerId" type="typer:fnrOrgnr" />
-				<xs:element name="datoSkyldnerFom" type="typer:dato" />
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="skyldner">
+        <xs:annotation>
+            <xs:documentation>Entitet skyldner</xs:documentation>
+            <xs:documentation>Referanse ID 153</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="skyldnerId" type="typer:fnrOrgnr"/>
+                <xs:element name="datoSkyldnerFom" type="typer:dato"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="kid">
-		<xs:annotation>
-			<xs:documentation>Inneholder elementene som skal være med KID</xs:documentation>
-			<xs:documentation>Referanse ID 154</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="kid" type="typer:kid" />
-				<xs:element name="datoKidFom" type="typer:dato" />
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="kid">
+        <xs:annotation>
+            <xs:documentation>Inneholder elementene som skal være med KID</xs:documentation>
+            <xs:documentation>Referanse ID 154</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="kid" type="typer:kid"/>
+                <xs:element name="datoKidFom" type="typer:dato"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="utbetalesTil">
-		<xs:annotation>
-			<xs:documentation>Entitet Utbetales til</xs:documentation>
-			<xs:documentation>Referanse ID 155</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="utbetalesTilId" type="typer:fnrOrgnr" />
-				<xs:element name="datoUtbetalesTilIdFom" type="typer:dato" />
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="utbetalesTil">
+        <xs:annotation>
+            <xs:documentation>Entitet Utbetales til</xs:documentation>
+            <xs:documentation>Referanse ID 155</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="utbetalesTilId" type="typer:fnrOrgnr"/>
+                <xs:element name="datoUtbetalesTilIdFom" type="typer:dato"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="refusjonsInfo">
-		<xs:annotation>
-			<xs:documentation>Entitet for refusjon til et orgnr og/eller maksdato for utbetaling av ytelse</xs:documentation>
-			<xs:documentation>Referanse ID 156</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="refunderesId" type="typer:fnrOrgnr" minOccurs="0" />
-				<xs:element name="maksDato" type="typer:dato" minOccurs="0" />
-				<xs:element name="datoFom" type="typer:dato" minOccurs="0" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="refusjonsInfo">
+        <xs:annotation>
+            <xs:documentation>Entitet for refusjon til et orgnr og/eller maksdato for utbetaling av ytelse</xs:documentation>
+            <xs:documentation>Referanse ID 156</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="refunderesId" type="typer:fnrOrgnr" minOccurs="0"/>
+                <xs:element name="maksDato" type="typer:dato" minOccurs="0"/>
+                <xs:element name="datoFom" type="typer:dato" minOccurs="0"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="avstemmingsnokkel">
-		<xs:annotation>
-			<xs:documentation>Entitet nøkler til bevis informasjon</xs:documentation>
-			<xs:documentation>Referanse ID 115</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="kodeKomponent">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1" />
-							<xs:maxLength value="8" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="avstemmingsNokkel">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1" />
-							<xs:maxLength value="8" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="vedtakssats">
+        <xs:annotation>
+            <xs:documentation>Entitet for vedtakssats</xs:documentation>
+            <xs:documentation>Referanse ID 157</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="vedtakssats" type="typer:sats"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="ompostering">
-		<xs:annotation>
-			<xs:documentation>Ompostering</xs:documentation>
-			<xs:documentation>Referanse ID 116</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="omPostering">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:enumeration value="J" />
-							<xs:enumeration value="N" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-				<xs:element name="datoOmposterFom" type="typer:dato" minOccurs="0" />
-				<xs:element name="feilreg" type="typer:feilreg" minOccurs="0"/>
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="avstemmingsnokkel">
+        <xs:annotation>
+            <xs:documentation>Entitet nøkler til bevis informasjon</xs:documentation>
+            <xs:documentation>Referanse ID 115</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="kodeKomponent">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:maxLength value="8"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="avstemmingsNokkel">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:maxLength value="8"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:complexType name="oppdragslinje">
-		<xs:annotation>
-			<xs:documentation>Entitet Oppdragslinje</xs:documentation>
-			<xs:documentation>Referanse ID 150</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="kodeEndringLinje">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="NY" />
-						<xs:enumeration value="ENDR" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="kodeStatusLinje" type="typer:kodeStatusLinje" minOccurs="0" />
-			<xs:element name="datoStatusFom" type="typer:dato" minOccurs="0" />
-			<xs:element name="vedtakId" type="typer:vedtakId" minOccurs="0" />
-			<xs:element name="delytelseId" type="typer:delytelseId" minOccurs="0" />
-			<xs:element name="linjeId" type="typer:linjeId" minOccurs="0" />
-			<xs:element name="kodeKlassifik" type="typer:kodeKlassifik" />
-			<xs:element name="datoKlassifikFom" type="typer:dato" minOccurs="0" />
-			<xs:element name="datoVedtakFom" type="typer:dato" />
-			<xs:element name="datoVedtakTom" type="typer:dato" minOccurs="0" />
-			<xs:element name="sats" type="typer:sats" />
-			<xs:element name="fradragTillegg" type="typer:fradragTillegg" />
-			<xs:element name="typeSats" type="typer:typeSats" />
-			<xs:element name="skyldnerId" type="typer:fnrOrgnr" minOccurs="0" />
-			<xs:element name="datoSkyldnerFom" type="typer:dato" minOccurs="0" />
-			<xs:element name="kravhaverId" type="typer:fnrOrgnr" minOccurs="0" />
-			<xs:element name="datoKravhaverFom" type="typer:dato" minOccurs="0" />
-			<xs:element name="kid" type="typer:kid" minOccurs="0" />
-			<xs:element name="datoKidFom" type="typer:dato" minOccurs="0" />
-			<xs:element name="brukKjoreplan" type="typer:brukKjoreplan" minOccurs="0" />
-			<xs:element name="saksbehId" type="typer:saksbehId" />
-			<xs:element name="utbetalesTilId" type="typer:fnrOrgnr" />
-			<xs:element name="datoUtbetalesTilIdFom" type="typer:dato" minOccurs="0" />
-			<xs:element name="kodeArbeidsgiver" type="typer:kodeArbeidsgiver" minOccurs="0" />
-			<xs:element name="henvisning" type="typer:henvisning" minOccurs="0" />
-			<xs:element name="typeSoknad" minOccurs="0">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:maxLength value="10" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="refFagsystemId" type="typer:fagsystemId" minOccurs="0" />
-			<xs:element name="refOppdragsId" type="typer:oppdragsId" minOccurs="0" />
-			<xs:element name="refDelytelseId" type="typer:delytelseId" minOccurs="0" />
-			<xs:element name="refLinjeId" type="typer:linjeId" minOccurs="0" />
-		</xs:sequence>
-	</xs:complexType>
+    <xs:element name="ompostering">
+        <xs:annotation>
+            <xs:documentation>Ompostering</xs:documentation>
+            <xs:documentation>Referanse ID 116</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="omPostering">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:enumeration value="J"/>
+                            <xs:enumeration value="N"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+                <xs:element name="datoOmposterFom" type="typer:dato" minOccurs="0"/>
+                <xs:element name="feilreg" type="typer:feilreg" minOccurs="0"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:complexType name="oppdrag">
-		<xs:annotation>
-			<xs:documentation>Entitet Oppdrag</xs:documentation>
-			<xs:documentation>Referanse ID 110</xs:documentation>
-		</xs:annotation>
-		<xs:sequence>
-			<xs:element name="kodeEndring">
-				<xs:simpleType>
-					<xs:restriction base="xs:string">
-						<xs:enumeration value="NY" />
-						<xs:enumeration value="ENDR" />
-						<xs:enumeration value="UEND" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="kodeStatus" type="typer:kodeStatus" minOccurs="0" />
-			<xs:element name="datoStatusFom" type="typer:dato" minOccurs="0" />
-			<xs:element name="kodeFagomraade" type="typer:kodeFagomraade" />
-			<xs:element name="fagsystemId" type="typer:fagsystemId" minOccurs="0" />
-			<xs:element name="oppdragsId" type="typer:oppdragsId" minOccurs="0" />
-			<xs:element name="utbetFrekvens" type="typer:utbetFrekvens" minOccurs="0" />
-			<xs:element name="datoForfall" type="typer:dato" minOccurs="0" />
-			<xs:element name="stonadId" type="typer:stonadId" minOccurs="0" />
-			<xs:element name="oppdragGjelderId" type="typer:fnrOrgnr" />
-			<xs:element name="datoOppdragGjelderFom" type="typer:dato" />
-			<xs:element name="saksbehId" type="typer:saksbehId" />
-			<xs:element ref="oppdragSkjema:enhet" minOccurs="0" maxOccurs="2" />
-			<xs:element ref="oppdragSkjema:belopsgrense" minOccurs="0" maxOccurs="50" />
-			<xs:element ref="oppdragSkjema:tekst" minOccurs="0" maxOccurs="50" />
-		</xs:sequence>
-	</xs:complexType>
+    <xs:element name="avvent">
+        <xs:annotation>
+            <xs:documentation>Avvent</xs:documentation>
+            <xs:documentation>Referanse ID 118</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element minOccurs="0" name="datoAvventFom" type="typer:dato"/>
+                <xs:element minOccurs="0" name="datoAvventTom" type="typer:dato"/>
+                <xs:element minOccurs="0" name="kodeArsak" type="xs:string"/>
+                <xs:element minOccurs="0" name="datoOverfores" type="typer:dato"/>
+                <xs:element minOccurs="0" name="feilreg">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:maxLength value="1"/>
+                            <xs:enumeration value="J"/>
+                            <xs:enumeration value="N"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
-	<xs:element name="oppdragStatus">
-		<xs:annotation>
-			<xs:documentation>Entitet Oppdragstatus</xs:documentation>
-			<xs:documentation>Referanse ID 111</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="kodeStatus" type="typer:kodeStatus" />
-				<xs:element name="datoStatusFom" type="typer:dato" />
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:complexType name="oppdragslinje">
+        <xs:annotation>
+            <xs:documentation>Entitet Oppdragslinje</xs:documentation>
+            <xs:documentation>Referanse ID 150</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="kodeEndringLinje">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="NY"/>
+                        <xs:enumeration value="ENDR"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:element>
+            <xs:element name="kodeStatusLinje" type="typer:kodeStatusLinje" minOccurs="0"/>
+            <xs:element name="datoStatusFom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="vedtakId" type="typer:vedtakId" minOccurs="0"/>
+            <xs:element name="delytelseId" type="typer:delytelseId" minOccurs="0"/>
+            <xs:element name="linjeId" type="typer:linjeId" minOccurs="0"/>
+            <xs:element name="kodeKlassifik" type="typer:kodeKlassifik"/>
+            <xs:element name="datoKlassifikFom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="datoVedtakFom" type="typer:dato"/>
+            <xs:element name="datoVedtakTom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="sats" type="typer:sats"/>
+            <xs:element name="fradragTillegg" type="typer:fradragTillegg"/>
+            <xs:element name="typeSats" type="typer:typeSats"/>
+            <xs:element name="skyldnerId" type="typer:fnrOrgnr" minOccurs="0"/>
+            <xs:element name="datoSkyldnerFom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="kravhaverId" type="typer:fnrOrgnr" minOccurs="0"/>
+            <xs:element name="datoKravhaverFom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="kid" type="typer:kid" minOccurs="0"/>
+            <xs:element name="datoKidFom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="brukKjoreplan" type="typer:brukKjoreplan" minOccurs="0"/>
+            <xs:element name="saksbehId" type="typer:saksbehId"/>
+            <xs:element name="utbetalesTilId" type="typer:fnrOrgnr"/>
+            <xs:element name="datoUtbetalesTilIdFom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="kodeArbeidsgiver" type="typer:kodeArbeidsgiver" minOccurs="0"/>
+            <xs:element name="henvisning" type="typer:henvisning" minOccurs="0"/>
+            <xs:element name="typeSoknad" minOccurs="0">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:maxLength value="10"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:element>
+            <xs:element name="refFagsystemId" type="typer:fagsystemId" minOccurs="0"/>
+            <xs:element name="refOppdragsId" type="typer:oppdragsId" minOccurs="0"/>
+            <xs:element name="refDelytelseId" type="typer:delytelseId" minOccurs="0"/>
+            <xs:element name="refLinjeId" type="typer:linjeId" minOccurs="0"/>
+        </xs:sequence>
+    </xs:complexType>
 
-	<xs:element name="oppdragGjelder">
-		<xs:annotation>
-			<xs:documentation>Entitet Oppdrag gjelder</xs:documentation>
-			<xs:documentation>Referanse ID 112</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="oppdragGjelderId" type="typer:fnrOrgnr" />
-				<xs:element name="datoOppdragGjelderFom" type="typer:dato" />
-				<xs:element name="tidspktReg" type="typer:tidspktReg" />
-				<xs:element name="saksbehId" type="typer:saksbehId" />
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:complexType name="oppdrag">
+        <xs:annotation>
+            <xs:documentation>Entitet Oppdrag</xs:documentation>
+            <xs:documentation>Referanse ID 110</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="kodeEndring">
+                <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                        <xs:enumeration value="NY"/>
+                        <xs:enumeration value="ENDR"/>
+                        <xs:enumeration value="UEND"/>
+                    </xs:restriction>
+                </xs:simpleType>
+            </xs:element>
+            <xs:element name="kodeStatus" type="typer:kodeStatus" minOccurs="0"/>
+            <xs:element name="datoStatusFom" type="typer:dato" minOccurs="0"/>
+            <xs:element name="kodeFagomraade" type="typer:kodeFagomraade"/>
+            <xs:element name="fagsystemId" type="typer:fagsystemId" minOccurs="0"/>
+            <xs:element name="oppdragsId" type="typer:oppdragsId" minOccurs="0"/>
+            <xs:element name="utbetFrekvens" type="typer:utbetFrekvens" minOccurs="0"/>
+            <xs:element name="datoForfall" type="typer:dato" minOccurs="0"/>
+            <xs:element name="stonadId" type="typer:stonadId" minOccurs="0"/>
+            <xs:element name="oppdragGjelderId" type="typer:fnrOrgnr"/>
+            <xs:element name="datoOppdragGjelderFom" type="typer:dato"/>
+            <xs:element name="saksbehId" type="typer:saksbehId"/>
+            <xs:element ref="oppdragSkjema:avvent" minOccurs="0" maxOccurs="50"/>
+            <xs:element ref="oppdragSkjema:enhet" minOccurs="0" maxOccurs="2"/>
+            <xs:element ref="oppdragSkjema:belopsgrense" minOccurs="0" maxOccurs="50"/>
+            <xs:element ref="oppdragSkjema:tekst" minOccurs="0" maxOccurs="50"/>
+        </xs:sequence>
+    </xs:complexType>
 
-	<xs:element name="bilagstype">
-		<xs:annotation>
-			<xs:documentation>Entitet Bilagstype</xs:documentation>
-			<xs:documentation>Referanse ID 113</xs:documentation>
-		</xs:annotation>
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="typeBilag">
-					<xs:simpleType>
-						<xs:restriction base="xs:string">
-							<xs:minLength value="1" />
-							<xs:maxLength value="4" />
-						</xs:restriction>
-					</xs:simpleType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
+    <xs:element name="oppdragStatus">
+        <xs:annotation>
+            <xs:documentation>Entitet Oppdragstatus</xs:documentation>
+            <xs:documentation>Referanse ID 111</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="kodeStatus" type="typer:kodeStatus"/>
+                <xs:element name="datoStatusFom" type="typer:dato"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="oppdragGjelder">
+        <xs:annotation>
+            <xs:documentation>Entitet Oppdrag gjelder</xs:documentation>
+            <xs:documentation>Referanse ID 112</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="oppdragGjelderId" type="typer:fnrOrgnr"/>
+                <xs:element name="datoOppdragGjelderFom" type="typer:dato"/>
+                <xs:element name="tidspktReg" type="typer:tidspktReg"/>
+                <xs:element name="saksbehId" type="typer:saksbehId"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="bilagstype">
+        <xs:annotation>
+            <xs:documentation>Entitet Bilagstype</xs:documentation>
+            <xs:documentation>Referanse ID 113</xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="typeBilag">
+                    <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                            <xs:minLength value="1"/>
+                            <xs:maxLength value="4"/>
+                        </xs:restriction>
+                    </xs:simpleType>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
 
 </xs:schema>
\ No newline at end of file
diff --git a/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/tjenester/simulerFpService/simulerFpServiceServiceTypes.xsd b/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/tjenester/simulerFpService/simulerFpServiceServiceTypes.xsd
index b0a6c87a..f85cff38 100644
--- a/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/tjenester/simulerFpService/simulerFpServiceServiceTypes.xsd
+++ b/nav-system-os-simuler-fp-service-tjenestespesifikasjon/src/main/wsdl/no/nav/system/os/tjenester/simulerFpService/simulerFpServiceServiceTypes.xsd
@@ -1,112 +1,113 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema targetNamespace="http://nav.no/system/os/tjenester/simulerFpService/simulerFpServiceServiceTypes"
             version="1.0"
-			xmlns:servicetypes="http://nav.no/system/os/tjenester/simulerFpService/simulerFpServiceServiceTypes"
-			xmlns:oppdragSkjema="http://nav.no/system/os/entiteter/oppdragSkjema"
-			xmlns:beregningSkjema="http://nav.no/system/os/entiteter/beregningSkjema"			
- 		    xmlns:infomelding="http://nav.no/system/os/entiteter/infomelding"
-			xmlns:typer="http://nav.no/system/os/entiteter/typer/simpleTypes"
-			xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-			             
-  <xsd:import namespace="http://nav.no/system/os/entiteter/oppdragSkjema"     schemaLocation="../../entiteter/oppdragSkjema.xsd"/>
-  <xsd:import namespace="http://nav.no/system/os/entiteter/beregningSkjema"   schemaLocation="../../entiteter/beregningSkjema.xsd"/>  
-  <xsd:import namespace="http://nav.no/system/os/entiteter/infomelding"       schemaLocation="../../entiteter/infomelding.xsd"/>  
-  <xsd:import namespace="http://nav.no/system/os/entiteter/typer/simpleTypes" schemaLocation="../../entiteter/typer/simpleTypes.xsd"/>  
-  
+            xmlns:servicetypes="http://nav.no/system/os/tjenester/simulerFpService/simulerFpServiceServiceTypes"
+            xmlns:oppdragSkjema="http://nav.no/system/os/entiteter/oppdragSkjema"
+            xmlns:beregningSkjema="http://nav.no/system/os/entiteter/beregningSkjema"
+            xmlns:infomelding="http://nav.no/system/os/entiteter/infomelding"
+            xmlns:typer="http://nav.no/system/os/entiteter/typer/simpleTypes"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+    <xsd:import namespace="http://nav.no/system/os/entiteter/oppdragSkjema" schemaLocation="../../entiteter/oppdragSkjema.xsd"/>
+    <xsd:import namespace="http://nav.no/system/os/entiteter/beregningSkjema" schemaLocation="../../entiteter/beregningSkjema.xsd"/>
+    <xsd:import namespace="http://nav.no/system/os/entiteter/infomelding" schemaLocation="../../entiteter/infomelding.xsd"/>
+    <xsd:import namespace="http://nav.no/system/os/entiteter/typer/simpleTypes" schemaLocation="../../entiteter/typer/simpleTypes.xsd"/>
+
     <xsd:annotation>
-		<xsd:documentation>Definisjon av request og respons for tjenesten</xsd:documentation>
-		<xsd:documentation>Kan bestå av både standard (gjenbrukbare) entiteter som kan bli gjenbrukt og (komplekse)typer spesifikk for denne tjenesten</xsd:documentation>		
-	</xsd:annotation>
-    
-  <!--utbetalingsLinje er forksjellig av definisjon for request og respons. egne types på servicenivå-->
-  <xsd:complexType name="oppdragslinje">
-	<xsd:complexContent>
-		<xsd:extension base="oppdragSkjema:oppdragslinje">
-			<xsd:sequence>
-				<xsd:element ref="oppdragSkjema:refusjonsInfo" minOccurs="0" maxOccurs="1" />
-				<xsd:element ref="oppdragSkjema:tekst" minOccurs="0" maxOccurs="50" />
-				<xsd:element ref="oppdragSkjema:enhet" minOccurs="0" maxOccurs="50" />
-				<xsd:element ref="oppdragSkjema:grad" minOccurs="0" maxOccurs="50" />
-				<xsd:element ref="oppdragSkjema:attestant" minOccurs="0" maxOccurs="50" />
-				<xsd:element ref="oppdragSkjema:valuta" minOccurs="0" maxOccurs="50" />						
-			</xsd:sequence>
-		</xsd:extension>
-	</xsd:complexContent>
-  </xsd:complexType>
-	
-  <!--oppdrag er forksjellig av definisjon for request og respons. egne types på servicenivå-->	
-  <xsd:complexType name="oppdrag">
-	<xsd:complexContent>
-		<xsd:extension base="oppdragSkjema:oppdrag">
-			<xsd:sequence>
-				<xsd:element ref="oppdragSkjema:bilagstype" minOccurs="0" maxOccurs="50" />
-				<xsd:element ref="oppdragSkjema:avstemmingsnokkel" minOccurs="0" maxOccurs="50" />
-                <xsd:element ref="oppdragSkjema:ompostering" minOccurs="0" />
-				<xsd:element name="oppdragslinje" type="servicetypes:oppdragslinje" minOccurs="0" maxOccurs="1400" />
-			</xsd:sequence>
-		</xsd:extension>
-	</xsd:complexContent>
-  </xsd:complexType>	
-  
-	
-  <xsd:complexType name="sendInnOppdragRequest">
-    <xsd:sequence>
-      <xsd:element name="oppdrag" type="servicetypes:oppdrag">
-        <xsd:annotation>
-          <xsd:documentation>Oppdraget for innsending.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="sendInnOppdragResponse">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="oppdrag" type="servicetypes:oppdrag">
-        <xsd:annotation>
-          <xsd:documentation>Oppdraget som er sendt inn og videreutfylt under behandling.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element minOccurs="0" name="infomelding" type="infomelding:infomelding">
-        <xsd:annotation>
-          <xsd:documentation>Informasjonsmelding</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>	  
-    </xsd:sequence>
-  </xsd:complexType>
-  
-  <xsd:complexType name="simulerBeregningRequest">
-    <xsd:sequence>
-        <xsd:element name="oppdrag" type="servicetypes:oppdrag">
-          <xsd:annotation>
-             <xsd:documentation>Oppdragetmed underelementer for simuleringsberegning.</xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>			
-		<xsd:element name="simuleringsPeriode">
-			<xsd:annotation>
-				<xsd:documentation>Entitet Simulering</xsd:documentation>
-				<xsd:documentation>Referanse ID 300</xsd:documentation>														
-			</xsd:annotation>
-			<xsd:complexType>
-				<xsd:sequence>
-					<xsd:element name="datoSimulerFom" type="typer:dato" minOccurs="0" />
-					<xsd:element name="datoSimulerTom" type="typer:dato" minOccurs="0" />
-				</xsd:sequence>
-			</xsd:complexType>
-		</xsd:element>	
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="simulerBeregningResponse">
-    <xsd:sequence>
-      <xsd:element minOccurs="0" name="simulering" type="beregningSkjema:beregning">
-        <xsd:annotation>
-          <xsd:documentation>Simulert beregningsresultat for gitt periode</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element minOccurs="0" name="infomelding" type="infomelding:infomelding">
-        <xsd:annotation>
-          <xsd:documentation>Informasjonsmelding</xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>	  	  
-    </xsd:sequence>
-  </xsd:complexType>
-  
+        <xsd:documentation>Definisjon av request og respons for tjenesten</xsd:documentation>
+        <xsd:documentation>Kan bestå av både standard (gjenbrukbare) entiteter som kan bli gjenbrukt og (komplekse)typer spesifikk for denne tjenesten</xsd:documentation>
+    </xsd:annotation>
+
+    <!--utbetalingsLinje er forksjellig av definisjon for request og respons. egne types på servicenivå-->
+    <xsd:complexType name="oppdragslinje">
+        <xsd:complexContent>
+            <xsd:extension base="oppdragSkjema:oppdragslinje">
+                <xsd:sequence>
+                    <xsd:element ref="oppdragSkjema:refusjonsInfo" minOccurs="0" maxOccurs="1"/>
+                    <xsd:element ref="oppdragSkjema:vedtakssats" minOccurs="0" maxOccurs="1"/>
+                    <xsd:element ref="oppdragSkjema:tekst" minOccurs="0" maxOccurs="50"/>
+                    <xsd:element ref="oppdragSkjema:enhet" minOccurs="0" maxOccurs="50"/>
+                    <xsd:element ref="oppdragSkjema:grad" minOccurs="0" maxOccurs="50"/>
+                    <xsd:element ref="oppdragSkjema:attestant" minOccurs="0" maxOccurs="50"/>
+                    <xsd:element ref="oppdragSkjema:valuta" minOccurs="0" maxOccurs="50"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <!--oppdrag er forksjellig av definisjon for request og respons. egne types på servicenivå-->
+    <xsd:complexType name="oppdrag">
+        <xsd:complexContent>
+            <xsd:extension base="oppdragSkjema:oppdrag">
+                <xsd:sequence>
+                    <xsd:element ref="oppdragSkjema:bilagstype" minOccurs="0" maxOccurs="50"/>
+                    <xsd:element ref="oppdragSkjema:avstemmingsnokkel" minOccurs="0" maxOccurs="50"/>
+                    <xsd:element ref="oppdragSkjema:ompostering" minOccurs="0"/>
+                    <xsd:element name="oppdragslinje" type="servicetypes:oppdragslinje" minOccurs="0" maxOccurs="1400"/>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+
+    <xsd:complexType name="sendInnOppdragRequest">
+        <xsd:sequence>
+            <xsd:element name="oppdrag" type="servicetypes:oppdrag">
+                <xsd:annotation>
+                    <xsd:documentation>Oppdraget for innsending.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="sendInnOppdragResponse">
+        <xsd:sequence>
+            <xsd:element minOccurs="0" name="oppdrag" type="servicetypes:oppdrag">
+                <xsd:annotation>
+                    <xsd:documentation>Oppdraget som er sendt inn og videreutfylt under behandling.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element minOccurs="0" name="infomelding" type="infomelding:infomelding">
+                <xsd:annotation>
+                    <xsd:documentation>Informasjonsmelding</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="simulerBeregningRequest">
+        <xsd:sequence>
+            <xsd:element name="oppdrag" type="servicetypes:oppdrag">
+                <xsd:annotation>
+                    <xsd:documentation>Oppdragetmed underelementer for simuleringsberegning.</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="simuleringsPeriode">
+                <xsd:annotation>
+                    <xsd:documentation>Entitet Simulering</xsd:documentation>
+                    <xsd:documentation>Referanse ID 300</xsd:documentation>
+                </xsd:annotation>
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="datoSimulerFom" type="typer:dato" minOccurs="0"/>
+                        <xsd:element name="datoSimulerTom" type="typer:dato" minOccurs="0"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+    <xsd:complexType name="simulerBeregningResponse">
+        <xsd:sequence>
+            <xsd:element minOccurs="0" name="simulering" type="beregningSkjema:beregning">
+                <xsd:annotation>
+                    <xsd:documentation>Simulert beregningsresultat for gitt periode</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element minOccurs="0" name="infomelding" type="infomelding:infomelding">
+                <xsd:annotation>
+                    <xsd:documentation>Informasjonsmelding</xsd:documentation>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
 </xsd:schema>
\ No newline at end of file
diff --git a/nav-virksomhet-oppdragsbehandling-v1-meldingsdefinisjon/src/main/xsd/no/trygdeetaten/skjema/oppdrag/oppdragskjema-1.xsd b/nav-virksomhet-oppdragsbehandling-v1-meldingsdefinisjon/src/main/xsd/no/trygdeetaten/skjema/oppdrag/oppdragskjema-1.xsd
index 6b7b1c64..cffc9281 100644
--- a/nav-virksomhet-oppdragsbehandling-v1-meldingsdefinisjon/src/main/xsd/no/trygdeetaten/skjema/oppdrag/oppdragskjema-1.xsd
+++ b/nav-virksomhet-oppdragsbehandling-v1-meldingsdefinisjon/src/main/xsd/no/trygdeetaten/skjema/oppdrag/oppdragskjema-1.xsd
@@ -277,7 +277,7 @@
     </xsd:complexType>
     <xsd:complexType name="vedtakssats-157">
         <xsd:annotation>
-            <xsd:documentation>Inneholder elementene som skal være med i en input 157-rekord, vedtaksstatus</xsd:documentation>
+            <xsd:documentation>Inneholder elementene som skal være med i en input 157-rekord, vedtakssats</xsd:documentation>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="vedtakssats" type="xsd_1:Tsats"/>
@@ -656,7 +656,7 @@
             <xsd:element minOccurs="0" name="bilagstype-113" type="xsd_1:bilagstype-113"/>
             <xsd:element minOccurs="0" name="avstemming-115" type="xsd_1:avstemming-115"/>
             <xsd:element minOccurs="0" name="ompostering-116" type="xsd_1:ompostering-116"/>
-            <xsd:element minOccurs="0" name="avvent-118" type="xsd_1:avvent-118"/>
+            <xsd:element maxOccurs="unbounded" minOccurs="0" name="avvent-118" type="xsd_1:avvent-118"/>
             <xsd:element maxOccurs="unbounded" minOccurs="0" name="oppdrags-enhet-120" type="xsd_1:oppdrags-enhet-120"/>
             <xsd:element maxOccurs="unbounded" minOccurs="0" name="belops-grense-130" type="xsd_1:belops-grense-130"/>
             <xsd:element maxOccurs="unbounded" minOccurs="0" name="tekst-140" type="xsd_1:tekst-140"/>