Index: APPS/Halux/Planning/Resource/impl/ConvertTBX.cls.xml
===================================================================
diff -u -r56901 -r56983
--- APPS/Halux/Planning/Resource/impl/ConvertTBX.cls.xml	(.../ConvertTBX.cls.xml)	(revision 56901)
+++ APPS/Halux/Planning/Resource/impl/ConvertTBX.cls.xml	(.../ConvertTBX.cls.xml)	(revision 56983)
@@ -70,7 +70,7 @@
 <Method name="CreateResourceVoormontage">
 <Implementation><![CDATA[
 	Quit:'..FrontCode
-	Quit:..SpeciaalCode'="F"
+	Quit:(..SpeciaalCode'="F")&&(..SpeciaalCode'="")
 	Do ..CreateOneResource("LBX&TBX","Voormontage","")
 ]]></Implementation>
 </Method>
Index: Prod/Product.cls.xml
===================================================================
diff -u -r50868 -r56983
--- Prod/Product.cls.xml	(.../Product.cls.xml)	(revision 50868)
+++ Prod/Product.cls.xml	(.../Product.cls.xml)	(revision 56983)
@@ -271,6 +271,10 @@
 <Type>%String</Type>
 </Property>
 
+<Property name="WerkvloerNettoAfm">
+<Type>%Decimal</Type>
+</Property>
+
 <Property name="EersteMoederProduct">
 <Description>
 Private opdat het geen tijd zou opnemen indien het niet expliciet is opgenomen in een query.</Description>
@@ -1679,6 +1683,11 @@
 <Node>15</Node>
 <Piece>9</Piece>
 </Data>
+<Data name="WerkvloerNettoAfm">
+<Delimiter>"\"</Delimiter>
+<Node>15</Node>
+<Piece>7</Piece>
+</Data>
 <Data name="WerkvloerSubmagazijn">
 <Delimiter>"\"</Delimiter>
 <Node>15</Node>
Index: APPS/Halux/Planning/Resource/impl/ConvertTAX.cls.xml
===================================================================
diff -u -r56901 -r56983
--- APPS/Halux/Planning/Resource/impl/ConvertTAX.cls.xml	(.../ConvertTAX.cls.xml)	(revision 56901)
+++ APPS/Halux/Planning/Resource/impl/ConvertTAX.cls.xml	(.../ConvertTAX.cls.xml)	(revision 56983)
@@ -9,9 +9,12 @@
 
 <Method name="BuildResourceCodes">
 <Implementation><![CDATA[
+	Set ..IngegevenKenmerken.Internebreedte=..IngegevenKenmerken.CorpusBreedte-(2*..IngegevenKenmerken.CorpusWandDikte)
+
 	Set ..BreedteCode=$S(..IngegevenKenmerken.Internebreedte>600:2,1:1)
 	Set ..DiepteCode=$S(..IngegevenKenmerken.LadeDiepte>550:2,1:1)
-	Set ..SpoelbakCode=$S(..IngegevenKenmerken.Toepassing="L":"",$zcvt(..IngegevenKenmerken.UitsparingUitsparingAantal,"U")="DUBBEL":2,1:1)
+	Set ..SpoelbakCode=$S("L"[..IngegevenKenmerken.Toepassing:"",$zcvt(..IngegevenKenmerken.UitsparingUitsparingAantal,"U")="DUBBEL":2,1:1)
+
 	Set ..FrontCode=$zcvt(..IngegevenKenmerken.IsBinnenlade,"U")="TRUE"
 	Set ..MatCode=..IngegevenKenmerken.MatMateriaal
 	Set ..VerpakCode=..IngegevenKenmerken.VerpakkingType
@@ -23,10 +26,18 @@
 
 <Method name="CreateResources">
 <Implementation><![CDATA[
-	Do ..CreateResourceHoofdlijn()
-	Do ..CreateResourceMat()
-	Do ..CreateResourceLaserLogo()
-	Do ..CreateResourceSpoelbak()
+	If $isObject(..IngegevenKenmerken)&&(..IngegevenKenmerken.Internebreedte>50)
+	{
+		Do ..CreateResourceHoofdlijn()
+		Do ..CreateResourceMat()
+		Do ..CreateResourceLaserLogo()
+		Do ..CreateResourceSpoelbak()
+	}
+	Else
+	{
+		Set ..SpeciaalCode="ZNDR KENMERK"
+		Do ..CreateResourceSpeciaal()
+	}
 ]]></Implementation>
 </Method>
 
@@ -55,6 +66,13 @@
 	Do ..CreateOneResource("TAX","Spoelbak","S:"_..SpoelbakCode)
 ]]></Implementation>
 </Method>
+
+<Method name="CreateResourceSpeciaal">
+<Implementation><![CDATA[
+	Quit:..SpeciaalCode=""
+	Do ..CreateOneResource("TAX","Special","X:"_..SpeciaalCode)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/PM/Kenmerk/ConvertAll.cls.xml
===================================================================
diff -u -r56906 -r56983
--- AXimpl/PM/Kenmerk/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 56906)
+++ AXimpl/PM/Kenmerk/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 56983)
@@ -25,10 +25,12 @@
 
 <Method name="VerwijderAlles">
 <Description>
-D ##class(AXimpl.PM.Kenmerk.ConvertAll).%New().Verwerk()
+D ##class(AXimpl.PM.Kenmerk.ConvertAll).%New(0).Verwerk()
 D ##class(AXimpl.PM.Kenmerk.ConvertAll).VerwijderAlles()</Description>
 <ClassMethod>1</ClassMethod>
 <Implementation><![CDATA[
+	r "ZEKER DAT JE ALLE KENMERKEN WIL VERWIJDEREN: JA[]",K
+	Quit:$zcvt(K,"U")'="JA"
 	Do ##class(Kenmerken).%KillExtent()
 	k ^PVKeys
 ]]></Implementation>
Index: STATWEEK.mac.rou
===================================================================
diff -u -r41768 -r56983
--- STATWEEK.mac.rou	(.../STATWEEK.mac.rou)	(revision 41768)
+++ STATWEEK.mac.rou	(.../STATWEEK.mac.rou)	(revision 56983)
@@ -283,6 +283,7 @@
  . For  Set LevWk2=$O(^HULP(%J,ORDNr,LevWk2)) Quit:LevWk2=""  Quit:$S(LevWk<LevWk2:LevWk2-LevWk,1:LevWk-LevWk2)<100 ; als een order binnen 100 dagen terug komt
  . Set:LevWk2="" NewOrd=1 ; niet gevonden
  . Set ^HULP(%J,ORDNr,LevWk)=""
+ Quit:KLNr=4682
  Do CUMUL(Grp,Node,NewOrd,Omzet,Marge,0,Qty)
  Do CUMUL(Grp,Node,NewOrd,Omzet,Marge,KLNr,Qty)
  Do DTL(Grp,Node,KLNr,PRNr,FAKNr,ULNr,ORDNr,NewOrd,Datum,Qty,Omzet,Marge)
@@ -456,4 +457,3 @@
  ....Write Type,$C(9),$$$ExcelDat(Datum),$C(9),$$$ExcelDat($$CALCDATE^vhLib.DataTypes(Datum,"M","FD")),$C(9),"'"_$$EXTDATE^vhLib.DataTypes(Datum,"DW"),$C(9),KLNr,$C(9),KLNm,$C(9),FAKNr,$C(9),PRNr,$C(9),KortT,$C(9),Qty,*9,$$$ExcelNum(Omzet),*9,$$$ExcelNum(Marge),*9,DocumentDatum,!
  Do CLOSE^vhDEV(Dev)
  Quit
-
Index: Flow/Toelev/Lijn.cls.xml
===================================================================
diff -u -r56299 -r56983
--- Flow/Toelev/Lijn.cls.xml	(.../Lijn.cls.xml)	(revision 56299)
+++ Flow/Toelev/Lijn.cls.xml	(.../Lijn.cls.xml)	(revision 56983)
@@ -175,7 +175,7 @@
 <Property name="LeveringsWeekVoorziene">
 <Description>
 Format: WW/JJ</Description>
-<Type>Sys.cDate</Type>
+<Type>%String</Type>
 <Final>0</Final>
 <Calculated>0</Calculated>
 <Collection/>
@@ -187,8 +187,15 @@
 <Transient>0</Transient>
 </Property>
 
+<Property name="VoorzieneLeveringsDatum">
+<Type>%Date</Type>
+<Calculated>1</Calculated>
+<SqlComputeCode> Set {*}=##class(Flow.Toelev.Lijn).VoorzieneLeveringsDatumCalc({Leverancier},{ToeleveringNr},{LijnNr})</SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+</Property>
+
 <Property name="LeverweekGevraagde">
-<Type>Sys.cDate</Type>
+<Type>%String</Type>
 <Final>0</Final>
 <Calculated>0</Calculated>
 <Collection/>
@@ -459,6 +466,13 @@
 <SqlComputed>1</SqlComputed>
 </Property>
 
+<Property name="FabKey">
+<Type>%String</Type>
+<Calculated>1</Calculated>
+<SqlComputeCode> Set {*}={ToeleveringNr}_";"_({UniekLijnNr}\100*100)</SqlComputeCode>
+<SqlComputed>1</SqlComputed>
+</Property>
+
 <Method name="%OnOpen">
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
@@ -469,6 +483,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="VoorzieneLeveringsDatumCalc">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>LEVNr,TOENr,TLNr</FormalSpec>
+<Implementation><![CDATA[
+	Set LeverWeek=$P(^KTO(LEVNr,TOENr,TLNr),"\",25)
+	Set:LeverWeek?2N1E2N LeverDatum=$ZD($$CALCDATE^vhLib.DataTypes($$INTDATE^vhLib.DataTypes(LeverWeek,"DW"),"W","FD"),3)
+	Quit $G(LeverDatum)
+]]></Implementation>
+</Method>
+
 <Storage name="DataM">
 <Type>%CacheSQLStorage</Type>
 <StreamLocation>^Flow.Toe.LijnS</StreamLocation>
Index: APPS/Halux/Planning/Resource/impl/ConvertAll.cls.xml
===================================================================
diff -u -r56901 -r56983
--- APPS/Halux/Planning/Resource/impl/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 56901)
+++ APPS/Halux/Planning/Resource/impl/ConvertAll.cls.xml	(.../ConvertAll.cls.xml)	(revision 56983)
@@ -42,6 +42,7 @@
 
 <Method name="Verwerk">
 <Implementation><![CDATA[
+	Lock +ProductieResource:0 Else  Quit
 	;Do ..VerwijderAlles()
 	Set ..itProductieOrder=##class(ProductieOrderIterator).%New()
 	
@@ -60,6 +61,7 @@
 		}
 		;Quit:..Cnt>10000
 	}
+	Lock -ProductieResource
 ]]></Implementation>
 </Method>
 
Index: APPS/Halux/Planning/Resource/impl/ConvertLBX.cls.xml
===================================================================
diff -u -r56901 -r56983
--- APPS/Halux/Planning/Resource/impl/ConvertLBX.cls.xml	(.../ConvertLBX.cls.xml)	(revision 56901)
+++ APPS/Halux/Planning/Resource/impl/ConvertLBX.cls.xml	(.../ConvertLBX.cls.xml)	(revision 56983)
@@ -66,7 +66,7 @@
 <Method name="CreateResourceVoormontage">
 <Implementation><![CDATA[
 	Quit:'..FrontCode
-	Quit:..SpeciaalCode'="F"
+	Quit:(..SpeciaalCode'="F")&&(..SpeciaalCode'="")
 	Do ..CreateOneResource("LBX&TBX","Voormontage","")
 ]]></Implementation>
 </Method>