diff --git a/APPL/FAC/fac_adres_list.asp b/APPL/FAC/fac_adres_list.asp
index 0bafa5af14..7610c99916 100644
--- a/APPL/FAC/fac_adres_list.asp
+++ b/APPL/FAC/fac_adres_list.asp
@@ -59,7 +59,7 @@ var showall = getQParamInt("showall", 0) == 1;
+ " m.mld_adres_bezoek_land, "
+ " m.mld_adres_post_land, "
+ " m.mld_adres_telefoon, "
- + " m.mld_adres_fax, "
+ + " m.mld_adres_email, "
+ " l.alg_locatie_omschrijving "
+ " FROM mld_adres m, alg_locatie l "
+ " WHERE l.alg_locatie_key(+) = m.alg_locatie_key AND m.mld_adres_verwijder IS NULL "
@@ -106,7 +106,7 @@ var showall = getQParamInt("showall", 0) == 1;
rst.addColumn(new Column({caption: L("lcl_prs_address_post_plaats"), content: "mld_adres_post_plaats", purpose: PRINTING_ONLY}));
rst.addColumn(new Column({caption: L("lcl_prs_address_post_land"), content: "mld_adres_post_land", purpose: PRINTING_ONLY}));
rst.addColumn(new Column({caption: L("lcl_prs_address_phone"), content: "mld_adres_telefoon", purpose: PRINTING_ONLY}));
- rst.addColumn(new Column({caption: L("lcl_prs_address_fax"), content: "mld_adres_fax", purpose: PRINTING_ONLY}));
+ rst.addColumn(new Column({caption: L("lcl_prs_address_email"), content: "mld_adres_email", purpose: PRINTING_ONLY}));
rst.addAction({action: "adresedit", caption: L("lcl_edit"), isDefault: true});
diff --git a/APPL/FAC/fac_edit_adres.asp b/APPL/FAC/fac_edit_adres.asp
index 85d8f9e056..a4560b063d 100644
--- a/APPL/FAC/fac_edit_adres.asp
+++ b/APPL/FAC/fac_edit_adres.asp
@@ -30,7 +30,7 @@ if (adr_key > -1)
{
sql = "SELECT mld_adres_contactpers_bureau, "
+ " mld_adres_telefoon, "
- + " mld_adres_fax, "
+ + " mld_adres_email, "
+ " mld_adres_naam, "
+ " mld_adres_bezoek_adres, "
+ " mld_adres_bezoek_postcode, "
@@ -43,7 +43,7 @@ if (adr_key > -1)
+ " mld_adres_post_land, "
+ " mld_adres_contactpersoon, "
+ " mld_adres_contactpers_telefoon, "
- + " mld_adres_contactpers_fax, "
+ + " mld_adres_contactpers_email, "
+ " mld_adres_factuuradres, "
+ " mld_adres_opdrachtadres, "
+ " mld_adres_afleveradres, "
@@ -55,7 +55,7 @@ oRs=Oracle.Execute(sql);
var mld_adr_cnt_bur = oRs("mld_adres_contactpers_bureau").Value;
var mld_adr_tel = oRs("mld_adres_telefoon").Value;
- var mld_adr_fax = oRs("mld_adres_fax").Value;
+ var mld_adr_email = oRs("mld_adres_email").Value;
var mld_adr_nm = oRs("mld_adres_naam").Value;
var mld_adr_bez_adr = oRs("mld_adres_bezoek_adres").Value;
var mld_adr_bez_pcd = oRs("mld_adres_bezoek_postcode").value;
@@ -68,7 +68,7 @@ oRs=Oracle.Execute(sql);
var mld_adr_pst_lnd = oRs("mld_adres_post_land").Value;
var mld_adr_cnt_prs = oRs("mld_adres_contactpersoon").Value;
var mld_adr_cnt_tel = oRs("mld_adres_contactpers_telefoon").Value;
- var mld_adr_cnt_fax = oRs("mld_adres_contactpers_fax").Value;
+ var mld_adr_cnt_email = oRs("mld_adres_contactpers_email").Value;
var mld_adr_fac_adr = oRs("mld_adres_factuuradres").Value;
var mld_adr_opd_adr = oRs("mld_adres_opdrachtadres").Value;
var mld_adr_afl_adr = oRs("mld_adres_afleveradres").Value;
@@ -124,14 +124,14 @@ BLOCK_START("facAlg", L("lcl_fac_adres_nawblock"));
filtercode: "FAC"
});
- RWFIELDTR("mld_adr_nm", "fld", L("lcl_prs_address_naam"), mld_adr_nm, {maxlength: 60, required: true});
+ RWFIELDTR("mld_adr_nm", "fld", L("lcl_prs_address_naam"), mld_adr_nm, {maxlength: 60, required: true});
RWFIELDTR("mld_adr_geb_rui", "fld", L("lcl_prs_address_gebouw_ruimte"), mld_adr_geb_rui, {maxlength: 30});
- RWFIELDTR("mld_adr_bez_adr", "fld", L("lcl_prs_address_bezoek_adres"), mld_adr_bez_adr, {maxlength: 50});
- RWFIELDTR("mld_adr_bez_pcd", "fld", L("lcl_prs_address_bezoek_postcode"), mld_adr_bez_pcd, {maxlength: 12});
+ RWFIELDTR("mld_adr_bez_adr", "fld", L("lcl_prs_address_bezoek_adres"), mld_adr_bez_adr, {maxlength: 50});
+ RWFIELDTR("mld_adr_bez_pcd", "fld", L("lcl_prs_address_bezoek_postcode"), mld_adr_bez_pcd, {maxlength: 12});
RWFIELDTR("mld_adr_bez_pla", "fld", L("lcl_prs_address_bezoek_plaats"), mld_adr_bez_pla, {maxlength: 30});
- RWFIELDTR("mld_adr_bez_lnd", "fld", L("lcl_prs_address_bezoek_land"), mld_adr_bez_lnd, {maxlength: 30});
- RWFIELDTR("mld_adr_tel", "fld", L("lcl_prs_address_phone"), mld_adr_tel, {maxlength: 15});
- RWFIELDTR("mld_adr_fax", "fld", L("lcl_prs_address_fax"), mld_adr_fax, {maxlength: 15});
+ RWFIELDTR("mld_adr_bez_lnd", "fld", L("lcl_prs_address_bezoek_land"), mld_adr_bez_lnd, {maxlength: 30});
+ RWFIELDTR("mld_adr_tel", "fld", L("lcl_prs_address_phone"), mld_adr_tel, {maxlength: 15});
+ RWFIELDTR("mld_adr_email", "fld", L("lcl_prs_address_email"), mld_adr_email, {maxlength: 15});
%>
|
@@ -149,17 +149,17 @@ BLOCK_START("facAlg", L("lcl_fac_adres_nawblock"));
BLOCK_END();
BLOCK_START("facBez", L("lcl_fac_adres_postblock"));
- RWFIELDTR("mld_adr_pst_adr", "fld", L("lcl_prs_address_post_adres"), mld_adr_pst_adr, {maxlength: 50});
- RWFIELDTR("mld_adr_pst_pcd", "fld", L("lcl_prs_address_post_postcode"), mld_adr_pst_pcd, {maxlength: 12});
+ RWFIELDTR("mld_adr_pst_adr", "fld", L("lcl_prs_address_post_adres"), mld_adr_pst_adr, {maxlength: 50});
+ RWFIELDTR("mld_adr_pst_pcd", "fld", L("lcl_prs_address_post_postcode"), mld_adr_pst_pcd, {maxlength: 12});
RWFIELDTR("mld_adr_pst_pla", "fld", L("lcl_prs_address_post_plaats"), mld_adr_pst_pla, {maxlength: 30});
- RWFIELDTR("mld_adr_pst_lnd", "fld", L("lcl_prs_address_post_land"), mld_adr_pst_lnd, {maxlength: 30});
+ RWFIELDTR("mld_adr_pst_lnd", "fld", L("lcl_prs_address_post_land"), mld_adr_pst_lnd, {maxlength: 30});
BLOCK_END();
BLOCK_START("facCnt", L("lcl_prs_bedrijf_contactblock"));
- RWFIELDTR("mld_adr_cnt_prs", "fld", L("lcl_prs_address_contact_person"), mld_adr_cnt_prs, {maxlength: 30});
- RWFIELDTR("mld_adr_cnt_tel", "fld", L("lcl_prs_address_contact_telefoon"), mld_adr_cnt_tel, {maxlength: 15});
- RWFIELDTR("mld_adr_cnt_fax", "fld", L("lcl_prs_address_contact_fax"), mld_adr_cnt_fax, {maxlength: 15});
- RWFIELDTR("mld_adr_cnt_bur", "fld", L("lcl_prs_address_contact_bureau"), mld_adr_cnt_bur, {maxlength: 20});
+ RWFIELDTR("mld_adr_cnt_prs", "fld", L("lcl_prs_address_contact_person"), mld_adr_cnt_prs, {maxlength: 30});
+ RWFIELDTR("mld_adr_cnt_tel", "fld", L("lcl_prs_address_contact_telefoon"), mld_adr_cnt_tel, {maxlength: 15});
+ RWFIELDTR("mld_adr_cnt_email", "fld", L("lcl_prs_address_contact_email"), mld_adr_cnt_email, {maxlength: 15});
+ RWFIELDTR("mld_adr_cnt_bur", "fld", L("lcl_prs_address_contact_bureau"), mld_adr_cnt_bur, {maxlength: 20});
BLOCK_END();
IFACE.FORM_END();
%>
diff --git a/APPL/FAC/fac_edit_adres_save.asp b/APPL/FAC/fac_edit_adres_save.asp
index 1eb767a112..ed6bbb4118 100644
--- a/APPL/FAC/fac_edit_adres_save.asp
+++ b/APPL/FAC/fac_edit_adres_save.asp
@@ -22,13 +22,13 @@
}) %>
<%
var adr_key = getQParamInt( "adr_key", -1 );
-
+
var autfunction = "WEB_ALGMSU";
var authparams = user.checkAutorisation(autfunction);
var fields = [ { dbs: "mld_adres_contactpers_bureau", typ: "varchar", frm: "mld_adr_cnt_bur" },
{ dbs: "mld_adres_telefoon", typ: "varchar", frm: "mld_adr_tel" },
- { dbs: "mld_adres_fax", typ: "varchar", frm: "mld_adr_fax" },
+ { dbs: "mld_adres_email", typ: "varchar", frm: "mld_adr_email" },
{ dbs: "mld_adres_naam", typ: "varchar", frm: "mld_adr_nm" },
{ dbs: "mld_adres_bezoek_adres", typ: "varchar", frm: "mld_adr_bez_adr" },
{ dbs: "mld_adres_bezoek_postcode", typ: "varchar", frm: "mld_adr_bez_pcd" },
@@ -41,12 +41,12 @@
{ dbs: "mld_adres_post_land", typ: "varchar", frm: "mld_adr_pst_lnd" },
{ dbs: "mld_adres_contactpersoon", typ: "varchar", frm: "mld_adr_cnt_prs" },
{ dbs: "mld_adres_contactpers_telefoon", typ: "varchar", frm: "mld_adr_cnt_tel" },
- { dbs: "mld_adres_contactpers_fax", typ: "varchar", frm: "mld_adr_cnt_fax" },
- { dbs: "mld_adres_factuuradres", typ: "check", frm: "mld_adr_fac_adr" },
- { dbs: "mld_adres_opdrachtadres", typ: "check", frm: "mld_adr_opd_adr" },
+ { dbs: "mld_adres_contactpers_email", typ: "varchar", frm: "mld_adr_cnt_email" },
+ { dbs: "mld_adres_factuuradres", typ: "check", frm: "mld_adr_fac_adr" },
+ { dbs: "mld_adres_opdrachtadres", typ: "check", frm: "mld_adr_opd_adr" },
{ dbs: "mld_adres_afleveradres", typ: "check", frm: "mld_adr_afl_adr" },
{ dbs: "alg_locatie_key", typ: "key", frm: "locatiekey" }];
-
+
var warning = "";
if (adr_key > 0)
{
diff --git a/APPL/FAC/fac_show_adres.asp b/APPL/FAC/fac_show_adres.asp
index e4f0021fac..ac65743862 100644
--- a/APPL/FAC/fac_show_adres.asp
+++ b/APPL/FAC/fac_show_adres.asp
@@ -28,7 +28,7 @@ var sql,oRs;
sql = "SELECT mld_adres_contactpers_bureau, "
+ " mld_adres_telefoon, "
- + " mld_adres_fax, "
+ + " mld_adres_email, "
+ " mld_adres_naam, "
+ " mld_adres_bezoek_adres, "
+ " mld_adres_bezoek_postcode, "
@@ -41,7 +41,7 @@ var sql,oRs;
+ " mld_adres_post_land, "
+ " mld_adres_contactpersoon, "
+ " mld_adres_contactpers_telefoon, "
- + " mld_adres_contactpers_fax, "
+ + " mld_adres_contactpers_email, "
+ " mld_adres_factuuradres, "
+ " mld_adres_opdrachtadres, "
+ " mld_adres_afleveradres, "
@@ -60,7 +60,7 @@ if (oRs.eof)
mld_adr_cnt_bur = oRs("mld_adres_contactpers_bureau").Value;
mld_adr_tel = oRs("mld_adres_telefoon").Value;
-mld_adr_fax = oRs("mld_adres_fax").Value;
+mld_adr_email = oRs("mld_adres_email").Value;
mld_adr_nm = oRs("mld_adres_naam").Value;
mld_adr_bez_adr = oRs("mld_adres_bezoek_adres").Value;
mld_adr_bez_pcd = oRs("mld_adres_bezoek_postcode").value;
@@ -73,7 +73,7 @@ mld_adr_pst_pla = oRs("mld_adres_post_plaats").Value;
mld_adr_pst_lnd = oRs("mld_adres_post_land").Value;
mld_adr_cnt_prs = oRs("mld_adres_contactpersoon").Value;
mld_adr_cnt_tel = oRs("mld_adres_contactpers_telefoon").Value;
-mld_adr_cnt_fax = oRs("mld_adres_contactpers_fax").Value;
+mld_adr_cnt_email = oRs("mld_adres_contactpers_email").Value;
mld_adr_fac_adr = oRs("mld_adres_factuuradres").Value;
mld_adr_opd_adr = oRs("mld_adres_opdrachtadres").Value;
mld_adr_afl_adr = oRs("mld_adres_afleveradres").Value;
@@ -146,7 +146,7 @@ BLOCK_START("facAlg", L("lcl_fac_adres_nawblock"));
ROFIELDTR("fld", L("lcl_prs_address_bezoek_plaats"), mld_adr_bez_pla);
ROFIELDTR("fld", L("lcl_prs_address_bezoek_land"), mld_adr_bez_lnd);
ROFIELDTR("fld", L("lcl_prs_address_phone"), mld_adr_tel, {suppressEmpty: true});
- ROFIELDTR("fld", L("lcl_prs_address_fax"), mld_adr_fax, {suppressEmpty: true});
+ ROFIELDTR("fld", L("lcl_prs_address_email"), mld_adr_email, {suppressEmpty: true});
%>
|
@@ -173,7 +173,7 @@ BLOCK_END();
BLOCK_START("facCnt", L("lcl_prs_bedrijf_contactblock"));
ROFIELDTR("fld", L("lcl_prs_address_contact_person"), mld_adr_cnt_prs, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_contact_telefoon"), mld_adr_cnt_tel, {suppressEmpty: true});
- ROFIELDTR("fld", L("lcl_prs_address_contact_fax"), mld_adr_cnt_fax, {suppressEmpty: true});
+ ROFIELDTR("fld", L("lcl_prs_address_contact_email"), mld_adr_cnt_email, {suppressEmpty: true});
ROFIELDTR("fld", L("lcl_prs_address_contact_bureau"), mld_adr_cnt_bur, {suppressEmpty: true});
BLOCK_END();
%>