IMR und Models überarbeitet

System/OPTIMA/IQD/Belege/Bilanzbelege_O21_csv.iqd

@@ -66,10 +66,10 @@ select T1."ACCT_NR" as c1,
 	   T6."Standort_Name" as c60,
 	   T7."Fabrikat" as c61,
 	   T7."Order_By" as c62,
-	   T6."Hauptbetrieb_ID" as c63,
-	   T6."Hauptbetrieb_Name" as c64,
-	   T6."Standort_ID" as c65,
-	   T6."Standort_Name" as c66,
+	   CASE WHEN (T6."Hauptbetrieb_ID" IS NULL) THEN ('1') ELSE (T6."Hauptbetrieb_ID") END as c63,
+	   CASE WHEN (T6."Hauptbetrieb_Name" IS NULL) THEN ('Heidenreich') ELSE (T6."Hauptbetrieb_Name") END as c64,
+	   CASE WHEN (T6."Standort_ID" IS NULL) THEN ('01') ELSE (T6."Standort_ID") END as c65,
+	   CASE WHEN (T6."Standort_Name" IS NULL) THEN ('Witzenhausen') ELSE (T6."Standort_Name") END as c66,
 	   T7."Fabrikat" as c67,
 	   T7."Order_By" as c68
 from "OPTIMA"."import"."ACCOUNT_INFO" T1,

System/OPTIMA/IQD/Belege/Bilanzbelege_O21_csv.sql

@@ -60,10 +60,10 @@ select T1."ACCT_NR" as "Acct Nr",
 	   T6."Standort_Name" as "Betrieb_Name_ori",
 	   T7."Fabrikat" as "Marke_ori",
 	   T7."Order_By" as "Fabrikat_Order_By_ori",
-	   T6."Hauptbetrieb_ID" as "Rechtseinheit_ID",
-	   T6."Hauptbetrieb_Name" as "Rechtseinheit_Name",
-	   T6."Standort_ID" as "Betrieb_ID",
-	   T6."Standort_Name" as "Betrieb_Name",
+	   CASE WHEN (T6."Hauptbetrieb_ID" IS NULL) THEN ('1') ELSE (T6."Hauptbetrieb_ID") END as "Rechtseinheit_ID",
+	   CASE WHEN (T6."Hauptbetrieb_Name" IS NULL) THEN ('Heidenreich') ELSE (T6."Hauptbetrieb_Name") END as "Rechtseinheit_Name",
+	   CASE WHEN (T6."Standort_ID" IS NULL) THEN ('01') ELSE (T6."Standort_ID") END as "Betrieb_ID",
+	   CASE WHEN (T6."Standort_Name" IS NULL) THEN ('Witzenhausen') ELSE (T6."Standort_Name") END as "Betrieb_Name",
 	   T7."Fabrikat" as "Marke",
 	   T7."Order_By" as "Fabrikat_Order_By"
 from "OPTIMA"."import"."ACCOUNT_INFO" T1,

System/OPTIMA/IQD/Belege/GuV_8_O21_STK_csv.iqd

@@ -76,7 +76,7 @@ select T1."ACCT_NR" as c1,
 	   T7."Hauptbetrieb_Name" as c70,
 	   T7."Standort_ID" as c71,
 	   T7."Standort_Name" as c72,
-	   CASE WHEN (T4."DESCRIPTION" LIKE '%Opel%') THEN ('Opel') WHEN (T4."DESCRIPTION" LIKE '%Suzuki%') THEN ('Suzuki') WHEN (T4."DESCRIPTION" LIKE '%Chevrolet%') THEN ('Chevrolet') WHEN (T4."DESCRIPTION" LIKE '%Saab%') THEN ('Saab') WHEN (T4."DESCRIPTION" LIKE '%Kia%') THEN ('Kia') WHEN (T4."DESCRIPTION" LIKE '%Fiat%') THEN ('Fiat') WHEN (T4."DESCRIPTION" LIKE '%Peugeot%') THEN ('Peugeot') WHEN (T4."DESCRIPTION" LIKE '%Reifenlager%') THEN ('Reifenlager') WHEN (T4."DESCRIPTION" LIKE '%MG%') THEN ('MG') ELSE ('Marke fehlt') END as c73,
+	   T8."Fabrikat" as c73,
 	   T8."Order_By" as c74,
 	   T6."EST_TIME_INT" as c75,
 	   T6."INV_TIME_INT" as c76,

System/OPTIMA/IQD/Belege/GuV_8_O21_STK_csv.sql

@@ -70,7 +70,7 @@ select T1."ACCT_NR" as "Acct Nr_ori",
 	   T7."Hauptbetrieb_Name" as "Rechtseinheit_Name",
 	   T7."Standort_ID" as "Betrieb_ID",
 	   T7."Standort_Name" as "Betrieb_Name",
-	   CASE WHEN (T4."DESCRIPTION" LIKE '%Opel%') THEN ('Opel') WHEN (T4."DESCRIPTION" LIKE '%Suzuki%') THEN ('Suzuki') WHEN (T4."DESCRIPTION" LIKE '%Chevrolet%') THEN ('Chevrolet') WHEN (T4."DESCRIPTION" LIKE '%Saab%') THEN ('Saab') WHEN (T4."DESCRIPTION" LIKE '%Kia%') THEN ('Kia') WHEN (T4."DESCRIPTION" LIKE '%Fiat%') THEN ('Fiat') WHEN (T4."DESCRIPTION" LIKE '%Peugeot%') THEN ('Peugeot') WHEN (T4."DESCRIPTION" LIKE '%Reifenlager%') THEN ('Reifenlager') WHEN (T4."DESCRIPTION" LIKE '%MG%') THEN ('MG') ELSE ('Marke fehlt') END as "Marke",
+	   T8."Fabrikat" as "Marke",
 	   T8."Order_By" as "Fabrikat_Order_By",
 	   T6."EST_TIME_INT" as "Est Time Int",
 	   T6."INV_TIME_INT" as "Inv Time Int",

System/OPTIMA/IQD/NW/nw_auftragsbestand.iqd

@@ -127,7 +127,7 @@ select T1."ORDER_NUMBER" as c1,
 	   T14."MODEL_TEXT" as c121,
 	   T14."ORIG_MODEL_CODE" as c122,
 	   T14."MAKE_CODE" as c123,
-	   CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END as c124,
+	   CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END as c124,
 	   '1' as c125,
 	   (od_left(T3."DEPARTMENT_TYPE_ID",2)) as c126,
 	   T4."SEL_NAME" as c127,
@@ -152,7 +152,7 @@ select T1."ORDER_NUMBER" as c1,
 	   T16."ALLOC_DATE_GMD" as c146,
 	   T16."DELIV_DATE_GMD" as c147,
 	   (CASE WHEN (T16."EVENT_CODE_GMD" IS NULL) THEN ('Info fehlt') ELSE (T16."EVENT_CODE_GMD") END) || ' - ' || (CASE WHEN (T16."EVENT_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((asciiz(extract(YEAR FROM T16."EVENT_DATE_GMD"),4) || '-' || asciiz(extract(MONTH FROM T16."EVENT_DATE_GMD"),2) || '-' || asciiz(extract(DAY FROM T16."EVENT_DATE_GMD"),2))) END) || ' - ' || (CASE WHEN (T16."ALLOC_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((asciiz(extract(YEAR FROM T16."ALLOC_DATE_GMD"),4) || '-' || asciiz(extract(MONTH FROM T16."ALLOC_DATE_GMD"),2) || '-' || asciiz(extract(DAY FROM T16."ALLOC_DATE_GMD"),2))) END) || ' - ' || (CASE WHEN (T16."DELIV_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((asciiz(extract(YEAR FROM T16."DELIV_DATE_GMD"),4) || '-' || asciiz(extract(MONTH FROM T16."DELIV_DATE_GMD"),2) || '-' || asciiz(extract(DAY FROM T16."DELIV_DATE_GMD"),2))) END) as c148,
-	   CASE WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '10' AND '13') THEN ('Endkunden') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '20' AND '23') THEN ('Geschäftskunden') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '30' AND '33') THEN ('Großkunden') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '40' AND '43') THEN ('Vermittler') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '80' AND '80') THEN ('Händler') WHEN ((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END) = 'Gebrauchtwagen') THEN ('GW' || ' ' || CASE WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE" from 3 for 3)) = '100')) THEN ('Endkunde') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE" from 3 for 3)) = '300')) THEN ('Aufkäufer') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and (not (substring(T10."BOOK_KEEPING_CODE" from 3 for 3)) IN ('100','300'))) THEN ('GW Sonstige') ELSE null END) ELSE null END as c149,
+	   CASE WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '10' AND '13') THEN ('Endkunden') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '20' AND '23') THEN ('Geschäftskunden') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '30' AND '33') THEN ('Großkunden') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '40' AND '43') THEN ('Vermittler') WHEN ((od_right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '80' AND '80') THEN ('Händler') WHEN ((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END) = 'Gebrauchtwagen') THEN ('GW' || ' ' || CASE WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE" from 3 for 3)) = '100')) THEN ('Endkunde') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE" from 3 for 3)) = '300')) THEN ('Aufkäufer') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and (not (substring(T10."BOOK_KEEPING_CODE" from 3 for 3)) IN ('100','300'))) THEN ('GW Sonstige') ELSE null END) ELSE null END as c149,
 	   CASE WHEN (T16."EVENT_CODE_GMD" IS NULL) THEN ('Info fehlt') ELSE (T16."EVENT_CODE_GMD") END as c150,
 	   CASE WHEN (T16."EVENT_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((asciiz(extract(YEAR FROM T16."EVENT_DATE_GMD"),4) || '-' || asciiz(extract(MONTH FROM T16."EVENT_DATE_GMD"),2) || '-' || asciiz(extract(DAY FROM T16."EVENT_DATE_GMD"),2))) END as c151,
 	   CASE WHEN (T16."ALLOC_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((asciiz(extract(YEAR FROM T16."ALLOC_DATE_GMD"),4) || '-' || asciiz(extract(MONTH FROM T16."ALLOC_DATE_GMD"),2) || '-' || asciiz(extract(DAY FROM T16."ALLOC_DATE_GMD"),2))) END as c152,
@@ -162,7 +162,7 @@ select T1."ORDER_NUMBER" as c1,
 from ((((((("OPTIMA"."import"."VEH_ORDER_HEADER" T1 left outer join "OPTIMA"."import"."VPP25" T2 on (T1."STATUS" = T2."STAT_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T3 on (T1."DEPARTMENT" = T3."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T3."CLIENT_DB")) left outer join "OPTIMA"."import"."VEH_ORDER_LINE" T8 on (T1."ORDER_NUMBER" = T8."ORDER_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP4K" T5 on (T1."FLEET_OWNER" = T5."FLEET_OWNER_CODE") and (T1."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP48" T6 on (T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP61" T7 on (T1."STOCK" = T7."STOCK") and (T1."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP5M" T10 on (T8."ACCOUNTING_CODE" = T10."BOOK_KEEPING_CODE") and (T8."CLIENT_DB" = T10."CLIENT_DB")),
 	((((((("OPTIMA"."import"."UNIT_FILE" T11 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T11."SALE_SALESMAN") and (T4."CLIENT_DB" = T11."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP5R" T9 on (T11."VEHICLE_TYPE" = T9."VEHICLE_TYPE") and (T11."CLIENT_DB" = T9."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T12 on T11."BASIS_NUMBER" = T12."BASIS_NUMBER") left outer join "OPTIMA"."import"."VPP5Q" T13 on ((T12."MODEL_LINE" = T13."MODEL_LINE") and (T12."MAKE_CD" = T13."MAKE_CD")) and (T12."CLIENT_DB" = T13."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP74" T14 on ((T12."WORKSHOP_MODEL" = T14."WORKSHOP_MODEL") and (T12."MAKE_CD" = T14."MAKE_CD")) and (T12."CLIENT_DB" = T14."CLIENT_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T15 on (T12."MAKE_CD" = T15."GLOBAL_MAKE_CD") and (T12."CLIENT_DB" = T15."CLIENT_DB")) left outer join "OPTIMA"."import"."GM_DRIVE_ORDER" T16 on (T11."UNIT_NUMBER" = T16."UNIT_NUMBER") and (T11."CLIENT_DB" = T16."CLIENT_DB"))
 where ((T8."UNIT_NUMBER" = T11."UNIT_NUMBER") and (T8."CLIENT_DB" = T11."CLIENT_DB"))
-and (((((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END) = 'Neuwagen') and (T8."LINE_TYPE_VEH" <> 'Z')) and (T1."ORDER_DATE" >= TIMESTAMP '2021-01-01 00:00:00.000')) and ((CASE WHEN (T1."STATUS" IN ('FG','FR','FS')) THEN ('fakturiert') ELSE ('Auftragsbestand') END) = 'Auftragsbestand'))
+and (((((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END) = 'Neuwagen') and (T8."LINE_TYPE_VEH" <> 'Z')) and (T1."ORDER_DATE" >= TIMESTAMP '2021-01-01 00:00:00.000')) and ((CASE WHEN (T1."STATUS" IN ('FG','FR','FS')) THEN ('fakturiert') ELSE ('Auftragsbestand') END) = 'Auftragsbestand'))
 order by c74 asc
 
 END SQL

System/OPTIMA/IQD/NW/nw_auftragsbestand.sql

@@ -121,7 +121,7 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 	   T14."MODEL_TEXT" as "Model Text",
 	   T14."ORIG_MODEL_CODE" as "Orig Model Code",
 	   T14."MAKE_CODE" as "Make Code",
-	   CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart_AB",
+	   CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart_AB",
 	   '1' as "Hauptbetrieb",
 	   (left(T3."DEPARTMENT_TYPE_ID",2)) as "Standort",
 	   T4."SEL_NAME" as "Verkäufer_AB",
@@ -146,7 +146,7 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 	   T16."ALLOC_DATE_GMD" as "Alloc Date Gmd_2",
 	   T16."DELIV_DATE_GMD" as "Deliv Date Gmd",
 	   (CASE WHEN (T16."EVENT_CODE_GMD" IS NULL) THEN ('Info fehlt') ELSE (T16."EVENT_CODE_GMD") END) + ' - ' + (CASE WHEN (T16."EVENT_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), month(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), day(T16."EVENT_DATE_GMD")))) END) + ' - ' + (CASE WHEN (T16."ALLOC_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), month(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), day(T16."ALLOC_DATE_GMD")))) END) + ' - ' + (CASE WHEN (T16."DELIV_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."DELIV_DATE_GMD")) + '-' + convert(varchar(50), month(T16."DELIV_DATE_GMD")) + '-' + convert(varchar(50), day(T16."DELIV_DATE_GMD")))) END) as "FZG_2(GD70)",
-	   CASE WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '10' AND '13') THEN ('Endkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '20' AND '23') THEN ('Geschäftskunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '30' AND '33') THEN ('Großkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '40' AND '43') THEN ('Vermittler') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '80' AND '80') THEN ('Händler') WHEN ((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END) = 'Gebrauchtwagen') THEN ('GW' + ' ' + CASE WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '100')) THEN ('Endkunde') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '300')) THEN ('Aufkäufer') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and (not (substring(T10."BOOK_KEEPING_CODE", 3, 3)) IN ('100','300'))) THEN ('GW Sonstige') ELSE null END) ELSE null END as "Kundenart",
+	   CASE WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '10' AND '13') THEN ('Endkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '20' AND '23') THEN ('Geschäftskunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '30' AND '33') THEN ('Großkunden') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '40' AND '43') THEN ('Vermittler') WHEN ((right(T10."BOOK_KEEPING_CODE",2)) BETWEEN '80' AND '80') THEN ('Händler') WHEN ((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END) = 'Gebrauchtwagen') THEN ('GW' + ' ' + CASE WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '100')) THEN ('Endkunde') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and ((substring(T10."BOOK_KEEPING_CODE", 3, 3)) = '300')) THEN ('Aufkäufer') WHEN ((T9."VEHICLE_TYPE" IN ('D','R')) and (not (substring(T10."BOOK_KEEPING_CODE", 3, 3)) IN ('100','300'))) THEN ('GW Sonstige') ELSE null END) ELSE null END as "Kundenart",
 	   CASE WHEN (T16."EVENT_CODE_GMD" IS NULL) THEN ('Info fehlt') ELSE (T16."EVENT_CODE_GMD") END as "Event Code Gmd",
 	   CASE WHEN (T16."EVENT_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), month(T16."EVENT_DATE_GMD")) + '-' + convert(varchar(50), day(T16."EVENT_DATE_GMD")))) END as "Event Date Gmd",
 	   CASE WHEN (T16."ALLOC_DATE_GMD" IS NULL) THEN ('Info fehlt') ELSE ((convert(varchar(50), year(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), month(T16."ALLOC_DATE_GMD")) + '-' + convert(varchar(50), day(T16."ALLOC_DATE_GMD")))) END as "Alloc Date Gmd",
@@ -156,5 +156,5 @@ select T1."ORDER_NUMBER" as "Order Number_2",
 from ((((((("OPTIMA"."import"."VEH_ORDER_HEADER" T1 left outer join "OPTIMA"."import"."VPP25" T2 on (T1."STATUS" = T2."STAT_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T3 on (T1."DEPARTMENT" = T3."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T3."CLIENT_DB")) left outer join "OPTIMA"."import"."VEH_ORDER_LINE" T8 on (T1."ORDER_NUMBER" = T8."ORDER_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP4K" T5 on (T1."FLEET_OWNER" = T5."FLEET_OWNER_CODE") and (T1."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP48" T6 on (T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP61" T7 on (T1."STOCK" = T7."STOCK") and (T1."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP5M" T10 on (T8."ACCOUNTING_CODE" = T10."BOOK_KEEPING_CODE") and (T8."CLIENT_DB" = T10."CLIENT_DB")),
 	((((((("OPTIMA"."import"."UNIT_FILE" T11 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T11."SALE_SALESMAN") and (T4."CLIENT_DB" = T11."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP5R" T9 on (T11."VEHICLE_TYPE" = T9."VEHICLE_TYPE") and (T11."CLIENT_DB" = T9."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T12 on T11."BASIS_NUMBER" = T12."BASIS_NUMBER") left outer join "OPTIMA"."import"."VPP5Q" T13 on ((T12."MODEL_LINE" = T13."MODEL_LINE") and (T12."MAKE_CD" = T13."MAKE_CD")) and (T12."CLIENT_DB" = T13."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP74" T14 on ((T12."WORKSHOP_MODEL" = T14."WORKSHOP_MODEL") and (T12."MAKE_CD" = T14."MAKE_CD")) and (T12."CLIENT_DB" = T14."CLIENT_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T15 on (T12."MAKE_CD" = T15."GLOBAL_MAKE_CD") and (T12."CLIENT_DB" = T15."CLIENT_DB")) left outer join "OPTIMA"."import"."GM_DRIVE_ORDER" T16 on (T11."UNIT_NUMBER" = T16."UNIT_NUMBER") and (T11."CLIENT_DB" = T16."CLIENT_DB"))
 where ((T8."UNIT_NUMBER" = T11."UNIT_NUMBER") and (T8."CLIENT_DB" = T11."CLIENT_DB"))
-and (((((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B','M')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R')) THEN ('Gebrauchtwagen') ELSE null END) = 'Neuwagen') and (T8."LINE_TYPE_VEH" <> 'Z')) and (T1."ORDER_DATE" >= convert(datetime, '2021-01-01 00:00:00.000'))) and ((CASE WHEN (T1."STATUS" IN ('FG','FR','FS')) THEN ('fakturiert') ELSE ('Auftragsbestand') END) = 'Auftragsbestand'))
+and (((((CASE WHEN (T9."VEHICLE_TYPE" IN ('N','T','V','B')) THEN ('Neuwagen') WHEN (T9."VEHICLE_TYPE" IN ('D','R','M')) THEN ('Gebrauchtwagen') ELSE null END) = 'Neuwagen') and (T8."LINE_TYPE_VEH" <> 'Z')) and (T1."ORDER_DATE" >= convert(datetime, '2021-01-01 00:00:00.000'))) and ((CASE WHEN (T1."STATUS" IN ('FG','FR','FS')) THEN ('fakturiert') ELSE ('Auftragsbestand') END) = 'Auftragsbestand'))
 -- order by "Unit Number_2" asc

System/OPTIMA/IQD/NW/nw_be_csv.iqd

@@ -769,7 +769,7 @@ from
 	   T1."ECC_STATUS" as c503,
 	   T1."BASIS_NUMBER" as c504
 from (((((((((("OPTIMA"."import"."UNIT_FILE" T1 left outer join "OPTIMA"."import"."vPP5R" T2 on (T1."VEHICLE_TYPE" = T2."VEHICLE_TYPE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T3 on T1."BASIS_NUMBER" = T3."BASIS_NUMBER") left outer join "OPTIMA"."import"."VPP5Q" T4 on ((T3."MODEL_LINE" = T4."MODEL_LINE") and (T3."MAKE_CD" = T4."MAKE_CD")) and (T3."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP74" T5 on ((T3."WORKSHOP_MODEL" = T5."WORKSHOP_MODEL") and (T3."MAKE_CD" = T5."MAKE_CD")) and (T3."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T6 on (T1."PURCH_DEPARTMENT" = T6."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T7 on (T3."MAKE_CD" = T7."GLOBAL_MAKE_CD") and (T3."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T8 on (T1."PURCH_SALSMAN_CODE" = T8."SELLER_CODE") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."import"."UNIT_CHANGE_HIST" T9 on ((T9."UNIT_NUMBER" = T1."UNIT_NUMBER") and (T9."DEPARTMENT" <> ' ')) and (T1."CLIENT_DB" = T9."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T1."CLIENT_DB" = T10."Hauptbetrieb") and ((od_left(T1."PURCH_DEPARTMENT",2)) = T10."Standort")) left outer join "OPTIMA"."data"."GC_Marken" T11 on (T3."CLIENT_DB" = T11."Client_DB") and (T3."MAKE_CD" = T11."Make"))
-where ((T1."ECC_STATUS" IN ('41','42','44')) and (not T1."VEHICLE_TYPE" IN ('G')))
+where ((T1."ECC_STATUS" IN ('41','44')) and (not T1."VEHICLE_TYPE" IN ('G')))
 ) D2
 ) D1
 where ((c262 = c233) or (c233 IS NULL))

System/OPTIMA/IQD/NW/nw_be_csv.sql

@@ -763,7 +763,7 @@ from
 	   T1."ECC_STATUS" as "Ecc Status",
 	   T1."BASIS_NUMBER" as "Basis Number_2"
 from (((((((((("OPTIMA"."import"."UNIT_FILE" T1 left outer join "OPTIMA"."import"."vPP5R" T2 on (T1."VEHICLE_TYPE" = T2."VEHICLE_TYPE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T3 on T1."BASIS_NUMBER" = T3."BASIS_NUMBER") left outer join "OPTIMA"."import"."VPP5Q" T4 on ((T3."MODEL_LINE" = T4."MODEL_LINE") and (T3."MAKE_CD" = T4."MAKE_CD")) and (T3."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."vPP74" T5 on ((T3."WORKSHOP_MODEL" = T5."WORKSHOP_MODEL") and (T3."MAKE_CD" = T5."MAKE_CD")) and (T3."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T6 on (T1."PURCH_DEPARTMENT" = T6."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T7 on (T3."MAKE_CD" = T7."GLOBAL_MAKE_CD") and (T3."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T8 on (T1."PURCH_SALSMAN_CODE" = T8."SELLER_CODE") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."import"."UNIT_CHANGE_HIST" T9 on ((T9."UNIT_NUMBER" = T1."UNIT_NUMBER") and (T9."DEPARTMENT" <> ' ')) and (T1."CLIENT_DB" = T9."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T1."CLIENT_DB" = T10."Hauptbetrieb") and ((left(T1."PURCH_DEPARTMENT",2)) = T10."Standort")) left outer join "OPTIMA"."data"."GC_Marken" T11 on (T3."CLIENT_DB" = T11."Client_DB") and (T3."MAKE_CD" = T11."Make"))
-where ((T1."ECC_STATUS" IN ('41','42','44')) and (not T1."VEHICLE_TYPE" IN ('G')))
+where ((T1."ECC_STATUS" IN ('41','44')) and (not T1."VEHICLE_TYPE" IN ('G')))
 ) D2
 ) D1
 where ((c262 = "Unique Ident_unique_change_history") or ("Unique Ident_unique_change_history" IS NULL))

System/OPTIMA/IQD/NW/nw_gw_vk_csv.iqd

@@ -544,17 +544,17 @@ from
 from 
 (select T1."UNIT_NUMBER" as c185,
 	   (rtrim(T1."UNIT_NUMBER")) || ' - ' || (rtrim(T16."Standort_Name")) || ' - ' || (truncate((CASE WHEN (T1."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T1."VEHICLE_TYPE" || ' - ' || T2."VEHICLE_TYPE_TEXT") END))) || ' - ' || (rtrim(T5."SEL_NAME")) || ' - ' || (rtrim(((rtrim(T6."CUSTOMER_NUMBER")) || ' - ' || (rtrim(T6."NAME"))))) as c186,
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('10','12','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('14')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - ((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as c187,
-	   (((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END))) as c188,
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('14')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as c189,
-	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('10','12','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END)) as c190,
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('10','14','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93','92')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('12')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - ((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as c187,
+	   (((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END))) as c188,
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('12')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as c189,
+	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('10','14','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END)) as c190,
 	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as c191,
 	   T1."PREV_OWNER" as c192,
 	   (rtrim((cast_numberToString(cast_integer(T13."DOCUMENT_NR"))))) || ' - ' || T13."TRANSACTION_CODE" || ' - ' || T13."REFERENCE" as c193,
 	   T12."SEL_NAME" as c194,
 	   (rtrim(T12."SEL_NAME")) || ' / ' || T1."PREV_OWNER" as c195,
 	   CASE WHEN (T11."Order_By" IS NULL) THEN (1) ELSE (T11."Order_By") END as c196,
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as c197,
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93','92')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as c197,
 	   T6."ZIPCODE" as c198,
 	   (substring(T6."ZIPCODE" from 1 for 4)) as c199,
 	   (substring(T6."ZIPCODE" from 1 for 3)) as c200,
@@ -576,7 +576,7 @@ from
 	   CASE WHEN (T10."DESCRIPTION" IN ('Opel')) THEN (T10."DESCRIPTION") ELSE ('Fremdfabrikat') END as c216,
 	   CASE WHEN (T1."RECEPTION_DATE" IS NULL) THEN ((extract(DAY FROM T1."SALE_DATE" - T1."PURCH_DATE"))) ELSE ((extract(DAY FROM T1."SALE_DATE" - T1."RECEPTION_DATE"))) END as c217,
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('26','27','28','29','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as c218,
-	   CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as c219,
+	   CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as c219,
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as c220,
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as c221,
 	   T13."INT_VOUCHER_NO" as c222,
@@ -612,7 +612,7 @@ from
 	   T6."CUSTOMER_GROUP" || ' - ' || T7."CUST_GROUP_SPECIFY" as c252,
 	   (rtrim(T6."CUSTOMER_NUMBER")) || ' - ' || (rtrim(T6."NAME")) as c253,
 	   CASE WHEN (T1."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T1."VEHICLE_TYPE" || ' - ' || T2."VEHICLE_TYPE_TEXT") END as c254,
-	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','W','M','V','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','G','K','R')) THEN ('Gebrauchtwagen') ELSE null END as c255,
+	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','W','V','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','G','K','R','M')) THEN ('Gebrauchtwagen') ELSE null END as c255,
 	   T8."CHASSIS_NUMBER" as c256,
 	   CASE WHEN ((CASE WHEN (T11."Fabrikat" IS NULL) THEN ('Fremdfabrikat') ELSE (T11."Fabrikat") END) = 'Fremdfabrikat') THEN (T8."MODEL_TEXT") ELSE (T9."MOD_LIN_SPECIFY") END as c257,
 	   T10."DESCRIPTION" as c258,

System/OPTIMA/IQD/NW/nw_gw_vk_csv.sql

@@ -538,17 +538,17 @@ from
 from 
 (select T1."UNIT_NUMBER" as "Unit Number",
 	   (rtrim(T1."UNIT_NUMBER")) + ' - ' + (rtrim(T16."Standort_Name")) + ' - ' + (rtrim((CASE WHEN (T1."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T1."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END))) + ' - ' + (rtrim(T5."SEL_NAME")) + ' - ' + (rtrim(((rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME"))))) as "FZG_Detail",
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('10','12','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('14')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - ((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "DB1",
-	   (((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END))) as "Einsatz",
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('14')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Ums. Fracht und Überf.",
-	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('10','12','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END)) as "Erlös",
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('10','14','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93','92')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('12')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - (CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) - ((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "DB1",
+	   (((CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END) + (CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END))) as "Einsatz",
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('12')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Ums. Fracht und Überf.",
+	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('10','14','24')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END)) as "Erlös",
 	   ((CASE WHEN (T13."TRANSACTION_CODE" IN ('13')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END)) as "Provisionen",
 	   T1."PREV_OWNER" as "Prev Owner",
 	   (rtrim((((T13."DOCUMENT_NR"))))) + ' - ' + T13."TRANSACTION_CODE" + ' - ' + T13."REFERENCE" as "Buch_Text",
 	   T12."SEL_NAME" as "Sel Name_EK_vpp43",
 	   (rtrim(T12."SEL_NAME")) + ' / ' + T1."PREV_OWNER" as "Einkäufer/Vorbesitzer",
 	   CASE WHEN (T11."Order_By" IS NULL) THEN (1) ELSE (T11."Order_By") END as "Order By",
-	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Sonst. Erlöse",
+	   (CASE WHEN (T13."TRANSACTION_CODE" IN ('15','16','18','19','90','91','93','92')) THEN (T13."ORDERS_GROSSVALUE" * -1) ELSE (0) END) as "Sonst. Erlöse",
 	   T6."ZIPCODE" as "Zipcode",
 	   (substring(T6."ZIPCODE", 1, 4)) as "PLZ_4",
 	   (substring(T6."ZIPCODE", 1, 3)) as "PLZ_3",
@@ -570,7 +570,7 @@ from
 	   CASE WHEN (T10."DESCRIPTION" IN ('Opel')) THEN (T10."DESCRIPTION") ELSE ('Fremdfabrikat') END as "Fabrikat_manuell",
 	   CASE WHEN (T1."RECEPTION_DATE" IS NULL) THEN ((day(T1."SALE_DATE" - T1."PURCH_DATE"))) ELSE ((day(T1."SALE_DATE" - T1."RECEPTION_DATE"))) END as "Standtage",
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('26','27','28','29','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "VK_Hilfen",
-	   CASE WHEN (T13."TRANSACTION_CODE" IN ('37 ','39 ','40 ','41 ','47 ','49 ','50','51','59','61','63','67','69','70 ','75 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "FZG-Kosten",
+	   CASE WHEN (T13."TRANSACTION_CODE" IN ('59','37','39','40','41','47','49')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "FZG-Kosten",
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('25 ','26 ','27 ','28 ','29 ','30','31','32','33','17')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "EK Fahrzeug",
 	   CASE WHEN (T13."TRANSACTION_CODE" IN ('11 ')) THEN (T13."ORDERS_GROSSVALUE") ELSE (0) END as "Nachlass",
 	   T13."INT_VOUCHER_NO" as "Int Voucher No",
@@ -606,7 +606,7 @@ from
 	   T6."CUSTOMER_GROUP" + ' - ' + T7."CUST_GROUP_SPECIFY" as "Kundenart",
 	   (rtrim(T6."CUSTOMER_NUMBER")) + ' - ' + (rtrim(T6."NAME")) as "Kunde",
 	   CASE WHEN (T1."VEHICLE_TYPE" IS NULL) THEN (T1."VEHICLE_TYPE") ELSE (T1."VEHICLE_TYPE" + ' - ' + T2."VEHICLE_TYPE_TEXT") END as "Fahrzeugtyp",
-	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','W','M','V','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','G','K','R')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
+	   CASE WHEN (T1."VEHICLE_TYPE" IN ('N','T','W','V','B')) THEN ('Neuwagen') WHEN (T1."VEHICLE_TYPE" IN ('D','G','K','R','M')) THEN ('Gebrauchtwagen') ELSE null END as "Fahrzeugart",
 	   T8."CHASSIS_NUMBER" as "Chassis Number",
 	   CASE WHEN ((CASE WHEN (T11."Fabrikat" IS NULL) THEN ('Fremdfabrikat') ELSE (T11."Fabrikat") END) = 'Fremdfabrikat') THEN (T8."MODEL_TEXT") ELSE (T9."MOD_LIN_SPECIFY") END as "Model",
 	   T10."DESCRIPTION" as "Description_Global_Make",

System/OPTIMA/IQD/OP/OP_AS.iqd

@@ -178,7 +178,7 @@ from
 	   T5."SEL_DEPARTMENT" as c77,
 	   '1' as c78,
 	   (od_left(T3."DEPARTMENT",2)) as c79,
-	   CASE WHEN (T1."STATUS" LIKE '3%') THEN ('3') ELSE ('4') END as c80,
+	   (substring(T3."DEPARTMENT" from 4 for 1)) as c80,
 	   T6."CUSTOMER_NUMBER" as c81,
 	   T6."NAME" as c82,
 	   (now()) as c83,
@@ -188,7 +188,7 @@ from
 	   T6."NAME" || ' - ' || T6."CUSTOMER_NUMBER" as c87,
 	   (asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2)) as c88,
 	   (cast_numberToString(cast_integer(T3."INVOICE_NUMBER"))) as c89,
-	   (substring((od_left(((cast_numberToString(cast_integer(T3."INVOICE_NUMBER")))),7)) || ' - ' || ((od_left(T1."COMMENT_CU",50))) || ' - ' || ((asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2))) || ' - MS: ' || T1."DUNTIMES" from 1 for 100)) as c90,
+	   (substring((od_left(((cast_numberToString(cast_integer(T3."INVOICE_NUMBER")))),7)) || ' - ' || ((od_left(T1."COMMENT_CU",50))) || ' - ' || ((asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2))) || ' - MS: ' || T1."DUNTIMES" from 1 for 100)) || ' - ' || (cast_numberToString(cast_integer(T3."ORDER_NUMBER"))) as c90,
 	   '1' as c91,
 	   T7."Hauptbetrieb_Name" as c92,
 	   ((od_left(T3."DEPARTMENT",2))) as c93,

System/OPTIMA/IQD/OP/OP_FZG.iqd

@@ -83,7 +83,7 @@ select T1."CUSTOMER_NUMBER" as c1,
 	   T5."SEL_DEPARTMENT" as c77,
 	   '1' as c78,
 	   (od_left(T3."DEPARTMENT",2)) as c79,
-	   (substring(T3."DEPARTMENT" from 3 for 1)) as c80,
+	   (substring(T3."DEPARTMENT" from 4 for 1)) as c80,
 	   T6."CUSTOMER_NUMBER" as c81,
 	   T6."NAME" as c82,
 	   (now()) as c83,
@@ -93,7 +93,7 @@ select T1."CUSTOMER_NUMBER" as c1,
 	   T6."NAME" || ' - ' || T6."CUSTOMER_NUMBER" as c87,
 	   (asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2)) as c88,
 	   (cast_numberToString(cast_integer(T1."VOUCHER_NO"))) as c89,
-	   CASE WHEN ((T2."NAME" || ' - ' || T1."CUSTOMER_NUMBER") = (T6."NAME" || ' - ' || T6."CUSTOMER_NUMBER")) THEN ((substring((od_left(((cast_numberToString(cast_integer(T1."VOUCHER_NO")))),7)) || ' - ' || (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((od_left(T1."COMMENT_CU",100))) END) || ' - ' || ((asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2))) || ' - MS: ' || T1."DUNTIMES" from 1 for 100))) ELSE ((substring((rtrim(T6."NAME")) || ' - ' || (od_left(((cast_numberToString(cast_integer(T1."VOUCHER_NO")))),7)) || ' - ' || (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((od_left(T1."COMMENT_CU",100))) END) || ' - ' || ((asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2))) || ' - MS: ' || T1."DUNTIMES" from 1 for 100))) END as c90,
+	   CASE WHEN ((T2."NAME" || ' - ' || T1."CUSTOMER_NUMBER") = (T6."NAME" || ' - ' || T6."CUSTOMER_NUMBER")) THEN ((substring((od_left(((cast_numberToString(cast_integer(T1."VOUCHER_NO")))),7)) || ' - ' || (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((od_left(T1."COMMENT_CU",100))) END) || ' - ' || ((asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2))) || ' - MS: ' || T1."DUNTIMES" from 1 for 100))) ELSE ((substring((rtrim(T6."NAME")) || ' - ' || (od_left(((cast_numberToString(cast_integer(T1."VOUCHER_NO")))),7)) || ' - ' || (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((od_left(T1."COMMENT_CU",100))) END) || ' - ' || ((asciiz(extract(YEAR FROM T1."BOOKKEEP_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."BOOKKEEP_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."BOOKKEEP_DATE"),2))) || ' - MS: ' || T1."DUNTIMES" from 1 for 100))) END || ' - ' || (cast_numberToString(cast_integer(T3."ORDER_NUMBER"))) as c90,
 	   '1' as c91,
 	   T7."Hauptbetrieb_Name" as c92,
 	   ((od_left(T3."DEPARTMENT",2))) as c93,

System/OPTIMA/IQD/OP/op_as.sql

@@ -172,7 +172,7 @@ from
 	   T5."SEL_DEPARTMENT" as "Sel Department",
 	   '1' as "Hauptbetrieb",
 	   (left(T3."DEPARTMENT",2)) as "Standort",
-	   CASE WHEN (T1."STATUS" LIKE '3%') THEN ('3') ELSE ('4') END as "Kostenstelle",
+	   (substring(T3."DEPARTMENT", 4, 1)) as "Kostenstelle",
 	   T6."CUSTOMER_NUMBER" as "Customer Number_Deliv",
 	   T6."NAME" as "Name_Deliv",
 	   (getdate()) as "Heute",
@@ -182,7 +182,7 @@ from
 	   T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER" as "Lieferkunde",
 	   (convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE"))) as "Datum_Zeichen",
 	   (((T3."INVOICE_NUMBER"))) as "Voucher_Zeichen",
-	   (substring((left(((((T3."INVOICE_NUMBER")))),7)) + ' - ' + ((left(T1."COMMENT_CU",50))) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100)) as "Beleg",
+	   (substring((left(((((T3."INVOICE_NUMBER")))),7)) + ' - ' + ((left(T1."COMMENT_CU",50))) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100)) + ' - ' + (((T3."ORDER_NUMBER"))) as "Beleg",
 	   '1' as "Hauptbetrieb_ID",
 	   T7."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   ((left(T3."DEPARTMENT",2))) as "Standort_ID_",

System/OPTIMA/IQD/OP/op_fzg.sql

@@ -77,7 +77,7 @@ select T1."CUSTOMER_NUMBER" as "Customer Number_2",
 	   T5."SEL_DEPARTMENT" as "Sel Department",
 	   '1' as "Hauptbetrieb",
 	   (left(T3."DEPARTMENT",2)) as "Standort",
-	   (substring(T3."DEPARTMENT", 3, 1)) as "Kostenstelle",
+	   (substring(T3."DEPARTMENT", 4, 1)) as "Kostenstelle",
 	   T6."CUSTOMER_NUMBER" as "Customer Number_Deliv",
 	   T6."NAME" as "Name_Deliv",
 	   (getdate()) as "Heute",
@@ -87,7 +87,7 @@ select T1."CUSTOMER_NUMBER" as "Customer Number_2",
 	   T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER" as "Lieferkunde",
 	   (convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE"))) as "Datum_Zeichen",
 	   (((T1."VOUCHER_NO"))) as "Voucher_Zeichen",
-	   CASE WHEN ((T2."NAME" + ' - ' + T1."CUSTOMER_NUMBER") = (T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER")) THEN ((substring((left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) ELSE ((substring((rtrim(T6."NAME")) + ' - ' + (left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) END as "Beleg",
+	   CASE WHEN ((T2."NAME" + ' - ' + T1."CUSTOMER_NUMBER") = (T6."NAME" + ' - ' + T6."CUSTOMER_NUMBER")) THEN ((substring((left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) ELSE ((substring((rtrim(T6."NAME")) + ' - ' + (left(((((T1."VOUCHER_NO")))),7)) + ' - ' + (CASE WHEN (T1."VOUCHER_NO" = 3271990) THEN (' - ') ELSE ((left(T1."COMMENT_CU",100))) END) + ' - ' + ((convert(varchar(50), year(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), month(T1."BOOKKEEP_DATE")) + '-' + convert(varchar(50), day(T1."BOOKKEEP_DATE")))) + ' - MS: ' + T1."DUNTIMES", 1, 100))) END + ' - ' + (((T3."ORDER_NUMBER"))) as "Beleg",
 	   '1' as "Hauptbetrieb_ID",
 	   T7."Hauptbetrieb_Name" as "Hauptbetrieb_Name",
 	   ((left(T3."DEPARTMENT",2))) as "Standort_ID_",

System/OPTIMA/IQD/Serv_Teile/offene_auftraege_csv.iqd

@@ -5,169 +5,169 @@ DATASOURCENAME,C:\GlobalCube\System\OPTIMA\IQD\serv_teile\offene_auftraege_csv.i
 TITLE,offene_auftraege_csv.imr
 BEGIN SQL
 select c172 as c1,
-	   c327 as c2,
-	   c326 as c3,
-	   c325 as c4,
-	   c324 as c5,
-	   c323 as c6,
-	   c322 as c7,
-	   c321 as c8,
-	   c320 as c9,
-	   c319 as c10,
-	   c318 as c11,
-	   c317 as c12,
-	   c316 as c13,
-	   c315 as c14,
-	   c314 as c15,
+	   c326 as c2,
+	   c325 as c3,
+	   c324 as c4,
+	   c323 as c5,
+	   c322 as c6,
+	   c321 as c7,
+	   c320 as c8,
+	   c319 as c9,
+	   c318 as c10,
+	   c317 as c11,
+	   c316 as c12,
+	   c315 as c13,
+	   c314 as c14,
+	   c313 as c15,
 	   c178 as c16,
-	   c313 as c17,
-	   c312 as c18,
-	   c311 as c19,
-	   c310 as c20,
-	   c309 as c21,
-	   c308 as c22,
-	   c307 as c23,
-	   c306 as c24,
-	   c305 as c25,
-	   c304 as c26,
-	   c303 as c27,
-	   c302 as c28,
-	   c301 as c29,
-	   c300 as c30,
-	   c299 as c31,
-	   c298 as c32,
-	   c297 as c33,
-	   c296 as c34,
-	   c295 as c35,
-	   c294 as c36,
-	   c293 as c37,
-	   c292 as c38,
-	   c291 as c39,
-	   c290 as c40,
-	   c289 as c41,
-	   c288 as c42,
-	   c287 as c43,
-	   c286 as c44,
-	   c285 as c45,
-	   c284 as c46,
-	   c283 as c47,
-	   c282 as c48,
-	   c281 as c49,
-	   c280 as c50,
-	   c279 as c51,
-	   c278 as c52,
-	   c277 as c53,
-	   c276 as c54,
-	   c275 as c55,
-	   c274 as c56,
-	   c273 as c57,
-	   c272 as c58,
-	   c271 as c59,
-	   c270 as c60,
-	   c269 as c61,
-	   c268 as c62,
-	   c267 as c63,
-	   c266 as c64,
-	   c265 as c65,
-	   c264 as c66,
-	   c263 as c67,
-	   c262 as c68,
-	   c261 as c69,
-	   c260 as c70,
-	   c259 as c71,
-	   c258 as c72,
-	   c257 as c73,
-	   c256 as c74,
-	   c255 as c75,
-	   c254 as c76,
-	   c253 as c77,
-	   c252 as c78,
-	   c251 as c79,
-	   c250 as c80,
-	   c249 as c81,
-	   c248 as c82,
-	   c247 as c83,
-	   c246 as c84,
-	   c245 as c85,
-	   c244 as c86,
-	   c243 as c87,
-	   c242 as c88,
-	   c241 as c89,
-	   c240 as c90,
-	   c239 as c91,
-	   c238 as c92,
-	   c237 as c93,
-	   c236 as c94,
-	   c235 as c95,
-	   c234 as c96,
-	   c233 as c97,
-	   c232 as c98,
-	   c231 as c99,
-	   c230 as c100,
-	   c192 as c101,
-	   c193 as c102,
-	   c194 as c103,
-	   c229 as c104,
-	   c228 as c105,
-	   c227 as c106,
-	   c226 as c107,
-	   c225 as c108,
-	   c224 as c109,
-	   c223 as c110,
-	   c202 as c111,
-	   c222 as c112,
-	   c221 as c113,
-	   c220 as c114,
-	   c219 as c115,
-	   c218 as c116,
-	   c217 as c117,
-	   c201 as c118,
-	   c216 as c119,
-	   c215 as c120,
-	   c214 as c121,
-	   c213 as c122,
-	   c212 as c123,
+	   c312 as c17,
+	   c311 as c18,
+	   c310 as c19,
+	   c309 as c20,
+	   c308 as c21,
+	   c307 as c22,
+	   c306 as c23,
+	   c305 as c24,
+	   c304 as c25,
+	   c303 as c26,
+	   c302 as c27,
+	   c301 as c28,
+	   c300 as c29,
+	   c299 as c30,
+	   c298 as c31,
+	   c297 as c32,
+	   c296 as c33,
+	   c295 as c34,
+	   c294 as c35,
+	   c293 as c36,
+	   c292 as c37,
+	   c291 as c38,
+	   c290 as c39,
+	   c289 as c40,
+	   c288 as c41,
+	   c287 as c42,
+	   c286 as c43,
+	   c285 as c44,
+	   c284 as c45,
+	   c283 as c46,
+	   c282 as c47,
+	   c281 as c48,
+	   c280 as c49,
+	   c279 as c50,
+	   c278 as c51,
+	   c277 as c52,
+	   c276 as c53,
+	   c275 as c54,
+	   c274 as c55,
+	   c273 as c56,
+	   c272 as c57,
+	   c271 as c58,
+	   c270 as c59,
+	   c269 as c60,
+	   c268 as c61,
+	   c267 as c62,
+	   c266 as c63,
+	   c265 as c64,
+	   c264 as c65,
+	   c263 as c66,
+	   c262 as c67,
+	   c261 as c68,
+	   c260 as c69,
+	   c259 as c70,
+	   c258 as c71,
+	   c257 as c72,
+	   c256 as c73,
+	   c255 as c74,
+	   c254 as c75,
+	   c253 as c76,
+	   c252 as c77,
+	   c251 as c78,
+	   c250 as c79,
+	   c249 as c80,
+	   c248 as c81,
+	   c247 as c82,
+	   c246 as c83,
+	   c245 as c84,
+	   c244 as c85,
+	   c243 as c86,
+	   c242 as c87,
+	   c241 as c88,
+	   c240 as c89,
+	   c239 as c90,
+	   c238 as c91,
+	   c237 as c92,
+	   c236 as c93,
+	   c235 as c94,
+	   c234 as c95,
+	   c233 as c96,
+	   c232 as c97,
+	   c231 as c98,
+	   c230 as c99,
+	   c229 as c100,
+	   c191 as c101,
+	   c192 as c102,
+	   c193 as c103,
+	   c228 as c104,
+	   c227 as c105,
+	   c226 as c106,
+	   c225 as c107,
+	   c224 as c108,
+	   c223 as c109,
+	   c222 as c110,
+	   c201 as c111,
+	   c221 as c112,
+	   c220 as c113,
+	   c219 as c114,
+	   c218 as c115,
+	   c217 as c116,
+	   c216 as c117,
+	   c200 as c118,
+	   c215 as c119,
+	   c214 as c120,
+	   c213 as c121,
+	   c212 as c122,
+	   c211 as c123,
 	   12 as c124,
-	   c211 as c125,
-	   c210 as c126,
-	   c209 as c127,
-	   c208 as c128,
-	   c207 as c129,
-	   c206 as c130,
-	   c205 as c131,
-	   c204 as c132,
-	   c203 as c133,
-	   c202 as c134,
-	   c201 as c135,
-	   c200 as c136,
-	   c199 as c137,
-	   c198 as c138,
-	   c197 as c139,
-	   c196 as c140,
-	   c195 as c141,
-	   c194 as c142,
-	   c193 as c143,
-	   c192 as c144,
-	   c191 as c145,
-	   c190 as c146,
-	   c189 as c147,
-	   c188 as c148,
-	   c187 as c149,
-	   c186 as c150,
-	   c185 as c151,
-	   c184 as c152,
-	   c183 as c153,
-	   c182 as c154,
-	   c181 as c155,
+	   c210 as c125,
+	   c209 as c126,
+	   c208 as c127,
+	   c207 as c128,
+	   c206 as c129,
+	   c205 as c130,
+	   c204 as c131,
+	   c203 as c132,
+	   c202 as c133,
+	   c201 as c134,
+	   c200 as c135,
+	   c199 as c136,
+	   c198 as c137,
+	   c197 as c138,
+	   c196 as c139,
+	   c195 as c140,
+	   c194 as c141,
+	   c193 as c142,
+	   c192 as c143,
+	   c191 as c144,
+	   c190 as c145,
+	   c189 as c146,
+	   c188 as c147,
+	   c187 as c148,
+	   c186 as c149,
+	   c185 as c150,
+	   c184 as c151,
+	   c183 as c152,
+	   c182 as c153,
+	   c181 as c154,
+	   '' as c155,
 	   c177 as c156,
 	   c180 as c157,
 	   c179 as c158,
 	   1 as c159,
-	   XCOUNT(c326 for c172) as c160,
-	   1 / (XCOUNT(c326 for c172)) as c161,
+	   XCOUNT(c325 for c172) as c160,
+	   1 / (XCOUNT(c325 for c172)) as c161,
 	   c178 as c162,
 	   c177 as c163,
-	   (c177) / (XCOUNT(c326 for c172)) as c164,
+	   (c177) / (XCOUNT(c325 for c172)) as c164,
 	   c176 as c165,
 	   c175 as c166,
 	   c174 as c167,
@@ -181,156 +181,155 @@ from
 	   (extract(DAY FROM (now()) - T1."ORDER_DATE")) as c177,
 	   T1."ORDER_DATE" as c178,
 	   CASE WHEN (T9."Fabrikat" IS NULL) THEN ('Fremd') ELSE (T9."Fabrikat") END as c179,
-	   (od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) || ' - ' || T1."NAME"))) || ' - ' || T1."REGISTER_NUMBER" as c180,
-	   (od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || (substring((asciiz(extract(YEAR FROM T1."ORDER_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."ORDER_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."ORDER_DATE"),2)) from 1 for 10)) || ' - ' || T1."DELIVERY_ACCOUNT" || T1."NAME" || ' - ' || T1."REGISTER_NUMBER" || ' - ' || T1."STATUS" as c181,
-	   (od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || (substring((asciiz(extract(YEAR FROM T1."ORDER_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."ORDER_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."ORDER_DATE"),2)) from 1 for 10)) || ' - ' || (rtrim(T1."DELIVERY_ACCOUNT")) || ' ' || T1."NAME" || ' - ' || (rtrim(T1."REGISTER_NUMBER")) || ' - ' || T1."STATUS" as c182,
-	   T1."BASIS_NUMBER" || ' - ' || T1."CHASSIS_NUMBER" as c183,
-	   T11."MOD_LIN_SPECIFY" as c184,
-	   T10."DESCRIPTION" as c185,
-	   T10."GLOBAL_MAKE_CD" as c186,
-	   T2."USED_TIME_INT" * 12 as c187,
-	   T2."EST_TIME_INT" * 12 as c188,
-	   (rtrim(T1."DEBIT_ACCOUNT")) || ' - ' || T1."NAME" as c189,
-	   T2."INV_TIME_INT" * 12 as c190,
-	   CASE WHEN (T2."ORDER_LINETYPE" = '3') THEN (T2."LINES_NET_VALUE") ELSE null END as c191,
-	   T2."USED_TIME_INT" as c192,
-	   T2."EST_TIME_INT" as c193,
-	   T2."INV_TIME_INT" as c194,
-	   CASE WHEN (T1."STATUS" IN ('35','37','39','47','49','34','36')) THEN ('Rechnung/Gutschrift') WHEN (T1."STATUS" IN ('30','40','32')) THEN ('offen') WHEN (T1."STATUS" IN ('41','31')) THEN ('Kostenvoranschlag') ELSE null END as c195,
-	   CASE WHEN ((T2."ORDER_LINETYPE" = '1') and (T1."STATUS" BETWEEN '30' AND '39')) THEN (T2."LINES_NET_VALUE") ELSE null END as c196,
-	   CASE WHEN (T2."INV_TIME" <> 0) THEN (T2."LINES_NET_VALUE") ELSE null END as c197,
-	   CASE WHEN ((T2."ORDER_LINETYPE" = '1') and (T1."STATUS" BETWEEN '40' AND '49')) THEN (T2."LINES_NET_VALUE") ELSE null END as c198,
-	   T1."STATUS" || ' - ' || T3."STAT_SPECIFY" as c199,
-	   CASE WHEN (T1."STATUS" BETWEEN '30' AND '39') THEN ('Teile') WHEN (T1."STATUS" BETWEEN '40' AND '49') THEN ('Service') WHEN (T1."STATUS" = '70') THEN ('sonst. Auftrag') WHEN (T1."STATUS" = '91') THEN ('Anfrage') ELSE null END as c200,
-	   T7."SEL_NAME" as c201,
-	   T5."SEL_NAME" as c202,
-	   T1."PMT_TERM" || ' - ' || T1."PAYMENT_TEXT" as c203,
-	   CASE WHEN (T1."CUSTOMER_GROUP" BETWEEN '10' AND '59') THEN ('extern') WHEN (T1."CUSTOMER_GROUP" IN ('91','92','60','70')) THEN ('GWL') WHEN (((T1."CUSTOMER_GROUP" IN ('99')) or (T1."PMT_TERM" = 'IN')) or ((od_left(T1."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as c204,
-	   T6."CUSTOMER_GROUP" || ' - ' || T6."CUST_GROUP_SPECIFY" as c205,
-	   T4."DEPARTMENT_TYPE_ID" || ' - ' || T4."DESCRIPTION" as c206,
-	   CASE WHEN (((od_left(T1."DEPARTMENT",2))) IN ('05','09','111','06','08','01','10','14','12','03','04','02')) THEN ('1') ELSE ((substring(T1."DEPARTMENT" from 2 for 1))) END as c207,
-	   (od_left(T1."DEPARTMENT",2)) as c208,
-	   T1."CLIENT_DB" as c209,
-	   T8."REPAIR_GRP_SPECIFY" as c210,
-	   T9."Fabrikat" as c211,
-	   T8."MAKE_CD" as c212,
-	   T8."REPAIR_GROUP" as c213,
-	   T7."SEL_FAMILY_NAME" as c214,
-	   T7."SEL_FIRST_NAME" as c215,
-	   T7."SEL_DEPARTMENT" as c216,
-	   T7."SELLER_CODE" as c217,
-	   T6."CUST_GROUP_SPECIFY" as c218,
-	   T6."CUSTOMER_GROUP" as c219,
-	   T5."SEL_FAMILY_NAME" as c220,
-	   T5."SEL_FIRST_NAME" as c221,
-	   T5."SEL_DEPARTMENT" as c222,
-	   T5."SELLER_CODE" as c223,
-	   T4."DESCRIPTION" as c224,
-	   T4."DEPARTMENT_TYPE_ID" as c225,
-	   T3."STAT_SPECIFY" as c226,
-	   T3."STAT_CODE" as c227,
-	   T2."UNIQUE_IDENT" as c228,
-	   T2."MAKE_TIME_UNIT" as c229,
-	   T2."INV_TIME" as c230,
-	   T2."EST_TIME" as c231,
-	   T2."USED_TIME" as c232,
-	   T2."REPAIR_NAME" as c233,
-	   T2."REPAIR_GROUP" as c234,
-	   T2."REPAIR_CODE" as c235,
-	   T2."LINE_COSTS" as c236,
-	   T2."DELIVERY_QUANTITY" as c237,
-	   T2."ORDER_QUANTITY" as c238,
-	   T2."PROD_NAME" as c239,
-	   T2."PRODUCT_GROUP" as c240,
-	   T2."MAKE_CD" as c241,
-	   T2."PROD_CODE" as c242,
-	   T2."LINES_NET_VALUE" as c243,
-	   T2."STDPRICE" as c244,
-	   T2."DISCOUNT" as c245,
-	   T2."SALESMAN" as c246,
-	   T2."MECHANIC_CODE" as c247,
-	   T2."REDUCTION_AMOUNT" as c248,
-	   T2."REDUCTION_CODE" as c249,
-	   T2."ORDER_LINETYPE" as c250,
-	   T2."LINE_NUMBER" as c251,
-	   T2."ORDER_NUMBER" as c252,
-	   T1."UNIQUE_IDENT" as c253,
-	   T1."CONV_FLAG" as c254,
-	   T1."ACTUAL_INV_DATE_TIME" as c255,
-	   T1."FHG_REPORT" as c256,
-	   T1."LDC_ORDER" as c257,
-	   T1."USE_PARTS_PRE_PICKING" as c258,
-	   T1."REF_IDENT_SALES_CLASS" as c259,
-	   T1."REF_IDENT_INV_TOTAL" as c260,
-	   T1."COMMISSION_SALESMAN" as c261,
-	   T1."WORKSHOP_TEAM" as c262,
-	   T1."CHASSIS_NUMBER" as c263,
-	   T1."TRANSFER_MAKE_CD" as c264,
-	   T1."YEAR_MODEL" as c265,
-	   T1."MAKE_CD" as c266,
-	   T1."FAC_MODEL_CODE_S" as c267,
-	   T1."END_TIME" as c268,
-	   T1."END_DATE" as c269,
-	   T1."ARRIVAL_DATE" as c270,
-	   T1."ARRIVAL_TIME" as c271,
-	   T1."SPLIT_COUNTER" as c272,
-	   T1."WORKSHOP_PRICECODE" as c273,
-	   T1."MODEL_TEXT" as c274,
-	   T1."BOL_TAX_SHARE" as c275,
-	   T1."EXPECTED_ORDER_TIM" as c276,
-	   T1."REFERENCE_NUMBER" as c277,
-	   T1."DISCOUNT_LIMIT" as c278,
-	   T1."MAIL_ADDR" as c279,
-	   T1."ZIPCODE" as c280,
-	   T1."ADDR_2" as c281,
-	   T1."STREET_ADDR" as c282,
-	   T1."NAME" as c283,
-	   T1."TITLE" as c284,
-	   T1."SALES_TAX_FREE" as c285,
-	   T1."INVOICE_CHARGE" as c286,
-	   T1."INVOICE_ROUNDED" as c287,
-	   T1."INVOICE_DISC_PERC" as c288,
-	   T1."SALES_CLASS_NUMBER" as c289,
-	   T1."PREV_STATUS" as c290,
-	   T1."MILEAGE" as c291,
-	   T1."BASIS_NUMBER" as c292,
-	   T1."INVOICE_COPY_CODE" as c293,
-	   T1."SMALL_ACCESSORIES" as c294,
-	   T1."CUSTOMER_GROUP" as c295,
-	   T1."INTERNAL_CODE" as c296,
-	   T1."PLACE_CODE" as c297,
-	   T1."STOCK" as c298,
-	   T1."MISC_ADDS" as c299,
-	   T1."PRICE_CODE" as c300,
-	   T1."DISCOUNT_AMOUNT" as c301,
-	   T1."TAX_SHARE" as c302,
-	   T1."ORDERS_GROSSVALUE" as c303,
-	   T1."PURCH_TAX" as c304,
-	   T1."COSTS" as c305,
-	   T1."PAYMENT_TEXT" as c306,
-	   T1."DUEDATE_1" as c307,
-	   T1."NEXT_LINE_NUMBER" as c308,
-	   T1."PMT_TERM" as c309,
-	   T1."TAX_PERC" as c310,
-	   T1."TAX_CODE" as c311,
-	   T1."INVOICE_DATE" as c312,
-	   T1."DELIVERY_DATE" as c313,
-	   T1."DEBIT_PERM" as c314,
-	   T1."SALESMAN" as c315,
-	   T1."DEBET_DEPARTMENT" as c316,
-	   T1."DEPARTMENT" as c317,
-	   T1."DELIVERY_ACCOUNT" as c318,
-	   T1."HANDLER" as c319,
-	   T1."TRANSACT_DATE" as c320,
-	   T1."STATE_CODE" as c321,
-	   T1."WORKSHOP_MODEL" as c322,
-	   T1."INVOICE_NUMBER" as c323,
-	   T1."DEBIT_ACCOUNT" as c324,
-	   T1."STATE_KEY_DATE" as c325,
-	   T1."STATUS" as c326,
-	   T1."REGISTER_NUMBER" as c327
+	   CASE WHEN (T1."ORDER_NUMBER" IN (3502817)) THEN ((od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) || ' - ' || T1."NAME")))) ELSE ((od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) || ' - ' || T1."NAME"))) || ' - ' || T1."REGISTER_NUMBER") END as c180,
+	   CASE WHEN (T1."ORDER_NUMBER" IN (3502817)) THEN ((od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || (substring((asciiz(extract(YEAR FROM T1."ORDER_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."ORDER_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."ORDER_DATE"),2)) from 1 for 10)) || ' - ' || (rtrim(T1."DELIVERY_ACCOUNT")) || ' ' || T1."NAME") ELSE ((od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || (substring((asciiz(extract(YEAR FROM T1."ORDER_DATE"),4) || '-' || asciiz(extract(MONTH FROM T1."ORDER_DATE"),2) || '-' || asciiz(extract(DAY FROM T1."ORDER_DATE"),2)) from 1 for 10)) || ' - ' || (rtrim(T1."DELIVERY_ACCOUNT")) || ' ' || T1."NAME" || ' - ' || (rtrim(T1."REGISTER_NUMBER")) || ' - ' || T1."STATUS") END as c181,
+	   T1."BASIS_NUMBER" || ' - ' || T1."CHASSIS_NUMBER" as c182,
+	   T11."MOD_LIN_SPECIFY" as c183,
+	   T10."DESCRIPTION" as c184,
+	   T10."GLOBAL_MAKE_CD" as c185,
+	   T2."USED_TIME_INT" * 12 as c186,
+	   T2."EST_TIME_INT" * 12 as c187,
+	   (rtrim(T1."DEBIT_ACCOUNT")) || ' - ' || T1."NAME" as c188,
+	   T2."INV_TIME_INT" * 12 as c189,
+	   CASE WHEN (T2."ORDER_LINETYPE" = '3') THEN (T2."LINES_NET_VALUE") ELSE null END as c190,
+	   T2."USED_TIME_INT" as c191,
+	   T2."EST_TIME_INT" as c192,
+	   T2."INV_TIME_INT" as c193,
+	   CASE WHEN (T1."STATUS" IN ('35','37','39','47','49','34','36')) THEN ('Rechnung/Gutschrift') WHEN (T1."STATUS" IN ('30','40','32')) THEN ('offen') WHEN (T1."STATUS" IN ('41','31')) THEN ('Kostenvoranschlag') ELSE null END as c194,
+	   CASE WHEN ((T2."ORDER_LINETYPE" = '1') and (T1."STATUS" BETWEEN '30' AND '39')) THEN (T2."LINES_NET_VALUE") ELSE null END as c195,
+	   CASE WHEN (T2."INV_TIME" <> 0) THEN (T2."LINES_NET_VALUE") ELSE null END as c196,
+	   CASE WHEN ((T2."ORDER_LINETYPE" = '1') and (T1."STATUS" BETWEEN '40' AND '49')) THEN (T2."LINES_NET_VALUE") ELSE null END as c197,
+	   T1."STATUS" || ' - ' || T3."STAT_SPECIFY" as c198,
+	   CASE WHEN (T1."STATUS" BETWEEN '30' AND '39') THEN ('Teile') WHEN (T1."STATUS" BETWEEN '40' AND '49') THEN ('Service') WHEN (T1."STATUS" = '70') THEN ('sonst. Auftrag') WHEN (T1."STATUS" = '91') THEN ('Anfrage') ELSE null END as c199,
+	   T7."SEL_NAME" as c200,
+	   T5."SEL_NAME" as c201,
+	   T1."PMT_TERM" || ' - ' || T1."PAYMENT_TEXT" as c202,
+	   CASE WHEN (T1."CUSTOMER_GROUP" BETWEEN '10' AND '59') THEN ('extern') WHEN (T1."CUSTOMER_GROUP" IN ('91','92','60','70')) THEN ('GWL') WHEN (((T1."CUSTOMER_GROUP" IN ('99')) or (T1."PMT_TERM" = 'IN')) or ((od_left(T1."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as c203,
+	   T6."CUSTOMER_GROUP" || ' - ' || T6."CUST_GROUP_SPECIFY" as c204,
+	   T4."DEPARTMENT_TYPE_ID" || ' - ' || T4."DESCRIPTION" as c205,
+	   CASE WHEN (((od_left(T1."DEPARTMENT",2))) IN ('05','09','111','06','08','01','10','14','12','03','04','02')) THEN ('1') ELSE ((substring(T1."DEPARTMENT" from 2 for 1))) END as c206,
+	   (od_left(T1."DEPARTMENT",2)) as c207,
+	   T1."CLIENT_DB" as c208,
+	   T8."REPAIR_GRP_SPECIFY" as c209,
+	   T9."Fabrikat" as c210,
+	   T8."MAKE_CD" as c211,
+	   T8."REPAIR_GROUP" as c212,
+	   T7."SEL_FAMILY_NAME" as c213,
+	   T7."SEL_FIRST_NAME" as c214,
+	   T7."SEL_DEPARTMENT" as c215,
+	   T7."SELLER_CODE" as c216,
+	   T6."CUST_GROUP_SPECIFY" as c217,
+	   T6."CUSTOMER_GROUP" as c218,
+	   T5."SEL_FAMILY_NAME" as c219,
+	   T5."SEL_FIRST_NAME" as c220,
+	   T5."SEL_DEPARTMENT" as c221,
+	   T5."SELLER_CODE" as c222,
+	   T4."DESCRIPTION" as c223,
+	   T4."DEPARTMENT_TYPE_ID" as c224,
+	   T3."STAT_SPECIFY" as c225,
+	   T3."STAT_CODE" as c226,
+	   T2."UNIQUE_IDENT" as c227,
+	   T2."MAKE_TIME_UNIT" as c228,
+	   T2."INV_TIME" as c229,
+	   T2."EST_TIME" as c230,
+	   T2."USED_TIME" as c231,
+	   T2."REPAIR_NAME" as c232,
+	   T2."REPAIR_GROUP" as c233,
+	   T2."REPAIR_CODE" as c234,
+	   T2."LINE_COSTS" as c235,
+	   T2."DELIVERY_QUANTITY" as c236,
+	   T2."ORDER_QUANTITY" as c237,
+	   T2."PROD_NAME" as c238,
+	   T2."PRODUCT_GROUP" as c239,
+	   T2."MAKE_CD" as c240,
+	   T2."PROD_CODE" as c241,
+	   T2."LINES_NET_VALUE" as c242,
+	   T2."STDPRICE" as c243,
+	   T2."DISCOUNT" as c244,
+	   T2."SALESMAN" as c245,
+	   T2."MECHANIC_CODE" as c246,
+	   T2."REDUCTION_AMOUNT" as c247,
+	   T2."REDUCTION_CODE" as c248,
+	   T2."ORDER_LINETYPE" as c249,
+	   T2."LINE_NUMBER" as c250,
+	   T2."ORDER_NUMBER" as c251,
+	   T1."UNIQUE_IDENT" as c252,
+	   T1."CONV_FLAG" as c253,
+	   T1."ACTUAL_INV_DATE_TIME" as c254,
+	   T1."FHG_REPORT" as c255,
+	   T1."LDC_ORDER" as c256,
+	   T1."USE_PARTS_PRE_PICKING" as c257,
+	   T1."REF_IDENT_SALES_CLASS" as c258,
+	   T1."REF_IDENT_INV_TOTAL" as c259,
+	   T1."COMMISSION_SALESMAN" as c260,
+	   T1."WORKSHOP_TEAM" as c261,
+	   T1."CHASSIS_NUMBER" as c262,
+	   T1."TRANSFER_MAKE_CD" as c263,
+	   T1."YEAR_MODEL" as c264,
+	   T1."MAKE_CD" as c265,
+	   T1."FAC_MODEL_CODE_S" as c266,
+	   T1."END_TIME" as c267,
+	   T1."END_DATE" as c268,
+	   T1."ARRIVAL_DATE" as c269,
+	   T1."ARRIVAL_TIME" as c270,
+	   T1."SPLIT_COUNTER" as c271,
+	   T1."WORKSHOP_PRICECODE" as c272,
+	   T1."MODEL_TEXT" as c273,
+	   T1."BOL_TAX_SHARE" as c274,
+	   T1."EXPECTED_ORDER_TIM" as c275,
+	   T1."REFERENCE_NUMBER" as c276,
+	   T1."DISCOUNT_LIMIT" as c277,
+	   T1."MAIL_ADDR" as c278,
+	   T1."ZIPCODE" as c279,
+	   T1."ADDR_2" as c280,
+	   T1."STREET_ADDR" as c281,
+	   T1."NAME" as c282,
+	   T1."TITLE" as c283,
+	   T1."SALES_TAX_FREE" as c284,
+	   T1."INVOICE_CHARGE" as c285,
+	   T1."INVOICE_ROUNDED" as c286,
+	   T1."INVOICE_DISC_PERC" as c287,
+	   T1."SALES_CLASS_NUMBER" as c288,
+	   T1."PREV_STATUS" as c289,
+	   T1."MILEAGE" as c290,
+	   T1."BASIS_NUMBER" as c291,
+	   T1."INVOICE_COPY_CODE" as c292,
+	   T1."SMALL_ACCESSORIES" as c293,
+	   T1."CUSTOMER_GROUP" as c294,
+	   T1."INTERNAL_CODE" as c295,
+	   T1."PLACE_CODE" as c296,
+	   T1."STOCK" as c297,
+	   T1."MISC_ADDS" as c298,
+	   T1."PRICE_CODE" as c299,
+	   T1."DISCOUNT_AMOUNT" as c300,
+	   T1."TAX_SHARE" as c301,
+	   T1."ORDERS_GROSSVALUE" as c302,
+	   T1."PURCH_TAX" as c303,
+	   T1."COSTS" as c304,
+	   T1."PAYMENT_TEXT" as c305,
+	   T1."DUEDATE_1" as c306,
+	   T1."NEXT_LINE_NUMBER" as c307,
+	   T1."PMT_TERM" as c308,
+	   T1."TAX_PERC" as c309,
+	   T1."TAX_CODE" as c310,
+	   T1."INVOICE_DATE" as c311,
+	   T1."DELIVERY_DATE" as c312,
+	   T1."DEBIT_PERM" as c313,
+	   T1."SALESMAN" as c314,
+	   T1."DEBET_DEPARTMENT" as c315,
+	   T1."DEPARTMENT" as c316,
+	   T1."DELIVERY_ACCOUNT" as c317,
+	   T1."HANDLER" as c318,
+	   T1."TRANSACT_DATE" as c319,
+	   T1."STATE_CODE" as c320,
+	   T1."WORKSHOP_MODEL" as c321,
+	   T1."INVOICE_NUMBER" as c322,
+	   T1."DEBIT_ACCOUNT" as c323,
+	   T1."STATE_KEY_DATE" as c324,
+	   T1."STATUS" as c325,
+	   T1."REGISTER_NUMBER" as c326
 from (((((((((((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."import"."ORDER_LINE" T2 on (T1."ORDER_NUMBER" = T2."ORDER_NUMBER") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP25" T3 on (T1."STATUS" = T3."STAT_CODE") and (T1."CLIENT_DB" = T3."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T4 on (T1."DEPARTMENT" = T4."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T5 on (T1."SALESMAN" = T5."SELLER_CODE") and (T1."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP48" T6 on (T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T7 on (T2."MECHANIC_CODE" = T7."SELLER_CODE") and (T2."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP73" T8 on ((T2."REPAIR_GROUP" = T8."REPAIR_GROUP") and (T2."MAKE_CD" = T8."MAKE_CD")) and (T2."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Marken" T9 on (T1."MAKE_CD" = T9."Make") and (T1."CLIENT_DB" = T9."Client_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T10 on (T1."MAKE_CD" = T10."GLOBAL_MAKE_CD") and (T1."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T13 on ((T13."CHASSIS_NUMBER" = T1."CHASSIS_NUMBER") and (T13."BASIS_NUMBER" = T1."BASIS_NUMBER")) and (T13."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP5Q" T11 on ((T13."MODEL_LINE" = T11."MODEL_LINE") and (T13."MAKE_CD" = T11."MAKE_CD")) and (T13."CLIENT_DB" = T11."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T12 on ((od_left(T1."DEPARTMENT",2)) = T12."Standort") and (T1."CLIENT_DB" = T12."Hauptbetrieb"))
-where ((((T1."STATUS" IN ('30','40','42','43','44')) and (T1."INVOICE_DATE" = TIMESTAMP '1800-01-01 00:00:00.000')) and (T1."ORDER_DATE" >= TIMESTAMP '2020-01-01 00:00:00.000')) and (T2."ORDER_LINETYPE" <> '2'))
+where ((((not T1."STATUS" IN ('39','41','49','91','31','47','37','33','35')) and (T1."INVOICE_DATE" = TIMESTAMP '1800-01-01 00:00:00.000')) and (T1."ORDER_DATE" >= TIMESTAMP '2020-01-01 00:00:00.000')) and (T2."ORDER_LINETYPE" <> '2'))
 order by c172 asc
 ) D1
 

System/OPTIMA/IQD/Serv_Teile/offene_auftraege_csv.sql

@@ -152,7 +152,7 @@ select "Order Number_ori_2",
 	   "Model",
 	   "Fahrzeug",
 	   "Auftrag_Det_S",
-	   "Auftrag_Det_T",
+	   '' as "Auftrag_Det_T",
 	   "Anzahl Tage",
 	   "Order Number",
 	   "Fabrikat",
@@ -175,9 +175,8 @@ from
 	   (day((getdate()) - T1."ORDER_DATE")) as "Anzahl Tage",
 	   T1."ORDER_DATE" as "Order Date",
 	   CASE WHEN (T9."Fabrikat" IS NULL) THEN ('Fremd') ELSE (T9."Fabrikat") END as "Fabrikat",
-	   (left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) + ' - ' + T1."NAME"))) + ' - ' + T1."REGISTER_NUMBER" as "Order Number",
-	   (left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + T1."DELIVERY_ACCOUNT" + T1."NAME" + ' - ' + T1."REGISTER_NUMBER" + ' - ' + T1."STATUS" as "Auftrag_Det_T",
-	   (left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + (rtrim(T1."DELIVERY_ACCOUNT")) + ' ' + T1."NAME" + ' - ' + (rtrim(T1."REGISTER_NUMBER")) + ' - ' + T1."STATUS" as "Auftrag_Det_S",
+	   CASE WHEN (T1."ORDER_NUMBER" IN (3502817)) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) + ' - ' + T1."NAME")))) ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (rtrim(((rtrim(T1."DEBIT_ACCOUNT")) + ' - ' + T1."NAME"))) + ' - ' + T1."REGISTER_NUMBER") END as "Order Number",
+	   CASE WHEN (T1."ORDER_NUMBER" IN (3502817)) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + (rtrim(T1."DELIVERY_ACCOUNT")) + ' ' + T1."NAME") ELSE ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + (substring((convert(varchar(50), year(T1."ORDER_DATE")) + '-' + convert(varchar(50), month(T1."ORDER_DATE")) + '-' + convert(varchar(50), day(T1."ORDER_DATE"))), 1, 10)) + ' - ' + (rtrim(T1."DELIVERY_ACCOUNT")) + ' ' + T1."NAME" + ' - ' + (rtrim(T1."REGISTER_NUMBER")) + ' - ' + T1."STATUS") END as "Auftrag_Det_S",
 	   T1."BASIS_NUMBER" + ' - ' + T1."CHASSIS_NUMBER" as "Fahrzeug",
 	   T11."MOD_LIN_SPECIFY" as "Model",
 	   T10."DESCRIPTION" as "Description",
@@ -324,6 +323,6 @@ from
 	   T1."STATUS" as "Status",
 	   T1."REGISTER_NUMBER" as "Register Number"
 from (((((((((((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."import"."ORDER_LINE" T2 on (T1."ORDER_NUMBER" = T2."ORDER_NUMBER") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP25" T3 on (T1."STATUS" = T3."STAT_CODE") and (T1."CLIENT_DB" = T3."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T4 on (T1."DEPARTMENT" = T4."DEPARTMENT_TYPE_ID") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T5 on (T1."SALESMAN" = T5."SELLER_CODE") and (T1."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP48" T6 on (T1."CUSTOMER_GROUP" = T6."CUSTOMER_GROUP") and (T1."CLIENT_DB" = T6."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP43" T7 on (T2."MECHANIC_CODE" = T7."SELLER_CODE") and (T2."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP73" T8 on ((T2."REPAIR_GROUP" = T8."REPAIR_GROUP") and (T2."MAKE_CD" = T8."MAKE_CD")) and (T2."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Marken" T9 on (T1."MAKE_CD" = T9."Make") and (T1."CLIENT_DB" = T9."Client_DB")) left outer join "OPTIMA"."import"."GLOBAL_MAKE" T10 on (T1."MAKE_CD" = T10."GLOBAL_MAKE_CD") and (T1."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."VEHICLE" T13 on ((T13."CHASSIS_NUMBER" = T1."CHASSIS_NUMBER") and (T13."BASIS_NUMBER" = T1."BASIS_NUMBER")) and (T13."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."VPP5Q" T11 on ((T13."MODEL_LINE" = T11."MODEL_LINE") and (T13."MAKE_CD" = T11."MAKE_CD")) and (T13."CLIENT_DB" = T11."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T12 on ((left(T1."DEPARTMENT",2)) = T12."Standort") and (T1."CLIENT_DB" = T12."Hauptbetrieb"))
-where ((((T1."STATUS" IN ('30','40','42','43','44')) and (T1."INVOICE_DATE" = convert(datetime, '1800-01-01 00:00:00.000'))) and (T1."ORDER_DATE" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (T2."ORDER_LINETYPE" <> '2'))
+where ((((not T1."STATUS" IN ('39','41','49','91','31','47','37','33','35')) and (T1."INVOICE_DATE" = convert(datetime, '1800-01-01 00:00:00.000'))) and (T1."ORDER_DATE" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (T2."ORDER_LINETYPE" <> '2'))
 -- order by "Order Number_ori_2" asc
 ) D1

System/OPTIMA/IQD/Zeiten/Auftraege_Mont_SPP_1340_benutzte_AW.iqd

@@ -27,7 +27,7 @@ from ((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."data"."GC_
 	(("OPTIMA"."import"."APPORTIONED_USED_TIME" T5 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T5."PROFILE_CODE") and (T4."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T3 on (T3."PROFILE_CODE" = T4."SELLER_CODE") and (T3."CLIENT_DB" = T4."CLIENT_DB")),
 	("OPTIMA"."import"."EMPLOYEE" T9 left outer join "OPTIMA"."import"."VPP91" T6 on (T9."WORK_LEADER_GROUP_ID" = T6."WORK_LEADER_GROUP") and (T9."CLIENT_DB" = T6."CLIENT_DB"))
 where (((T8."ORDER_NUMBER" = T5."ORDER_NUMBER") and (T8."UNIQUE_IDENT" = T5."ORDER_LINE_ID")) and (T8."CLIENT_DB" = T5."CLIENT_DB")) and ((T9."PERSON_ID" = T3."PERSON_ID") and (T9."CLIENT_DB" = T3."CLIENT_DB"))
-and ((T1."INVOICE_DATE" >= TIMESTAMP '2020-01-01 00:00:00.000') and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34')))
+and (((T1."INVOICE_DATE" >= TIMESTAMP '2020-01-01 00:00:00.000') and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34'))) and ((T6."WORK_LEADER_GROUP" || ' - ' || T6."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))
 
 END SQL
 COLUMN,0,Order Number

System/OPTIMA/IQD/Zeiten/Auftraege_Mont_SPP_1340_benutzte_AW.sql

@@ -21,4 +21,4 @@ from ((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."data"."GC_
 	(("OPTIMA"."import"."APPORTIONED_USED_TIME" T5 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T5."PROFILE_CODE") and (T4."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T3 on (T3."PROFILE_CODE" = T4."SELLER_CODE") and (T3."CLIENT_DB" = T4."CLIENT_DB")),
 	("OPTIMA"."import"."EMPLOYEE" T9 left outer join "OPTIMA"."import"."VPP91" T6 on (T9."WORK_LEADER_GROUP_ID" = T6."WORK_LEADER_GROUP") and (T9."CLIENT_DB" = T6."CLIENT_DB"))
 where (((T8."ORDER_NUMBER" = T5."ORDER_NUMBER") and (T8."UNIQUE_IDENT" = T5."ORDER_LINE_ID")) and (T8."CLIENT_DB" = T5."CLIENT_DB")) and ((T9."PERSON_ID" = T3."PERSON_ID") and (T9."CLIENT_DB" = T3."CLIENT_DB"))
-and ((T1."INVOICE_DATE" >= convert(datetime, '2020-01-01 00:00:00.000')) and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34')))
+and (((T1."INVOICE_DATE" >= convert(datetime, '2020-01-01 00:00:00.000')) and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34'))) and ((T6."WORK_LEADER_GROUP" + ' - ' + T6."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))

System/OPTIMA/IQD/Zeiten/Auftraege_Mont_SPP_1340_verk_AW_mit_EP.iqd

@@ -0,0 +1,80 @@
+COGNOS QUERY
+STRUCTURE,1,1
+DATABASE,O21
+DATASOURCENAME,C:\GlobalCube\System\OPTIMA\IQD\zeiten\Auftraege_Mont_SPP_1340_verk_AW_mit_EP.imr
+TITLE,Auftraege_Mont_SPP_1340_verk_AW_mit_EP.imr
+BEGIN SQL
+select T1."ORDER_NUMBER" as c1,
+	   T1."INVOICE_DATE" as c2,
+	   T1."CLIENT_DB" as c3,
+	   (substring(T1."DEPARTMENT" from 2 for 1)) as c4,
+	   (substring(T1."DEPARTMENT" from 4 for 1)) as c5,
+	   T2."Zuordnung" as c6,
+	   (rtrim(T3."PROFILE_CODE")) || ' - ' || T4."SEL_NAME" as c7,
+	   T5."EDITED_INV_TIME_INT" as c8,
+	   T6."WORK_LEADER_GROUP" as c9,
+	   T6."WORKLEADER_TEXT" as c10,
+	   T6."WORK_LEADER_GROUP" || ' - ' || T6."WORKLEADER_TEXT" as c11,
+	   'ben. Zeit' as c12,
+	   '' as c13,
+	   '' as c14,
+	   T7."Hauptbetrieb_ID" as c15,
+	   T7."Hauptbetrieb_Name" as c16,
+	   T7."Standort_ID" as c17,
+	   T7."Standort_Name" as c18,
+	   CASE WHEN ((extract(DAY FROM (now()) - T1."INVOICE_DATE")) <= 4) THEN ((od_left((cast_numberToString(cast_integer(T1."ORDER_NUMBER"))),7)) || ' - ' || T1."MODEL_TEXT" || ' - ' || T1."NAME") ELSE null END as c19,
+	   CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END as c20,
+	   CASE WHEN (T8."KEY_PROD_CODE" = 'EP') THEN (T8."LINES_NET_VALUE") WHEN ((T5."EDITED_INV_TIME_INT" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT" * -1) ELSE (0) END as c21,
+	   T8."INV_TIME" as c22,
+	   T5."EDITED_INV_TIME_INT" as c23,
+	   T8."LINES_NET_VALUE" as c24,
+	   T8."REDUCTION_AMOUNT" as c25,
+	   T8."INV_TIME_INT" as c26,
+	   (CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT" as c27,
+	   T5."EDITED_INV_TIME_INT" as c28,
+	   T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT") as c29,
+	   RSUM((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) as c30,
+	   T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT") as c31,
+	   (CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT" as c32,
+	   CASE WHEN (T5."EDITED_INV_TIME_INT" = T8."INV_TIME_INT") THEN ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) WHEN (T5."EDITED_INV_TIME_INT" = T8."EST_TIME_INT") THEN ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT"))) ELSE ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) END as c33
+from ((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."data"."GC_Umsatzart" T2 on (T2."Client_DB" = T1."CLIENT_DB") and (T2."Geschaeftsbuchungsgruppe" = T1."CUSTOMER_GROUP")) left outer join "OPTIMA"."import"."ORDER_LINE" T8 on (T1."ORDER_NUMBER" = T8."ORDER_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T7 on (od_left(T1."DEPARTMENT",2)) = T7."Standort"),
+	(("OPTIMA"."import"."APPORTIONED_INV_TIME" T5 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T5."PROFILE_CODE") and (T4."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T3 on (T3."PROFILE_CODE" = T4."SELLER_CODE") and (T3."CLIENT_DB" = T4."CLIENT_DB")),
+	("OPTIMA"."import"."EMPLOYEE" T9 left outer join "OPTIMA"."import"."VPP91" T6 on (T9."WORK_LEADER_GROUP_ID" = T6."WORK_LEADER_GROUP") and (T9."CLIENT_DB" = T6."CLIENT_DB"))
+where (((T8."ORDER_NUMBER" = T5."ORDER_NUMBER") and (T8."UNIQUE_IDENT" = T5."ORDER_LINE_ID")) and (T8."CLIENT_DB" = T5."CLIENT_DB")) and ((T9."PERSON_ID" = T3."PERSON_ID") and (T9."CLIENT_DB" = T3."CLIENT_DB"))
+and (((T1."INVOICE_DATE" >= TIMESTAMP '2020-01-01 00:00:00.000') and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34'))) and ((T6."WORK_LEADER_GROUP" || ' - ' || T6."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))
+
+END SQL
+COLUMN,0,Order Number
+COLUMN,1,Datum
+COLUMN,2,Hauptbetrieb
+COLUMN,3,Marke
+COLUMN,4,Kostenstelle
+COLUMN,5,Umsatzart
+COLUMN,6,Monteur
+COLUMN,7,berechn. AW
+COLUMN,8,Work Leader Group
+COLUMN,9,Workleader Text
+COLUMN,10,Monteur_Gruppe
+COLUMN,11,Activity_Codes_Group1
+COLUMN,12,Activity_Codes_Group2
+COLUMN,13,Activity_Desc
+COLUMN,14,Hauptbetrieb Id
+COLUMN,15,Hauptbetrieb Name
+COLUMN,16,Standort Id
+COLUMN,17,Standort Name
+COLUMN,18,Order Number_Mont
+COLUMN,19,Umsatz Lohn Basis für Monteur
+COLUMN,20,EP
+COLUMN,21,Inv Time
+COLUMN,22,Edited Inv Time Int
+COLUMN,23,Lines Net Value
+COLUMN,24,Reduction Amount
+COLUMN,25,Inv Time Int
+COLUMN,26,STD-Satz
+COLUMN,27,verk. Stunden
+COLUMN,28,Umsatz Lohn Monteur
+COLUMN,29,Summe  (Umsatz Lohn Monteur) Nr.1
+COLUMN,30,Umsatz Lohn Monteur Est Time
+COLUMN,31,STD-Satz Est Time
+COLUMN,32,Umsatz Lohn Monteur final
+

System/OPTIMA/IQD/Zeiten/Auftraege_Mont_SPP_1340_verk_AW_mit_EP.sql

@@ -0,0 +1,38 @@
+select T1."ORDER_NUMBER" as "Order Number",
+	   T1."INVOICE_DATE" as "Datum",
+	   T1."CLIENT_DB" as "Hauptbetrieb",
+	   (substring(T1."DEPARTMENT", 2, 1)) as "Marke",
+	   (substring(T1."DEPARTMENT", 4, 1)) as "Kostenstelle",
+	   T2."Zuordnung" as "Umsatzart",
+	   (rtrim(T3."PROFILE_CODE")) + ' - ' + T4."SEL_NAME" as "Monteur",
+	   T5."EDITED_INV_TIME_INT" as "berechn. AW",
+	   T6."WORK_LEADER_GROUP" as "Work Leader Group",
+	   T6."WORKLEADER_TEXT" as "Workleader Text",
+	   T6."WORK_LEADER_GROUP" + ' - ' + T6."WORKLEADER_TEXT" as "Monteur_Gruppe",
+	   'ben. Zeit' as "Activity_Codes_Group1",
+	   '' as "Activity_Codes_Group2",
+	   '' as "Activity_Desc",
+	   T7."Hauptbetrieb_ID" as "Hauptbetrieb Id",
+	   T7."Hauptbetrieb_Name" as "Hauptbetrieb Name",
+	   T7."Standort_ID" as "Standort Id",
+	   T7."Standort_Name" as "Standort Name",
+	   CASE WHEN ((day((getdate()) - T1."INVOICE_DATE")) <= 4) THEN ((left((((T1."ORDER_NUMBER"))),7)) + ' - ' + T1."MODEL_TEXT" + ' - ' + T1."NAME") ELSE null END as "Order Number_Mont",
+	   CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END as "Umsatz Lohn Basis für Monteur",
+	   CASE WHEN (T8."KEY_PROD_CODE" = 'EP') THEN (T8."LINES_NET_VALUE") WHEN ((T5."EDITED_INV_TIME_INT" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT" * -1) ELSE (0) END as "EP",
+	   T8."INV_TIME" as "Inv Time",
+	   T5."EDITED_INV_TIME_INT" as "Edited Inv Time Int",
+	   T8."LINES_NET_VALUE" as "Lines Net Value",
+	   T8."REDUCTION_AMOUNT" as "Reduction Amount",
+	   T8."INV_TIME_INT" as "Inv Time Int",
+	   (CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT" as "STD-Satz",
+	   T5."EDITED_INV_TIME_INT" as "verk. Stunden",
+	   T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT") as "Umsatz Lohn Monteur",
+	   RSUM((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) as "Summe  (Umsatz Lohn Monteur) Nr.1",
+	   T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT") as "Umsatz Lohn Monteur Est Time",
+	   (CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT" as "STD-Satz Est Time",
+	   CASE WHEN (T5."EDITED_INV_TIME_INT" = T8."INV_TIME_INT") THEN ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) WHEN (T5."EDITED_INV_TIME_INT" = T8."EST_TIME_INT") THEN ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."EST_TIME_INT"))) ELSE ((T5."EDITED_INV_TIME_INT" * ((CASE WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" <> .00)) THEN (T8."LINES_NET_VALUE") WHEN ((T8."INV_TIME" <> 0) and (T8."LINES_NET_VALUE" = .00)) THEN (T8."REDUCTION_AMOUNT") ELSE null END) / T8."INV_TIME_INT"))) END as "Umsatz Lohn Monteur final"
+from ((("OPTIMA"."import"."ORDER_HEADER" T1 left outer join "OPTIMA"."data"."GC_Umsatzart" T2 on (T2."Client_DB" = T1."CLIENT_DB") and (T2."Geschaeftsbuchungsgruppe" = T1."CUSTOMER_GROUP")) left outer join "OPTIMA"."import"."ORDER_LINE" T8 on (T1."ORDER_NUMBER" = T8."ORDER_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T7 on (left(T1."DEPARTMENT",2)) = T7."Standort"),
+	(("OPTIMA"."import"."APPORTIONED_INV_TIME" T5 left outer join "OPTIMA"."import"."VPP43" T4 on (T4."SELLER_CODE" = T5."PROFILE_CODE") and (T4."CLIENT_DB" = T5."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T3 on (T3."PROFILE_CODE" = T4."SELLER_CODE") and (T3."CLIENT_DB" = T4."CLIENT_DB")),
+	("OPTIMA"."import"."EMPLOYEE" T9 left outer join "OPTIMA"."import"."VPP91" T6 on (T9."WORK_LEADER_GROUP_ID" = T6."WORK_LEADER_GROUP") and (T9."CLIENT_DB" = T6."CLIENT_DB"))
+where (((T8."ORDER_NUMBER" = T5."ORDER_NUMBER") and (T8."UNIQUE_IDENT" = T5."ORDER_LINE_ID")) and (T8."CLIENT_DB" = T5."CLIENT_DB")) and ((T9."PERSON_ID" = T3."PERSON_ID") and (T9."CLIENT_DB" = T3."CLIENT_DB"))
+and (((T1."INVOICE_DATE" >= convert(datetime, '2020-01-01 00:00:00.000')) and (T1."STATUS" IN ('35','37','39','47','48','49','50','51','52','36','34'))) and ((T6."WORK_LEADER_GROUP" + ' - ' + T6."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))

System/OPTIMA/IQD/Zeiten/Monteur_neu_Zeiterf_neu.iqd

@@ -41,7 +41,7 @@ select c1 as c1,
 	   c35 as c35,
 	   c36 as c36,
 	   c37 as c37,
-	   c38 as c38,
+	   RSUM(c37) as c38,
 	   c39 as c39,
 	   c40 as c40,
 	   c41 as c41,
@@ -64,10 +64,10 @@ select c1 as c1,
 	   c58 as c58,
 	   c59 as c59,
 	   c60 as c60,
-	   RSUM(c60) as c61,
-	   c62 as c62,
-	   RSUM(c62) as c63,
-	   c64 as c64,
+	   c61 as c61,
+	   RSUM(c61) as c62,
+	   c63 as c63,
+	   RSUM(c63) as c64,
 	   c65 as c65,
 	   c66 as c66,
 	   c67 as c67,
@@ -94,7 +94,8 @@ select c1 as c1,
 	   c88 as c88,
 	   c89 as c89,
 	   c90 as c90,
-	   c91 as c91
+	   c91 as c91,
+	   c92 as c92
 from 
 (select T1."UNIQUE_IDENT" as c1,
 	   T1."ACTIVITY_CODE" as c2,
@@ -133,63 +134,63 @@ from
 	   T4."ACTIVITY_DESCRIPTION" as c35,
 	   T4."PRESENT" as c36,
 	   CASE WHEN (T4."PRESENT" = 1) THEN (T1."USED_TIME_INT") ELSE (0) END as c37,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W4  ','2200')) THEN (T1."USED_TIME_INT") ELSE (0) END as c38,
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE" from 2 for 1)) = 'L') THEN (T1."USED_TIME_INT") ELSE (0) END as c39,
-	   '' as c40,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W1  ','2210')) THEN (T1."USED_TIME_INT") ELSE (0) END as c41,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1000','1002','1001','1003  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as c42,
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE" from 2 for 1)) = 'H') THEN (T1."USED_TIME_INT") ELSE (0) END as c43,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2900')) THEN (T1."USED_TIME_INT") ELSE (0) END as c44,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END as c45,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1060')) THEN (T1."USED_TIME_INT") ELSE (0) END as c46,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5100  ','5110')) THEN (T1."USED_TIME_INT") ELSE (0) END as c47,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3020')) THEN (T1."USED_TIME_INT") ELSE (0) END as c48,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5000')) THEN (T1."USED_TIME_INT") ELSE (0) END as c49,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5010')) THEN (T1."USED_TIME_INT") ELSE (0) END as c50,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END as c51,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('4010')) THEN (T1."USED_TIME_INT") ELSE (0) END as c52,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('4020')) THEN (T1."USED_TIME_INT") ELSE (0) END as c53,
-	   T5."ORDER_NUMBER" as c54,
-	   T5."CUSTOMER_GROUP" as c55,
-	   CASE WHEN ((T5."CUSTOMER_GROUP" BETWEEN '10' AND '59') or (T5."CUSTOMER_GROUP" LIKE '7%')) THEN ('extern') WHEN (T5."CUSTOMER_GROUP" LIKE '6%') THEN ('GWL') WHEN (((T5."CUSTOMER_GROUP" LIKE '9%') or (T5."PMT_TERM" = 'IN')) or ((od_left(T5."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as c56,
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE" from 3 for 2)) IN ('11','12','13')) THEN (T1."USED_TIME_INT") ELSE (0) END as c57,
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE" from 3 for 2)) IN ('21','22','23')) THEN (T1."USED_TIME_INT") ELSE (0) END as c58,
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE" from 3 for 2)) IN ('31','32','33')) THEN (T1."USED_TIME_INT") ELSE (0) END as c59,
-	   (CASE WHEN ((substring(T1."ACTIVITY_CODE" from 3 for 2)) IN ('11','12','13')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE" from 3 for 2)) IN ('21','22','23')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE" from 3 for 2)) IN ('31','32','33')) THEN (T1."USED_TIME_INT") ELSE (0) END) as c60,
-	   (CASE WHEN (T1."ACTIVITY_CODE" IN ('1000','1002','1001','1003  ')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE" from 2 for 1)) = 'L') THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W4  ','2200')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W1  ','2210')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE" from 2 for 1)) = 'H') THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('2900')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W3  ')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('1060')) THEN (T1."USED_TIME_INT") ELSE (0) END) as c62,
-	   (CASE WHEN (T1."ACTIVITY_CODE" IN ('3020')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('4010')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('4020')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5000')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5010')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5100  ','5110')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('996')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('2999')) THEN (T1."USED_TIME_INT") ELSE (0) END) as c64,
-	   T3."WORK_LEADER_GROUP" || ' - ' || T3."WORKLEADER_TEXT" as c65,
-	   (cdate(T1."START_DATE_TIME")) as c66,
-	   T6."CLIENT_DB" as c67,
-	   T7."DEPARTMENT_TYPE_ID" as c68,
-	   T7."DESCRIPTION" as c69,
-	   (od_left(T2."SEL_DEPARTMENT",2)) as c70,
-	   (substring(T2."SEL_DEPARTMENT" from 4 for 1)) as c71,
-	   T2."SEL_NAME" as c72,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2999')) THEN (T1."USED_TIME_INT") ELSE (0) END as c73,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END as c74,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W3  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as c75,
-	   T6."WORK_LEADER_GROUP_ID" as c76,
-	   '' as c77,
-	   '' as c78,
-	   '' as c79,
-	   '' as c80,
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('996')) THEN (T1."USED_TIME_INT") ELSE (0) END as c81,
-	   (T3."WORK_LEADER_GROUP" || ' - ' || T3."WORKLEADER_TEXT") as c82,
-	   T1."PROFILE_CODE" || ' - ' || T2."SEL_NAME" as c83,
-	   '' as c84,
-	   T8."Zeitkategorie_1" as c85,
-	   T8."Zeitkategorie_2" as c86,
-	   T8."Activity_Code" || ' - ' || T8."Activity_Desc" as c87,
-	   T9."Hauptbetrieb_ID" as c88,
-	   T9."Hauptbetrieb_Name" as c89,
-	   T9."Standort_ID" as c90,
-	   T9."Standort_Name" as c91
-from "OPTIMA"."import"."EMPLOYEE" T6,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2830')) THEN (T1."USED_TIME_INT") ELSE (0) END as c39,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2000')) THEN (T1."USED_TIME_INT") ELSE (0) END as c40,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('HUB ')) THEN (T1."USED_TIME_INT") ELSE (0) END as c41,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W1  ','2210')) THEN (T1."USED_TIME_INT") ELSE (0) END as c42,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2100','1001','1000','1005','1004','2110')) THEN (T1."USED_TIME_INT") ELSE (0) END as c43,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2200','2210','2220','2250','2230')) THEN (T1."USED_TIME_INT") ELSE (0) END as c44,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2900')) THEN (T1."USED_TIME_INT") ELSE (0) END as c45,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5100')) THEN (T1."USED_TIME_INT") ELSE (0) END as c46,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2800')) THEN (T1."USED_TIME_INT") ELSE (0) END as c47,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5000  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as c48,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3000')) THEN (T1."USED_TIME_INT") ELSE (0) END as c49,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END as c50,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5210')) THEN (T1."USED_TIME_INT") ELSE (0) END as c51,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END as c52,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('4010')) THEN (T1."USED_TIME_INT") ELSE (0) END as c53,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5400')) THEN (T1."USED_TIME_INT") ELSE (0) END as c54,
+	   T5."ORDER_NUMBER" as c55,
+	   T5."CUSTOMER_GROUP" as c56,
+	   CASE WHEN ((T5."CUSTOMER_GROUP" BETWEEN '10' AND '59') or (T5."CUSTOMER_GROUP" LIKE '7%')) THEN ('extern') WHEN (T5."CUSTOMER_GROUP" LIKE '6%') THEN ('GWL') WHEN (((T5."CUSTOMER_GROUP" LIKE '9%') or (T5."PMT_TERM" = 'IN')) or ((od_left(T5."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as c57,
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('Extern')) THEN (T1."USED_TIME_INT") ELSE (0) END as c58,
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('GWL')) THEN (T1."USED_TIME_INT") ELSE (0) END as c59,
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('Intern')) THEN (T1."USED_TIME_INT") ELSE (0) END as c60,
+	   (CASE WHEN (T6."Zeitkategorie_2" IN ('Extern')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T6."Zeitkategorie_2" IN ('GWL')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T6."Zeitkategorie_2" IN ('Intern')) THEN (T1."USED_TIME_INT") ELSE (0) END) as c61,
+	   CASE WHEN (T6."Zeitkategorie_1" IN ('unproduktiv')) THEN (T1."USED_TIME_INT") ELSE (0) END as c63,
+	   CASE WHEN (T6."Zeitkategorie_1" IN ('Abwesenheit')) THEN (T1."USED_TIME_INT") ELSE (0) END as c65,
+	   T3."WORK_LEADER_GROUP" || ' - ' || T3."WORKLEADER_TEXT" as c66,
+	   (cdate(T1."START_DATE_TIME")) as c67,
+	   T7."CLIENT_DB" as c68,
+	   T8."DEPARTMENT_TYPE_ID" as c69,
+	   T8."DESCRIPTION" as c70,
+	   (od_left(T2."SEL_DEPARTMENT",2)) as c71,
+	   (substring(T2."SEL_DEPARTMENT" from 4 for 1)) as c72,
+	   T2."SEL_NAME" as c73,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2999')) THEN (T1."USED_TIME_INT") ELSE (0) END as c74,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END as c75,
+	   '' as c76,
+	   T7."WORK_LEADER_GROUP_ID" as c77,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2850')) THEN (T1."USED_TIME_INT") ELSE (0) END as c78,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2810')) THEN (T1."USED_TIME_INT") ELSE (0) END as c79,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2820')) THEN (T1."USED_TIME_INT") ELSE (0) END as c80,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2840')) THEN (T1."USED_TIME_INT") ELSE (0) END as c81,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('996')) THEN (T1."USED_TIME_INT") ELSE (0) END as c82,
+	   (T3."WORK_LEADER_GROUP" || ' - ' || T3."WORKLEADER_TEXT") as c83,
+	   T1."PROFILE_CODE" || ' - ' || T2."SEL_NAME" as c84,
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1009')) THEN (T1."USED_TIME_INT") ELSE (0) END as c85,
+	   T6."Zeitkategorie_1" as c86,
+	   T6."Zeitkategorie_2" as c87,
+	   T6."Activity_Code" || ' - ' || T6."Activity_Desc" as c88,
+	   T9."Hauptbetrieb_ID" as c89,
+	   T9."Hauptbetrieb_Name" as c90,
+	   T9."Standort_ID" as c91,
+	   T9."Standort_Name" as c92
+from "OPTIMA"."import"."EMPLOYEE" T7,
 	"OPTIMA"."import"."VPP91" T3,
-	((((((("OPTIMA"."import"."PUNCH" T1 left outer join "OPTIMA"."import"."VPP43" T2 on (T1."PROFILE_CODE" = T2."SELLER_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T10 on (T2."SELLER_CODE" = T10."PROFILE_CODE") and (T2."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."ACTIVITY" T4 on (T1."ACTIVITY_CODE" = T4."ACTIVITY_CODE") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."ORDER_HEADER" T5 on (T5."ORDER_NUMBER" = T1."ORDER_NUMBER") and (T5."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T7 on (T2."SEL_DEPARTMENT" = T7."DEPARTMENT_TYPE_ID") and (T2."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Activity_Codes" T8 on (T4."CLIENT_DB" = T8."Client_DB") and (T4."ACTIVITY_CODE" = T8."Activity_Code")) left outer join "OPTIMA"."data"."GC_Department" T9 on (T2."CLIENT_DB" = T9."Hauptbetrieb") and ((od_left(T2."SEL_DEPARTMENT",2)) = T9."Standort"))
-where ((T6."PERSON_ID" = T10."PERSON_ID") and (T6."CLIENT_DB" = T10."CLIENT_DB")) and ((T3."WORK_LEADER_GROUP" = T6."WORK_LEADER_GROUP_ID") and (T3."CLIENT_DB" = T6."CLIENT_DB"))
-and (((not T1."PROFILE_CODE" IN ('MARE')) and (((cdate(T1."START_DATE_TIME"))) >= DATE '2020-01-01')) and (((T3."WORK_LEADER_GROUP" || ' - ' || T3."WORKLEADER_TEXT")) IN ('1100 - LH KDD Mechaniker','1700 - LH VW','2100 - SE KDD Mechaniker','2120 - SE KDD 2 Mechaniker','2700 - SE VW','3100 - LÜ KDD Mechaniker','3200 - LÜ KAR','3300 - LÜ LACK','3700 - LÜ VW','4100 - WE KDD Mechaniker','4700 - WE VW','6100 - DO KDD Mechaniker','6700 - DO VW')))
+	((((((("OPTIMA"."import"."PUNCH" T1 left outer join "OPTIMA"."import"."VPP43" T2 on (T1."PROFILE_CODE" = T2."SELLER_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T10 on (T2."SELLER_CODE" = T10."PROFILE_CODE") and (T2."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."ACTIVITY" T4 on (T1."ACTIVITY_CODE" = T4."ACTIVITY_CODE") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."ORDER_HEADER" T5 on (T5."ORDER_NUMBER" = T1."ORDER_NUMBER") and (T5."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Activity_Codes" T6 on (T4."CLIENT_DB" = T6."Client_DB") and (T4."ACTIVITY_CODE" = T6."Activity_Code")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T8 on (T2."SEL_DEPARTMENT" = T8."DEPARTMENT_TYPE_ID") and (T2."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T9 on (T2."CLIENT_DB" = T9."Hauptbetrieb") and ((od_left(T2."SEL_DEPARTMENT",2)) = T9."Standort"))
+where ((T7."PERSON_ID" = T10."PERSON_ID") and (T7."CLIENT_DB" = T10."CLIENT_DB")) and ((T3."WORK_LEADER_GROUP" = T7."WORK_LEADER_GROUP_ID") and (T3."CLIENT_DB" = T7."CLIENT_DB"))
+and (((not T1."PROFILE_CODE" IN ('MARE')) and (((cdate(T1."START_DATE_TIME"))) >= DATE '2020-01-01')) and (((T3."WORK_LEADER_GROUP" || ' - ' || T3."WORKLEADER_TEXT")) IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))
 order by c7 asc
 ) D1
 
@@ -231,58 +232,59 @@ COLUMN,33,Activity Code_Activity
 COLUMN,34,Activity Description
 COLUMN,35,Present_Activity
 COLUMN,36,Anwesenheit
-COLUMN,37,Nacharbeit
-COLUMN,38,Leerlauf/Wartezeit
-COLUMN,39,Prob.fahrt/Endkontr._
-COLUMN,40,Instandhltg. Werkstatt
-COLUMN,41,Unprod. Anwes.
-COLUMN,42,Hilfslohn
-COLUMN,43,Schulung intern
-COLUMN,44,Schulung extern
-COLUMN,45,Reifenwechsel
-COLUMN,46,Krank
-COLUMN,47,Arzt
-COLUMN,48,Urlaub
-COLUMN,49,Sonderurlaub
-COLUMN,50,Feiertag
-COLUMN,51,zu spät
-COLUMN,52,Überstunden
-COLUMN,53,Order Number_Auftrag
-COLUMN,54,Customer Group
-COLUMN,55,Umsatzart
-COLUMN,56,Extern
-COLUMN,57,GWL
-COLUMN,58,Intern
-COLUMN,59,produktiv
-COLUMN,60,Summe  (produktiv) Nr.1
-COLUMN,61,unproduktiv
-COLUMN,62,Summe  (unproduktiv) Nr.1
-COLUMN,63,abwesend
-COLUMN,64,Monteur_Gruppe_ori
-COLUMN,65,Datum
-COLUMN,66,Hauptbetrieb
-COLUMN,67,Department Type Id
-COLUMN,68,Description
-COLUMN,69,Standort
-COLUMN,70,Kostenstelle
-COLUMN,71,Monteur_ori
-COLUMN,72,Konv Zeitkonto minus
-COLUMN,73,Berufsschule
-COLUMN,74,Ausb.Zeit mit Handwerker nur Azubi
-COLUMN,75,Work Leader Group Id
-COLUMN,76,Fahrten für KDD_
-COLUMN,77,MW tanken_
-COLUMN,78,Arbeiten Anlage B_
-COLUMN,79,Aushilfe Annahme_
-COLUMN,80,Abzug T390
-COLUMN,81,Monteur_Gruppe
-COLUMN,82,Monteur
-COLUMN,83,Aushilfe GW_
-COLUMN,84,Activity_Codes_Group1
-COLUMN,85,Activity_Codes_Group2
-COLUMN,86,Activity_Desc
-COLUMN,87,Hauptbetrieb Id
-COLUMN,88,Hauptbetrieb Name
-COLUMN,89,Standort Id
-COLUMN,90,Standort Name
+COLUMN,37,Summe  (Anwesenheit) Nr.1
+COLUMN,38,Nacharbeit
+COLUMN,39,Leerlauf/Wartezeit
+COLUMN,40,Hol u Bring Service
+COLUMN,41,Instandhltg. Werkstatt
+COLUMN,42,Unprod. Anwes.
+COLUMN,43,Hilfslohn
+COLUMN,44,Schulung intern
+COLUMN,45,Schulung extern
+COLUMN,46,Reifenlager
+COLUMN,47,Krank
+COLUMN,48,Arzt
+COLUMN,49,Urlaub
+COLUMN,50,Sonderurlaub
+COLUMN,51,Feiertag
+COLUMN,52,zu spät
+COLUMN,53,Überstunden
+COLUMN,54,Order Number_Auftrag
+COLUMN,55,Customer Group
+COLUMN,56,Umsatzart
+COLUMN,57,Extern
+COLUMN,58,GWL
+COLUMN,59,Intern
+COLUMN,60,produktiv
+COLUMN,61,Summe  (produktiv) Nr.1
+COLUMN,62,unproduktiv
+COLUMN,63,Summe  (unproduktiv) Nr.1
+COLUMN,64,abwesend
+COLUMN,65,Monteur_Gruppe_ori
+COLUMN,66,Datum
+COLUMN,67,Hauptbetrieb
+COLUMN,68,Department Type Id
+COLUMN,69,Description
+COLUMN,70,Standort
+COLUMN,71,Kostenstelle
+COLUMN,72,Monteur_ori
+COLUMN,73,Konv Zeitkonto minus
+COLUMN,74,Berufsschule
+COLUMN,75,Ausb.Zeit mit Handwerker nur Azubi_
+COLUMN,76,Work Leader Group Id
+COLUMN,77,GW-Bewertung
+COLUMN,78,Waschanlage
+COLUMN,79,Sondereinsatz lt. WL
+COLUMN,80,Abschleppen
+COLUMN,81,Abzug T390
+COLUMN,82,Monteur_Gruppe
+COLUMN,83,Monteur
+COLUMN,84,Tag beenden
+COLUMN,85,Activity_Codes_Group1
+COLUMN,86,Activity_Codes_Group2
+COLUMN,87,Activity_Desc
+COLUMN,88,Hauptbetrieb Id
+COLUMN,89,Hauptbetrieb Name
+COLUMN,90,Standort Id
+COLUMN,91,Standort Name
 

System/OPTIMA/IQD/Zeiten/Monteur_neu_Zeiterf_neu.sql

@@ -35,15 +35,16 @@ select "Unique Ident" as "Unique Ident",
 	   "Activity Description" as "Activity Description",
 	   "Present_Activity" as "Present_Activity",
 	   "Anwesenheit" as "Anwesenheit",
+	   RSUM("Anwesenheit") as "Summe  (Anwesenheit) Nr.1",
 	   "Nacharbeit" as "Nacharbeit",
 	   "Leerlauf/Wartezeit" as "Leerlauf/Wartezeit",
-	   "Prob.fahrt/Endkontr._" as "Prob.fahrt/Endkontr._",
+	   "Hol u Bring Service" as "Hol u Bring Service",
 	   "Instandhltg. Werkstatt" as "Instandhltg. Werkstatt",
 	   "Unprod. Anwes." as "Unprod. Anwes.",
 	   "Hilfslohn" as "Hilfslohn",
 	   "Schulung intern" as "Schulung intern",
 	   "Schulung extern" as "Schulung extern",
-	   "Reifenwechsel" as "Reifenwechsel",
+	   "Reifenlager" as "Reifenlager",
 	   "Krank" as "Krank",
 	   "Arzt" as "Arzt",
 	   "Urlaub" as "Urlaub",
@@ -72,16 +73,16 @@ select "Unique Ident" as "Unique Ident",
 	   "Monteur_ori" as "Monteur_ori",
 	   "Konv Zeitkonto minus" as "Konv Zeitkonto minus",
 	   "Berufsschule" as "Berufsschule",
-	   "Ausb.Zeit mit Handwerker nur Azubi" as "Ausb.Zeit mit Handwerker nur Azubi",
+	   "Ausb.Zeit mit Handwerker nur Azubi_" as "Ausb.Zeit mit Handwerker nur Azubi_",
 	   "Work Leader Group Id" as "Work Leader Group Id",
-	   "Fahrten für KDD_" as "Fahrten für KDD_",
-	   "MW tanken_" as "MW tanken_",
-	   "Arbeiten Anlage B_" as "Arbeiten Anlage B_",
-	   "Aushilfe Annahme_" as "Aushilfe Annahme_",
+	   "GW-Bewertung" as "GW-Bewertung",
+	   "Waschanlage" as "Waschanlage",
+	   "Sondereinsatz lt. WL" as "Sondereinsatz lt. WL",
+	   "Abschleppen" as "Abschleppen",
 	   "Abzug T390" as "Abzug T390",
 	   "Monteur_Gruppe" as "Monteur_Gruppe",
 	   "Monteur" as "Monteur",
-	   "Aushilfe GW_" as "Aushilfe GW_",
+	   "Tag beenden" as "Tag beenden",
 	   "Activity_Codes_Group1" as "Activity_Codes_Group1",
 	   "Activity_Codes_Group2" as "Activity_Codes_Group2",
 	   "Activity_Desc" as "Activity_Desc",
@@ -127,62 +128,62 @@ from
 	   T4."ACTIVITY_DESCRIPTION" as "Activity Description",
 	   T4."PRESENT" as "Present_Activity",
 	   CASE WHEN (T4."PRESENT" = 1) THEN (T1."USED_TIME_INT") ELSE (0) END as "Anwesenheit",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W4  ','2200')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Nacharbeit",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'L') THEN (T1."USED_TIME_INT") ELSE (0) END as "Leerlauf/Wartezeit",
-	   '' as "Prob.fahrt/Endkontr._",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2830')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Nacharbeit",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2000')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Leerlauf/Wartezeit",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('HUB ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Hol u Bring Service",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W1  ','2210')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Instandhltg. Werkstatt",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1000','1002','1001','1003  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Unprod. Anwes.",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'H') THEN (T1."USED_TIME_INT") ELSE (0) END as "Hilfslohn",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2100','1001','1000','1005','1004','2110')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Unprod. Anwes.",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2200','2210','2220','2250','2230')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Hilfslohn",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2900')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Schulung intern",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Schulung extern",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1060')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Reifenwechsel",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5100  ','5110')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Krank",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3020')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Arzt",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5000')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Urlaub",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5010')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Sonderurlaub",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Feiertag",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5100')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Schulung extern",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2800')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Reifenlager",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5000  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Krank",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3000')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Arzt",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Urlaub",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5210')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Sonderurlaub",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Feiertag",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('4010')) THEN (T1."USED_TIME_INT") ELSE (0) END as "zu spät",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('4020')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Überstunden",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('5400')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Überstunden",
 	   T5."ORDER_NUMBER" as "Order Number_Auftrag",
 	   T5."CUSTOMER_GROUP" as "Customer Group",
 	   CASE WHEN ((T5."CUSTOMER_GROUP" BETWEEN '10' AND '59') or (T5."CUSTOMER_GROUP" LIKE '7%')) THEN ('extern') WHEN (T5."CUSTOMER_GROUP" LIKE '6%') THEN ('GWL') WHEN (((T5."CUSTOMER_GROUP" LIKE '9%') or (T5."PMT_TERM" = 'IN')) or ((left(T5."CUSTOMER_GROUP",1)) BETWEEN 'A' AND 'Z')) THEN ('intern') ELSE null END as "Umsatzart",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('11','12','13')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Extern",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('21','22','23')) THEN (T1."USED_TIME_INT") ELSE (0) END as "GWL",
-	   CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('31','32','33')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Intern",
-	   (CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('11','12','13')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('21','22','23')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 3, 2)) IN ('31','32','33')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "produktiv",
-	   (CASE WHEN (T1."ACTIVITY_CODE" IN ('1000','1002','1001','1003  ')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'L') THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W4  ','2200')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W1  ','2210')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN ((substring(T1."ACTIVITY_CODE", 2, 1)) = 'H') THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('2900')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('W3  ')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('1060')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "unproduktiv",
-	   (CASE WHEN (T1."ACTIVITY_CODE" IN ('3020')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5300')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('4010')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('4020')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5000')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5010')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5100  ','5110')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('5200')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('996')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T1."ACTIVITY_CODE" IN ('2999')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "abwesend",
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('Extern')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Extern",
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('GWL')) THEN (T1."USED_TIME_INT") ELSE (0) END as "GWL",
+	   CASE WHEN (T6."Zeitkategorie_2" IN ('Intern')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Intern",
+	   (CASE WHEN (T6."Zeitkategorie_2" IN ('Extern')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T6."Zeitkategorie_2" IN ('GWL')) THEN (T1."USED_TIME_INT") ELSE (0) END) + (CASE WHEN (T6."Zeitkategorie_2" IN ('Intern')) THEN (T1."USED_TIME_INT") ELSE (0) END) as "produktiv",
+	   CASE WHEN (T6."Zeitkategorie_1" IN ('unproduktiv')) THEN (T1."USED_TIME_INT") ELSE (0) END as "unproduktiv",
+	   CASE WHEN (T6."Zeitkategorie_1" IN ('Abwesenheit')) THEN (T1."USED_TIME_INT") ELSE (0) END as "abwesend",
 	   T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT" as "Monteur_Gruppe_ori",
 	   ((T1."START_DATE_TIME")) as "Datum",
-	   T6."CLIENT_DB" as "Hauptbetrieb",
-	   T7."DEPARTMENT_TYPE_ID" as "Department Type Id",
-	   T7."DESCRIPTION" as "Description",
+	   T7."CLIENT_DB" as "Hauptbetrieb",
+	   T8."DEPARTMENT_TYPE_ID" as "Department Type Id",
+	   T8."DESCRIPTION" as "Description",
 	   (left(T2."SEL_DEPARTMENT",2)) as "Standort",
 	   (substring(T2."SEL_DEPARTMENT", 4, 1)) as "Kostenstelle",
 	   T2."SEL_NAME" as "Monteur_ori",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2999')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Konv Zeitkonto minus",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('3920')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Berufsschule",
-	   CASE WHEN (T1."ACTIVITY_CODE" IN ('W3  ')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Ausb.Zeit mit Handwerker nur Azubi",
-	   T6."WORK_LEADER_GROUP_ID" as "Work Leader Group Id",
-	   '' as "Fahrten für KDD_",
-	   '' as "MW tanken_",
-	   '' as "Arbeiten Anlage B_",
-	   '' as "Aushilfe Annahme_",
+	   '' as "Ausb.Zeit mit Handwerker nur Azubi_",
+	   T7."WORK_LEADER_GROUP_ID" as "Work Leader Group Id",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2850')) THEN (T1."USED_TIME_INT") ELSE (0) END as "GW-Bewertung",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2810')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Waschanlage",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2820')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Sondereinsatz lt. WL",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('2840')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Abschleppen",
 	   CASE WHEN (T1."ACTIVITY_CODE" IN ('996')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Abzug T390",
 	   (T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT") as "Monteur_Gruppe",
 	   T1."PROFILE_CODE" + ' - ' + T2."SEL_NAME" as "Monteur",
-	   '' as "Aushilfe GW_",
-	   T8."Zeitkategorie_1" as "Activity_Codes_Group1",
-	   T8."Zeitkategorie_2" as "Activity_Codes_Group2",
-	   T8."Activity_Code" + ' - ' + T8."Activity_Desc" as "Activity_Desc",
+	   CASE WHEN (T1."ACTIVITY_CODE" IN ('1009')) THEN (T1."USED_TIME_INT") ELSE (0) END as "Tag beenden",
+	   T6."Zeitkategorie_1" as "Activity_Codes_Group1",
+	   T6."Zeitkategorie_2" as "Activity_Codes_Group2",
+	   T6."Activity_Code" + ' - ' + T6."Activity_Desc" as "Activity_Desc",
 	   T9."Hauptbetrieb_ID" as "Hauptbetrieb Id",
 	   T9."Hauptbetrieb_Name" as "Hauptbetrieb Name",
 	   T9."Standort_ID" as "Standort Id",
 	   T9."Standort_Name" as "Standort Name"
-from "OPTIMA"."import"."EMPLOYEE" T6,
+from "OPTIMA"."import"."EMPLOYEE" T7,
 	"OPTIMA"."import"."VPP91" T3,
-	((((((("OPTIMA"."import"."PUNCH" T1 left outer join "OPTIMA"."import"."VPP43" T2 on (T1."PROFILE_CODE" = T2."SELLER_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T10 on (T2."SELLER_CODE" = T10."PROFILE_CODE") and (T2."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."ACTIVITY" T4 on (T1."ACTIVITY_CODE" = T4."ACTIVITY_CODE") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."ORDER_HEADER" T5 on (T5."ORDER_NUMBER" = T1."ORDER_NUMBER") and (T5."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T7 on (T2."SEL_DEPARTMENT" = T7."DEPARTMENT_TYPE_ID") and (T2."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Activity_Codes" T8 on (T4."CLIENT_DB" = T8."Client_DB") and (T4."ACTIVITY_CODE" = T8."Activity_Code")) left outer join "OPTIMA"."data"."GC_Department" T9 on (T2."CLIENT_DB" = T9."Hauptbetrieb") and ((left(T2."SEL_DEPARTMENT",2)) = T9."Standort"))
-where ((T6."PERSON_ID" = T10."PERSON_ID") and (T6."CLIENT_DB" = T10."CLIENT_DB")) and ((T3."WORK_LEADER_GROUP" = T6."WORK_LEADER_GROUP_ID") and (T3."CLIENT_DB" = T6."CLIENT_DB"))
-and (((not T1."PROFILE_CODE" IN ('MARE')) and ((((T1."START_DATE_TIME"))) >= convert(date, '2020-01-01'))) and (((T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT")) IN ('1100 - LH KDD Mechaniker','1700 - LH VW','2100 - SE KDD Mechaniker','2120 - SE KDD 2 Mechaniker','2700 - SE VW','3100 - LÜ KDD Mechaniker','3200 - LÜ KAR','3300 - LÜ LACK','3700 - LÜ VW','4100 - WE KDD Mechaniker','4700 - WE VW','6100 - DO KDD Mechaniker','6700 - DO VW')))
+	((((((("OPTIMA"."import"."PUNCH" T1 left outer join "OPTIMA"."import"."VPP43" T2 on (T1."PROFILE_CODE" = T2."SELLER_CODE") and (T1."CLIENT_DB" = T2."CLIENT_DB")) left outer join "OPTIMA"."import"."PROFILE" T10 on (T2."SELLER_CODE" = T10."PROFILE_CODE") and (T2."CLIENT_DB" = T10."CLIENT_DB")) left outer join "OPTIMA"."import"."ACTIVITY" T4 on (T1."ACTIVITY_CODE" = T4."ACTIVITY_CODE") and (T1."CLIENT_DB" = T4."CLIENT_DB")) left outer join "OPTIMA"."import"."ORDER_HEADER" T5 on (T5."ORDER_NUMBER" = T1."ORDER_NUMBER") and (T5."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Activity_Codes" T6 on (T4."CLIENT_DB" = T6."Client_DB") and (T4."ACTIVITY_CODE" = T6."Activity_Code")) left outer join "OPTIMA"."import"."DEPARTMENT_TYPE" T8 on (T2."SEL_DEPARTMENT" = T8."DEPARTMENT_TYPE_ID") and (T2."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T9 on (T2."CLIENT_DB" = T9."Hauptbetrieb") and ((left(T2."SEL_DEPARTMENT",2)) = T9."Standort"))
+where ((T7."PERSON_ID" = T10."PERSON_ID") and (T7."CLIENT_DB" = T10."CLIENT_DB")) and ((T3."WORK_LEADER_GROUP" = T7."WORK_LEADER_GROUP_ID") and (T3."CLIENT_DB" = T7."CLIENT_DB"))
+and (((not T1."PROFILE_CODE" IN ('MARE')) and ((((T1."START_DATE_TIME"))) >= convert(date, '2020-01-01'))) and (((T3."WORK_LEADER_GROUP" + ' - ' + T3."WORKLEADER_TEXT")) IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 ','510  - LPH Mechanik','520  - LPH Karosserie','540  - LPH Lehrlinge')))
 -- order by "Transact Date Long" asc
 ) D1

System/OPTIMA/IQD/Zeiten/Schichtplan_pro_MA_neu.iqd

@@ -30,14 +30,14 @@ select T1."REFERENCE_IDENT" as c1,
 	   T6."CALENDAR_TYPE_ID" as c24,
 	   T6."RECURRING_TYPE_ID" as c25,
 	   T6."HOLIDAY_ID" as c26,
-	   (dayofweek(T6."EVENT_START")) as c27,
-	   T3."SEL_NAME" as c28,
+	   (dayofweek(T6."EVENT_START")) + 1 as c27,
+	   T3."SEL_NAME" || ' - ' || T7."PROFILE_CODE" as c28,
 	   T6."EVENT_START" as c29,
-	   T7."PERS_DEPARTMENT" as c30,
-	   T4."CLIENT_DB" as c31,
+	   T8."PERS_DEPARTMENT" as c30,
+	   '1' as c31,
 	   (od_left(T3."SEL_DEPARTMENT",2)) as c32,
-	   T8."PROFILE_CODE" as c33,
-	   (substring(T3."SEL_DEPARTMENT" from 4 for 1)) as c34,
+	   T7."PROFILE_CODE" as c33,
+	   CASE WHEN ((substring(T3."SEL_DEPARTMENT" from 3 for 2)) = '20') THEN ('2') WHEN ((substring(T3."SEL_DEPARTMENT" from 3 for 2)) IN ('30','80')) THEN ('6') WHEN ((substring(T3."SEL_DEPARTMENT" from 3 for 2)) = '40') THEN ('3') WHEN ((substring(T3."SEL_DEPARTMENT" from 3 for 2)) = '41') THEN ('4') WHEN (T3."SEL_DEPARTMENT" IN ('1F  ')) THEN ('3') ELSE null END as c34,
 	   T4."CORE_WORKING_HOURS" as c35,
 	   '' as c36,
 	   T9."WORK_LEADER_GROUP_ID" as c37,
@@ -47,7 +47,7 @@ select T1."REFERENCE_IDENT" as c1,
 	   T4."CORE_WORKING_HOURS" as c41,
 	   T4."WORKINGDAY" as c42,
 	   T4."START_DAY_ID" as c43,
-	   (rtrim(T8."PROFILE_CODE")) || ' - ' || T3."SEL_NAME" as c44,
+	   (rtrim(T7."PROFILE_CODE")) || ' - ' || T3."SEL_NAME" as c44,
 	   'Abwesenheit' as c45,
 	   'Feiertag' as c46,
 	   '' as c47,
@@ -59,10 +59,10 @@ from "OPTIMA"."import"."WORKING_PERIOD" T4,
 	"OPTIMA"."import"."EMPLOYEE" T9,
 	"OPTIMA"."import"."VPP91" T5,
 	"OPTIMA"."import"."CALENDAR_EVENT" T6,
-	(("OPTIMA"."import"."CALENDAR_INFO" T1 left outer join "OPTIMA"."import"."CALENDAR_PATTERN" T2 on (T2."CALENDAR_INFO_ID" = T1."REFERENCE_IDENT") and (T2."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."PERSON_INFO" T7 on (T1."REFERENCE_NAME" = T7."PERSON_NUMBER") and (T1."CLIENT_DB" = T7."CLIENT_DB")),
-	(("OPTIMA"."import"."VPP43" T3 left outer join "OPTIMA"."import"."PROFILE" T8 on (T3."SELLER_CODE" = T8."PROFILE_CODE") and (T3."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T3."CLIENT_DB" = T10."Hauptbetrieb") and ((od_left(T3."SEL_DEPARTMENT",2)) = T10."Standort"))
-where ((T8."PROFILE_CODE" = T1."REFERENCE_NAME") and (T8."CLIENT_DB" = T1."CLIENT_DB")) and ((T2."RECURRING_PATTERN_ID" = T4."RECURRING_PATTERN_ID") and (T2."CLIENT_DB" = T4."CLIENT_DB")) and ((T9."PERSON_ID" = T8."PERSON_ID") and (T9."CLIENT_DB" = T8."CLIENT_DB")) and ((T5."WORK_LEADER_GROUP" = T9."WORK_LEADER_GROUP_ID") and (T5."CLIENT_DB" = T9."CLIENT_DB"))
-and ((((((((not T8."PROFILE_CODE" IN ('MARE')) and (T6."HOLIDAY_ID" IS NOT NULL)) and (T6."EVENT_START" >= TIMESTAMP '2020-01-01 00:00:00.000')) and (T6."HOLIDAY_ID" IN (1,3,5,6,7,9,10,12,14,17,18))) and (((dayofweek(T6."EVENT_START"))) BETWEEN 2 AND 6)) and (T6."EVENT_START" < (now()))) and ((T5."WORK_LEADER_GROUP" || ' - ' || T5."WORKLEADER_TEXT") IN ('1100 - LH KDD Mechaniker','1700 - LH VW','2100 - SE KDD Mechaniker','2700 - SE VW','3100 - LÜ KDD Mechaniker','3200 - LÜ KAR','3300 - LÜ LACK','3700 - LÜ VW','4100 - WE KDD Mechaniker','4700 - WE VW','6100 - DO KDD Mechaniker','6700 - DO VW'))) and ((T9."JOB_END_DATE" = TIMESTAMP '1800-01-01 00:00:00.000') or (T6."EVENT_START" < T9."JOB_END_DATE")))
+	(("OPTIMA"."import"."CALENDAR_INFO" T1 left outer join "OPTIMA"."import"."CALENDAR_PATTERN" T2 on (T2."CALENDAR_INFO_ID" = T1."REFERENCE_IDENT") and (T2."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."PERSON_INFO" T8 on (T1."REFERENCE_NAME" = T8."PERSON_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")),
+	(("OPTIMA"."import"."VPP43" T3 left outer join "OPTIMA"."import"."PROFILE" T7 on (T3."SELLER_CODE" = T7."PROFILE_CODE") and (T3."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T3."CLIENT_DB" = T10."Hauptbetrieb") and ((od_left(T3."SEL_DEPARTMENT",2)) = T10."Standort"))
+where ((T7."PROFILE_CODE" = T1."REFERENCE_NAME") and (T7."CLIENT_DB" = T1."CLIENT_DB")) and ((T2."RECURRING_PATTERN_ID" = T4."RECURRING_PATTERN_ID") and (T2."CLIENT_DB" = T4."CLIENT_DB")) and ((T9."PERSON_ID" = T7."PERSON_ID") and (T9."CLIENT_DB" = T7."CLIENT_DB")) and ((T5."WORK_LEADER_GROUP" = T9."WORK_LEADER_GROUP_ID") and (T5."CLIENT_DB" = T9."CLIENT_DB"))
+and (((((((((T6."HOLIDAY_ID" IS NOT NULL) and (T6."EVENT_START" >= TIMESTAMP '2013-01-02 00:00:00.000')) and (T6."HOLIDAY_ID" IN (20,22,24,25,26,28,29,31,36,37))) and (((dayofweek(T6."EVENT_START")) + 1) BETWEEN 2 AND 6)) and (T6."EVENT_START" < (now()))) and ((T5."WORK_LEADER_GROUP" || ' - ' || T5."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 '))) and ((T9."JOB_END_DATE" = TIMESTAMP '1800-01-01 00:00:00.000') or (T6."EVENT_START" < T9."JOB_END_DATE"))) and ((T2."RECURRING_PATTERN_PRIORITY" = 0) or (T2."RECURRING_PATTERN_PRIORITY" IS NULL))) and (((dayofweek(T6."EVENT_START")) + 1) = T4."START_DAY_ID"))
 order by c2 asc
 
 END SQL
@@ -93,7 +93,7 @@ COLUMN,23,Calendar Type Id
 COLUMN,24,Recurring Type Id
 COLUMN,25,Holiday Id
 COLUMN,26,Wochentag
-COLUMN,27,Monteur_ori
+COLUMN,27,Monteur
 COLUMN,28,Datum
 COLUMN,29,Pers Department
 COLUMN,30,Hauptbetrieb

System/OPTIMA/IQD/Zeiten/Schichtplan_pro_MA_neu.sql

@@ -24,14 +24,14 @@ select T1."REFERENCE_IDENT" as "Reference Ident",
 	   T6."CALENDAR_TYPE_ID" as "Calendar Type Id",
 	   T6."RECURRING_TYPE_ID" as "Recurring Type Id",
 	   T6."HOLIDAY_ID" as "Holiday Id",
-	   (datepart(weekday, T6."EVENT_START")) as "Wochentag",
-	   T3."SEL_NAME" as "Monteur_ori",
+	   (datepart(weekday, T6."EVENT_START")) + 1 as "Wochentag",
+	   T3."SEL_NAME" + ' - ' + T7."PROFILE_CODE" as "Monteur_2",
 	   T6."EVENT_START" as "Datum",
-	   T7."PERS_DEPARTMENT" as "Pers Department",
-	   T4."CLIENT_DB" as "Hauptbetrieb",
+	   T8."PERS_DEPARTMENT" as "Pers Department",
+	   '1' as "Hauptbetrieb",
 	   (left(T3."SEL_DEPARTMENT",2)) as "Standort",
-	   T8."PROFILE_CODE" as "Profile Code",
-	   (substring(T3."SEL_DEPARTMENT", 4, 1)) as "Kostenstelle",
+	   T7."PROFILE_CODE" as "Profile Code",
+	   CASE WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) = '20') THEN ('2') WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) IN ('30','80')) THEN ('6') WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) = '40') THEN ('3') WHEN ((substring(T3."SEL_DEPARTMENT", 3, 2)) = '41') THEN ('4') WHEN (T3."SEL_DEPARTMENT" IN ('1F  ')) THEN ('3') ELSE null END as "Kostenstelle",
 	   T4."CORE_WORKING_HOURS" as "Feiertag",
 	   '' as "Order Number",
 	   T9."WORK_LEADER_GROUP_ID" as "Work Leader Group Id",
@@ -41,7 +41,7 @@ select T1."REFERENCE_IDENT" as "Reference Ident",
 	   T4."CORE_WORKING_HOURS" as "Core Working Hours",
 	   T4."WORKINGDAY" as "Workingday",
 	   T4."START_DAY_ID" as "Start Day Id",
-	   (rtrim(T8."PROFILE_CODE")) + ' - ' + T3."SEL_NAME" as "Monteur",
+	   (rtrim(T7."PROFILE_CODE")) + ' - ' + T3."SEL_NAME" as "Monteur",
 	   'Abwesenheit' as "Activity_Codes_Group1",
 	   'Feiertag' as "Activity_Codes_Group2",
 	   '' as "Activity_Desc",
@@ -53,8 +53,8 @@ from "OPTIMA"."import"."WORKING_PERIOD" T4,
 	"OPTIMA"."import"."EMPLOYEE" T9,
 	"OPTIMA"."import"."VPP91" T5,
 	"OPTIMA"."import"."CALENDAR_EVENT" T6,
-	(("OPTIMA"."import"."CALENDAR_INFO" T1 left outer join "OPTIMA"."import"."CALENDAR_PATTERN" T2 on (T2."CALENDAR_INFO_ID" = T1."REFERENCE_IDENT") and (T2."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."PERSON_INFO" T7 on (T1."REFERENCE_NAME" = T7."PERSON_NUMBER") and (T1."CLIENT_DB" = T7."CLIENT_DB")),
-	(("OPTIMA"."import"."VPP43" T3 left outer join "OPTIMA"."import"."PROFILE" T8 on (T3."SELLER_CODE" = T8."PROFILE_CODE") and (T3."CLIENT_DB" = T8."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T3."CLIENT_DB" = T10."Hauptbetrieb") and ((left(T3."SEL_DEPARTMENT",2)) = T10."Standort"))
-where ((T8."PROFILE_CODE" = T1."REFERENCE_NAME") and (T8."CLIENT_DB" = T1."CLIENT_DB")) and ((T2."RECURRING_PATTERN_ID" = T4."RECURRING_PATTERN_ID") and (T2."CLIENT_DB" = T4."CLIENT_DB")) and ((T9."PERSON_ID" = T8."PERSON_ID") and (T9."CLIENT_DB" = T8."CLIENT_DB")) and ((T5."WORK_LEADER_GROUP" = T9."WORK_LEADER_GROUP_ID") and (T5."CLIENT_DB" = T9."CLIENT_DB"))
-and ((((((((not T8."PROFILE_CODE" IN ('MARE')) and (T6."HOLIDAY_ID" IS NOT NULL)) and (T6."EVENT_START" >= convert(datetime, '2020-01-01 00:00:00.000'))) and (T6."HOLIDAY_ID" IN (1,3,5,6,7,9,10,12,14,17,18))) and (((datepart(weekday, T6."EVENT_START"))) BETWEEN 2 AND 6)) and (T6."EVENT_START" < (getdate()))) and ((T5."WORK_LEADER_GROUP" + ' - ' + T5."WORKLEADER_TEXT") IN ('1100 - LH KDD Mechaniker','1700 - LH VW','2100 - SE KDD Mechaniker','2700 - SE VW','3100 - LÜ KDD Mechaniker','3200 - LÜ KAR','3300 - LÜ LACK','3700 - LÜ VW','4100 - WE KDD Mechaniker','4700 - WE VW','6100 - DO KDD Mechaniker','6700 - DO VW'))) and ((T9."JOB_END_DATE" = convert(datetime, '1800-01-01 00:00:00.000')) or (T6."EVENT_START" < T9."JOB_END_DATE")))
+	(("OPTIMA"."import"."CALENDAR_INFO" T1 left outer join "OPTIMA"."import"."CALENDAR_PATTERN" T2 on (T2."CALENDAR_INFO_ID" = T1."REFERENCE_IDENT") and (T2."CLIENT_DB" = T1."CLIENT_DB")) left outer join "OPTIMA"."import"."PERSON_INFO" T8 on (T1."REFERENCE_NAME" = T8."PERSON_NUMBER") and (T1."CLIENT_DB" = T8."CLIENT_DB")),
+	(("OPTIMA"."import"."VPP43" T3 left outer join "OPTIMA"."import"."PROFILE" T7 on (T3."SELLER_CODE" = T7."PROFILE_CODE") and (T3."CLIENT_DB" = T7."CLIENT_DB")) left outer join "OPTIMA"."data"."GC_Department" T10 on (T3."CLIENT_DB" = T10."Hauptbetrieb") and ((left(T3."SEL_DEPARTMENT",2)) = T10."Standort"))
+where ((T7."PROFILE_CODE" = T1."REFERENCE_NAME") and (T7."CLIENT_DB" = T1."CLIENT_DB")) and ((T2."RECURRING_PATTERN_ID" = T4."RECURRING_PATTERN_ID") and (T2."CLIENT_DB" = T4."CLIENT_DB")) and ((T9."PERSON_ID" = T7."PERSON_ID") and (T9."CLIENT_DB" = T7."CLIENT_DB")) and ((T5."WORK_LEADER_GROUP" = T9."WORK_LEADER_GROUP_ID") and (T5."CLIENT_DB" = T9."CLIENT_DB"))
+and (((((((((T6."HOLIDAY_ID" IS NOT NULL) and (T6."EVENT_START" >= convert(datetime, '2013-01-02 00:00:00.000'))) and (T6."HOLIDAY_ID" IN (20,22,24,25,26,28,29,31,36,37))) and (((datepart(weekday, T6."EVENT_START")) + 1) BETWEEN 2 AND 6)) and (T6."EVENT_START" < (getdate()))) and ((T5."WORK_LEADER_GROUP" + ' - ' + T5."WORKLEADER_TEXT") IN ('110  - WIZ Mechanik                  ','120  - WIZ Karosserie                ','140  - WIZ Lehrlinge                 ','310  - ESW Mechanik                  ','320  - ESW Karosserie                ','340  - ESW Lehrlinge                 '))) and ((T9."JOB_END_DATE" = convert(datetime, '1800-01-01 00:00:00.000')) or (T6."EVENT_START" < T9."JOB_END_DATE"))) and ((T2."RECURRING_PATTERN_PRIORITY" = 0) or (T2."RECURRING_PATTERN_PRIORITY" IS NULL))) and (((datepart(weekday, T6."EVENT_START")) + 1) = T4."START_DAY_ID"))
 -- order by "Reference Name" asc

Tasks/OPTIMA_imr_csv.bat

@@ -35,7 +35,8 @@ rem call impromptu.bat belege\GuV_8_O21_STK_hist.imr csv
  call impromptu.bat op\op_ohne_auftrag_O21.imr csv 
  
  call impromptu.bat zeiten\Auftraege_Mont_SPP_1340_benutzte_AW.imr csv 
- call impromptu.bat zeiten\Auftraege_Mont_SPP_1340_verk_AW.imr csv
+ rem call impromptu.bat zeiten\Auftraege_Mont_SPP_1340_verk_AW.imr csv
+ call impromptu.bat zeiten\Auftraege_Mont_SPP_1340_verk_AW_mit_EP.imr csv
  call impromptu.bat zeiten\Monteur_neu_Zeiterf_neu.imr csv 
  call impromptu.bat zeiten\Schichtplan_pro_MA_neu.imr csv