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

AALB#23337 _prijs_vast is 0/1 ipv null/1

Browse Source 
svn path=/Database/trunk/; revision=11439
This commit is contained in:
Peter Feij
2012-06-05 12:21:08 +00:00
parent 0080e413cc
commit 50be5351e2
3 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
RES/RES_PAC.SRC
View File

@@ -991,7 +991,7 @@ AS
lres_t_avond := fac.safe_to_number (fac.getsetting ('res_t_avond'));
BEGIN
SELECT COALESCE (ru.res_ruimte_prijs, 0),
COALESCE (ru.res_ruimte_prijs_vast, 0),
ru.res_ruimte_prijs_vast,
COALESCE (ru.res_ruimte_prijs_ochtend, 0),
COALESCE (ru.res_ruimte_prijs_middag, 0),
ru.res_ruimte_prijs_avond,
@@ -1108,7 +1108,7 @@ AS
NULL;
END;
SELECT COALESCE (d.res_deel_prijs, 0),
COALESCE (d.res_deel_prijs_vast, 0),
d.res_deel_prijs_vast,
fac.safe_to_number (TO_CHAR (rd.res_rsv_deel_tot - rd.res_rsv_deel_van)) * 24,
fac.safe_to_number (TO_CHAR (rd.res_rsv_deel_van, 'HH24'))
+ fac.safe_to_number (TO_CHAR (rd.res_rsv_deel_van, 'MI')) / 60,
@@ -1200,7 +1200,7 @@ AS
WHERE res_rsv_artikel_key = pres_rsv_artikel_key
AND ra.res_artikel_key = a.res_artikel_key
AND res_rsv_artikel_prijs IS NOT NULL
AND (res_status_bo_key >= 5 OR res_artikel_prijs_vast IS NULL);
AND (res_status_bo_key >= 5 OR res_artikel_prijs_vast <> 1);
RETURN artikel_price_total * doorbelasting / 100;
EXCEPTION
WHEN OTHERS