Konflikte behoben

Report/DefaultReportCreator.cs

@@ -1003,6 +1003,10 @@ namespace BeWo.Report
 
         public override XtraReport CreateRosterReport(long wOid, DateTime dt, List<int> feiertage)
         {
+            if (TemplateOid.HasValue && TemplateOid.Value == -2)
+            {
+                return CreateRosterReportIst(wOid, dt);
+            }
             var service = new OperationsServiceImp();
             var service2 = new CustomerServiceImp();
             var report = FindReportImp<RosterRO>();