From 57b957377be33be9b2cd591aeb07fd9ffe06e144 Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Thu, 30 Jun 2016 13:33:33 +0200
Subject: [PATCH 1/2] jj 30.06 fix replaceplaceholders for parentrecordid

---
 app/DD-Record-Organiser/ClassControlValues.vb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/DD-Record-Organiser/ClassControlValues.vb b/app/DD-Record-Organiser/ClassControlValues.vb
index 66af155..7f47a9b 100644
--- a/app/DD-Record-Organiser/ClassControlValues.vb
+++ b/app/DD-Record-Organiser/ClassControlValues.vb
@@ -761,7 +761,7 @@ Public Class ClassControlValues
                             vorgabe = defaultValue.Replace("@FORM_ID", CURRENT_FORM_ID)
                             vorgabe = vorgabe.Replace("@RECORD_ID", CURRENT_RECORD_ID)
                             vorgabe = vorgabe.Replace("@RECORDID", CURRENT_RECORD_ID)
-                            vorgabe = vorgabe.Replace("@PARENTRECORD_ID", CURRENT_PARENT_ENTITY_ID)
+                            vorgabe = vorgabe.Replace("@PARENTRECORD_ID", CURRENT_PARENT_RECORD_ID)
                             defaultValue = ClassDatabase.Execute_Scalar(vorgabe.ToString, True)
                             If IsNothing(vorgabe) Then
                                 textbox.Text = ""

From df29fa21f909d955b96f3c4d03b1ebaabbab47eb Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Thu, 30 Jun 2016 16:23:07 +0200
Subject: [PATCH 2/2] jj 30.06 wix per machine install

---
 app/SetupWiX/Product.wxs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/SetupWiX/Product.wxs b/app/SetupWiX/Product.wxs
index 198951f..d12d009 100644
--- a/app/SetupWiX/Product.wxs
+++ b/app/SetupWiX/Product.wxs
@@ -2,7 +2,21 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
   <Product Name="Record Organizer" Id="*" UpgradeCode="{6387325E-F6D7-46BE-BBA8-D0E37BEEF800}" Version="$(var.ProductVersion)" Manufacturer="Digital Data" Language="1031" Codepage="1252">
-    <Package Id="*" Keywords="Installer" Description="Digital Data Record Organizer Setup" Comments="Record Organizer is a registered Trademark of Digital Data" Manufacturer="Digital Data" InstallerVersion="100" Languages="1031" Compressed="yes" SummaryCodepage="1252"/>
+    <Package 
+      Id="*" 
+      Keywords="Installer" 
+      Description="Digital Data Record Organizer Setup" 
+      Comments="Record Organizer is a registered Trademark of Digital Data" 
+      Manufacturer="Digital Data" 
+      InstallerVersion="100" 
+      Languages="1031" 
+      Compressed="yes" 
+      SummaryCodepage="1252"
+      InstallScope="perMachine"
+    />
+    <!-- 
+      InstallScrope="perMachine" - sorgt dafür, dass das Programm für jeden Benutzer installiert wird
+    -->
     
     <!-- Nicht entfernen! -->
     <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1' />