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

PNBR#37746 Bestellingen: opmerkingen weergeven bij bestelopdracht

Browse Source 
svn path=/Website/trunk/; revision=31216
This commit is contained in:
Erik Groener
2016-10-26 07:36:23 +00:00
parent 4473339189
commit dbbbe2b7aa
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/BES/bes.inc
View File

@@ -177,7 +177,7 @@
if (bes_bestelling.bes_key == -1)
{
BLOCK_START("besInfo" , L("lcl_mld_new_bestelling"));
RWTEXTAREATR("lev_opm", "fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {html: "rows='3'"} );
RWTEXTAREATR("lev_opm", "fldtxt", L("lcl_bes_bestelling_lev_opm"), bes_bestelling.lev_opm, {html: "rows='3'"} );
}
else
{
@@ -360,9 +360,9 @@
}
if (mode == "RW")
RWTEXTAREATR("lev_opm", "fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {html: "rows='3'"} );
RWTEXTAREATR("lev_opm", "fldtxt", L("lcl_bes_bestelling_lev_opm"), bes_bestelling.lev_opm, {html: "rows='3'"} );
else
ROTEXTAREATR("fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {suppressEmpty: true} );
ROTEXTAREATR("fldtxt", L("lcl_bes_bestelling_lev_opm"), bes_bestelling.lev_opm, {suppressEmpty: true} );
}
BLOCK_END();
},

30
APPL/BES/bes_edit_bestelling_save.asp
View File

@@ -283,7 +283,7 @@ var fields = [ { dbs: "prs_perslid_key", typ: "key", val: prs_
{ dbs: "bes_bestelling_module", typ: "varchar", val: "BES" },
{ dbs: "bes_bestelling_levkosten", typ: "float", val: staffel_info.bes_kosten },
{ dbs: "bes_bestelling_korting", typ: "float", val: staffel_info.opdrachtkortingbedrag },
{ dbs: "bes_bestelling_lev_opm", typ: "varchar", frm: "lev_opm", track: L("lcl_bes_opmerking") }
{ dbs: "bes_bestelling_lev_opm", typ: "varchar", frm: "lev_opm", track: L("lcl_bes_bestelling_lev_opm") }
];
var mld_key = getQParamInt("mld_key", -1);
@@ -298,22 +298,22 @@ if (isNew || makechange)
{ // Insert een nieuwe (change) bestelaanvraag
if (makechange)
{ // Parent_key ook opslaan
fields.push({dbs: "bes_bestelling_parentkey", typ: "key", val: bes_key});
}
fields.push({dbs: "bes_bestelling_parentkey", typ: "key", val: bes_key});
}
if (act_mode)
{
fields.push({dbs: "fac_activiteit_key", typ: "key", val: act_key});
}
if (act_mode)
{
fields.push({dbs: "fac_activiteit_key", typ: "key", val: act_key});
}
var levdat = getFParamDate("calendar");
var maxdate = new Date();
maxdate.setDate(maxdate.getDate() + S("bes_datum_limiet"));
if ( S("bes_datum_limiet") > 0 && levdat > maxdate )
{
abort_with_warning(L("lcl_bes_date_farfuture")); // te ver in de toekomst
}
if (levdat < (new Date()).midnight() && bes_disc_info.disc_params_leverdagen > 0)
var levdat = getFParamDate("calendar");
var maxdate = new Date();
maxdate.setDate(maxdate.getDate() + S("bes_datum_limiet"));
if ( S("bes_datum_limiet") > 0 && levdat > maxdate )
{
abort_with_warning(L("lcl_bes_date_farfuture")); // te ver in de toekomst
}
if (levdat < (new Date()).midnight() && bes_disc_info.disc_params_leverdagen > 0)
{
abort_with_warning(L("lcl_bes_date_future")); // Moet in de toekomst
}

2
APPL/BES/bes_edit_opdr.asp
View File

@@ -235,7 +235,7 @@ var this_bestelopdr = bes.func_enabled_bestelopdracht(opdr_key);
emptyOption:(bes_bestelopdr.mld_adres_key_fac < 0? null : "")})
RWTEXTAREATR("opmerk", "fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {html: "rows='3'", suppressEmpty: true}); // Afhandeling, reden niet akkoord
ROTEXTAREATR("fldtxt", L("lcl_bes_comment"), bes_bestelopdr.delivery_opmerk, {suppressEmpty: true});
ROTEXTAREATR("fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {suppressEmpty: true} );
ROTEXTAREATR("fldtxt", L("lcl_bes_bestelling_lev_opm"), bes_bestelling.lev_opm, {suppressEmpty: true} );
BLOCK_END();

2
APPL/BES/bes_show_opdr.asp
View File

@@ -198,7 +198,7 @@ user.auth_required_or_abort(this_bestelopdr.canReadAny || this_bestelling.isVera
ROFIELDTR("fld", L("lcl_bes_adres_fac"), !oRs1.eof ? oRs1("mld_adres_naam").value : '?');
ROTEXTAREATR("fldtxt", L("lcl_remark"), bes_bestelopdr.opmerking, {id: "txt", suppressEmpty: true}); // Afhandeling, reden niet akkoord
ROTEXTAREATR("fldtxt", L("lcl_bes_comment"), bes_bestelopdr.delivery_opmerk, {id: "odtxt", suppressEmpty: true});
ROTEXTAREATR("fldtxt", L("lcl_bes_opmerking"), bes_bestelling.lev_opm, {suppressEmpty: true} );
ROTEXTAREATR("fldtxt", L("lcl_bes_bestelling_lev_opm"), bes_bestelling.lev_opm, {suppressEmpty: true} );
BLOCK_END();
BLOCK_START("besOpdrItems", L("lcl_bes_geselecteerd"));