diff --git a/ax/SRC/AxFacilitor.js b/ax/SRC/AxFacilitor.js
index 3057c1d..01ec90e 100644
--- a/ax/SRC/AxFacilitor.js
+++ b/ax/SRC/AxFacilitor.js
@@ -141,6 +141,10 @@ function MARX_2_FCLT_AfgemeldeOpdrachten(){
F_GetOpdrachten_Afgemeld();
}
+function MARX_2_FCLT_AfgerondeOpdrachten(){
+ F_GetOpdrachten_FinancAfgerond();
+}
+
function MARX_2_FCLT_Facturen(){
F_GetFacturen_FCLT();
}
@@ -345,6 +349,10 @@ function MAREON_2_FACILITOR()
MARX_2_FCLT_AfgemeldeOpdrachten();
__Log("*** END", 2);
+ __Log("*** START MAREON --> CUST.FACILITOR.NL : Afgeronde opdrachten uit Mareon naar Facilitor ***", 2);
+ MARX_2_FCLT_AfgerondeOpdrachten();
+ __Log("*** END", 2);
+
__Log("*** START MAREON --> CUST.FACILITOR.NL : Facturen uit Mareon naar Facilitor ***", 2);
if (G_fclt_factuur_xmlfolder != ""){
MARX_2_FCLT_Facturen();
@@ -399,8 +407,9 @@ function FACILITOR_2_Xtractor()
// 1.35 -- MARX#56792: Mareon sync adapter aanpassen tbv nieuwe statussen naar Tobias2012 + MARX#57368: Aanpassing 'huidige' aanroep Tobias-AX webservice ivm communicatie logboek
// 1.36 -- MARX#57502: AX Adapter robuuster maken + MARX#57491: Communicatie logboek ook voor Tobias AX 2009
// 1.37 -- MARX#57420: Documenten van Tobias AX naar Mareon
+// 1.38 -- MARX#60079: Mareon inrichten voor reversible billing KPN
-var G_Mareon_Adapter = "1.37";
+var G_Mareon_Adapter = "1.38";
//MARX#56643: Test Haagwonen inkoopordernummer ontbreekt in Mareon ION001753
var G_new_date = new Date();
//-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/ax/SRC/FCLT_FinancAfrondenServiceTask.js b/ax/SRC/FCLT_FinancAfrondenServiceTask.js
new file mode 100644
index 0000000..4e3007a
--- /dev/null
+++ b/ax/SRC/FCLT_FinancAfrondenServiceTask.js
@@ -0,0 +1,23 @@
+// --------------------------------------------------------------------------------------
+// FCLT_FinancAfrondenServiceTask.js
+// Copyright 2019 Aareon|facilitor. 053-4800 700, helpdesk@mareon.nl
+// Written by MB (2019)
+//
+
+
+function FCLT_FinancAfrondenServiceTask (v_company_id, v_taskId, v_externnr, v_kosten)
+{
+
+var v_API = "MARX_OPDR_STATUS";
+var v_req = ""
++ " ORDAFR"
++ " " + v_kosten + ""
++ " ";
+
+
+var v_type = 1;
+var v_soapAction = "";
+var v_resp = apiAX(v_API, v_req, v_type, v_soapAction);
+
+return v_resp;
+}
\ No newline at end of file
diff --git a/ax/SRC/F_GetOpdrachtenFinancAfgerond.js b/ax/SRC/F_GetOpdrachtenFinancAfgerond.js
new file mode 100644
index 0000000..5d20921
--- /dev/null
+++ b/ax/SRC/F_GetOpdrachtenFinancAfgerond.js
@@ -0,0 +1,63 @@
+// --------------------------------------------------------------------------------------
+// F_GetOpdrachten_FinancAfgerond.js
+// Copyright 2019 Aareon|Facilitor. 053-4800 700, helpdesk@mareon.nl
+// Written by MB (2019)
+//
+// MAREON Connector/Adapter Ax -> FACILITOR en Facilitor -> Ax
+// --------------------------------------------------------------------------------------
+
+
+function F_GetOpdrachten_FinancAfgerond()
+{
+
+ var v_API = "AFGEROND_OPDR_4AX";
+ var v_APIKEY = G_marx_apikey;
+ var v_req = "" + G_Mareon_Adapter + "" + v_APIKEY + ""
+ var v_type = 1; // xml
+ var v_soap_envelop = 1; //soap-envelop eromheen
+
+ var v_resp = apiFCLT(G_marx_url, v_API, v_APIKEY, v_req, v_type, v_soap_envelop);
+
+ var l_node;
+
+ __Log("F_GetOpdrachten_FinancAfgerond: " + v_resp.text,3);
+
+ // Uitlezen van XML's...
+ var i = 1;
+ var strQuery = "//xml/mld_ordr[" + i + "]";
+ var l_deelxml = v_resp.selectSingleNode(strQuery);
+ while (l_deelxml)
+ {
+ l_node = strQuery + "/ax_company_id";
+ var v_company_id = v_resp.selectSingleNode(l_node).text;
+
+ l_node = strQuery + "/mld_opdr_ordernr";
+ var v_taskId = v_resp.selectSingleNode(l_node).text;
+
+ l_node = strQuery + "/mld_opdr_externnr";
+ var v_externnr = v_resp.selectSingleNode(l_node).text;
+
+ var l_node = strQuery + "/mld_opdr_opmerking";
+ var v_extraInfo = v_resp.selectSingleNode(l_node).text;
+
+ var l_node = strQuery + "/mld_opdr_kosten";
+ var v_opdr_kosten = v_resp.selectSingleNode(l_node).text;
+
+ __Log("v_company_id: " + v_company_id,2);
+ __Log("v_taskId: " + v_taskId,2);
+ __Log("v_externnr: " + v_externnr,2);
+ __Log("v_extraInfo: " + v_extraInfo,3);
+ __Log("v_opdr_kosten: " + v_opdr_kosten,2);
+
+ //MARX#56792: XML equivalent van & < > etc toepassen...
+ v_extraInfo = escapeXml(v_extraInfo);
+
+ if (AX_or_Tobias() == "F") {
+ FCLT_FinancAfrondenServiceTask (v_company_id, v_taskId, v_externnr, v_opdr_kosten);
+ }
+
+ i = i + 1;
+ var strQuery = "//xml/mld_ordr[" + i + "]";
+ l_deelxml = v_resp.selectSingleNode(strQuery);
+ }
+}