admin/Database
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 5.2.3 Gold C (DB17b) patches

Browse Source 
svn path=/Database/trunk/; revision=16550
This commit is contained in:
Jos Groot Lipman
2013-01-17 12:55:59 +00:00
parent ab9728f1b2
commit 13bf173097
8 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FAC/FAC_LCLASP.SRC
View File

@@ -464,6 +464,7 @@ FACXSL_LCL('lcl_ins_controle_oms', 'Omschrijving', 'Description', 'Umschreibung'
FACXSL_LCL('lcl_ins_controle_opm', 'Opmerking', 'Remark', 'Bemerkung', 'Remarque')
FACXSL_LCL('lcl_ins_inspecteur', 'Inspecteur', 'Inspector', 'Inspekteur', 'Inspecteur')
FACXSL_LCL('lcl_ins_copy', 'Kopieer', 'Copy', 'Kopiere', 'Copier')
FACXSL_LCL('lcl_ins_info', 'Info', 'Info', 'Info', 'Info ')
FACXSL_LCL('lcl_obj_identification', 'Identificatie', 'Identification', 'Identifikation', 'Identification')
FACXSL_LCL('lcl_obj_draggable', 'sleepbaar', 'draggable', 'zu schleppen', 'd<>pla<6C>able')
FACXSL_LCL('lcl_obj_position', 'Plaats', 'Place', 'Ort', 'Lieu')
@@ -1072,6 +1073,7 @@ FACXSL_LCL('lcl_mld_urg_laag1', '<img src=''../pictures/priolow.png''>', '<img s
FACXSL_LCL('lcl_mld_urg_hold1', '<img src=''../pictures/pin.png''>', '<img src=''../pictures/pin.png''>', '<img src=''../pictures/pin.png''>', '<img src=''../pictures/pin.png''>')
FACXSL_LCL('lcl_mld_appr_req', 'Verzoek fiattering', 'Offered for approval', 'Antrag Genehmigung', 'Demande d''autorisation')
FACXSL_LCL('lcl_mld_not_solved', 'Niet opgelost', 'Not solved', 'Nicht gel<65>st', 'Pas r<>solu')
FACXSL_LCL('lcl_mld_offerte_accept', 'Offerte acceptatie', 'Offer nr Accept', 'Angebot akzeptieren', 'Offre accepter')
FACXSL_LCL('lcl_mld_choose_srt', 'Welke categorie?', 'Which category?', 'Welche Kategorie?', 'Quelle cat<61>gorie?')
FACXSL_LCL('lcl_mld_choose_na', 'Niet beschikbaar', 'Not available', 'Nicht verf<72>gbar', 'Pas disponible')
FACXSL_LCL('lcl_mld_choose_typeodr', 'Kies het soort opdracht', 'Select an order type', 'W<>hlen Sie die Auftragsart', 'Choisissez le type d''ordre')

6
FAC/FAC_PAC.SRC
View File

@@ -232,7 +232,7 @@ CREATE OR REPLACE PACKAGE fac AS
FUNCTION gettrackingdate (peventcode IN VARCHAR2, pkey IN number) RETURN date;
FUNCTION gettrackinguserkey (peventcode IN VARCHAR2, pkey IN number) RETURN number;
PROCEDURE initsession (flcode IN VARCHAR2);
PROCEDURE registerversion (pmaj IN NUMBER, pmin IN NUMBER, ppatch IN VARCHAR2, pschema IN NUMBER, plang IN VARCHAR2);
PROCEDURE registerversion (pmaj IN NUMBER, pmin IN NUMBER, ppatch IN VARCHAR2, pschema IN VARCHAR2, plang IN VARCHAR2);
PROCEDURE registercustversion (pcustid IN VARCHAR2, pcustnr IN NUMBER);
FUNCTION getdbversion RETURN VARCHAR2;
PROCEDURE systrackscript (n IN VARCHAR2, r IN VARCHAR2, force IN NUMBER);
@@ -3433,7 +3433,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
EXECUTE IMMEDIATE setsql;
END;
PROCEDURE registerversion (pmaj IN NUMBER, pmin IN NUMBER, ppatch IN VARCHAR2, pschema IN NUMBER, plang IN VARCHAR2)
PROCEDURE registerversion (pmaj IN NUMBER, pmin IN NUMBER, ppatch IN VARCHAR2, pschema IN VARCHAR2, plang IN VARCHAR2)
AS
verstring fac_module.fac_module_version%TYPE;
revisionnr fac_version.fac_version_schema%TYPE;
@@ -3448,7 +3448,7 @@ CREATE OR REPLACE PACKAGE BODY fac AS
SET fac_version_major = pmaj,
fac_version_minor = pmin,
fac_version_patch = ppatch,
fac_version_schema = TO_CHAR(pschema),
fac_version_schema = pschema,
fac_version_date = SYSDATE;
UPDATE fac_message

7
FCLT.SRC
View File

@@ -15,9 +15,8 @@ SET HEADING OFF
SET FEEDBACK OFF
SET ECHO OFF
#define _MKVER(a) STRINGIZE(a)
column fcltlogfile new_value fcltlogfile NOPRINT;
select 'FACILITOR'||_MKVER(_DBV) || '_' || UPPER(USER || '_' || sys_context('USERENV', 'SERVICE_NAME') || '_' || sys_context('USERENV', 'SERVER_HOST')) || '_' || to_char(sysdate,'YYYYMMDD_HH24MISS') || '.lst' as fcltlogfile from dual;
select 'FACILITOR'|| _DBV_STRING || '_' || UPPER(USER || '_' || sys_context('USERENV', 'SERVICE_NAME') || '_' || sys_context('USERENV', 'SERVER_HOST')) || '_' || to_char(sysdate,'YYYYMMDD_HH24MISS') || '.lst' as fcltlogfile from dual;
spool &fcltlogfile
WHENEVER SQLERROR EXIT;
@@ -134,7 +133,7 @@ COMMIT;
///////////////////////////// finally compile all views, triggers etc acc to the latest state ///////
BEGIN DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE); END;
/
BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, _DBV, 'NL'); END;
BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, _DBV_STRING, 'NL'); END;
/
REGISTERONCE('$Workfile: FCLT.SRC $','$Revision$')
@@ -143,7 +142,7 @@ COMMIT;
SET ECHO OFF
SET LINESIZE 80
PROMPT List of all invalid objects after FACILITOR creation:
SELECT 'OR'||'A-'||'DB'||TO_CHAR(_DBV)||' Warning: ' || object_type || ' ' || object_name || ' is ' || status
SELECT 'OR'||'A-'||'DB'|| _DBV_STRING ||' Warning: ' || object_type || ' ' || object_name || ' is ' || status
FROM user_objects
WHERE object_type IN ('VIEW', 'TRIGGER', 'PACKAGE', 'PROCEDURE', 'FUNCTION', 'PACKAGE BODY')
AND status <> 'VALID'

4
FIN/FIN_PAC.SRC
View File

@@ -436,7 +436,7 @@ AS
AND fin_factuur_verwijder IS NULL
AND fin_factuur_datum <= factuurdatum;
IF fin.tolerantiematch (discipline, ftype, totaalgefactureerd, contractkosten) = 1
IF totaalgefactureerd <= contractkosten
AND fin.tolerantiematch (discipline, ftype, factuurbedrag, contracttermijnkosten) = 1
THEN
retval := 1;
@@ -775,7 +775,7 @@ AS
INTO lperc, lverlegd
FROM fin_btwtabelwaarde
WHERE fin_btwtabelwaarde_key = pbtwtabelwaardekey;
IF lverlegd = 1 THEN
lbtwbedrag := 0;
ELSE

9
MLD/MLD_TRI.SRC
View File

@@ -142,10 +142,11 @@ BEGIN
FROM mld_stdmelding msm
WHERE msm.mld_stdmelding_key = :new.mld_stdmelding_key;
-- Alleen aanpassen aan de SLA indien niet meegegeven en mogelijk gewijzigd (!)
IF ((UPDATING AND NOT UPDATING('mld_melding_einddatum')) OR (INSERTING AND :new.mld_melding_einddatum IS NULL))
AND (:old.mld_melding_einddatum_std IS NULL
OR :old.mld_melding_einddatum_std <> :new.mld_melding_einddatum_std)
AND l_planbaar <> 1
IF (UPDATING AND NOT UPDATING('mld_melding_einddatum')
AND (:old.mld_melding_einddatum_std IS NULL
OR :old.mld_melding_einddatum_std <> :new.mld_melding_einddatum_std)
AND l_planbaar <> 1)
OR (INSERTING AND :new.mld_melding_einddatum IS NULL)
THEN
:new.mld_melding_einddatum := :new.mld_melding_einddatum_std;
END IF;

6
_UP/epilogue.inc
View File

@@ -17,9 +17,7 @@ DELETE FROM fac_localeitems
///////////////////////////// now recreate all views, triggers etc acc to the latest state ///////
#include "recreate.inc"
BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, _DBV, NULL); END;
/
COMMIT;
SET ECHO OFF
SET FEEDBACK OFF
PROMPT ======================================================================
@@ -27,7 +25,7 @@ SELECT 'Schema FACILITOR@' || USER || ' is now ' || fac.getdbversion() FROM DUAL
PROMPT
PROMPT Your schema upgrade is ready. Please check the logfile for errors.
PROMPT If in doubt please contact: SG|facilitor Helpdesk +31 53 4800 700
PROMPT Copyright (c) 1992-2012 SG|facilitor bv. All rights reserved.
PROMPT Copyright (c) 1992-2013 SG|facilitor bv. All rights reserved.
SET DEFINE ON
PROMPT Logfile of this upgrade is: &fcltlogfile
SPOOL OFF

2
_UP/recreate.inc
View File

@@ -61,6 +61,8 @@
/* SETTINGS's */
#include "fac\fac_set.src"
BEGIN fac.registerversion(_VERSIONMAJ, _VERSIONMIN, _VERSIONPATCH, _DBV_STRING, NULL); END;
/
/* now compile all views, triggers etc acc to the latest state */
BEGIN DBMS_UTILITY.COMPILE_SCHEMA(USER, FALSE); END;
/

4
_UP/recreate.src
View File

@@ -37,7 +37,7 @@ SET TIME ON
SET SERVEROUTPUT ON;
SET DEFINE ON
column fcltlogfile new_value fcltlogfile NOPRINT;
select 'RECRE'||TO_CHAR(_DBV) || '_' || UPPER(USER || '_' || sys_context('USERENV', 'SERVICE_NAME') || '_' || sys_context('USERENV', 'SERVER_HOST')) || '_' || to_char(sysdate,'YYYYMMDD_HH24MISS') || '.lst' as fcltlogfile from dual;
select 'RECRE'||_DBV_STRING || '_' || UPPER(USER || '_' || sys_context('USERENV', 'SERVICE_NAME') || '_' || sys_context('USERENV', 'SERVER_HOST')) || '_' || to_char(sysdate,'YYYYMMDD_HH24MISS') || '.lst' as fcltlogfile from dual;
spool &fcltlogfile
SET DEFINE OFF
@@ -48,7 +48,7 @@ SET ECHO OFF
SET HEADING OFF
SET LINESIZE 80
PROMPT List of all invalid objects after Facilitor upgrade:
SELECT 'OR'||'A-'||'DB'||TO_CHAR(_DBV)||' Warning: ' || object_type || ' ' || object_name || ' is ' || status
SELECT 'OR'||'A-'||'DB'||_DBV_STRING||' Warning: ' || object_type || ' ' || object_name || ' is ' || status
FROM user_objects
WHERE object_type IN ('VIEW', 'TRIGGER', 'PACKAGE', 'PROCEDURE', 'FUNCTION', 'PACKAGE BODY')
AND status <> 'VALID'