Index: Prod/GADef/KaderDeur.cls.xml
===================================================================
diff -u -r60138 -r69312
--- Prod/GADef/KaderDeur.cls.xml	(.../KaderDeur.cls.xml)	(revision 60138)
+++ Prod/GADef/KaderDeur.cls.xml	(.../KaderDeur.cls.xml)	(revision 69312)
@@ -652,21 +652,21 @@
  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"
+ ; volledige lijst is: "TO;PT;PA;OP;HO;BR;GM;VP;TR;AK;VK;PW;ON;VU;BS;BO;RM;DO;TY;SC;PR;WT;XS"
 
  Set CopyProptList=""
 
  If $G(CopyMode)="FullCopy" Do
  . ; Copy almost all properties
- . Set CopyProptList="TO;PT;PA;OP;HO;BR;GM;VP;AK;VK;TR;PW;ON;VU;BS;BO;DO;TY;SC;PR"     ; do not copy WT;XS"
+ . Set CopyProptList="TO;PT;PA;OP;HO;BR;GM;VP;AK;VK;TR;PW;ON;VU;BS;BO;RM;DO;TY;SC;PR"     ; do not copy WT;XS"
 
  Else  If $G(CopyMode)="ExactCopy" Do
  . ; Copy all properties
- . Set CopyProptList="TO;PT;PA;OP;HO;BR;GM;VPAK;VK;TR;PW;ON;VU;BS;BO;DO;TY;SC;PR;WT;XS"     ; complete list
+ . Set CopyProptList="TO;PT;PA;OP;HO;BR;GM;VPAK;VK;TR;PW;ON;VU;BS;BO;RM;DO;TY;SC;PR;WT;XS"     ; complete list
 
  Else  If $G(CopyMode)="KadOnly" Do
  . ; GADef.KaderDeur Full Copy without DossierNr
- . Set CopyProptList="TO;PT;PA;OP;HO;BR;GM;VP;AK;VK;TR;PW;ON;VU;BS;BO"     ; do not copy DO;TY;SC;PR;WT;XS"
+ . Set CopyProptList="TO;PT;PA;OP;HO;BR;GM;VP;AK;VK;TR;PW;ON;VU;BS;BO;RM"     ; do not copy DO;TY;SC;PR;WT;XS"
 
  Else  If $G(CopyMode)="Empty" Do
  . ; Geen properties invullen
@@ -692,6 +692,7 @@
  Set:(CopyProptList["AK") caNewObj.ProfAfwKostSpecial=%this.ProfAfwKostSpecial
  Set:(CopyProptList["VK") caNewObj.VullingKostSpecial=%this.VullingKostSpecial
  Set:(CopyProptList["TR") caNewObj.TemplateRoutine=%this.TemplateRoutine
+ Set:(CopyProptList["RM") caNewObj.Opmerking=%this.Opmerking   ; "OP" is reeds elders gebruikt (en in deze constructie geeft "OPM" dan ook ongewenst gedrag); vandaar RM" van remark 
 
  ; Copy Lists and Arrays
  If CopyProptList["ON" Do
@@ -1086,15 +1087,27 @@
  Set:(ModPRNr'?4.7N) ModPRNr=""
  If $G(GenPRNr)'?4.7N Do   ; Defaulting
  . Set GenPRNr=..GenerischPRNr()
+
+ New BestaatKprDataVanModPRNr, IsNieuwProductMetHergebruikVanPRNr
+ Set BestaatKprDataVanModPRNr = (ModPRNr > 0) && ($$$aHasData(^KPR(ModPRNr,0)))
+ Set IsNieuwProductMetHergebruikVanPRNr = (ModPRNr > 0) && $$$Not(BestaatKprDataVanModPRNr)   ; Bij "Hergebruik" is de KPR-data vooraf opgekuist. 
+	
  ; Fill ^KPR nodes
 	
  If ('ModPRNr) {
 	Do ..BeslagDummiesNietOpnemen()
  }
 
  Lock:(ModPRNr) +^KPR(ModPRNr)
- Do kpcCOPY(GenPRNr,ModPRNr,.NewRec)
- Do:('ModPRNr) kpcCLEAN(GenPRNr,,.NewRec)   ; Alleen bij nieuwe product
+ Do:(ModPRNr)&&(BestaatKprDataVanModPRNr) DELIND^PRODUKT2(ModPRNr)   ; Added by WimV on 01/07/2021 
+ If IsNieuwProductMetHergebruikVanPRNr {
+	Do kpcCOPY(GenPRNr,"",.NewRec)
+	Do kpcCLEAN(GenPRNr,,.NewRec)
+ }
+ Else {
+	Do kpcCOPY(GenPRNr,ModPRNr,.NewRec)
+	Do:('ModPRNr) kpcCLEAN(GenPRNr,,.NewRec)   ; Alleen bij nieuwe product
+ }
  Do kpcFILL(.NewRec,MetPrijs)
  Do kpcSAVE(.NewRec)
  Set NewPRNr=..ProductGetObjectId()
@@ -2709,7 +2722,7 @@
 #define HTMLnotGood(%v)   $ZCVT(%v,"O","HTML")
 #define Attrib(%n,%v)     $$PARAMFILL^XMLWRITE(%n,$$$HTML(%v))
 
- New Tag,Toepas,Key,emObj,blnLosProf,KadVertaler
+ New Tag,Toepas,Key,emObj,blnLosProf,KadVertaler,SvgKaderdeur,xmlLevel
  New NL
  Set NL=$C(13,10)
  Set KadVertaler=##class(Prod.GADef.KadVertaler).%New(Taal)
@@ -2785,7 +2798,16 @@
  . Do ..XMLVectorWrite(DevObj,$G(Opties),Taal)
  . Do ENDTAG^XMLWRITE(DevObj,"DRAW")
  . Do WRITELN^XMLWRITE(DevObj)
-
+ #dim SvgKaderdeur = ##class(APPS.Halux.PPS.ALUFrees.Svg.Kaderdeur).%New()
+ If $G(Opties)["GASVG" Do  ; Tekening opnemen
+ . Do SvgKaderdeur.GenereerSvg(%this)
+ . Do WRITELN^XMLWRITE(DevObj)
+ . Do BEGINTAG^XMLWRITE(DevObj,"DRAWSVG", "" )
+ . Do WRITELN^XMLWRITE(DevObj)
+ . Do SvgKaderdeur.VulInStream(%this, DevObj, Taal)
+ . Do ENDTAG^XMLWRITE(DevObj,"DRAWSVG")
+ . Do WRITELN^XMLWRITE(DevObj)
+ 
  Do ENDTAG^XMLWRITE(DevObj,Tag)
  Do WRITELN^XMLWRITE(DevObj)