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

MARX#36441: Nieuwe Materiaalregels in een nieuw materiaal(frame).

Browse Source 
svn path=/Website/trunk/; revision=38810
This commit is contained in:
Maykel Geerdink
2018-08-14 12:50:40 +00:00
parent d9d6882380
commit 2cfc5ecb80
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
APPL/MLD/mld_opdr_materiaal.asp
View File

@@ -28,6 +28,8 @@ var mld_ordermaterial_frame = S("mld_ordermaterial_frame") == 1;
var opdr_key = getQParamInt("opdr_key");
var uitv_key = getQParamInt("uitv_key");
var readonly = getQParamInt("readonly", 0) == 1;
var outputmode = getQParamInt("outputmode", 0); // 0 = screen, 1 = print, 2 = excel etc
var showall = getQParamInt("showall", 0) == 1;
if (!readonly && opdr_key > 0)
{
this_opdr = mld.func_enabled_opdracht(opdr_key); // wat mag ik zoal op deze opdracht
@@ -37,7 +39,7 @@ if (!readonly && opdr_key > 0)
<html>
<head>
<% FCLTHeader.Generate() %>
<% FCLTHeader.Generate({ outputmode: outputmode }); %>
<script type="text/javascript">
var matkeystr = FcltMgr.dialogArguments().matkeystr;
var mld_ordermaterial_fac_usrtab_key = <%=S("mld_ordermaterial_fac_usrtab_key")%>;
@@ -138,6 +140,7 @@ if (!readonly && opdr_key > 0)
}
var sql = "SELECT ud.mld_opdr_materiaal_key"
+ " , ud.mld_opdr_materiaal_id"
+ " , fu.fac_usrdata_key"
+ " , ud.mld_opdr_materiaal_aantal"
+ " , ud.mld_opdr_materiaal_eenheid"
@@ -145,6 +148,8 @@ if (!readonly && opdr_key > 0)
+ " , ud.mld_opdr_materiaal_code"
+ " , ud.mld_opdr_materiaal_groep"
+ " , ud.mld_opdr_materiaal_extra2"
+ " , ud.mld_opdr_materiaal_extra3"
+ " , ud.mld_opdr_materiaal_extra4"
+ " , (ud.mld_opdr_materiaal_aantal * ud.mld_opdr_materiaal_prijs) totaal"
+ " , " + lcl.xsqla('fu.fac_usrdata_omschr', 'fu.fac_usrdata_key')
+ " , ud.mld_opdr_materiaal_omschr"
@@ -157,25 +162,37 @@ if (!readonly && opdr_key > 0)
+ " WHERE ud.fac_usrdata_key = fu.fac_usrdata_key (+)"
+ " AND ud.fin_btwtabelwaarde_key = b.fin_btwtabelwaarde_key (+)"
+ " AND ud.mld_opdr_key = " + opdr_key
+ " ORDER BY fu.fac_usrdata_volgnr"
+ " , UPPER(" + lcl.xsql('fu.fac_usrdata_omschr', 'fu.fac_usrdata_key' )+ ")";
+ " ORDER BY "
+ (mld_ordermaterial_frame
? " ud.mld_opdr_materiaal_groep"
+ " , ud.mld_opdr_materiaal_extra2"
+ " , ud.mld_opdr_materiaal_code"
+ " , ud.mld_opdr_materiaal_id"
: " fu.fac_usrdata_volgnr"
+ " , UPPER(" + lcl.xsql("fu.fac_usrdata_omschr", "fu.fac_usrdata_key") + ")");
var rst = new ResultsetTable({ keyColumn: "mld_opdr_materiaal_key",
sql: sql,
ID: "materiaaltable",
title: (mld_ordermaterial_frame? L("lcl_mld_material") : null),
outputmode: outputmode,
showAll: showall,
noPrint: (mld_ordermaterial_frame? null : true)
});
if (mld_ordermaterial_frame)
{
rst.addColumn(new Column({caption: L("lcl_mld_opdr_code"), content: "mld_opdr_materiaal_code"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_groep"), content: "mld_opdr_materiaal_groep"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_extra2"), content: "mld_opdr_materiaal_extra2"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_extra3"), content: "mld_opdr_materiaal_extra3"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_extra4"), content: "mld_opdr_materiaal_extra4"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_id"), content: "mld_opdr_materiaal_id"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_code"), content: "mld_opdr_materiaal_code"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_omschr"), content: "mld_opdr_materiaal_omschr"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_aantal"), content: "mld_opdr_materiaal_aantal", datatype: "number"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_eenheid"), content: "mld_opdr_materiaal_eenheid" }));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_prijs"), content: "mld_opdr_materiaal_prijs", datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_btw"), content: "fin_btwtabelwaarde_oms"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_info"), content: "mld_opdr_materiaal_info"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_totaal"), content: "totaal", datatype: "currency"}));
}
else
{