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=38820
This commit is contained in:
Maykel Geerdink
2018-08-15 08:05:46 +00:00
parent 0687be50d8
commit 939f32b095
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/MLD/mld_opdr_materiaal.asp
View File

@@ -162,14 +162,13 @@ 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 "
+ (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") + ")");
? " ORDER BY ud.mld_opdr_materiaal_id"
+ " , ud.mld_opdr_materiaal_groep"
+ " , ud.mld_opdr_materiaal_extra2"
+ " , ud.mld_opdr_materiaal_code"
: " ORDER BY 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,
@@ -181,11 +180,11 @@ if (!readonly && opdr_key > 0)
});
if (mld_ordermaterial_frame)
{
rst.addColumn(new Column({caption: L("lcl_mld_opdr_id"), content: "mld_opdr_materiaal_id"}));
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"}));