Index: Prod/GADef/KaderDeur.cls.xml =================================================================== diff -u -r38163 -r39196 --- Prod/GADef/KaderDeur.cls.xml (.../KaderDeur.cls.xml) (revision 38163) +++ Prod/GADef/KaderDeur.cls.xml (.../KaderDeur.cls.xml) (revision 39196) @@ -367,7 +367,7 @@ Quit:($G(Hoogte)="") Quit:($G(Breedte)="") Quit:($G(KlantID)="") - New KadObj,Prijs,objMunt,sData,Korting,LogDate,LogTime + New KadObj,Prijs,objMunt,sData,Korting,LogDate,LogTime,OK Set sData=$G(^KLDATA(KlantID),"") Set Korting=+$P(sData, "\", 5) @@ -647,7 +647,7 @@ ;Quit $$CopyObject^Prod.GADef.KaderDeur.tmpDev(%this,CopyMode) - New caNewObj,CopyProptList,key,emObj,sVal + New caNewObj,CopyProptList,Key,emObj,sVal Set caNewObj=##class(Prod.GADef.KaderDeur).%New() ; CopyProptList bevat alle properties (per propt. TWEE chars, gescheiden met ";"), die moeten gekopieerd worden: ; volledige lijst is: "TO;PT;PA;OP;HO;BR;GM;VP;TR;AK;VK;PW;ON;VU;BS;BO;DO;TY;SC;PR;WT;XS" @@ -1019,6 +1019,7 @@ Quit:('$L(%this.ProfType)) -3 Quit:('$L(%this.ProfAfw)) -4 + New GVulling,KdGw Set GVulling=$S(%this.Vulling.Vulling="":0,1:%this.Vulling.Vulling.Gewicht) Set:(CalcMode["SimVul")&&(GVulling'>0) GVulling=10000 ; g/m² @@ -1263,6 +1264,7 @@ Quit $J(..KostPrijs(QtyStaffel,"",0),0,2) kpcCOPY(GenPRNr,FromPRNr,NewRec) + New I1 ;NewRec via .Local Do FETCHPR^UTILI($S('$G(FromPRNr):GenPRNr,1:FromPRNr),"NewRec") Set $P(NewRec(0),D,3)=GenPRNr @@ -1544,7 +1546,7 @@ #; method code include files end #define TOSECONDS(%Hdt) ($P(%Hdt,",")*3600*24+$P(%Hdt,",",2)) - New CalcObj,CalcID,Key,tmpID + New CalcObj,CalcID,Key,tmpID,Ok New NeedToRecalc,KostPrijs New WijzigTS,CalcTS New PrevNoSa @@ -1612,6 +1614,7 @@ . Set:(##class(Prod.GAData.Product).%ExistsId(tmpID)) sc=##class(Prod.GAData.Product).%DeleteId(tmpID) Quit kprConvertMunt(KostPrijs,Munt) + New CalcNew Set CalcNew=1 ; $$CalcNewKost^Prod.GADef.KaderDeur.tmpDev() If $L(Munt)&&(CalcNew) Do . New MuntEur @@ -2283,6 +2286,7 @@ 1 +1 code %Library.String code %Library.String