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

MARX#86119 Integratie Viadata CI365 en Mareon voor inspectieproces - toegevoegd LEDO location & vat, aangepast longdesc

Browse Source 
svn path=/Mareon/trunk/; revision=67647
This commit is contained in:
Marcel Bourseau
2025-01-20 16:49:47 +00:00
parent bf65a245cb
commit 30f17e8166
1 changed files with 39 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
ax/SRC/F_GetOpdrachtenStatussen.js
View File

@@ -425,13 +425,12 @@ function F_Make_DICO_005_Opdracht_regels (p_mld_opdr_key, p_statuscode)
//var l_mld_opdr_materiaal_key = l_mat_regels[i].id;
var l_mld_opdr_materiaal_id = l_mat_regels[i].seq;
var l_mld_opdr_materiaal_code = l_mat_regels[i].code;
//var l_mld_opdr_materiaal_groep = l_mat_regels[i].group;
//var l_mld_opdr_materiaal_name0 = l_mat_regels[i].name0;
//TODO: "name0": null, wat is dit?
var l_mld_opdr_materiaal_omschr = l_mat_regels[i].name;
//LEDO Location = group..
var l_mld_opdr_materiaal_groep = l_mat_regels[i].group;
var l_mld_opdr_materiaal_omschr = l_mat_regels[i].userdefined;
var l_mld_opdr_materiaal_prijs = l_mat_regels[i].price;
//var l_mld_opdr_materiaal_btw = l_mat_regels[i].vat;
//TODO: Let op: BTW, wat is dit, percentage of key?
var l_mld_opdr_materiaal_btw_perc = l_mat_regels[i].vat_perc;
var l_mld_opdr_materiaal_aantal = l_mat_regels[i].quantity;
//var l_mld_opdr_materiaal_eenheid = l_mat_regels[i].unit;
var l_mld_opdr_materiaal_eenheidcode = l_mat_regels[i].unitcode;
@@ -448,15 +447,38 @@ function F_Make_DICO_005_Opdracht_regels (p_mld_opdr_key, p_statuscode)
l_result += " <Quantity>" + l_mld_opdr_materiaal_aantal + "</Quantity>";
l_result += " <MeasurementUnitQuantity>" + l_mld_opdr_materiaal_eenheidcode + "</MeasurementUnitQuantity>";
l_result += " <Status>" + p_statuscode + "</Status>";
l_result += " <NormPriceCode>" + l_mld_opdr_materiaal_code.substr(0, 17) + "</NormPriceCode>";
l_result += " <LongDescription>" + l_mld_opdr_materiaal_omschr.substr(0, 70) + "</LongDescription>";
l_result += " <PriceInformation>";
l_result += " <Price>"+ l_mld_opdr_materiaal_prijs + "</Price>";
l_result += " <PriceBase>";
l_result += " <NumberOfUnitsInPriceBasis>1</NumberOfUnitsInPriceBasis>";
l_result += " <MeasureUnitPriceBasis>" + l_mld_opdr_materiaal_eenheidcode + "</MeasureUnitPriceBasis>";
l_result += " </PriceBase>";
l_result += " </PriceInformation>";
if (l_mld_opdr_materiaal_code)
{
l_result += " <NormPriceCode>" + l_mld_opdr_materiaal_code.substr(0, 17) + "</NormPriceCode>";
}
if (l_mld_opdr_materiaal_omschr)
{
l_result += " <LongDescription>" + l_mld_opdr_materiaal_omschr.substr(0, 70) + "</LongDescription>";
}
if (l_mld_opdr_materiaal_groep)
{
l_result += " <LEDOInformation>";
l_result += " <Location>" + l_mld_opdr_materiaal_groep.substr(0, 70) + "</Location>";
l_result += " </LEDOInformation>";
}
if (l_mld_opdr_materiaal_prijs && l_mld_opdr_materiaal_eenheidcode)
{
l_result += " <PriceInformation>";
l_result += " <Price>"+ l_mld_opdr_materiaal_prijs + "</Price>";
l_result += " <PriceBase>";
l_result += " <NumberOfUnitsInPriceBasis>1</NumberOfUnitsInPriceBasis>";
l_result += " <MeasureUnitPriceBasis>" + l_mld_opdr_materiaal_eenheidcode + "</MeasureUnitPriceBasis>";
l_result += " </PriceBase>";
l_result += " </PriceInformation>";
if (l_mld_opdr_materiaal_btw_perc)
{
l_result += " <VATInformation>";
l_result += " <VATRate>" + "S" + "</VATRate>";
l_result += " <VATPercentage>" + l_mld_opdr_materiaal_btw_perc + "</VATPercentage>";
l_result += " </VATInformation>";
}
}
l_result += "</InstructionLine>";
}
}
@@ -495,7 +517,7 @@ function F_GetOpdracht_regels (p_mld_opdr_key)
// "name0": null,
// "name": "Badkamerverbetering 2m2-uitvoeren",
// "price": 100,
// "vat": null,
// "vat_perc": null,
// "quantity": 1,
// "unit": "PCE",
// "unitcode": "PCE",
@@ -515,10 +537,7 @@ function F_GetOpdracht_regels (p_mld_opdr_key)
// "name0": null,
// "name": "Keukenopstelling- 1700mm verbetering - uitvoeren",
// "price": 3559.76,
// "vat":{
// "id": 3,
// "name": "Hoog"
// },
// "vat_perc": 21,
// "quantity": 1,
// "unit": "PCE",
// "unitcode": "PCE",