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

Merge 2024.1 DB47b patches

Browse Source 
svn path=/Database/trunk/; revision=63890
This commit is contained in:
Jos Groot Lipman
2024-03-12 11:49:54 +00:00
parent 0dfa579cbd
commit 0cddd124f1
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FAC/FAC_LCL.SRC
View File

@@ -1797,6 +1797,8 @@ FAC_LCL('lcl_res_status_dirty', 'ONGELDIG', 'INVALID')
FAC_LCL('lcl_res_rsv_kosten', 'Totale kosten', 'Total costs')
FAC_LCL('lcl_res_from_actual', 'Gearriveerd', 'Arrived')
FAC_LCL('lcl_res_rsv_deel_end_premature', 'Je meldt deze reservering eerder af dan de geplande eindtijd.' || CHR(10) || 'Wil je de gereserveerde voorziening(en) ook direct al vrijgeven?', 'You are closing this reservation before its planned end time.' || CHR(10) || 'Would you like to release the reserved equipment immediately?')
FAC_LCL('lcl_res_rsv_art_name', 'Voor vrije artikelnaam moet een naam worden ingevuld.', 'For a free article name, a name is mandatory.')
FAC_LCL('lcl_res_rsv_art_count', 'Aantal artikelen mag niet 0 zijn.', 'The number of Articles cannot be 0.')
FAC_LCL('lcl_res_plan_tt_eerder', 'Dag eerder', 'Day before')
FAC_LCL('lcl_res_plan_tt_later', 'Dag later', 'Day later')
FAC_LCL('lcl_res_plan_tt_meer_eerder', 'Dag erbij', 'Extra day')

2
FAC/FAC_PACANO.SRC
View File

@@ -758,7 +758,7 @@ CREATE OR REPLACE PACKAGE BODY ano AS
WHERE nc.fac_srtnotificatie_code = 'RESANO'
)
)
) BETWEEN to_date('01-01-2023','dd-mm-yyyy') AND to_date('01-07-2023','dd-mm-yyyy')
) BETWEEN p_startdatum AND p_einddatum
AND ( r.res_status_bo_key IN (5,6)
OR r.res_rsv_ruimte_verwijder IS NOT NULL
)

6
FAC/FAC_PACFLEX.SRC
View File

@@ -705,7 +705,8 @@
-20001,
'Error parsing flex-expression ' || pmodule || ' kenmerkkey:' || expr.fac_kenmwaarden_kenmerk_key
|| CHR(10) || SQLERRM
|| CHR(10) || l_sql_exprval);
|| CHR(10) || l_sql_exprval
|| CHR(10) || 'Original: ' || l_expr);
END;
--DBMS_SQL.describe_columns(l_cursor_exprval, l_colcnt, l_desctab);
IF expr.fac_kenmwaarden_kenmerktype = 'N'
@@ -864,7 +865,8 @@
-20001,
'Error parsing flex-expression ' || pmodule || ' kenmerkkey:' || expr.fac_kenmwaarden_kenmerk_key
|| CHR(10) || SQLERRM
|| CHR(10) || l_sql_exprval);
|| CHR(10) || l_sql_exprval
|| CHR(10) || 'Original: ' || l_expr);
END;
--DBMS_SQL.describe_columns(l_cursor_exprval, l_colcnt, l_desctab);
DBMS_SQL.define_column(l_cursor_exprval, 1, l_exprval_num); -- onze expressie is altijd numeriek

31
MLD/MLD_LCL.SRC
View File

@@ -218,6 +218,21 @@ DEFINE_LOCALEITEM(frm_mldmldlistframe)
DEFINE_LOCALEITEM(frm_opdrlistframe)
DEFINE_LOCALEITEM(frm_mldbeslistframe)
DEFINE_LOCALEITEM(frm_resframe)
DEFINE_LOCALEITEM(lcl_mld_urgentie)
DEFINE_LOCALEITEM(lcl_mld_impact)
DEFINE_LOCALEITEM(lcl_mld_urgentie1)
DEFINE_LOCALEITEM(lcl_mld_urgentie2)
DEFINE_LOCALEITEM(lcl_mld_urgentie3)
DEFINE_LOCALEITEM(lcl_mld_impact1)
DEFINE_LOCALEITEM(lcl_mld_impact2)
DEFINE_LOCALEITEM(lcl_mld_impact3)
DEFINE_LOCALEITEM(lcl_mld_urgentie1_info)
DEFINE_LOCALEITEM(lcl_mld_urgentie2_info)
DEFINE_LOCALEITEM(lcl_mld_urgentie3_info)
DEFINE_LOCALEITEM(lcl_mld_impact1_info)
DEFINE_LOCALEITEM(lcl_mld_impact2_info)
DEFINE_LOCALEITEM(lcl_mld_impact3_info)
END_LOCALEITEMS()
START_LOCALEITEMS('MLD_TYPEOPDR_KEY')
@@ -350,22 +365,6 @@ DEFINE_LOCALEITEM(lcl_date_time)
DEFINE_LOCALEITEM(lcl_mld_changedby)
DEFINE_LOCALEITEM(lcl_mld_note)
DEFINE_LOCALEITEM(lcl_mld_note_new)
DEFINE_LOCALEITEM(lcl_mld_urgentie)
DEFINE_LOCALEITEM(lcl_mld_impact)
DEFINE_LOCALEITEM(lcl_mld_urgentie1)
DEFINE_LOCALEITEM(lcl_mld_urgentie2)
DEFINE_LOCALEITEM(lcl_mld_urgentie3)
DEFINE_LOCALEITEM(lcl_mld_impact1)
DEFINE_LOCALEITEM(lcl_mld_impact2)
DEFINE_LOCALEITEM(lcl_mld_impact3)
DEFINE_LOCALEITEM(lcl_mld_urgentie1_info)
DEFINE_LOCALEITEM(lcl_mld_urgentie2_info)
DEFINE_LOCALEITEM(lcl_mld_urgentie3_info)
DEFINE_LOCALEITEM(lcl_mld_impact1_info)
DEFINE_LOCALEITEM(lcl_mld_impact2_info)
DEFINE_LOCALEITEM(lcl_mld_impact3_info)
END_LOCALEITEMS()
REGISTERONCE('$Id$')