瀏覽代碼

Anpassungen Bieling

Bieling 4 月之前
父節點
當前提交
7fa100bcf7
共有 50 個文件被更改,包括 990 次插入565 次删除
  1. 二進制
      System/LOCOSOFT/Catalogs/GCStruct.cat
  2. 二進制
      System/LOCOSOFT/Catalogs/Kalender.cat
  3. 二進制
      System/LOCOSOFT/Catalogs/Locosoft.cat
  4. 二進制
      System/LOCOSOFT/Catalogs/Locosoft_Bestand_NW_GW_VK.cat
  5. 二進制
      System/LOCOSOFT/Catalogs/Locosoft_operativ.cat
  6. 二進制
      System/LOCOSOFT/Catalogs/Locosoft_operativ_NW_GW_VK_2018.cat
  7. 二進制
      System/LOCOSOFT/Catalogs/Locosoft_operativ_Sollzeit.cat
  8. 0 0
      System/LOCOSOFT/Catalogs/Locosoft_operativ_Sollzeit.icr
  9. 二進制
      System/LOCOSOFT/Catalogs/Locosoft_operativ_offene_Auftraege.cat
  10. 二進制
      System/LOCOSOFT/IQD/Belege/LOC_Belege.imr
  11. 3 3
      System/LOCOSOFT/IQD/Belege/LOC_Belege.iqd
  12. 二進制
      System/LOCOSOFT/IQD/Belege/LOC_Belege_Bilanz.imr
  13. 1 1
      System/LOCOSOFT/IQD/Belege/LOC_Belege_Bilanz.iqd
  14. 二進制
      System/LOCOSOFT/IQD/Belege/LOC_Belege_STK.imr
  15. 二進制
      System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ.imr
  16. 1 1
      System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ.iqd
  17. 67 0
      System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ.sql
  18. 二進制
      System/LOCOSOFT/IQD/Belege/current_date_fuer_ims.imr
  19. 11 14
      System/LOCOSOFT/IQD/Belege/loc_belege.sql
  20. 1 1
      System/LOCOSOFT/IQD/Belege/loc_belege_bilanz.sql
  21. 二進制
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo.imr
  22. 18 18
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo.iqd
  23. 142 61
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo.sql
  24. 二進制
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo_vor_Verkäufer_als_Verursacher.imr
  25. 二進制
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520.imr
  26. 18 18
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520.iqd
  27. 142 61
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520.sql
  28. 二進制
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520_mit_Verkäufer.imr
  29. 二進制
      System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520_vor_Verkäufer_als_Verursacher.imr
  30. 二進制
      System/LOCOSOFT/IQD/Zeit/Zeit_Sollzeit.imr
  31. 1 1
      System/LOCOSOFT/IQD/Zeit/Zeit_Sollzeit.iqd
  32. 二進制
      System/LOCOSOFT/Models/F_Belege_SKR.pyj
  33. 二進制
      System/LOCOSOFT/Models/S_Aftersales.pyj
  34. 二進制
      System/LOCOSOFT/Models/V_Verkauf.pyj
  35. 二進制
      System/LOCOSOFT/Models/Z_Monteure.pyj
  36. 0 0
      System/LOCOSOFT/Package/IDLog.xml
  37. 0 0
      System/LOCOSOFT/Package/log.xml
  38. 0 0
      System/LOCOSOFT/Package/model.xml
  39. 16 0
      System/LOCOSOFT/SQL/exec/GC_Mitarbeiter_Update.sql
  40. 87 0
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.current_date_prognose_operativ_imr.sql
  41. 1 1
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.loc_belege_bilanz_imr.sql
  42. 11 14
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.loc_belege_imr.sql
  43. 142 61
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.op_aus_loc_belege_deb_saldo_imr.sql
  44. 142 61
      System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.op_aus_loc_belege_ohne_8520_imr.sql
  45. 二進制
      System/LOCOSOFT/Sicherung/GC_BACKUP_CONTENT_STORE_DAILY.zip
  46. 二進制
      System/LOCOSOFT/Sicherung/GC_BACKUP_CONTENT_STORE_WEEKLY.zip
  47. 1 1
      Tasks/GlobalCube.bat
  48. 1 0
      Tasks/LOCOSOFT_imr_csv.bat
  49. 53 69
      Tasks/config/c11/folders.json
  50. 131 179
      Tasks/config/c11/reports.json

二進制
System/LOCOSOFT/Catalogs/GCStruct.cat


二進制
System/LOCOSOFT/Catalogs/Kalender.cat


二進制
System/LOCOSOFT/Catalogs/Locosoft.cat


二進制
System/LOCOSOFT/Catalogs/Locosoft_Bestand_NW_GW_VK.cat


二進制
System/LOCOSOFT/Catalogs/Locosoft_operativ.cat


二進制
System/LOCOSOFT/Catalogs/Locosoft_operativ_NW_GW_VK_2018.cat


二進制
System/LOCOSOFT/Catalogs/Locosoft_operativ_Soll-Zeit.cat → System/LOCOSOFT/Catalogs/Locosoft_operativ_Sollzeit.cat


+ 0 - 0
System/LOCOSOFT/Catalogs/Locosoft_operativ_Soll-Zeit.icr → System/LOCOSOFT/Catalogs/Locosoft_operativ_Sollzeit.icr


二進制
System/LOCOSOFT/Catalogs/Locosoft_operativ_offene_Auftraege.cat


二進制
System/LOCOSOFT/IQD/Belege/LOC_Belege.imr


+ 3 - 3
System/LOCOSOFT/IQD/Belege/LOC_Belege.iqd

@@ -50,7 +50,7 @@ select T1."accounting_date" as c1,
 	   CASE WHEN (T1."skr51_cost_unit" BETWEEN 1 AND 49) THEN ('Neuwagen') WHEN (T1."skr51_cost_unit" BETWEEN 50 AND 59) THEN ('Gebrauchtwagen') WHEN (T1."skr51_cost_unit" BETWEEN 60 AND 69) THEN ('Teile & Zubehör') WHEN (T1."skr51_cost_unit" BETWEEN 70 AND 79) THEN ('Service') WHEN (T1."skr51_cost_unit" = 0) THEN ('Ohne Kostenträger') ELSE null END as c44,
 	   T2."is_profit_loss_account" as c45,
 	   T1."subsidiary_to_company_ref" as c46,
-	   '0' || (cast_numberToString(cast_integer(T1."skr51_branch"))) as c47,
+	   '0' || (cast_numberToString(cast_integer(T1."branch_number"))) as c47,
 	   CASE WHEN (((CASE WHEN (T1."posting_text" IS NULL) THEN (' - ') ELSE (T1."posting_text") END) = 'Saldenübernahme CDK') or (T1."accounting_date" = DATE '2019-01-01')) THEN (DATE '2019-12-01') ELSE (T1."accounting_date") END as c48,
 	   (rtrim((cast_numberToString(cast_integer(T1."skr51_make"))))) as c49,
 	   CASE WHEN ((extract(DAY FROM (now()) - (cdatetime((CASE WHEN (((CASE WHEN (T1."posting_text" IS NULL) THEN (' - ') ELSE (T1."posting_text") END) = 'Saldenübernahme CDK') or (T1."accounting_date" = DATE '2019-01-01')) THEN (DATE '2019-12-01') ELSE (T1."accounting_date") END))))) <= 90) THEN ((ascii(((intdiv(T1."document_number",1))))) || ' - ' || (CASE WHEN (T1."posting_text" IS NULL) THEN (' - ') ELSE (T1."posting_text") END) || '/' || (CASE WHEN (T1."vehicle_reference" IS NULL) THEN (' - ') ELSE (T1."vehicle_reference") END) || ' - ' || (od_left((cast_numberToString(cast_integer(T1."employee_number"))),4))) ELSE ('Buchungen älter 90 Tage') END as c50,
@@ -67,11 +67,11 @@ select T1."accounting_date" as c1,
 	   CASE WHEN (T1."skr51_cost_unit" BETWEEN 1 AND 49) THEN (((rtrim((cast_numberToString(cast_integer(T1."skr51_make"))))) || ' - ' || (rtrim((cast_numberToString(cast_integer(T1."skr51_cost_unit"))))) || ' - ' || (T3."skr51_cost_unit_name"))) ELSE ((rtrim((cast_numberToString(cast_integer(T1."skr51_cost_unit"))))) || ' - ' || (T3."skr51_cost_unit_name")) END as c61,
 	   CASE WHEN (T2."is_profit_loss_account" = 'J') THEN ('2') ELSE ('1') END as c62,
 	   (od_left((cast_numberToString(cast_integer(T1."nominal_account_number"))),1)) as c63,
-	   CASE WHEN (T1."skr51_cost_center" <> 0) THEN ((rtrim((cast_numberToString(cast_integer(T1."nominal_account_number"))))) || '_' || (rtrim((cast_numberToString(cast_integer(T1."skr51_cost_center")))))) ELSE ((cast_numberToString(cast_integer(T1."nominal_account_number")))) END as c64
+	   CASE WHEN (not T1."skr51_cost_center" IN (0,2)) THEN ((rtrim((cast_numberToString(cast_integer(T1."nominal_account_number"))))) || '_' || (rtrim((cast_numberToString(cast_integer(T1."skr51_cost_center")))))) ELSE ((cast_numberToString(cast_integer(T1."nominal_account_number")))) END as c64
 from "dbo"."nominal_accounts" T2,
 	("dbo"."journal_accountings" T1 left outer join "dbo"."accounts_characteristics" T3 on (((((T3."subsidiary_to_company_ref" = T1."subsidiary_to_company_ref") and (T3."skr51_branch" = T1."skr51_branch")) and (T3."skr51_make" = T1."skr51_make")) and (T3."skr51_cost_center" = T1."skr51_cost_center")) and (T3."skr51_sales_channel" = T1."skr51_sales_channel")) and (T3."skr51_cost_unit" = T1."skr51_cost_unit"))
 where ((T2."nominal_account_number" = T1."nominal_account_number") and (T2."subsidiary_to_company_ref" = T1."subsidiary_to_company_ref"))
-and (((T2."is_profit_loss_account" = 'J') and (not (CASE WHEN (T1."posting_text" IS NULL) THEN (' - ') ELSE (T1."posting_text") END) IN ('G&V-Abschlussbuchung'))) and (T1."document_type" <> 'A'))
+and ((T2."is_profit_loss_account" = 'J') and (not (CASE WHEN (T1."posting_text" IS NULL) THEN (' - ') ELSE (T1."posting_text") END) IN ('G&V-Abschlussbuchung')))
 order by c6 asc
 
 END SQL

二進制
System/LOCOSOFT/IQD/Belege/LOC_Belege_Bilanz.imr


+ 1 - 1
System/LOCOSOFT/IQD/Belege/LOC_Belege_Bilanz.iqd

@@ -50,7 +50,7 @@ select T1."accounting_date" as c1,
 	   CASE WHEN (T1."skr51_cost_unit" BETWEEN 1 AND 49) THEN ('Neuwagen') WHEN (T1."skr51_cost_unit" BETWEEN 50 AND 59) THEN ('Gebrauchtwagen') WHEN (T1."skr51_cost_unit" BETWEEN 60 AND 69) THEN ('Teile & Zubehör') WHEN (T1."skr51_cost_unit" BETWEEN 70 AND 79) THEN ('Service') WHEN (T1."skr51_cost_unit" = 0) THEN ('Ohne Kostenträger') ELSE null END as c44,
 	   T2."is_profit_loss_account" as c45,
 	   T1."subsidiary_to_company_ref" as c46,
-	   ('0' || (cast_numberToString(cast_integer(T1."skr51_branch")))) as c47,
+	   ('0' || (cast_numberToString(cast_integer(T1."branch_number")))) as c47,
 	   T1."accounting_date" as c48,
 	   (rtrim((cast_numberToString(cast_integer(T1."skr51_make"))))) as c49,
 	   '' as c50,

二進制
System/LOCOSOFT/IQD/Belege/LOC_Belege_STK.imr


二進制
System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ.imr


+ 1 - 1
System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ.iqd

@@ -1,7 +1,7 @@
 COGNOS QUERY
 STRUCTURE,1,1
 DATABASE,Kalender
-DATASOURCENAME,C:\GAPS_Audev\Portal\System\IQD\Belege\current_date_Prognose_operativ.imr
+DATASOURCENAME,C:\GlobalCube\System\LOCOSOFT\IQD\belege\current_date_Prognose_operativ.imr
 TITLE,current_date_Prognose_operativ.imr
 BEGIN SQL
 select c1 as c1,

+ 67 - 0
System/LOCOSOFT/IQD/Belege/current_date_Prognose_operativ.sql

@@ -0,0 +1,67 @@
+SELECT "Bundeslaender Id" AS "Bundeslaender Id",
+	"Datum" AS "Datum",
+	"Wochentage Id" AS "Wochentage Id",
+	"Arbeitstag Mofr" AS "Arbeitstag Mofr",
+	"Zaehler Mofr" AS "Zaehler Mofr",
+	"Summe Mofr" AS "Summe Mofr",
+	"Arbeitstag Mosa" AS "Arbeitstag Mosa",
+	"Zaehler Mosa" AS "Zaehler Mosa",
+	"Summe Mosa" AS "Summe Mosa",
+	"Feiertage Id" AS "Feiertage Id",
+	"Jahr" AS "Jahr",
+	CASE 
+		WHEN ("Arbeitstag Mofr" = 1)
+			THEN (RCOUNT("Arbeitstag Mofr"))
+		ELSE NULL
+		END AS "Arbeitstag Nr Jahr",
+	"Gesamt Arbeitstage" AS "Gesamt Arbeitstage"
+FROM (
+	SELECT T1."bundeslaender_id" AS "Bundeslaender Id",
+		T1."datum" AS "Datum",
+		T1."wochentage_id" AS "Wochentage Id",
+		T1."arbeitstag_mofr" AS "Arbeitstag Mofr",
+		T1."zaehler_mofr" AS "Zaehler Mofr",
+		T1."summe_mofr" AS "Summe Mofr",
+		T1."arbeitstag_mosa" AS "Arbeitstag Mosa",
+		T1."zaehler_mosa" AS "Zaehler Mosa",
+		T1."summe_mosa" AS "Summe Mosa",
+		T1."feiertage_id" AS "Feiertage Id",
+		(getdate()) AS "Jahr",
+		CASE 
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2008-01-01 00:00:00.000') AND convert(DATETIME, '2008-12-31 00:00:00.000'))
+				THEN (252)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2009-01-01 00:00:00.000') AND convert(DATETIME, '2009-12-31 00:00:00.000'))
+				THEN (252)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2010-01-01 00:00:00.000') AND convert(DATETIME, '2010-12-31 00:00:00.000'))
+				THEN (253)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2011-01-01 00:00:00.000') AND convert(DATETIME, '2011-12-31 00:00:00.000'))
+				THEN (250)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2012-01-01 00:00:00.000') AND convert(DATETIME, '2012-12-31 00:00:00.000'))
+				THEN (249)
+			ELSE (250)
+			END AS "Gesamt Arbeitstage"
+	FROM "Arbeitstage" T1
+	WHERE (
+			(
+				(
+					(
+						(T1."bundeslaender_id" = '10')
+						AND (T1."arbeitstag_mofr" = 1)
+						)
+					AND ((year(T1."datum")) = (year(((getdate())))))
+					)
+				AND (T1."datum" <= ((getdate())))
+				)
+			OR (
+				(
+					(
+						(T1."bundeslaender_id" = '10')
+						AND ((year(T1."datum")) = (year(((getdate())))))
+						)
+					AND (T1."datum" <= ((getdate())))
+					)
+				AND (T1."datum" IN (convert(DATETIME, '2015-01-01 00:00:00.000'), convert(DATETIME, '2016-01-01 00:00:00.000'), convert(DATETIME, '2017-01-01 00:00:00.000'), convert(DATETIME, '2018-01-01 00:00:00.000'), convert(DATETIME, '2019-01-01 00:00:00.000')))
+				)
+			)
+		-- order by "Bundeslaender Id" asc,"Datum" asc,"Wochentage Id" asc,"Arbeitstag Mofr" asc,"Zaehler Mofr" asc,"Summe Mofr" asc,"Arbeitstag Mosa" asc,"Zaehler Mosa" asc,"Summe Mosa" asc,"Feiertage Id" asc,"Gesamt Arbeitstage" asc
+	) D1

二進制
System/LOCOSOFT/IQD/Belege/current_date_fuer_ims.imr


+ 11 - 14
System/LOCOSOFT/IQD/Belege/loc_belege.sql

@@ -64,7 +64,7 @@ SELECT T1."accounting_date" AS "Accounting Date",
 		END AS "Free Form Document Text",
 	T2."is_profit_loss_account" AS "Nom_Account_Is Profit Loss Account",
 	T1."subsidiary_to_company_ref" AS "Rechtseinheit",
-	'0' + (((T1."skr51_branch"))) AS "Betrieb",
+	'0' + (((T1."branch_number"))) AS "Betrieb",
 	CASE 
 		WHEN (
 				(
@@ -154,7 +154,7 @@ SELECT T1."accounting_date" AS "Accounting Date",
 		END AS "GuV_Bilanz",
 	(left((((T1."nominal_account_number"))), 1)) AS "Susa",
 	CASE 
-		WHEN (T1."skr51_cost_center" <> 0)
+		WHEN (NOT T1."skr51_cost_center" IN (0, 2))
 			THEN ((rtrim((((T1."nominal_account_number"))))) + '_' + (rtrim((((T1."skr51_cost_center"))))))
 		ELSE ((((T1."nominal_account_number"))))
 		END AS "Acct Nr"
@@ -180,18 +180,15 @@ WHERE (
 		AND (T2."subsidiary_to_company_ref" = T1."subsidiary_to_company_ref")
 		)
 	AND (
-		(
-			(T2."is_profit_loss_account" = 'J')
-			AND (
-				NOT (
-					CASE 
-						WHEN (T1."posting_text" IS NULL)
-							THEN (' - ')
-						ELSE (T1."posting_text")
-						END
-					) IN ('G&V-Abschlussbuchung')
-				)
+		(T2."is_profit_loss_account" = 'J')
+		AND (
+			NOT (
+				CASE 
+					WHEN (T1."posting_text" IS NULL)
+						THEN (' - ')
+					ELSE (T1."posting_text")
+					END
+				) IN ('G&V-Abschlussbuchung')
 			)
-		AND (T1."document_type" <> 'A')
 		)
 	-- order by "Nominal Account Number" asc

+ 1 - 1
System/LOCOSOFT/IQD/Belege/loc_belege_bilanz.sql

@@ -56,7 +56,7 @@ SELECT T1."accounting_date" AS "Accounting Date",
 		END AS "Free Form Document Text",
 	T2."is_profit_loss_account" AS "Nom_Account_Is Profit Loss Account",
 	T1."subsidiary_to_company_ref" AS "Rechtseinheit",
-	('0' + (((T1."skr51_branch")))) AS "Betrieb",
+	('0' + (((T1."branch_number")))) AS "Betrieb",
 	T1."accounting_date" AS "Bookkeep Date",
 	(rtrim((((T1."skr51_make"))))) AS "Marke",
 	'' AS "Text",

二進制
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo.imr


文件差異過大導致無法顯示
+ 18 - 18
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo.iqd


+ 142 - 61
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo.sql

@@ -158,7 +158,7 @@ FROM (
 		"Betrieb" AS "Standort",
 		SUM("Betrag") OVER (PARTITION BY "Customer Number_suctomer_supplier") AS c80
 	FROM (
-		SELECT T3."customer_number" AS "Customer Number_suctomer_supplier",
+		SELECT T5."customer_number" AS "Customer Number_suctomer_supplier",
 			('0' + (((T1."branch_number")))) AS "Betrieb",
 			CASE 
 				WHEN (
@@ -213,15 +213,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -231,15 +231,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -249,15 +249,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -267,15 +267,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -466,8 +466,8 @@ FROM (
 							END
 						))
 				) AS "Anzahl_Stellen_Invoice_Number",
-			T2."name" AS "Name_Employees_journal_accountings",
-			T2."employee_number" AS "Employee Number_Employees_journal_accountings",
+			T4."name" AS "Name_Employees_journal_accountings",
+			T4."employee_number" AS "Employee Number_Employees_journal_accountings",
 			(
 				(
 					CASE 
@@ -490,9 +490,9 @@ FROM (
 					)
 				) AS "Beleg",
 			CASE 
-				WHEN (T3."first_name" IS NOT NULL)
-					THEN ((left((((T3."customer_number"))), 7)) + ' - ' + T3."first_name" + ' ' + T3."family_name")
-				ELSE ((left((((T3."customer_number"))), 7)) + ' - ' + T3."family_name")
+				WHEN (T5."first_name" IS NOT NULL)
+					THEN ((left((((T5."customer_number"))), 7)) + ' - ' + T5."first_name" + ' ' + T5."family_name")
+				ELSE ((left((((T5."customer_number"))), 7)) + ' - ' + T5."family_name")
 				END AS "Kunde",
 			CASE 
 				WHEN (((- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date"))))) BETWEEN 0 AND 14)
@@ -509,15 +509,15 @@ FROM (
 				END AS "Staffel",
 			(- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date")))) AS "Tage",
 			CASE 
-				WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+				WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 					THEN ('3')
-				WHEN (T5."invoice_type" IN (5))
+				WHEN (T7."invoice_type" IN (5))
 					THEN ('6')
-				WHEN (T5."invoice_type" IN (7))
+				WHEN (T7."invoice_type" IN (7))
 					THEN ('1')
-				WHEN (T5."invoice_type" IN (8))
+				WHEN (T7."invoice_type" IN (8))
 					THEN ('2')
-				WHEN (T4."document_type_in_journal" = 'R')
+				WHEN (T6."document_type_in_journal" = 'R')
 					THEN ('7')
 				ELSE NULL
 				END AS "Kostenstelle",
@@ -528,10 +528,14 @@ FROM (
 					ELSE (T1."posted_value" / 100)
 					END
 				) AS "Betrag",
-			(left((((T2."employee_number"))), 4)) + ' - ' + T2."name" AS "Sel Name",
 			CASE 
-				WHEN (T5."subsidiary" IS NOT NULL)
-					THEN ('0' + (left((((T5."subsidiary"))), 1)))
+				WHEN (T2."salesman_number" IS NOT NULL)
+					THEN ((left((((T3."employee_number"))), 4)) + ' - ' + T3."name")
+				ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+				END AS "Sel Name",
+			CASE 
+				WHEN (T7."subsidiary" IS NOT NULL)
+					THEN ('0' + (left((((T7."subsidiary"))), 1)))
 				ELSE ('nicht zuzuordnen')
 				END AS "Standort_ori",
 			CASE 
@@ -539,15 +543,15 @@ FROM (
 					THEN ('15')
 				ELSE ('1')
 				END AS "Hauptbetrieb",
-			T5."invoice_date" AS "Invoice Date_Invoices",
-			T5."subsidiary" AS "Subsidiary_Invoices",
-			T5."invoice_number" AS "Invoice Number_Invoices",
-			T5."invoice_type" AS "Invoice Type_Invoices",
-			T4."document_type_description" AS "Document Type Description",
-			T4."document_type_in_journal" AS "Document Type In Journal",
-			T3."family_name" AS "Family Name",
-			T3."first_name" AS "First Name",
-			T3."is_supplier" AS "Is Supplier",
+			T7."invoice_date" AS "Invoice Date_Invoices",
+			T7."subsidiary" AS "Subsidiary_Invoices",
+			T7."invoice_number" AS "Invoice Number_Invoices",
+			T7."invoice_type" AS "Invoice Type_Invoices",
+			T6."document_type_description" AS "Document Type Description",
+			T6."document_type_in_journal" AS "Document Type In Journal",
+			T5."family_name" AS "Family Name",
+			T5."first_name" AS "First Name",
+			T5."is_supplier" AS "Is Supplier",
 			T1."nominal_account_number" AS "Nominal Account Number",
 			CASE 
 				WHEN (T1."debit_or_credit" = 'H')
@@ -586,7 +590,13 @@ FROM (
 										THEN (' - ')
 									ELSE (T1."vehicle_reference")
 									END
-								) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+								) + ' - ' + (
+								CASE 
+									WHEN (T2."salesman_number" IS NOT NULL)
+										THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+									ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+									END
+								) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 							)
 				ELSE (
 						(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -598,7 +608,13 @@ FROM (
 									THEN (' - ')
 								ELSE (T1."vehicle_reference")
 								END
-							) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+							) + ' - ' + (
+							CASE 
+								WHEN (T2."salesman_number" IS NOT NULL)
+									THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+								ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+								END
+							) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 						)
 				END AS "Text",
 			T1."accounting_date" AS "Accounting Date",
@@ -641,7 +657,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -653,7 +675,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%RG-BONUS%'
@@ -692,7 +720,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -704,7 +738,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%GEBURTSTAGS%'
@@ -744,7 +784,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 											ELSE (
 													(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -756,7 +802,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 											END
 										) LIKE '%STARTGUTHABEN%'
@@ -796,7 +848,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 										ELSE (
 												(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -808,7 +866,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 										END
 									) LIKE '%BONUS F%'
@@ -848,7 +912,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 									ELSE (
 											(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -860,7 +930,13 @@ FROM (
 														THEN (' - ')
 													ELSE (T1."vehicle_reference")
 													END
-												) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+												) + ' - ' + (
+												CASE 
+													WHEN (T2."salesman_number" IS NOT NULL)
+														THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+													ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+													END
+												) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 											)
 									END
 								) LIKE '%RG-ABZUG%'
@@ -935,10 +1011,15 @@ FROM (
 			(
 				(
 					(
-						"journal_accountings" T1 LEFT JOIN "LOCOSOFT"."dbo"."employees" T2 ON T1."employee_number" = T2."employee_number"
-						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T3 ON T3."customer_number" = T1."customer_number"
-					) LEFT JOIN "document_types" T4 ON T4."document_type_in_journal" = T1."document_type"
-				) LEFT JOIN "invoices" T5 ON T5."invtype_invnr" = T1."invoice_number"
+						(
+							(
+								"journal_accountings" T1 LEFT JOIN "vehicles" T2 ON (right(T1."vehicle_reference", 17)) = T2."vin"
+								) LEFT JOIN "employees" T3 ON (T2."salesman_number" <> 0)
+								AND (T2."salesman_number" = T3."salesman_number")
+							) LEFT JOIN "LOCOSOFT"."dbo"."employees" T4 ON T1."employee_number" = T4."employee_number"
+						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T5 ON T5."customer_number" = T1."customer_number"
+					) LEFT JOIN "document_types" T6 ON T6."document_type_in_journal" = T1."document_type"
+				) LEFT JOIN "invoices" T7 ON T7."invtype_invnr" = T1."invoice_number"
 			)
 		WHERE (
 				(
@@ -949,9 +1030,9 @@ FROM (
 							)
 						AND (T1."customer_number" IS NOT NULL)
 						)
-					AND (NOT T4."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
+					AND (NOT T6."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
 					)
-				AND (T3."customer_number" IS NOT NULL)
+				AND (T5."customer_number" IS NOT NULL)
 				)
 		) D2
 	) D1

二進制
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_Deb_Saldo_vor_Verkäufer_als_Verursacher.imr


二進制
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520.imr


文件差異過大導致無法顯示
+ 18 - 18
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520.iqd


+ 142 - 61
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520.sql

@@ -158,7 +158,7 @@ FROM (
 		"Betrieb" AS "Standort",
 		SUM("Betrag") OVER (PARTITION BY "Customer Number_suctomer_supplier") AS c80
 	FROM (
-		SELECT T3."customer_number" AS "Customer Number_suctomer_supplier",
+		SELECT T5."customer_number" AS "Customer Number_suctomer_supplier",
 			('0' + (((T1."branch_number")))) AS "Betrieb",
 			CASE 
 				WHEN (
@@ -213,15 +213,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -231,15 +231,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -249,15 +249,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -267,15 +267,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -466,8 +466,8 @@ FROM (
 							END
 						))
 				) AS "Anzahl_Stellen_Invoice_Number",
-			T2."name" AS "Name_Employees_journal_accountings",
-			T2."employee_number" AS "Employee Number_Employees_journal_accountings",
+			T4."name" AS "Name_Employees_journal_accountings",
+			T4."employee_number" AS "Employee Number_Employees_journal_accountings",
 			(
 				(
 					CASE 
@@ -490,9 +490,9 @@ FROM (
 					)
 				) AS "Beleg",
 			CASE 
-				WHEN (T3."first_name" IS NOT NULL)
-					THEN ((left((((T3."customer_number"))), 7)) + ' - ' + T3."first_name" + ' ' + T3."family_name")
-				ELSE ((left((((T3."customer_number"))), 7)) + ' - ' + T3."family_name")
+				WHEN (T5."first_name" IS NOT NULL)
+					THEN ((left((((T5."customer_number"))), 7)) + ' - ' + T5."first_name" + ' ' + T5."family_name")
+				ELSE ((left((((T5."customer_number"))), 7)) + ' - ' + T5."family_name")
 				END AS "Kunde",
 			CASE 
 				WHEN (((- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date"))))) BETWEEN 0 AND 14)
@@ -509,15 +509,15 @@ FROM (
 				END AS "Staffel",
 			(- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date")))) AS "Tage",
 			CASE 
-				WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+				WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 					THEN ('3')
-				WHEN (T5."invoice_type" IN (5))
+				WHEN (T7."invoice_type" IN (5))
 					THEN ('6')
-				WHEN (T5."invoice_type" IN (7))
+				WHEN (T7."invoice_type" IN (7))
 					THEN ('1')
-				WHEN (T5."invoice_type" IN (8))
+				WHEN (T7."invoice_type" IN (8))
 					THEN ('2')
-				WHEN (T4."document_type_in_journal" = 'R')
+				WHEN (T6."document_type_in_journal" = 'R')
 					THEN ('7')
 				ELSE NULL
 				END AS "Kostenstelle",
@@ -528,10 +528,14 @@ FROM (
 					ELSE (T1."posted_value" / 100)
 					END
 				) AS "Betrag",
-			(left((((T2."employee_number"))), 4)) + ' - ' + T2."name" AS "Sel Name",
 			CASE 
-				WHEN (T5."subsidiary" IS NOT NULL)
-					THEN ('0' + (left((((T5."subsidiary"))), 1)))
+				WHEN (T2."salesman_number" IS NOT NULL)
+					THEN ((left((((T3."employee_number"))), 4)) + ' - ' + T3."name")
+				ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+				END AS "Sel Name",
+			CASE 
+				WHEN (T7."subsidiary" IS NOT NULL)
+					THEN ('0' + (left((((T7."subsidiary"))), 1)))
 				ELSE ('nicht zuzuordnen')
 				END AS "Standort_ori",
 			CASE 
@@ -539,15 +543,15 @@ FROM (
 					THEN ('15')
 				ELSE ('1')
 				END AS "Hauptbetrieb",
-			T5."invoice_date" AS "Invoice Date_Invoices",
-			T5."subsidiary" AS "Subsidiary_Invoices",
-			T5."invoice_number" AS "Invoice Number_Invoices",
-			T5."invoice_type" AS "Invoice Type_Invoices",
-			T4."document_type_description" AS "Document Type Description",
-			T4."document_type_in_journal" AS "Document Type In Journal",
-			T3."family_name" AS "Family Name",
-			T3."first_name" AS "First Name",
-			T3."is_supplier" AS "Is Supplier",
+			T7."invoice_date" AS "Invoice Date_Invoices",
+			T7."subsidiary" AS "Subsidiary_Invoices",
+			T7."invoice_number" AS "Invoice Number_Invoices",
+			T7."invoice_type" AS "Invoice Type_Invoices",
+			T6."document_type_description" AS "Document Type Description",
+			T6."document_type_in_journal" AS "Document Type In Journal",
+			T5."family_name" AS "Family Name",
+			T5."first_name" AS "First Name",
+			T5."is_supplier" AS "Is Supplier",
 			T1."nominal_account_number" AS "Nominal Account Number",
 			CASE 
 				WHEN (T1."debit_or_credit" = 'H')
@@ -586,7 +590,13 @@ FROM (
 										THEN (' - ')
 									ELSE (T1."vehicle_reference")
 									END
-								) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+								) + ' - ' + (
+								CASE 
+									WHEN (T2."salesman_number" IS NOT NULL)
+										THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+									ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+									END
+								) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 							)
 				ELSE (
 						(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -598,7 +608,13 @@ FROM (
 									THEN (' - ')
 								ELSE (T1."vehicle_reference")
 								END
-							) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+							) + ' - ' + (
+							CASE 
+								WHEN (T2."salesman_number" IS NOT NULL)
+									THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+								ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+								END
+							) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 						)
 				END AS "Text",
 			T1."accounting_date" AS "Accounting Date",
@@ -641,7 +657,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -653,7 +675,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%RG-BONUS%'
@@ -692,7 +720,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -704,7 +738,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%GEBURTSTAGS%'
@@ -744,7 +784,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 											ELSE (
 													(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -756,7 +802,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 											END
 										) LIKE '%STARTGUTHABEN%'
@@ -796,7 +848,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 										ELSE (
 												(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -808,7 +866,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 										END
 									) LIKE '%BONUS F%'
@@ -848,7 +912,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 									ELSE (
 											(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -860,7 +930,13 @@ FROM (
 														THEN (' - ')
 													ELSE (T1."vehicle_reference")
 													END
-												) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+												) + ' - ' + (
+												CASE 
+													WHEN (T2."salesman_number" IS NOT NULL)
+														THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+													ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+													END
+												) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 											)
 									END
 								) LIKE '%RG-ABZUG%'
@@ -935,10 +1011,15 @@ FROM (
 			(
 				(
 					(
-						"journal_accountings" T1 LEFT JOIN "LOCOSOFT"."dbo"."employees" T2 ON T1."employee_number" = T2."employee_number"
-						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T3 ON T3."customer_number" = T1."customer_number"
-					) LEFT JOIN "document_types" T4 ON T4."document_type_in_journal" = T1."document_type"
-				) LEFT JOIN "invoices" T5 ON T5."invtype_invnr" = T1."invoice_number"
+						(
+							(
+								"journal_accountings" T1 LEFT JOIN "vehicles" T2 ON (right(T1."vehicle_reference", 17)) = T2."vin"
+								) LEFT JOIN "employees" T3 ON (T2."salesman_number" <> 0)
+								AND (T2."salesman_number" = T3."salesman_number")
+							) LEFT JOIN "LOCOSOFT"."dbo"."employees" T4 ON T1."employee_number" = T4."employee_number"
+						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T5 ON T5."customer_number" = T1."customer_number"
+					) LEFT JOIN "document_types" T6 ON T6."document_type_in_journal" = T1."document_type"
+				) LEFT JOIN "invoices" T7 ON T7."invtype_invnr" = T1."invoice_number"
 			)
 		WHERE (
 				(
@@ -949,9 +1030,9 @@ FROM (
 							)
 						AND (T1."customer_number" IS NOT NULL)
 						)
-					AND (NOT T4."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
+					AND (NOT T6."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
 					)
-				AND (T3."customer_number" IS NOT NULL)
+				AND (T5."customer_number" IS NOT NULL)
 				)
 		) D2
 	) D1

二進制
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520_mit_Verkäufer.imr


二進制
System/LOCOSOFT/IQD/OP/OP_aus_LOC_Belege_ohne_8520_vor_Verkäufer_als_Verursacher.imr


二進制
System/LOCOSOFT/IQD/Zeit/Zeit_Sollzeit.imr


+ 1 - 1
System/LOCOSOFT/IQD/Zeit/Zeit_Sollzeit.iqd

@@ -1,7 +1,7 @@
 COGNOS QUERY
 STRUCTURE,1,1
 DATABASE,Locosoft_GC
-DATASOURCENAME,C:\GlobalCube\System\LOCOSOFT\IQD\Zeit\Zeit_Sollzeit.imr
+DATASOURCENAME,C:\GlobalCube\System\LOCOSOFT\IQD\zeit\Zeit_Sollzeit.imr
 TITLE,Zeit_Sollzeit.imr
 BEGIN SQL
 select T1."employee_number" as c1,

二進制
System/LOCOSOFT/Models/F_Belege_SKR.pyj


二進制
System/LOCOSOFT/Models/S_Aftersales.pyj


二進制
System/LOCOSOFT/Models/V_Verkauf.pyj


二進制
System/LOCOSOFT/Models/Z_Monteure.pyj


文件差異過大導致無法顯示
+ 0 - 0
System/LOCOSOFT/Package/IDLog.xml


文件差異過大導致無法顯示
+ 0 - 0
System/LOCOSOFT/Package/log.xml


文件差異過大導致無法顯示
+ 0 - 0
System/LOCOSOFT/Package/model.xml


+ 16 - 0
System/LOCOSOFT/SQL/exec/GC_Mitarbeiter_Update.sql

@@ -0,0 +1,16 @@
+INSERT INTO [GC].[data].[GC_Mitarbeiter]
+SELECT T1.[Client_DB]
+      ,T1.[Employee_ID]
+      ,T1.[Name]
+      ,T1.[Department]
+      ,T1.[Zuordnung_Funktion]
+      ,T1.[Zuordnung_Produktiv]
+      ,T1.[Monteur_Ebene_1]
+      ,T1.[Monteur_Ebene_2]
+      ,T1.[Monteur_Ebene_3]
+      ,T1.[Zuordnung_Department_Name]
+      ,T1.[productivity_factor]
+      ,T1.[leave_date]
+  FROM [LOCOSOFT].[template].[GC_Mitarbeiter] T1
+  LEFT JOIN [GC].[data].[GC_Mitarbeiter] T2 ON T1.Client_DB = T2.Client_DB AND T1.Employee_ID = T2.Employee_ID
+  WHERE T2.[Name] IS NULL

+ 87 - 0
System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.current_date_prognose_operativ_imr.sql

@@ -0,0 +1,87 @@
+SET QUOTED_IDENTIFIER ON
+GO
+
+SET ANSI_NULLS ON
+GO
+
+CREATE VIEW staging.current_date_prognose_operativ_imr
+AS
+SELECT "Bundeslaender Id" AS "Bundeslaender Id",
+	"Datum" AS "Datum",
+	"Wochentage Id" AS "Wochentage Id",
+	"Arbeitstag Mofr" AS "Arbeitstag Mofr",
+	"Zaehler Mofr" AS "Zaehler Mofr",
+	"Summe Mofr" AS "Summe Mofr",
+	"Arbeitstag Mosa" AS "Arbeitstag Mosa",
+	"Zaehler Mosa" AS "Zaehler Mosa",
+	"Summe Mosa" AS "Summe Mosa",
+	"Feiertage Id" AS "Feiertage Id",
+	"Jahr" AS "Jahr",
+	CASE 
+		WHEN ("Arbeitstag Mofr" = 1)
+			THEN (RCOUNT("Arbeitstag Mofr"))
+		ELSE NULL
+		END AS "Arbeitstag Nr Jahr",
+	"Gesamt Arbeitstage" AS "Gesamt Arbeitstage"
+FROM (
+	SELECT T1."bundeslaender_id" AS "Bundeslaender Id",
+		T1."datum" AS "Datum",
+		T1."wochentage_id" AS "Wochentage Id",
+		T1."arbeitstag_mofr" AS "Arbeitstag Mofr",
+		T1."zaehler_mofr" AS "Zaehler Mofr",
+		T1."summe_mofr" AS "Summe Mofr",
+		T1."arbeitstag_mosa" AS "Arbeitstag Mosa",
+		T1."zaehler_mosa" AS "Zaehler Mosa",
+		T1."summe_mosa" AS "Summe Mosa",
+		T1."feiertage_id" AS "Feiertage Id",
+		(getdate()) AS "Jahr",
+		CASE 
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2008-01-01 00:00:00.000') AND convert(DATETIME, '2008-12-31 00:00:00.000'))
+				THEN (252)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2009-01-01 00:00:00.000') AND convert(DATETIME, '2009-12-31 00:00:00.000'))
+				THEN (252)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2010-01-01 00:00:00.000') AND convert(DATETIME, '2010-12-31 00:00:00.000'))
+				THEN (253)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2011-01-01 00:00:00.000') AND convert(DATETIME, '2011-12-31 00:00:00.000'))
+				THEN (250)
+			WHEN (T1."datum" BETWEEN convert(DATETIME, '2012-01-01 00:00:00.000') AND convert(DATETIME, '2012-12-31 00:00:00.000'))
+				THEN (249)
+			ELSE (250)
+			END AS "Gesamt Arbeitstage"
+	FROM "Arbeitstage" T1
+	WHERE (
+			(
+				(
+					(
+						(T1."bundeslaender_id" = '10')
+						AND (T1."arbeitstag_mofr" = 1)
+						)
+					AND ((year(T1."datum")) = (year(((getdate())))))
+					)
+				AND (T1."datum" <= ((getdate())))
+				)
+			OR (
+				(
+					(
+						(T1."bundeslaender_id" = '10')
+						AND ((year(T1."datum")) = (year(((getdate())))))
+						)
+					AND (T1."datum" <= ((getdate())))
+					)
+				AND (T1."datum" IN (convert(DATETIME, '2015-01-01 00:00:00.000'), convert(DATETIME, '2016-01-01 00:00:00.000'), convert(DATETIME, '2017-01-01 00:00:00.000'), convert(DATETIME, '2018-01-01 00:00:00.000'), convert(DATETIME, '2019-01-01 00:00:00.000')))
+				)
+			)
+		-- order by "Bundeslaender Id" asc,"Datum" asc,"Wochentage Id" asc,"Arbeitstag Mofr" asc,"Zaehler Mofr" asc,"Summe Mofr" asc,"Arbeitstag Mosa" asc,"Zaehler Mosa" asc,"Summe Mosa" asc,"Feiertage Id" asc,"Gesamt Arbeitstage" asc
+	) D1
+GO
+
+SET QUOTED_IDENTIFIER OFF
+GO
+
+SET ANSI_NULLS OFF
+GO
+
+
+GO
+
+

+ 1 - 1
System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.loc_belege_bilanz_imr.sql

@@ -64,7 +64,7 @@ SELECT T1."accounting_date" AS "Accounting Date",
 		END AS "Free Form Document Text",
 	T2."is_profit_loss_account" AS "Nom_Account_Is Profit Loss Account",
 	T1."subsidiary_to_company_ref" AS "Rechtseinheit",
-	('0' + (((T1."skr51_branch")))) AS "Betrieb",
+	('0' + (((T1."branch_number")))) AS "Betrieb",
 	T1."accounting_date" AS "Bookkeep Date",
 	(rtrim((((T1."skr51_make"))))) AS "Marke",
 	'' AS "Text",

+ 11 - 14
System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.loc_belege_imr.sql

@@ -72,7 +72,7 @@ SELECT T1."accounting_date" AS "Accounting Date",
 		END AS "Free Form Document Text",
 	T2."is_profit_loss_account" AS "Nom_Account_Is Profit Loss Account",
 	T1."subsidiary_to_company_ref" AS "Rechtseinheit",
-	'0' + (((T1."skr51_branch"))) AS "Betrieb",
+	'0' + (((T1."branch_number"))) AS "Betrieb",
 	CASE 
 		WHEN (
 				(
@@ -162,7 +162,7 @@ SELECT T1."accounting_date" AS "Accounting Date",
 		END AS "GuV_Bilanz",
 	(left((((T1."nominal_account_number"))), 1)) AS "Susa",
 	CASE 
-		WHEN (T1."skr51_cost_center" <> 0)
+		WHEN (NOT T1."skr51_cost_center" IN (0, 2))
 			THEN ((rtrim((((T1."nominal_account_number"))))) + '_' + (rtrim((((T1."skr51_cost_center"))))))
 		ELSE ((((T1."nominal_account_number"))))
 		END AS "Acct Nr"
@@ -188,19 +188,16 @@ WHERE (
 		AND (T2."subsidiary_to_company_ref" = T1."subsidiary_to_company_ref")
 		)
 	AND (
-		(
-			(T2."is_profit_loss_account" = 'J')
-			AND (
-				NOT (
-					CASE 
-						WHEN (T1."posting_text" IS NULL)
-							THEN (' - ')
-						ELSE (T1."posting_text")
-						END
-					) IN ('G&V-Abschlussbuchung')
-				)
+		(T2."is_profit_loss_account" = 'J')
+		AND (
+			NOT (
+				CASE 
+					WHEN (T1."posting_text" IS NULL)
+						THEN (' - ')
+					ELSE (T1."posting_text")
+					END
+				) IN ('G&V-Abschlussbuchung')
 			)
-		AND (T1."document_type" <> 'A')
 		)
 	-- order by "Nominal Account Number" asc
 GO

+ 142 - 61
System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.op_aus_loc_belege_deb_saldo_imr.sql

@@ -166,7 +166,7 @@ FROM (
 		"Betrieb" AS "Standort",
 		SUM("Betrag") OVER (PARTITION BY "Customer Number_suctomer_supplier") AS c80
 	FROM (
-		SELECT T3."customer_number" AS "Customer Number_suctomer_supplier",
+		SELECT T5."customer_number" AS "Customer Number_suctomer_supplier",
 			('0' + (((T1."branch_number")))) AS "Betrieb",
 			CASE 
 				WHEN (
@@ -221,15 +221,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -239,15 +239,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -257,15 +257,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -275,15 +275,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -474,8 +474,8 @@ FROM (
 							END
 						))
 				) AS "Anzahl_Stellen_Invoice_Number",
-			T2."name" AS "Name_Employees_journal_accountings",
-			T2."employee_number" AS "Employee Number_Employees_journal_accountings",
+			T4."name" AS "Name_Employees_journal_accountings",
+			T4."employee_number" AS "Employee Number_Employees_journal_accountings",
 			(
 				(
 					CASE 
@@ -498,9 +498,9 @@ FROM (
 					)
 				) AS "Beleg",
 			CASE 
-				WHEN (T3."first_name" IS NOT NULL)
-					THEN ((left((((T3."customer_number"))), 7)) + ' - ' + T3."first_name" + ' ' + T3."family_name")
-				ELSE ((left((((T3."customer_number"))), 7)) + ' - ' + T3."family_name")
+				WHEN (T5."first_name" IS NOT NULL)
+					THEN ((left((((T5."customer_number"))), 7)) + ' - ' + T5."first_name" + ' ' + T5."family_name")
+				ELSE ((left((((T5."customer_number"))), 7)) + ' - ' + T5."family_name")
 				END AS "Kunde",
 			CASE 
 				WHEN (((- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date"))))) BETWEEN 0 AND 14)
@@ -517,15 +517,15 @@ FROM (
 				END AS "Staffel",
 			(- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date")))) AS "Tage",
 			CASE 
-				WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+				WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 					THEN ('3')
-				WHEN (T5."invoice_type" IN (5))
+				WHEN (T7."invoice_type" IN (5))
 					THEN ('6')
-				WHEN (T5."invoice_type" IN (7))
+				WHEN (T7."invoice_type" IN (7))
 					THEN ('1')
-				WHEN (T5."invoice_type" IN (8))
+				WHEN (T7."invoice_type" IN (8))
 					THEN ('2')
-				WHEN (T4."document_type_in_journal" = 'R')
+				WHEN (T6."document_type_in_journal" = 'R')
 					THEN ('7')
 				ELSE NULL
 				END AS "Kostenstelle",
@@ -536,10 +536,14 @@ FROM (
 					ELSE (T1."posted_value" / 100)
 					END
 				) AS "Betrag",
-			(left((((T2."employee_number"))), 4)) + ' - ' + T2."name" AS "Sel Name",
 			CASE 
-				WHEN (T5."subsidiary" IS NOT NULL)
-					THEN ('0' + (left((((T5."subsidiary"))), 1)))
+				WHEN (T2."salesman_number" IS NOT NULL)
+					THEN ((left((((T3."employee_number"))), 4)) + ' - ' + T3."name")
+				ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+				END AS "Sel Name",
+			CASE 
+				WHEN (T7."subsidiary" IS NOT NULL)
+					THEN ('0' + (left((((T7."subsidiary"))), 1)))
 				ELSE ('nicht zuzuordnen')
 				END AS "Standort_ori",
 			CASE 
@@ -547,15 +551,15 @@ FROM (
 					THEN ('15')
 				ELSE ('1')
 				END AS "Hauptbetrieb",
-			T5."invoice_date" AS "Invoice Date_Invoices",
-			T5."subsidiary" AS "Subsidiary_Invoices",
-			T5."invoice_number" AS "Invoice Number_Invoices",
-			T5."invoice_type" AS "Invoice Type_Invoices",
-			T4."document_type_description" AS "Document Type Description",
-			T4."document_type_in_journal" AS "Document Type In Journal",
-			T3."family_name" AS "Family Name",
-			T3."first_name" AS "First Name",
-			T3."is_supplier" AS "Is Supplier",
+			T7."invoice_date" AS "Invoice Date_Invoices",
+			T7."subsidiary" AS "Subsidiary_Invoices",
+			T7."invoice_number" AS "Invoice Number_Invoices",
+			T7."invoice_type" AS "Invoice Type_Invoices",
+			T6."document_type_description" AS "Document Type Description",
+			T6."document_type_in_journal" AS "Document Type In Journal",
+			T5."family_name" AS "Family Name",
+			T5."first_name" AS "First Name",
+			T5."is_supplier" AS "Is Supplier",
 			T1."nominal_account_number" AS "Nominal Account Number",
 			CASE 
 				WHEN (T1."debit_or_credit" = 'H')
@@ -594,7 +598,13 @@ FROM (
 										THEN (' - ')
 									ELSE (T1."vehicle_reference")
 									END
-								) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+								) + ' - ' + (
+								CASE 
+									WHEN (T2."salesman_number" IS NOT NULL)
+										THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+									ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+									END
+								) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 							)
 				ELSE (
 						(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -606,7 +616,13 @@ FROM (
 									THEN (' - ')
 								ELSE (T1."vehicle_reference")
 								END
-							) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+							) + ' - ' + (
+							CASE 
+								WHEN (T2."salesman_number" IS NOT NULL)
+									THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+								ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+								END
+							) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 						)
 				END AS "Text",
 			T1."accounting_date" AS "Accounting Date",
@@ -649,7 +665,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -661,7 +683,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%RG-BONUS%'
@@ -700,7 +728,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -712,7 +746,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%GEBURTSTAGS%'
@@ -752,7 +792,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 											ELSE (
 													(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -764,7 +810,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 											END
 										) LIKE '%STARTGUTHABEN%'
@@ -804,7 +856,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 										ELSE (
 												(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -816,7 +874,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 										END
 									) LIKE '%BONUS F%'
@@ -856,7 +920,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 									ELSE (
 											(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -868,7 +938,13 @@ FROM (
 														THEN (' - ')
 													ELSE (T1."vehicle_reference")
 													END
-												) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+												) + ' - ' + (
+												CASE 
+													WHEN (T2."salesman_number" IS NOT NULL)
+														THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+													ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+													END
+												) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 											)
 									END
 								) LIKE '%RG-ABZUG%'
@@ -943,10 +1019,15 @@ FROM (
 			(
 				(
 					(
-						"journal_accountings" T1 LEFT JOIN "LOCOSOFT"."dbo"."employees" T2 ON T1."employee_number" = T2."employee_number"
-						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T3 ON T3."customer_number" = T1."customer_number"
-					) LEFT JOIN "document_types" T4 ON T4."document_type_in_journal" = T1."document_type"
-				) LEFT JOIN "invoices" T5 ON T5."invtype_invnr" = T1."invoice_number"
+						(
+							(
+								"journal_accountings" T1 LEFT JOIN "vehicles" T2 ON (right(T1."vehicle_reference", 17)) = T2."vin"
+								) LEFT JOIN "employees" T3 ON (T2."salesman_number" <> 0)
+								AND (T2."salesman_number" = T3."salesman_number")
+							) LEFT JOIN "LOCOSOFT"."dbo"."employees" T4 ON T1."employee_number" = T4."employee_number"
+						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T5 ON T5."customer_number" = T1."customer_number"
+					) LEFT JOIN "document_types" T6 ON T6."document_type_in_journal" = T1."document_type"
+				) LEFT JOIN "invoices" T7 ON T7."invtype_invnr" = T1."invoice_number"
 			)
 		WHERE (
 				(
@@ -957,9 +1038,9 @@ FROM (
 							)
 						AND (T1."customer_number" IS NOT NULL)
 						)
-					AND (NOT T4."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
+					AND (NOT T6."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
 					)
-				AND (T3."customer_number" IS NOT NULL)
+				AND (T5."customer_number" IS NOT NULL)
 				)
 		) D2
 	) D1

+ 142 - 61
System/LOCOSOFT/SQL/schema/LOCOSOFT/views_imr/staging.op_aus_loc_belege_ohne_8520_imr.sql

@@ -166,7 +166,7 @@ FROM (
 		"Betrieb" AS "Standort",
 		SUM("Betrag") OVER (PARTITION BY "Customer Number_suctomer_supplier") AS c80
 	FROM (
-		SELECT T3."customer_number" AS "Customer Number_suctomer_supplier",
+		SELECT T5."customer_number" AS "Customer Number_suctomer_supplier",
 			('0' + (((T1."branch_number")))) AS "Betrieb",
 			CASE 
 				WHEN (
@@ -221,15 +221,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -239,15 +239,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -257,15 +257,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -275,15 +275,15 @@ FROM (
 				WHEN (
 						(
 							CASE 
-								WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+								WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 									THEN ('3')
-								WHEN (T5."invoice_type" IN (5))
+								WHEN (T7."invoice_type" IN (5))
 									THEN ('6')
-								WHEN (T5."invoice_type" IN (7))
+								WHEN (T7."invoice_type" IN (7))
 									THEN ('1')
-								WHEN (T5."invoice_type" IN (8))
+								WHEN (T7."invoice_type" IN (8))
 									THEN ('2')
-								WHEN (T4."document_type_in_journal" = 'R')
+								WHEN (T6."document_type_in_journal" = 'R')
 									THEN ('7')
 								ELSE NULL
 								END
@@ -474,8 +474,8 @@ FROM (
 							END
 						))
 				) AS "Anzahl_Stellen_Invoice_Number",
-			T2."name" AS "Name_Employees_journal_accountings",
-			T2."employee_number" AS "Employee Number_Employees_journal_accountings",
+			T4."name" AS "Name_Employees_journal_accountings",
+			T4."employee_number" AS "Employee Number_Employees_journal_accountings",
 			(
 				(
 					CASE 
@@ -498,9 +498,9 @@ FROM (
 					)
 				) AS "Beleg",
 			CASE 
-				WHEN (T3."first_name" IS NOT NULL)
-					THEN ((left((((T3."customer_number"))), 7)) + ' - ' + T3."first_name" + ' ' + T3."family_name")
-				ELSE ((left((((T3."customer_number"))), 7)) + ' - ' + T3."family_name")
+				WHEN (T5."first_name" IS NOT NULL)
+					THEN ((left((((T5."customer_number"))), 7)) + ' - ' + T5."first_name" + ' ' + T5."family_name")
+				ELSE ((left((((T5."customer_number"))), 7)) + ' - ' + T5."family_name")
 				END AS "Kunde",
 			CASE 
 				WHEN (((- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date"))))) BETWEEN 0 AND 14)
@@ -517,15 +517,15 @@ FROM (
 				END AS "Staffel",
 			(- 1 * datediff(day, (getdate()), (convert(DATETIME, T1."accounting_date")))) AS "Tage",
 			CASE 
-				WHEN (T5."invoice_type" IN (2, 4, 6, 3))
+				WHEN (T7."invoice_type" IN (2, 4, 6, 3))
 					THEN ('3')
-				WHEN (T5."invoice_type" IN (5))
+				WHEN (T7."invoice_type" IN (5))
 					THEN ('6')
-				WHEN (T5."invoice_type" IN (7))
+				WHEN (T7."invoice_type" IN (7))
 					THEN ('1')
-				WHEN (T5."invoice_type" IN (8))
+				WHEN (T7."invoice_type" IN (8))
 					THEN ('2')
-				WHEN (T4."document_type_in_journal" = 'R')
+				WHEN (T6."document_type_in_journal" = 'R')
 					THEN ('7')
 				ELSE NULL
 				END AS "Kostenstelle",
@@ -536,10 +536,14 @@ FROM (
 					ELSE (T1."posted_value" / 100)
 					END
 				) AS "Betrag",
-			(left((((T2."employee_number"))), 4)) + ' - ' + T2."name" AS "Sel Name",
 			CASE 
-				WHEN (T5."subsidiary" IS NOT NULL)
-					THEN ('0' + (left((((T5."subsidiary"))), 1)))
+				WHEN (T2."salesman_number" IS NOT NULL)
+					THEN ((left((((T3."employee_number"))), 4)) + ' - ' + T3."name")
+				ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+				END AS "Sel Name",
+			CASE 
+				WHEN (T7."subsidiary" IS NOT NULL)
+					THEN ('0' + (left((((T7."subsidiary"))), 1)))
 				ELSE ('nicht zuzuordnen')
 				END AS "Standort_ori",
 			CASE 
@@ -547,15 +551,15 @@ FROM (
 					THEN ('15')
 				ELSE ('1')
 				END AS "Hauptbetrieb",
-			T5."invoice_date" AS "Invoice Date_Invoices",
-			T5."subsidiary" AS "Subsidiary_Invoices",
-			T5."invoice_number" AS "Invoice Number_Invoices",
-			T5."invoice_type" AS "Invoice Type_Invoices",
-			T4."document_type_description" AS "Document Type Description",
-			T4."document_type_in_journal" AS "Document Type In Journal",
-			T3."family_name" AS "Family Name",
-			T3."first_name" AS "First Name",
-			T3."is_supplier" AS "Is Supplier",
+			T7."invoice_date" AS "Invoice Date_Invoices",
+			T7."subsidiary" AS "Subsidiary_Invoices",
+			T7."invoice_number" AS "Invoice Number_Invoices",
+			T7."invoice_type" AS "Invoice Type_Invoices",
+			T6."document_type_description" AS "Document Type Description",
+			T6."document_type_in_journal" AS "Document Type In Journal",
+			T5."family_name" AS "Family Name",
+			T5."first_name" AS "First Name",
+			T5."is_supplier" AS "Is Supplier",
 			T1."nominal_account_number" AS "Nominal Account Number",
 			CASE 
 				WHEN (T1."debit_or_credit" = 'H')
@@ -594,7 +598,13 @@ FROM (
 										THEN (' - ')
 									ELSE (T1."vehicle_reference")
 									END
-								) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+								) + ' - ' + (
+								CASE 
+									WHEN (T2."salesman_number" IS NOT NULL)
+										THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+									ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+									END
+								) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 							)
 				ELSE (
 						(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -606,7 +616,13 @@ FROM (
 									THEN (' - ')
 								ELSE (T1."vehicle_reference")
 								END
-							) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+							) + ' - ' + (
+							CASE 
+								WHEN (T2."salesman_number" IS NOT NULL)
+									THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+								ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+								END
+							) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 						)
 				END AS "Text",
 			T1."accounting_date" AS "Accounting Date",
@@ -649,7 +665,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -661,7 +683,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%RG-BONUS%'
@@ -700,7 +728,13 @@ FROM (
 																		THEN (' - ')
 																	ELSE (T1."vehicle_reference")
 																	END
-																) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+																) + ' - ' + (
+																CASE 
+																	WHEN (T2."salesman_number" IS NOT NULL)
+																		THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																	ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																	END
+																) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 															)
 												ELSE (
 														(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -712,7 +746,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 												END
 											) LIKE '%GEBURTSTAGS%'
@@ -752,7 +792,13 @@ FROM (
 																	THEN (' - ')
 																ELSE (T1."vehicle_reference")
 																END
-															) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+															) + ' - ' + (
+															CASE 
+																WHEN (T2."salesman_number" IS NOT NULL)
+																	THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+																ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+																END
+															) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 														)
 											ELSE (
 													(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -764,7 +810,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 											END
 										) LIKE '%STARTGUTHABEN%'
@@ -804,7 +856,13 @@ FROM (
 																THEN (' - ')
 															ELSE (T1."vehicle_reference")
 															END
-														) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+														) + ' - ' + (
+														CASE 
+															WHEN (T2."salesman_number" IS NOT NULL)
+																THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+															ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+															END
+														) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 													)
 										ELSE (
 												(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -816,7 +874,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 										END
 									) LIKE '%BONUS F%'
@@ -856,7 +920,13 @@ FROM (
 															THEN (' - ')
 														ELSE (T1."vehicle_reference")
 														END
-													) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+													) + ' - ' + (
+													CASE 
+														WHEN (T2."salesman_number" IS NOT NULL)
+															THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+														ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+														END
+													) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 												)
 									ELSE (
 											(rtrim((convert(VARCHAR(50), ((T1."document_number")))))) + ' - ' + (
@@ -868,7 +938,13 @@ FROM (
 														THEN (' - ')
 													ELSE (T1."vehicle_reference")
 													END
-												) + ' - ' + ((left((((T2."employee_number"))))) + ' - ' + T2."name") + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
+												) + ' - ' + (
+												CASE 
+													WHEN (T2."salesman_number" IS NOT NULL)
+														THEN ((left((((T3."employee_number"))))) + ' - ' + T3."name")
+													ELSE ((left((((T4."employee_number"))), 4)) + ' - ' + T4."name")
+													END
+												) + ' - ' + (convert(VARCHAR(50), year(T1."document_date")) + '-' + convert(VARCHAR(50), month(T1."document_date")) + '-' + convert(VARCHAR(50), day(T1."document_date")))
 											)
 									END
 								) LIKE '%RG-ABZUG%'
@@ -943,10 +1019,15 @@ FROM (
 			(
 				(
 					(
-						"journal_accountings" T1 LEFT JOIN "LOCOSOFT"."dbo"."employees" T2 ON T1."employee_number" = T2."employee_number"
-						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T3 ON T3."customer_number" = T1."customer_number"
-					) LEFT JOIN "document_types" T4 ON T4."document_type_in_journal" = T1."document_type"
-				) LEFT JOIN "invoices" T5 ON T5."invtype_invnr" = T1."invoice_number"
+						(
+							(
+								"journal_accountings" T1 LEFT JOIN "vehicles" T2 ON (right(T1."vehicle_reference", 17)) = T2."vin"
+								) LEFT JOIN "employees" T3 ON (T2."salesman_number" <> 0)
+								AND (T2."salesman_number" = T3."salesman_number")
+							) LEFT JOIN "LOCOSOFT"."dbo"."employees" T4 ON T1."employee_number" = T4."employee_number"
+						) LEFT JOIN "LOCOSOFT"."dbo"."customers_suppliers" T5 ON T5."customer_number" = T1."customer_number"
+					) LEFT JOIN "document_types" T6 ON T6."document_type_in_journal" = T1."document_type"
+				) LEFT JOIN "invoices" T7 ON T7."invtype_invnr" = T1."invoice_number"
 			)
 		WHERE (
 				(
@@ -957,9 +1038,9 @@ FROM (
 							)
 						AND (T1."customer_number" IS NOT NULL)
 						)
-					AND (NOT T4."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
+					AND (NOT T6."document_type_in_journal" IN ('A', 'E', 'U', 'V'))
 					)
-				AND (T3."customer_number" IS NOT NULL)
+				AND (T5."customer_number" IS NOT NULL)
 				)
 		) D2
 	) D1

二進制
System/LOCOSOFT/Sicherung/GC_BACKUP_CONTENT_STORE_DAILY.zip


二進制
System/LOCOSOFT/Sicherung/GC_BACKUP_CONTENT_STORE_WEEKLY.zip


+ 1 - 1
Tasks/GlobalCube.bat

@@ -7,6 +7,6 @@ if "%Mo-So%"=="J" (
   call ..\LOCOSOFT_import.bat
   call ..\LOCOSOFT_imr_csv.bat
   call ..\LOCOSOFT_Cubes.bat
-  call ..\LOCOSOFT_Versand.bat
+  rem call ..\LOCOSOFT_Versand.bat
   
 )

+ 1 - 0
Tasks/LOCOSOFT_imr_csv.bat

@@ -10,6 +10,7 @@
 
  call impromptu.bat belege\kontenrahmen_gc_struct_skr.imr csv 
  call impromptu.bat belege\current_date_Prognose.imr csv 
+ call impromptu.bat belege\current_date_Prognose_operativ.imr csv
  call impromptu.bat belege\current_date_Prognose_operativ_VJ-2.imr csv 
  rem call impromptu.bat belege\kontenrahmen_stk_gc_struct_skr.imr csv 
  rem call impromptu.bat belege\skr_herkunft_kst.imr csv 

+ 53 - 69
Tasks/config/c11/folders.json

@@ -4,219 +4,203 @@
     "name": "Team Content"
   },
   {
-    "id": "i90DAFB2F41934A3BBCA5954A22C8A669",
+    "id": "iA0ACF995241043ADB5C77CE96DC5B4CE",
     "name": "Team Content/Aftersales"
   },
   {
-    "id": "iFE3689CC5D0C415AB9923B6C96864FFD",
+    "id": "i714315DD958F4B86ABC857A56698AAC1",
     "name": "Team Content/Aftersales/1. Service"
   },
   {
-    "id": "iA169000377C4429EBB39A8F1A533E4D2",
+    "id": "iF678EF58CACC487181136FEA7D1EAEE2",
     "name": "Team Content/Aftersales/2. Teile"
   },
   {
-    "id": "i5A3AED59729D4910A4BF89950516757A",
+    "id": "iD8A7FCDE6D044FF3B0C95ABADF2225FC",
     "name": "Team Content/Beispiele"
   },
   {
-    "id": "i8D390156B36F41CF98EE676E00818208",
+    "id": "i2BE0E366A2004BE8A9B922228C31399B",
     "name": "Team Content/Beispiele/Berichte"
   },
   {
-    "id": "i3F9F4023788A4D79B413F6865D98156F",
+    "id": "i7529275D765B4DF7824F59BD3BB32C1F",
     "name": "Team Content/Beispiele/Dashboards"
   },
   {
-    "id": "iF6767EC5746B41B0B4CCE7208DA95A82",
+    "id": "i8B46F631C2464DC3925B3B01B814C4DD",
     "name": "Team Content/Beispiele/Daten"
   },
   {
-    "id": "iC3A38D8D1FAE48F7AEC1995C86B34214",
+    "id": "i9597F892B3574522ACC71E45948E4A3A",
     "name": "Team Content/Beispiele/Daten/Quellendateien"
   },
   {
-    "id": "i78C06ED61490450DB95BBFA34F748ACF",
+    "id": "i44C61EB6495D489E8F5EA6CE9BBD4533",
     "name": "Team Content/Beispiele/Daten/Quellendateien/Einzelhandel"
   },
   {
-    "id": "i8F4E1631BB3549DFAA0CD78264ED34E7",
+    "id": "i654299F726E04FF8A0F7C390811AB125",
     "name": "Team Content/Beispiele/Daten/Quellendateien/Telekommunikationsunternehmen"
   },
   {
-    "id": "i843DEDB236E045BA8F2FE4722274C239",
+    "id": "iB3DA6019A443496D837F30B7D20DC1BA",
     "name": "Team Content/Beispiele/Daten/Quellendateien/Versicherung"
   },
   {
-    "id": "i36E98EA605BC4820B1DF85B9351F1406",
+    "id": "i199C2D9FBE384C1C8C17926FC8B8601A",
     "name": "Team Content/Beispiele/Erweiterungen"
   },
   {
-    "id": "i71FE8CDD309F4A849389C55C31D8E3F1",
+    "id": "i1368B06B18CC4776AEE8FC0E19AE850A",
     "name": "Team Content/Beispiele/Erweiterungen/Tabs"
   },
   {
-    "id": "i9C10A92CAB4A4480A7ADA08BDFA6F5C1",
+    "id": "i3B50295AFFB54B7FAA6383729282D301",
     "name": "Team Content/Beispiele/Erweiterungen/Tabs/Overview"
   },
   {
-    "id": "i4580D1546DBA4A898C641C86615043E5",
+    "id": "i06983809FFB44F9FB328C99491D957D0",
     "name": "Team Content/Beispiele/Erweiterungen/Tabs/Retailer"
   },
   {
-    "id": "i6A28DF0A8C95414D9FD29D352FAE8E67",
+    "id": "iF85794FBCF184617800130FA8D5F43FB",
     "name": "Team Content/Beispiele/Erweiterungen/Tabs/Revenue"
   },
   {
-    "id": "i010214CAA8084A8DA1C8CE5917FDE352",
+    "id": "i24DA56960A85433EB69F25B75965BD87",
     "name": "Team Content/Beispiele/Erweiterungen/Tabs/Revenue/By quarter"
   },
   {
-    "id": "i2493006AB1054EFCAB4DDC228653395C",
+    "id": "i4193E4D39A5E4317BC14C64C96C2EDEB",
     "name": "Team Content/Beispiele/Erweiterungen/Tabs/Revenue/By year"
   },
   {
-    "id": "i022FC1E0A7F4438BAA7B64D487698E97",
+    "id": "i4AE2EA5F4D1B4D568CA78754603C09EC",
     "name": "Team Content/Beispiele/Erweiterungen/Tabs/Revenue/QTD"
   },
   {
-    "id": "iA54D6D8CCBB140F08A0EF4E523502C9F",
+    "id": "iCEC5D58A039A48ECA457F0B9C0D0C181",
     "name": "Team Content/Beispiele/Explorationen"
   },
   {
-    "id": "i8B2F412E98EB406FA06150B6166D1C0C",
+    "id": "i8EDF755427FA4DF3BEA0944C2A152535",
     "name": "Team Content/Beispiele/JavaScript"
   },
   {
-    "id": "i5F6653AC082448E6943F130466F0D4AE",
+    "id": "i75E5E2D377D549668DB6F29FB1DE90D2",
     "name": "Team Content/Beispiele/JavaScript/Theme"
   },
   {
-    "id": "iC65B292EFBD445CCA7C548A8589310CA",
+    "id": "iFCAA07104C344B0BBBCDF91ECF33977F",
     "name": "Team Content/Beispiele/Relative Datumsangaben"
   },
   {
-    "id": "i6E794523D7E0401DB4F76A0D4D3DC4DE",
+    "id": "iE57D2F091A514AA0983F1F65E359F79B",
     "name": "Team Content/Beispiele/Relative Datumsangaben/Daten"
   },
   {
-    "id": "i6CCD5E211C384360B86839496FA0F164",
+    "id": "i8A28995173474223AC9BC971BA7774A6",
     "name": "Team Content/Beispiele/Relative Datumsangaben/Daten/Quellendateien"
   },
   {
-    "id": "iDE8686268D3445FEBF312850EB598AE1",
+    "id": "i4C8BC0AF2C3D49BF8186412D7021D095",
     "name": "Team Content/Beispiele/Storys"
   },
   {
-    "id": "i2980793F6384489F8971B225663433DB",
+    "id": "iED1005E5D0DD40C99114F7DAB53A03F3",
     "name": "Team Content/Dashboard"
   },
   {
-    "id": "iF0E62B3F15324E2B916A832C589F6C91",
+    "id": "i40E9C818142F41128F64733CAFEC4DBE",
     "name": "Team Content/Dashboard_Teile"
   },
   {
-    "id": "iBECA64EECCF54DDBAFB3F85BFDFAE215",
+    "id": "i9733441646E84979BCAB3ED12BDBE1CB",
     "name": "Team Content/Datasets"
   },
   {
-    "id": "i59DCC27B473B49F791320E46DBF783EC",
+    "id": "i1FB4FA755C3F4051A59CB149838CC61E",
     "name": "Team Content/Drilltrough"
   },
   {
-    "id": "iBF46929DA41A4A7385DCC003F1E8035A",
+    "id": "i4EA4CE58D3114F77847C7E17DC1A904E",
     "name": "Team Content/Einf\u00fchrung"
   },
   {
-    "id": "iE7C956BBE3454C679D4004A1D2CB7DEA",
+    "id": "i4B63E85C7C214319B4A93AB3C199CABB",
     "name": "Team Content/Einf\u00fchrung/Daten"
   },
   {
-    "id": "i1EA7500D573E45D7BFEC613952B86D00",
+    "id": "iD9FFC2C1325C424C8B1F86B21E5F4195",
     "name": "Team Content/Einf\u00fchrung/Daten/Quellendateien"
   },
   {
-    "id": "i324ECA296AA54320911646C06CFB36B4",
+    "id": "i282BA84774214256ACD1EC05715AF479",
+    "name": "Team Content/Emailversand"
+  },
+  {
+    "id": "iA8636AC1066644C2B048740D1AD3D585",
     "name": "Team Content/Finanzbuchhaltung"
   },
   {
-    "id": "i32E6CEE8FA9546ED88A87F410A02F852",
+    "id": "i35D16ACEC2BE451387A73836F62BEA21",
     "name": "Team Content/Forderungen"
   },
   {
-    "id": "iD10087F02E1F4C59A21EECADE69CBC1D",
+    "id": "i72BA83C2001442998E5AB5E044FA8FFE",
     "name": "Team Content/GC"
   },
   {
-    "id": "i60E71F6A4E9E48EF8A59C5D979265FC6",
+    "id": "iCDA2255E731946A9936E19107AD4BA89",
     "name": "Team Content/GC/Packages"
   },
   {
-    "id": "i7C835B6C64BC4EDBAD8F425B39413E9A",
+    "id": "iE44CB1AFEC214520A2A2B3A6EDC235F3",
     "name": "Team Content/Kalender"
   },
   {
-    "id": "i215351FF480B42818A5CD5A54E763BDB",
+    "id": "i6E6F0EBAD874486BB99524FAC417ED0A",
     "name": "Team Content/Kalender/Fiscal calendars"
   },
   {
-    "id": "i8DD0B2CD30A94D6788D06E0026E16832",
+    "id": "i40C1177372C44BD9AA1C5755E28AF80C",
     "name": "Team Content/Kalender/Quellendateien"
   },
   {
-    "id": "iCB9525B34F5C4D71A6514349051CDACC",
+    "id": "i3C49B89B24CA47EAA3796B1507B45BE1",
     "name": "Team Content/Kalender/Werkzeuge"
   },
   {
-    "id": "i663CE5F75D754BB6BD6667DC9E3B7255",
+    "id": "i61E1B0E7E8754609A586E70C6DB82373",
     "name": "Team Content/Package"
   },
   {
-    "id": "i8D101EE6C91241369E4649042DD70C07",
-    "name": "Team Content/ReportOutput"
-  },
-  {
-    "id": "i5098A1888FB144C09EEEA8431F10CC04",
-    "name": "Team Content/ReportOutput/mittwochs_alle_14Tage"
-  },
-  {
-    "id": "i43BFAC8EF09F4EB4A4ED850AEF3DEE81",
-    "name": "Team Content/ReportOutput/montags"
-  },
-  {
-    "id": "iD0730D431C1C4970A57D8DBCE172A48A",
-    "name": "Team Content/ReportOutput/taeglich"
-  },
-  {
-    "id": "i6757AEB44FBE48A48840E1DD804525EA",
-    "name": "Team Content/Report_sich"
-  },
-  {
-    "id": "iFD7C5849C4404B678A5B8E9C318EE6EB",
+    "id": "i16525D484789442FBFAB76E3A4EB7C6B",
     "name": "Team Content/Templates"
   },
   {
-    "id": "iF7584FE9A40145389E798C026967055D",
+    "id": "i09506345E719405B84610BA89685EB67",
     "name": "Team Content/Templates/Style Reference Reports"
   },
   {
-    "id": "iC55BE549EB5A491B820C871DA8EEDC40",
+    "id": "i0AABA55E84F24EA5874B8C97574B17C9",
     "name": "Team Content/Verkauf"
   },
   {
-    "id": "iC7544DE3BD584375864D05C0457A20EB",
+    "id": "i28327E88CF7B469D91BB44234E979E16",
     "name": "Team Content/Verkauf/1. Gesamtverkauf"
   },
   {
-    "id": "i8AFED07C4E6C4F60969503B51259C5C7",
+    "id": "i6CEAE1BCD34C48E08655AE6F13479E69",
     "name": "Team Content/Verkauf/2. Neuwagen"
   },
   {
-    "id": "iA3A28E9505264A4D8EA1DD6654C2A415",
+    "id": "i0CEE4898AA754D68BA7ED8F04CBC0EF2",
     "name": "Team Content/Verkauf/3. Gebrauchtwagen"
   },
   {
-    "id": "i3537D3E126094A4598E5CD07DF810D41",
+    "id": "i94FA8A1EF947409CB677710D599E4D22",
     "name": "Team Content/Zeiterfassung"
   }
 ]

文件差異過大導致無法顯示
+ 131 - 179
Tasks/config/c11/reports.json


部分文件因文件數量過多而無法顯示