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

MARX#35457: Extra velden bij opdrachtmateriaal tbv Tobias-inkooporders.

Browse Source 
svn path=/Website/trunk/; revision=28852
This commit is contained in:
Maykel Geerdink
2016-04-12 08:19:24 +00:00
parent 61478b75a6
commit 71bcc937c4
2 changed files with 5 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/MLD/mld_opdr_materiaal.asp
View File

@@ -144,7 +144,7 @@ if (!readonly && opdr_key > 0)
+ " , " + lcl.xsqla('fu.fac_usrdata_omschr', 'fu.fac_usrdata_key')
+ " , ud.mld_opdr_materiaal_omschr"
+ " , ud.mld_opdr_materiaal_info"
+ " , b.fin_btwtabelwaarde_code"
+ " , b.fin_btwtabelwaarde_oms"
+ " , (ud.mld_opdr_materiaal_aantal * ud.mld_opdr_materiaal_prijs * (100+fin_btwtabelwaarde_perc)/100) totaalincbtw"
+ " FROM mld_opdr_materiaal ud"
+ " , fac_usrdata fu"
@@ -160,11 +160,11 @@ if (!readonly && opdr_key > 0)
noPrint: true
});
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_descr"), content: fncolOmschr}));
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_totaal"), content: "totaal", datatype: "currency"}));
rst.addColumn(new Column({caption: L("lcl_mld_opdr_btw"), content: "fin_btwtabelwaarde_code"}));
var mld = rst.processResultset();
}
else

42
APPL/MLD/mld_opdr_materiaal.js
View File

@@ -94,7 +94,7 @@ function checkInput(str, field, typeNC)
|| (typeNC == "N" && !isGoodNumber(str.replace(',', '.'),false,true,8,2))
))
{
alert(L("lcl_shared_invalid_format"));
alert(L("lcl_mld_opdr_invalid_sum"));
field.select();
field.focus();
return false;
@@ -306,8 +306,6 @@ function submit()
{
if (!validateForm("u2"))
return false;
if (!DesCheck())
return false;
var total = $("#total").val();
FcltMgr.closeDetail(window, { matTotal: total, matExistArray: matExistArray, matUserArray: matUserArray });
@@ -489,50 +487,14 @@ function DesChanged(evt)
var index = obj.id.substr(8);
matUserArray[index].descript = des;
// omschrijving mag maar 1 keer bestaan binnen opdracht.
for (var i in matUserArray)
{
if ((matUserArray[i].descript == des) && (i != index))
{
alert(L("lcl_mld_opdr_materials_unique"));
return;
}
}
}
function DesCheck()
{
// omschrijving mag maar 1 keer bestaan binnen opdracht.
var uniek = true;
for (var i=0; i<=rowIndex; i++)
{
if (matUserArray[i])
{
des_i = matUserArray[i].descript;
for (var j=i+1; j<=rowIndex; j++)
{
if (matUserArray[j])
{
des_j = matUserArray[j].descript;
if (des_i == des_j)
{
alert(L("lcl_mld_opdr_materials_unique"));
uniek = false;
}
}
}
}
}
return uniek;
}
function setTotal(index)
{
if ((matUserArray.length != 0) && (index >= 0))
{ // Na wijzigen van amount of price moet de sum van deze regel worden aangepast.
matUserArray[index].sum = parseFloat(matUserArray[index].amount * matUserArray[index].price);
matUserArray[index].row.cells[5].innerHTML = "<nobr>" + num2curr(matUserArray[index].sum) + "</nobr>" + "&nbsp;";
matUserArray[index].row.cells[6].innerHTML = "<nobr>" + num2curr(matUserArray[index].sum) + "</nobr>" + "&nbsp;";
}
var total = 0;
for (var i in matExistArray)