FSN#31612 count_Work_Days0 NLS onafhankelijk gemaakt

svn path=/Database/trunk/; revision=24002

FAC/FAC_PAC.SRC

@@ -401,16 +401,6 @@ CREATE OR REPLACE PACKAGE BODY fac AS
     v_day_to NUMBER;
     v_holidays NUMBER;
     BEGIN
-
-     -- Dit is een maandag, is dat volgens de huidige territory dag 2?
-     eikdag := TO_NUMBER (TO_CHAR (TO_DATE('01-01-2007', 'DD-MM-YYYY'), 'D'));
-
-     IF eikdag <> 2
-     THEN
-	   -- WE MOETEN met zondag=1 werken (geen nieuwe eis, wel duidelijker probleem)
-       raise_application_error (-20000, 'Facilitor: Invalid NLS_TERRITORY');
-     END IF;
-
      -- Remove time-part from dates (ie. set to 0:00) and set dates chronologically
      IF pdate1 > pdate2 THEN
        v_date_from := TRUNC(pdate2);
@@ -431,8 +421,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS
      v_mod := mod((v_date_to - v_date_from),7);
 
      -- Correct remaining days (v_mod) depending on the FROM and TO "day-number"
-     v_day_from := to_number(DATE_TO_CHAR(v_date_from,'d'));
-     v_day_to := to_number(DATE_TO_CHAR(v_date_to,'d'));
+     v_day_from := getweekdaynum(v_date_from);
+     v_day_to := getweekdaynum(v_date_to);
      IF v_day_from = 1 THEN               /* FROM is sunday */
        IF v_day_to = 7 THEN               /* TO is saturday */
          v_mod := v_mod - 1;              /* should always be 5! */
@@ -475,8 +465,6 @@ CREATE OR REPLACE PACKAGE BODY fac AS
      ELSE
        RETURN  5 * v_week + v_mod + v_extra_day - v_holidays;
      END IF;
-    EXCEPTION
-     WHEN OTHERS THEN RETURN NULL;
     END;
 
    FUNCTION count_Work_Days_InclTime( pdate1 IN DATE , pdate2 IN DATE ) RETURN NUMBER IS
@@ -542,17 +530,6 @@ CREATE OR REPLACE PACKAGE BODY fac AS
    BEGIN
       returnval := NULL;
 
-      -- Dit is een maandag, is dat volgens de huidige territory dag 2?
-      eikdag :=
-         TO_NUMBER (TO_CHAR (TO_DATE ('01-01-2007', 'DD-MM-YYYY'), 'D'));
-
-      IF eikdag <> 2
-      THEN -- We MOETEN met zo=1 werken (geen nieuwe eis, wel duidelijker probleem).
-         raise_application_error (-20000, 'Facilitor: Invalid NLS_TERRITORY (should be AMERICA)');
-      END IF;
-
-      -- Veronderstelt NLS_TERRITORY='AMERICA'.
-
       IF     begindatum IS NOT NULL
          AND uitvoertijd IS NOT NULL
          AND pMode BETWEEN 0 AND 2