DJIN#41675 Bevestiging levering/ontvangst door besteller (MGE)
FSN#47307 Bestellijst MARX#51994 Ook uitgaande stylesheet bij FAC_API svn path=/Database/trunk/; revision=36725
This commit is contained in:
Jos Groot Lipman
@@ -310,6 +310,10 @@ CREATE_TABLE(bes_bestelopdr, 0)
|
||||
ALTER TABLE cnt_contract ADD bes_bestelopdr_key
|
||||
NUMBER(10)
|
||||
CONSTRAINT cnt_r_bes_bestelopdr_key REFERENCES bes_bestelopdr(bes_bestelopdr_key);
|
||||
ALTER TABLE ins_deel
|
||||
ADD bes_bestelopdr_key
|
||||
NUMBER(10)
|
||||
CONSTRAINT bes_r_bes_bestelopdr_key3 REFERENCES bes_bestelopdr(bes_bestelopdr_key);
|
||||
|
||||
CREATE_TABLE(bes_bestelopdr_item, 0)
|
||||
(
|
||||
@@ -510,10 +514,25 @@ CREATE_TABLE(bes_disc_params, 0)
|
||||
bes_disc_params_bestellimiet5
|
||||
NUMBER(11,2)
|
||||
DEFAULT 1000000,
|
||||
bes_disc_params_freeartikel /* Vrije-artikel mode {0=ouderwets, 1=vrij artikelen, 2=met suggest voor bestaande (future)} */
|
||||
bes_disc_params_freeartikel /* Deprecated, gaat van 2017.3 via bes_disc_params_bestelmode */
|
||||
NUMBER(1)
|
||||
DEFAULT 0
|
||||
NOT NULL
|
||||
NOT NULL,
|
||||
bes_disc_params_bestelmode /* 0=ouderwets artikelselector, 1=vrij artikelen, 2=bestellijst */
|
||||
NUMBER(1)
|
||||
DEFAULT 0
|
||||
NOT NULL,
|
||||
bes_disc_params_fotomode /* 0=alleen bij kiezen artikel, 1=ook in bestellijst */
|
||||
NUMBER(1)
|
||||
DEFAULT 0
|
||||
NOT NULL,
|
||||
bes_disc_params_ins_mode /* bestelcatalogusinstellingen {0=Niet van toepassing, 1=Aanmaken en koppelen (Nog niet ondersteund), 2=Koppelen} */
|
||||
NUMBER(1)
|
||||
DEFAULT 0
|
||||
NOT NULL,
|
||||
bes_disc_params_ins_srtdeelkey /* objectrelatie */
|
||||
NUMBER(10)
|
||||
CONSTRAINT ins_r_ins_srtdeel_key3 REFERENCES ins_srtdeel(ins_srtdeel_key)
|
||||
);
|
||||
|
||||
//// flexprops
|
||||
|
||||
@@ -1066,6 +1066,7 @@ FAC_LCL('lcl_ins_objects', 'Objecten', 'Objects')
|
||||
FAC_LCL('lcl_deel_state', 'Status', 'Status')
|
||||
FAC_LCL('lcl_ins_history_add_value', 'Toevoegen waarde', 'Add value')
|
||||
FAC_LCL('lcl_ins_meta_data', 'Administratieve gegevens', 'Administrative details')
|
||||
FAC_LCL('lcl_ins_mode', 'Object mode bij levering', 'Object mode on delivery')
|
||||
|
||||
FAC_LCL('lcl_mjb_group', 'Groepering', 'Group by')
|
||||
FAC_LCL('lcl_mjb_uptoyear', 'Tot aan jaar', 'Up to year')
|
||||
@@ -1496,6 +1497,8 @@ FAC_LCL('lcl_vis_departed', 'Vertrokken', 'Departed')
|
||||
FAC_LCL('lcl_vis_processed', 'Verwerkt', 'Processed')
|
||||
FAC_LCL('lcl_vis_number_vis', '#Bezoekers', '#Visitors')
|
||||
FAC_LCL('lcl_vis_number_park', '#Parkeerplaats', '#Parking spaces')
|
||||
FAC_LCL('lcl_vis_number_checkin', '#Binnengemeld', '#Arrival registered')
|
||||
FAC_LCL('lcl_vis_number_checkout', '#Geregistreerd vertrek', '#Departures registered')
|
||||
FAC_LCL('lcl_vis_visit', 'Bezoek voor', 'Visit for')
|
||||
FAC_LCL('lcl_vis_visitors', 'Bezoekers', 'Visitors')
|
||||
FAC_LCL('lcl_vis_appointment', 'Afspraak', 'Appointment')
|
||||
@@ -2287,6 +2290,7 @@ FAC_LCL('lcl_bes_annuleer_request', 'Annuleer verzoek in {0}', 'Cancel request i
|
||||
FAC_LCL('lcl_bes_stock_changed', 'Correctie op voorraad', 'Correction in stock')
|
||||
FAC_LCL('lcl_bes_stock_correct_err', 'Ongeldige correctie op voorraad', 'Invalid stock correction')
|
||||
FAC_LCL('lcl_bes_bestelling_lev_opm', 'Opmerking bestelaanvraag', 'Remark order request')
|
||||
FAC_LCL('lcl_bes_insuf_instock', 'Er is onvoldoende van dit artikel op voorraad (Maximaal {0}).', 'There is insufficient of this item in stock (Maximum {0}).')
|
||||
FAC_LCL('lcl_rfo_no_items_to_approve', 'Geen fiatteringsverzoeken gevonden', 'No approval requests found')
|
||||
FAC_LCL('lcl_ok', 'Ok', 'Ok')
|
||||
FAC_LCL('lcl_inserted0', '{0} toegevoegd', '{0} added')
|
||||
@@ -3670,6 +3674,7 @@ FAC_LCL('lcl_bez_import_cntbed', ' waarvan met bedrijf: ', ' with company: ')
|
||||
FAC_LCL('lcl_bez_insinn_objects', 'Innemen objecten', 'Take in objects')
|
||||
FAC_LCL('lcl_bez_send_sms', 'Verstuur SMS', 'Send SMS')
|
||||
FAC_LCL('lcl_bez_send_sms_to', 'Stuur naar', 'Send to')
|
||||
FAC_LCL('lcl_bez_no_mobile', 'Er zijn geen mobiele nummers bekend waar een SMS naar toe kan worden gestuurd.', 'No mobile numbers are known where an SMS can be sent to.')
|
||||
FAC_LCL('lcl_bez_visitor_arrived', 'Uw bezoeker {0} is gearriveerd', 'Your visitor {0} has arrived')
|
||||
FAC_LCL('lcl_bes_article_details', 'Artikeldetails', 'Article details')
|
||||
FAC_LCL('lcl_bes_bestelopdracht', 'Bestelopdracht', 'Purchase order')
|
||||
@@ -3861,7 +3866,7 @@ FAC_LCL('lcl_ins_no_same_srtcontrole', 'Geselecteerde taaksoorten zijn niet geli
|
||||
FAC_LCL('lcl_ins_lend_out', 'Uitlenen', 'Lend out')
|
||||
FAC_LCL('lcl_ins_lend_out_to', 'Uitlenen aan', 'Lend out to')
|
||||
FAC_LCL('lcl_ins_lend_no_res', 'Let op: object is reserveerbaar maar er is geen toekomstige reservering.', 'Please note: object can be reserved but there are no future reservation for this object.')
|
||||
FAC_LCL('lcl_ins_lend_next_res', 'Eerstkomende reservering {0} op {1}', 'Next reservation {0} at {1}')
|
||||
FAC_LCL('lcl_ins_lend_next_res', 'Eerstkomende reservering {0} op {1} door {2}', 'Next reservation {0} at {1} by {2}')
|
||||
FAC_LCL('lcl_ins_lent_res', 'Uitgegeven aan', 'Lent out to')
|
||||
FAC_LCL('lcl_ins_takein_object', 'Innemen object', 'Take in object')
|
||||
FAC_LCL('lcl_ins_lendout_object', 'Uitlenen object', 'Lend out object')
|
||||
@@ -4343,6 +4348,7 @@ FAC_LCL('lcl_fac_api_loglevel', 'Log level', 'Log level')
|
||||
FAC_LCL('lcl_fac_api_usrrap', 'Tabelnaam', 'Table name')
|
||||
FAC_LCL('lcl_fac_api_viewmapping', 'View mapping', 'View mapping')
|
||||
FAC_LCL('lcl_fac_api_stylesheet', 'Stylesheet', 'Stylesheet')
|
||||
FAC_LCL('lcl_fac_api_stylesheet_out', 'Stylesheet uitgaand', 'Stylesheet outgoing')
|
||||
FAC_LCL('lcl_fac_import_app', 'Import app', 'Import app')
|
||||
FAC_LCL('lcl_fac_api_options', 'Opties', 'Options')
|
||||
FAC_LCL('lcl_fac_api_xmlnode', 'Node', 'Node')
|
||||
@@ -4576,7 +4582,8 @@ FAC_LCL('bes_discipline_factuurappr', 'Factuur automatisch fiatteren',
|
||||
FAC_LCL('bes_discipline_factuurgrens', 'Factuur accoord beneden <20>', 'Match invoice below <20>')
|
||||
FAC_LCL('bes_discipline_leverdagen', 'Leverdagen', 'Delivery time')
|
||||
FAC_LCL('bes_discipline_remoteconfirm', 'Afleverbevestiging door leverancier', 'Delivery confirmation by supplier')
|
||||
FAC_LCL('bes_discipline_freeartikel', 'Artikelen', 'Articles')
|
||||
FAC_LCL('bes_discipline_bestelmode', 'Artikelen', 'Articles')
|
||||
FAC_LCL('bes_discipline_fotomode', 'Toon afbeeldingen', 'Show images')
|
||||
FAC_LCL('bes_discipline_punchouturl', 'Punchout URL', 'Punch-out URL')
|
||||
FAC_LCL('bes_discipline_punch_bedr_key', 'Punchout bedrijf', 'Punch-out company')
|
||||
FAC_LCL('bes_discipline_logo_url', 'Logo', 'Logo')
|
||||
@@ -4595,9 +4602,12 @@ FAC_LCL('bes_discipline_cnt_disckey', 'Contracttype' ,
|
||||
FAC_LCL('bes_discipline_cnt_termijn', 'Contractperiode', 'Contract period')
|
||||
FAC_LCL('bes_discipline_cnt_opzegterm', 'Opzegtermijn', 'Notice period')
|
||||
FAC_LCL('bes_discipline_for_others', 'FE kan bestellen voor anderen', 'FE can order for others')
|
||||
FAC_LCL('bes_discipline_freeartikelLOV',
|
||||
'0;Uit catalogus;1;Vrij aanmaken',
|
||||
'0;From catalog;1;Create freely')
|
||||
FAC_LCL('bes_discipline_bestelmodeLOV',
|
||||
'0;Uit catalogus;1;Vrij aanmaken;2;Bestellijst',
|
||||
'0;From catalog;1;Create freely;2;Order list')
|
||||
FAC_LCL('bes_discipline_fotomodeLOV',
|
||||
'0;Tijdens kiezen;1;Ook in bestellijst',
|
||||
'0;While choosing;1;Also in order list')
|
||||
FAC_LCL('bes_discipline_factmatchmodeLOV',
|
||||
'2;2-weg;3;3-weg',
|
||||
'2;2-way;3;3-way')
|
||||
@@ -4610,6 +4620,9 @@ FAC_LCL('bes_discipline_herfiatLOV',
|
||||
FAC_LCL('bes_discipline_pgbLOV',
|
||||
'0;Nee;1;PGB;2;AGB;3;Beide',
|
||||
'0;No;1;Personal Budget;2;Department Budget;3;Both')
|
||||
FAC_LCL('bes_discipline_ins_modeLOV',
|
||||
'0;Niet van toepassing;2;Koppelen',
|
||||
'0;Not applicable;2;Attach')
|
||||
|
||||
FAC_LCL('ins_tab_discipline', 'Catalogus', 'Catalogue')
|
||||
FAC_LCL('ins_tab_discipline_m', 'Productcatalogi', 'Product catalogues')
|
||||
|
||||
@@ -64,6 +64,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'image_path_local_regexp'
|
||||
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'image_path_virtual' , 'string' , NULL , 'path used by WEB for flexproperties of type X')
|
||||
DEFINE_SETTING('FAC', 0000, 'WEB_FACTAB', 'flexFilesPath' , 'string' , NULL , 'Path for Flexbestanden type ''F'' en ''M'', zonder eindslash')
|
||||
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flexAllowedExt' , 'string' , '.*\.(doc|docx|xls|xlsx|jpg|jpeg|png|gif|bmp|dwg|dwf|eml|pdf|msg|zip|vsd|txt|ppt|pptx|oft|rtf|tif|tiff|csv|dot|xml|mcw|rar|encrypted|gz|gzip)$', 'Allowed extensions')
|
||||
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flex_mimetypes' , 'json' , '{ "jpg": "image/jpeg", "jpeg": "image/jpeg" , "png": "image/png", "bmp": "image/bmp", "gif": "image/gif", "pdf": "application/pdf" }', 'Supported streaming mimetypes')
|
||||
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'flex_min_size' , 'number' , '64' , 'E-mail attachments smaller (in bytes) than this are silently ignored')
|
||||
DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'impAllowedExt' , 'string' , '.*\.(txt|csv|xml)$' , 'Allowed importfile extensions')
|
||||
DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'flexExtensionFilter' , 'string' , NULL , 'All files can be uploaded. "PDF DOC TIFF XLS" would filter')
|
||||
@@ -775,6 +776,9 @@ DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_flags' , 'number
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_order_flexfiles' , 'number' , '0' , 'Include flexfiles with sent orders')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_apppushurl' , 'string' , '' , 'URL for pushing APP notifications')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_failalert_threshold' , 'number' , '240' , 'Minimum minutes after first failed send-attempts before an alert is sent to the (PRSSYS) application manager(s)')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_faildelayincrement' , 'number' , '10' , 'Delay retry of failed orders up to failures*10 minutes')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_faildelaymax' , 'number' , '120' , 'Maximum delay of failed orders in minutes')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_failextralogging' , 'number' , '3' , 'At the 3rd failure logging is increased automatically once')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'bdradrfiles_path' , 'string' , NULL , 'Technische adressen bijlagen folder')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_FACTAB', 'puo_lcl_friendly_mailto' , 'string' , 'Opdracht per e-mail gestuurd naar {0}' , 'Friendly text for mail tracking')
|
||||
DEFINE_SETTING('PUO', 0001, 'WEB_PRSSYS', 'puo_lcl_friendly_http' , 'string' , 'Opdracht per SOAP gestuurd naar {0}' , 'Friendly text for http tracking')
|
||||
|
||||
@@ -1828,6 +1828,7 @@ CREATE_TABLE(fac_api, 0)
|
||||
fac_usrrap_key NUMBER (10),
|
||||
fac_api_viewmapping_json VARCHAR2 (4000),
|
||||
fac_api_stylesheet VARCHAR2 (64),
|
||||
fac_api_stylesheet_out VARCHAR2 (64),
|
||||
fac_import_app_key NUMBER (10),
|
||||
fac_api_options_json VARCHAR2 (4000)
|
||||
);
|
||||
|
||||
@@ -92,13 +92,13 @@ CREATE_TABLE(ins_tab_discipline,0)
|
||||
// prs_kostensoort_key
|
||||
// NUMBER(10)
|
||||
// CONSTRAINT ins_r_prs_kostensoort_key1 REFERENCES prs_kostensoort(prs_kostensoort_key),
|
||||
ins_discipline_btw -- 1=Incl. BTW
|
||||
ins_discipline_btw -- 1=Incl. BTW
|
||||
NUMBER(1) DEFAULT(1)
|
||||
CONSTRAINT ins_c_ins_discipline_btw CHECK(ins_discipline_btw IN (0,1)),
|
||||
ins_discipline_ktopercentage /* percentage dat evt. deelneemt aan KTO (klanttevredenheidsonderzoek), voor MLD, RES, BES */
|
||||
ins_discipline_ktopercentage /* percentage dat evt. deelneemt aan KTO (klanttevredenheidsonderzoek), voor MLD, RES, BES */
|
||||
NUMBER(3)
|
||||
CONSTRAINT ins_c_discipline_ktopercentage CHECK(ins_discipline_ktopercentage BETWEEN 0 AND 100),
|
||||
ins_discipline_ktodrempel /* minimum aantal dat evt. deelneemt aan KTO */
|
||||
ins_discipline_ktodrempel /* minimum aantal dat evt. deelneemt aan KTO */
|
||||
NUMBER(3),
|
||||
ins_discipline_volgnr
|
||||
NUMBER(4),
|
||||
@@ -258,6 +258,7 @@ CREATE_TABLE(ins_srtdeel,0)
|
||||
CONSTRAINT ins_c_ins_srtdeel_binding CHECK ((ins_srtdeel_module ='INS' AND ins_srtdeel_binding > 0) OR ins_srtdeel_module <> 'INS')
|
||||
);
|
||||
|
||||
|
||||
/* New table for relations between object types; designed for key management (formerly SLE)*/
|
||||
CREATE_TABLE(ins_srtdeel_srtdeel, 0)
|
||||
(
|
||||
@@ -372,6 +373,10 @@ CREATE_TABLE(ins_deel,0)
|
||||
-- prs_perslid_key_beh
|
||||
-- NUMBER(10)
|
||||
-- CONSTRAINT ins_r_prs_perslid_key_beh REFERENCES prs_perslid (prs_perslid_key),
|
||||
-- In: BES_TAB.SRC
|
||||
-- bes_bestelopdr_key
|
||||
-- NUMBER(10)
|
||||
-- CONSTRAINT bes_r_bes_bestelopdr_key3 REFERENCES bes_bestelopdr(bes_bestelopdr_key),
|
||||
CONSTRAINT ins_u_ins_deel_upper2 UNIQUE(ins_alg_locatie_key,
|
||||
ins_deel_parent_key, ins_srtdeel_key, ins_deel_upper,
|
||||
ins_deel_verwijder)
|
||||
|
||||
@@ -248,6 +248,44 @@ UPDATE mld_stdmelding
|
||||
/////////////////////////////////////////////////////////////////////////////////////////// DJIN#41676
|
||||
ALTER TABLE bes_bestelopdr ADD bes_bestelopdr_flag NUMBER(1);
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////// DJIN#41675
|
||||
ALTER TABLE bes_disc_params /* bestelcatalogusinstellingen {0=Niet van toepassing, 1=Aanmaken en koppelen (Nog niet ondersteund), 2=Koppelen} */
|
||||
ADD bes_disc_params_ins_mode
|
||||
NUMBER(1)
|
||||
DEFAULT 0
|
||||
NOT NULL;
|
||||
|
||||
ALTER TABLE bes_disc_params /* objectrelatie */
|
||||
ADD bes_disc_params_ins_srtdeelkey
|
||||
NUMBER(10)
|
||||
CONSTRAINT ins_r_ins_srtdeel_key3 REFERENCES ins_srtdeel(ins_srtdeel_key);
|
||||
|
||||
ALTER TABLE ins_deel
|
||||
ADD bes_bestelopdr_key
|
||||
NUMBER(10)
|
||||
CONSTRAINT bes_r_bes_bestelopdr_key3 REFERENCES bes_bestelopdr(bes_bestelopdr_key);
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////// FSN#47307
|
||||
ALTER TABLE bes_disc_params /* 0=ouderwets artikelselector, 1=vrij artikelen, 2=bestellijst */
|
||||
ADD bes_disc_params_bestelmode
|
||||
NUMBER(1)
|
||||
DEFAULT 0
|
||||
NOT NULL;
|
||||
|
||||
UPDATE bes_disc_params
|
||||
SET bes_disc_params_bestelmode = bes_disc_params_freeartikel;
|
||||
|
||||
ALTER TABLE bes_disc_params /* 0=alleen bij kiezen artikel, 1=ook in bestellijst */
|
||||
ADD bes_disc_params_fotomode
|
||||
NUMBER(1)
|
||||
DEFAULT 0
|
||||
NOT NULL;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////// MARX#51994
|
||||
ALTER TABLE fac_api
|
||||
ADD fac_api_stylesheet_out
|
||||
VARCHAR2 (64);
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////// XXXX#12345
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user