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

Merge 5.4.1 patches

Browse Source 
svn path=/Database/trunk/; revision=21461
This commit is contained in:
Jos Groot Lipman
2014-05-01 07:39:55 +00:00
parent 8bbc7e530f
commit bd524f2bcd
5 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FAC/FAC_PACF.SRC
View File

@@ -12039,7 +12039,7 @@ AS
-- v_seq_of_columns ListOfInteger := (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21);
-- Dus dan maar via een string, en ook op slimme wijze, nl alsof het een ingelezen factuur-record is met p_fielddelimitor
v_seq_of_columns VARCHAR(50);
v_seq_of_columns VARCHAR(255);
-- Afwijkingen op deze volgorde zijn in eigen cust_import_factuur te regelen.

2
FAC/FAC_TAB.SRC
View File

@@ -644,7 +644,7 @@ CREATE_TABLE(fac_export_app, 0)
fac_export_app_folder
VARCHAR(320),
fac_export_app_prefix
VARCHAR2(20),
VARCHAR2(60),
fac_export_app_postfix
VARCHAR2(20),
fac_export_app_log_postfix

6
FCLT.NMK
View File

@@ -60,9 +60,9 @@ PROJEXE=z:\Project\FACILITOR\BUILD
##
## New style using schemanumbers
##
CURRENTVERSION=20
NEXTVERSION=21
FILEVERSION=
CURRENTVERSION=21
NEXTVERSION=22
FILEVERSION=a
NEXTCAREVERSION=26
NEXTROOT=DB$(NEXTVERSION)$(FILEVERSION)
CURRENTUPDATE=DB$(CURRENTVERSION)to$(NEXTVERSION)

32
INS/INS_TRI.SRC
View File

@@ -162,6 +162,8 @@ BEFORE INSERT OR UPDATE ON ins_deel
FOR EACH ROW
declare
Dummy1 BOOLEAN;
new_date DATE;
prev_state ins_deel_state_history.ins_deel_state%TYPE;
BEGIN
UPDATE_PRIMARY_KEY(ins_deel_key,ins_s_ins_inst_keys);
@@ -301,8 +303,34 @@ BEGIN
IF (:old.ins_deel_state IS NULL AND :new.ins_deel_state IS NOT NULL)
OR (:new.ins_deel_state <> :old.ins_deel_state)
THEN
INSERT INTO ins_deel_state_history (ins_deel_key, ins_deel_state, ins_deel_statedate)
VALUES (:new.ins_deel_key, :new.ins_deel_state, COALESCE(:new.ins_deel_statedate, SYSDATE));
BEGIN
new_date := COALESCE (:new.ins_deel_statedate, SYSDATE); -- voorkom dat de update *net* een seconde later kan zijn
INSERT INTO ins_deel_state_history (ins_deel_key, ins_deel_state, ins_deel_statedate)
VALUES (:new.ins_deel_key, :new.ins_deel_state, COALESCE(:new.ins_deel_statedate, new_date));
EXCEPTION
WHEN DUP_VAL_ON_INDEX
THEN
SELECT ins_deel_state
INTO prev_state
FROM ins_deel_state_history
WHERE ins_deel_state_history_key =
(SELECT MAX (ins_deel_state_history_key)
FROM ins_deel_state_history
WHERE ins_deel_key = :new.ins_deel_key
AND ins_deel_statedate < new_date);
IF (prev_state = :new.ins_deel_state)
THEN
DELETE ins_deel_state_history
WHERE ins_deel_key = :new.ins_deel_key
AND ins_deel_statedate = new_date;
ELSE -- kan alleen bij tri-stste statussen gebeuren
UPDATE ins_deel_state_history
SET ins_deel_state = :new.ins_deel_state
WHERE ins_deel_key = :new.ins_deel_key
AND ins_deel_statedate = new_date;
END IF;
END;
END IF;
UPDATE_AANMAAKDATUM(ins_deel, ins_deel_aanmaak);
END;

2
_UP/DB20to21.src
View File

@@ -26,7 +26,7 @@ CREATE_TABLE(fac_export_app, 0)
fac_export_app_folder
VARCHAR(320),
fac_export_app_prefix
VARCHAR2(20),
VARCHAR2(60),
fac_export_app_postfix
VARCHAR2(20),
fac_export_app_log_postfix