FSN#38471 Bedragen via scaffolding centen tonen

svn path=/Website/trunk/; revision=31546
This commit is contained in:
Jos Groot Lipman
2016-11-17 13:23:35 +00:00
parent 97c0d44f19
commit c16d5c60c4
22 changed files with 73 additions and 25 deletions

View File

@@ -43,36 +43,43 @@ function model_alg_srtterreinsector()
"price_1": {
"dbs": "alg_srtterreinsector_prijs",
"label": L("alg_srtterreinsector_prijs"),
"iscurrency": true,
"typ": "float"
},
"price_2": {
"dbs": "alg_srtterreinsector_prijs2",
"label": L("alg_srtterreinsector_prijs2"),
"iscurrency": true,
"typ": "float"
},
"price_3": {
"dbs": "alg_srtterreinsector_prijs3",
"label": L("alg_srtterreinsector_prijs3"),
"iscurrency": true,
"typ": "float"
},
"price_4": {
"dbs": "alg_srtterreinsector_prijs4",
"label": L("alg_srtterreinsector_prijs4"),
"label": L("alg_srtterreinsector_prijs4"),
"iscurrency": true,
"typ": "float"
},
"price_5": {
"dbs": "alg_srtterreinsector_prijs5",
"label": L("alg_srtterreinsector_prijs5"),
"iscurrency": true,
"typ": "float"
},
"rentable": {
"dbs": "prs_verhuurbaar",
"label": L("prs_verhuurbaar"),
"iscurrency": true,
"typ": "check"
},
"code": {
"dbs": "alg_srtterreinsector_code",
"label": L("alg_srtterreinsector_code"),
"iscurrency": true,
"typ": "varchar"
}
};

View File

@@ -27,7 +27,7 @@ model_approvals =
"name" : { dbs: "aanvraagnummer", typ: "varchar" },
"date" : { dbs: "datum", typ: "datetime" },
"requestor" : { dbs: "prs_perslid_naam_full", typ: "varchar" },
"amount" : { dbs: "bedrag", typ: "float" },
"amount" : { dbs: "bedrag", typ: "float", "iscurrency": true },
"module" : { dbs: "module", typ: "varchar" },
"type" : { dbs: "type", typ: "varchar" },
//"status" : { dbs: "fiatstatus", typ: "varchar"},

View File

@@ -37,31 +37,38 @@ model_bes_disc_params =
"bestellimiet1": {
"dbs": "bes_disc_params_bestellimiet",
"label": L("bes_discipline_bestellimiet1"),
"iscurrency": true,
"typ": "float"
},
"bestellimiet2": {
"dbs": "bes_disc_params_bestellimiet2",
"label": L("bes_discipline_bestellimiet2"),
"iscurrency": true,
"typ": "float"
},
"bestellimiet3": {
"dbs": "bes_disc_params_bestellimiet3",
"label": L("bes_discipline_bestellimiet3"),
"iscurrency": true,
"typ": "float"
},
"bestellimiet4": {
"dbs": "bes_disc_params_bestellimiet4",
"label": L("bes_discipline_bestellimiet4"),
"iscurrency": true,
"typ": "float"
},
"bestellimiet5": {
"dbs": "bes_disc_params_bestellimiet5",
"label": L("bes_discipline_bestellimiet5"),
"iscurrency": true,
"typ": "float"
},
"min_bedrag": {
"dbs": "bes_disc_params_min_bedrag",
"label": L("bes_discipline_min_bedrag"),
"iscurrency": true,
"iscurrency": true,
"typ": "float"
},
"auto_order": {
@@ -89,6 +96,7 @@ model_bes_disc_params =
"herfiatmarge": {
"dbs": "bes_disc_params_herfiatmarge",
"label": L("bes_discipline_herfiatmarge"),
"iscurrency": true,
"typ": "float"
},
"factuurpct": {
@@ -99,6 +107,7 @@ model_bes_disc_params =
"factuurmarge": {
"dbs": "bes_disc_params_factuurmarge",
"label": L("bes_discipline_factuurmarge"),
"iscurrency": true,
"typ": "float"
},
"factmatchmode": {

View File

@@ -58,6 +58,7 @@ model_cnt_disc_params =
"margin": {
"dbs": "cnt_disc_params_factuurmarge",
"label": L("cnt_discipline_factuurmarge"),
"iscurrency": true,
"typ": "float"
},
"approve": {

View File

@@ -40,7 +40,7 @@ function model_companies()
"contactphone" : { dbs: "prs_bedrijf_contact_telefoon", typ: "varchar", filter: "like" },
"remark" : { dbs: "prs_bedrijf_opmerking" , typ: "varchar", filter: "like" },
"remark2" : { dbs: "prs_bedrijf_opmerking2" , typ: "varchar", filter: "like" }, /*?*/
"hourrate" : { dbs: "prs_bedrijf_uurloon" , typ: "float", filter: "like" },
"hourrate" : { dbs: "prs_bedrijf_uurloon" , typ: "float", "iscurrency": true, filter: "like" },
"code" : { dbs: "prs_leverancier_nr" , typ: "varchar", filter: "like" },
"agreement" : { dbs: "prs_overeenkomst_nr" , typ: "varchar", filter: "like" },
"agreementdate": { dbs: "prs_overeenkomst_datum" , typ: "date", filter: "range" },

View File

@@ -61,6 +61,7 @@ function model_fac_usrdata()
"price": {
"dbs": "fac_usrdata_prijs",
"label": L("fac_usrdata_prijs"),
"iscurrency": true,
"typ": "float"
},
"expirationdate": {

View File

@@ -123,12 +123,14 @@ function model_fin_verkoopfactuurregels()
"fin_verkoopfactuur_bedrag": {
"dbs": "fin_verkoopfactuur_bedrag",
"label": L("lcl_fin_verkoopfactuur_bedrag"),
"iscurrency": true,
"typ": "float",
"total": true
},
"fin_verkoopfactuur_btw": {
"dbs": "fin_verkoopfactuur_btw",
"label": L("lcl_fin_verkoopfactuur_btw"),
"iscurrency": true,
"typ": "float",
"total": true
},
@@ -162,30 +164,35 @@ function model_fin_verkoopfactuurregels()
"dbs": "fin_verkoopfactuur_n1",
"label": L("lcl_fin_verkoopfactuur_n1"),
"typ": "number",
"iscurrency": true,
"datatype": "float"
},
"fin_verkoopfactuur_n2": {
"dbs": "fin_verkoopfactuur_n2",
"label": L("lcl_fin_verkoopfactuur_n2"),
"typ": "number",
"iscurrency": true,
"datatype": "float"
},
"fin_verkoopfactuur_n3": {
"dbs": "fin_verkoopfactuur_n3",
"label": L("lcl_fin_verkoopfactuur_n3"),
"typ": "number",
"iscurrency": true,
"datatype": "float"
},
"fin_verkoopfactuur_n4": {
"dbs": "fin_verkoopfactuur_n4",
"label": L("lcl_fin_verkoopfactuur_n4"),
"typ": "number",
"iscurrency": true,
"datatype": "float"
},
"fin_verkoopfactuur_n5": {
"dbs": "fin_verkoopfactuur_n5",
"label": L("lcl_fin_verkoopfactuur_n5"),
"typ": "number",
"iscurrency": true,
"datatype": "float"
},
"fin_verkoopfactuur_c1": {
@@ -326,12 +333,14 @@ model_fin_verkoopfactuur = function()
"fin_verkoopfactuur_bedrag": {
"dbs": "fin_verkoopfactuur_bedrag",
"label": L("lcl_fin_verkoopfactuur_bedrag"),
"iscurrency": true,
"typ": "float",
"total": true
},
"fin_verkoopfactuur_btw": {
"dbs": "fin_verkoopfactuur_btw",
"label": L("lcl_fin_verkoopfactuur_btw"),
"iscurrency": true,
"typ": "float",
"total": true
},

View File

@@ -149,21 +149,25 @@ function model_ins_srtcontrole()
"costs": {
"dbs": "ins_srtcontrole_kosten",
"label": L("ins_srtcontrole_kosten"),
"iscurrency": true,
"typ": "float"
},
"costs2": {
"dbs": "ins_srtcontrole_kosten2",
"label": L("ins_srtcontrole_kosten2"),
"iscurrency": true,
"typ": "float"
},
"costs3": {
"dbs": "ins_srtcontrole_kosten3",
"label": L("ins_srtcontrole_kosten3"),
"iscurrency": true,
"typ": "float"
},
"material": {
"dbs": "ins_srtcontrole_materiaal",
"label": L("ins_srtcontrole_materiaal"),
"iscurrency": true,
"typ": "float"
},
"hours": {

View File

@@ -27,8 +27,8 @@ model_invoicelines =
fields: { "id" : { dbs: "fin_factuurregel_key", typ: "key", filter: "exact" },
"name" : { dbs: "fin_factuurregel_omschrijving", typ: "varchar", track: true, label: L("lcl_descr"), filter: "like" },
"line" : { dbs: "fin_factuurregel_nr", typ: "number" },
"total" : { dbs: "fin_factuurregel_totaal", typ: "float", track: true, label: L("lcl_fin_total_sum_exBTW") },
"vat" : { dbs: "fin_factuurregel_btw", typ: "float", track: true, label: L("lcl_fin_total_sum_inBTW") },
"total" : { dbs: "fin_factuurregel_totaal", typ: "float", "iscurrency": true, track: true, label: L("lcl_fin_total_sum_exBTW") },
"vat" : { dbs: "fin_factuurregel_btw", typ: "float", "iscurrency": true, track: true, label: L("lcl_fin_total_sum_inBTW") },
"reference": { dbs: "fin_factuurregel_referentie", typ: "varchar", track: true, label: L("lcl_fin_referencecode"), filter: "like" },
"vatvalue" : { dbs: "fin_btwtabelwaarde_key", typ: "key", foreign: "fin_btwtabelwaarde", track: true, label: L("lcl_fin_btwtarief"), filter: "exact" },
"costtype" : { dbs: "prs_kostensoort_key", typ: "key", foreign: "prs_kostensoort", track: true, label: L("lcl_shared_charge_type"), filter: "exact" },

View File

@@ -47,8 +47,8 @@ function model_invoices(fin_key, params)
"order" : { dbs: "mld_opdr_key", typ: "key", foreign: "mld_opdr", filter: "exact"},
"contract" : { dbs: "cnt_contract_key", typ: "key", foreign: "cnt_contract", filter: "exact"},
"purchaseorder" : { dbs: "bes_bestelopdr_key", typ: "key", foreign: "bes_bestelopdr", filter: "exact"},
"total" : { dbs: "fin_factuur_totaal", typ: "float", track: true, label: L("lcl_fin_totaal_bedrag"), filter: "range" },
"vat" : { dbs: "fin_factuur_totaal_btw", typ: "float", track: true, label: L("lcl_fin_totaal_bedrag_btw"), filter: "range" },
"total" : { dbs: "fin_factuur_totaal", typ: "float", "iscurrency": true, track: true, label: L("lcl_fin_totaal_bedrag"), filter: "range" },
"vat" : { dbs: "fin_factuur_totaal_btw", typ: "float", "iscurrency": true, track: true, label: L("lcl_fin_totaal_bedrag_btw"), filter: "range" },
"finstatus" : { dbs: "fin_factuur_statuses_key", typ: "key", foreign: fin.getfinstatustext, track: true, label: L("lcl_fin_fin_status"), filter: "exact" },
"accountingperiod": { dbs: "fin_factuur_boekmaand", typ: "varchar", track: true, label: L("lcl_fin_divide_period"), filter: "exact" },
"debiteur_nr" : { dbs: "fin_factuur_debiteur_nr", typ: "varchar", track: true, label: L("lcl_fin_debtor_nr"), filter: "like" },

View File

@@ -48,26 +48,31 @@ model_mld_disc_params =
"orderlimit1": {
"dbs": "mld_disc_params_bestellimiet",
"label": L("mld_discipline_bestellimiet1"),
"iscurrency": true,
"typ": "float"
},
"orderlimit2": {
"dbs": "mld_disc_params_bestellimiet2",
"label": L("mld_discipline_bestellimiet2"),
"iscurrency": true,
"typ": "float"
},
"orderlimit3": {
"dbs": "mld_disc_params_bestellimiet3",
"label": L("mld_discipline_bestellimiet3"),
"iscurrency": true,
"typ": "float"
},
"orderlimit4": {
"dbs": "mld_disc_params_bestellimiet4",
"label": L("mld_discipline_bestellimiet4"),
"iscurrency": true,
"typ": "float"
},
"orderlimit5": {
"dbs": "mld_disc_params_bestellimiet5",
"label": L("mld_discipline_bestellimiet5"),
"iscurrency": true,
"typ": "float"
},
"chargebudget": {
@@ -113,6 +118,7 @@ model_mld_disc_params =
"invoicemargin": {
"dbs": "mld_disc_params_factuurmarge",
"label": L("mld_discipline_margin"),
"iscurrency": true,
"typ": "float",
"defaultvalue": 0
},

View File

@@ -65,9 +65,10 @@ function model_mld_kosten()
"translate": true,
"len": 15
},
"expences": {
"expenses": {
"dbs": "mld_kosten_kosten",
"label": L("mld_kosten_kosten"),
"iscurrency": true,
"typ": "float"
}
};

View File

@@ -101,11 +101,13 @@ function model_mld_typeopdr()
"offerlimit": {
"dbs": "mld_typeopdr_offertelimiet",
"label": L("mld_typeopdr_offertelimiet"),
"typ": "number"
"iscurrency": true,
"typ": "float"
},
"approval": {
"dbs": "mld_typeopdr_gvs",
"label": L("mld_typeopdr_gvs"),
"iscurrency": true,
"typ": "float"
},
"nextordertype": {

View File

@@ -64,9 +64,9 @@ function model_orders(opdr_key, params)
"remark" : { dbs: "mld_opdr_opmerking", typ: "varchar", label: L("lcl_mld_inf_Opmerking"), track: true, filter: "like", len: 4000 },
"account" : { dbs: "prs_kostenplaats_key", typ: "key", foreign: "prs_kostenplaats", label: L("lcl_mld_inf_Kostenplaats"), track: true, filter: "exact" },
"hours" : { dbs: "mld_opdr_uren", typ: "float", label: L("lcl_mld_hours"), track: true },
"hourrate" : { dbs: "mld_opdr_uurloon", typ: "float", label: L("lcl_hour_rate"), track: true },
"materialcost" : { dbs: "mld_opdr_materiaal", typ: "float", label: L("lcl_mater_cost"), track: true },
"costs" : { dbs: "mld_opdr_kosten", typ: "float", label: L("lcl_total_cost"), track: true },
"hourrate" : { dbs: "mld_opdr_uurloon", typ: "float", "iscurrency": true, label: L("lcl_hour_rate"), track: true },
"materialcost" : { dbs: "mld_opdr_materiaal", typ: "float", "iscurrency": true, label: L("lcl_mater_cost"), track: true },
"costs" : { dbs: "mld_opdr_kosten", typ: "float", "iscurrency": true, label: L("lcl_total_cost"), track: true },
"status" : { dbs: "mld_statusopdr_key", typ: "key", foreign: status.getopdrstatustext, label: L("lcl_status"), track: true, filter: "exact" },
"ordernr" : { dbs: "mld_opdr_ordernr", typ: "varchar", label: L("lcl_mld_inf_Ordernr"), track: true },
"orderdate" : { dbs: "mld_opdr_datumbegin", typ: "datetime", label: L("lcl_orderdate"), track: true, filter:"range" },
@@ -913,19 +913,19 @@ function model_orders(opdr_key, params)
if (reapprove || refiat)
{ // Zet de refiat waarden. Het hergoedkeurings- en/of herfiatteringstraject wordt opnieuw ingegaan. // Tracking hiervan is niet nodig.
if (opdr_info.hours > 0)
dbfields["hoursrefiat"] = { dbs: "mld_opdr_uren_refiat", typ: "float", val: opdr_info.hours };
dbfields["hoursrefiat"] = { dbs: "mld_opdr_uren_refiat", typ: "float", "iscurrency": true, val: opdr_info.hours };
if (opdr_info.h_rate > 0)
dbfields["raterefiat"] = { dbs: "mld_opdr_uurloon_refiat", typ: "float", val: opdr_info.h_rate };
dbfields["raterefiat"] = { dbs: "mld_opdr_uurloon_refiat", typ: "float", "iscurrency": true, val: opdr_info.h_rate };
if (opdr_info.m_cost > 0)
dbfields["matrerialfiat"] = { dbs: "mld_opdr_materiaal_refiat", typ: "float", val: opdr_info.m_cost };
dbfields["matrerialfiat"] = { dbs: "mld_opdr_materiaal_refiat", typ: "float", "iscurrency": true, val: opdr_info.m_cost };
if (opdr_info.t_cost > 0)
dbfields["costrefiat"] = { dbs: "mld_opdr_kosten_refiat", typ: "float", val: opdr_info.t_cost };
dbfields["costrefiat"] = { dbs: "mld_opdr_kosten_refiat", typ: "float", "iscurrency": true, val: opdr_info.t_cost };
// Ook voor status 5 wordt refiatstatus gezet zodat bekend is dat het om een herfiattering gaat. De fiatteringsvoorwaarde is dan iets anders.
dbfields["statusrefiat"] = { dbs: "mld_statusopdr_key_refiat", typ: "number", val: opdr_info.opdr_status };
// Goedkeuring opnieuw ingaan kan alleen als het approved bedrag leeg is.
dbfields["approvedrefiat"] = { dbs: "mld_opdr_approved_refiat", typ: "float", val: opdr_info.approved };
dbfields["approved"] = { dbs: "mld_opdr_approved", typ: "float", val: null };
dbfields["approvedrefiat"] = { dbs: "mld_opdr_approved_refiat", typ: "float", "iscurrency": true, val: opdr_info.approved };
dbfields["approved"] = { dbs: "mld_opdr_approved", typ: "float", "iscurrency": true, val: null };
}
// Met FSN#20132 kan bij bestaande opdrachten via deze weg niet meer het opdrachttype wijzigen

View File

@@ -44,6 +44,7 @@ function model_prs_srtperslid()
"hourly_wages": {
"dbs": "prs_srtperslid_uurloon",
"label": L("prs_srtperslid_uurloon"),
"iscurrency": true,
"typ": "float"
},
"area": {

View File

@@ -55,6 +55,7 @@ function model_prs_staffel()
"dbs": "prs_staffel_korting",
"label": L("prs_staffel_korting"),
"typ": "float",
"iscurrency": true,
"required": true
}
};

View File

@@ -69,11 +69,13 @@ function model_res_artikel()
"res_artikel_prijs": {
"dbs": "res_artikel_prijs",
"label": L("res_artikel_prijs"),
"iscurrency": true,
"typ": "float"
},
"res_artikel_btw": {
"dbs": "res_artikel_btw",
"label": L("res_artikel_btw"),
"iscurrency": true,
"typ": "float"
},
"res_artikel_prijs_vast": {
@@ -84,16 +86,19 @@ function model_res_artikel()
"res_artikel_inkoopprijs": {
"dbs": "res_artikel_inkoopprijs",
"label": L("res_artikel_inkoopprijs"),
"iscurrency": true,
"typ": "float"
},
"res_artikel_kostenpersoneel": {
"dbs": "res_artikel_kostenpersoneel",
"label": L("res_artikel_kostenpersoneel"),
"iscurrency": true,
"typ": "float"
},
"res_artikel_kostenalgemeen": {
"dbs": "res_artikel_kostenalgemeen",
"label": L("res_artikel_kostenalgemeen"),
"iscurrency": true,
"typ": "float"
},
"res_artikel_minimum": {

View File

@@ -82,6 +82,7 @@ function model_res_deel()
"res_deel_prijs": {
"dbs": "res_deel_prijs",
"label": L("res_deel_prijs"),
"iscurrency": true,
"typ": "float"
},
"res_deel_prijs_vast": {

View File

@@ -27,12 +27,12 @@ model_reservableconsumables =
"sequence" : { dbs: "res_artikel_volgnummer", typ: "number" },
"remark" : { dbs: "res_artikel_opmerking", typ: "varchar", filter: "like" },
"unit" : { dbs: "res_artikel_eenheid", typ: "varchar", filter: "like" },
"price" : { dbs: "res_artikel_prijs", typ: "float" },
"price" : { dbs: "res_artikel_prijs", typ: "float", "iscurrency": true },
"fixed" : { dbs: "res_artikel_prijs_vast", typ: "check0", filter: "exact" },
"purchase" : { dbs: "res_artikel_inkoopprijs", typ: "float"},
"purchase" : { dbs: "res_artikel_inkoopprijs", typ: "float", "iscurrency": true},
"vat" : { dbs: "res_artikel_btw", typ: "float" },
"employeecost": { dbs: "res_artikel_kostenpersoneel", typ: "float" },
"generalcost" : { dbs: "res_artikel_kostenalgemeen", typ: "float" },
"employeecost": { dbs: "res_artikel_kostenpersoneel", typ: "float", "iscurrency": true },
"generalcost" : { dbs: "res_artikel_kostenalgemeen", typ: "float", "iscurrency": true },
"catalog" : { dbs: "res_discipline_key", typ: "key", foreign: "res_discipline" },
"group" : { dbs: "res_artikel_groep", typ: "varchar", filter: "like" },
"start" : { dbs: "res_artikel_ingangsdatum", typ: "date" },

View File

@@ -42,7 +42,7 @@ model_reservableequipment =
"name" : { dbs: "res_deel_omschrijving", typ: "varchar", filter: "like" },
"remark" : { dbs: "res_deel_opmerking", typ: "varchar", filter: "like" },
"unit" : { dbs: "res_deel_eenheid", typ: "varchar", filter: "like" },
"price" : { dbs: "res_deel_prijs", typ: "float", filter: "like" },
"price" : { dbs: "res_deel_prijs", typ: "float", "iscurrency": true, filter: "like" },
"fixed" : { dbs: "res_deel_prijs_vast", typ: "check0", filter: "exact" },
"object" : { dbs: "res_ins_deel_key", typ: "key", foreign: "ins_deel" },
"catalog" : { dbs: "res_discipline_key", typ: "key", foreign: "res_discipline", filter: "exact" },

View File

@@ -36,7 +36,7 @@ model_reservationconsumables =
"status" : { dbs: "res_status_bo_key", typ: "number", filter: "exact", foreign: status_bo },
"from" : { dbs: "res_rsv_artikel_levering", typ: "time", filter: "exact" },
//: "to" { dbs: "res_rsv_artikel_tot", typ: "date" },
"price" : { dbs: "res_rsv_artikel_prijs", typ: "float" },
"price" : { dbs: "res_rsv_artikel_prijs", typ: "float", "iscurrency": true },
"processed" : { dbs: "res_rsv_artikel_verwerkt", typ: "datetime" },
"closed" : { dbs: "res_rsv_artikel_afgemeld", typ: "datetime" },
"changed" : { dbs: "res_rsv_artikel_mutatie", typ: "datetime" },

View File

@@ -39,7 +39,7 @@ model_reservationequipment =
"status" : { dbs: "res_status_bo_key", typ: "key", filter: "exact", foreign: res.getbostatustext },
"from" : { dbs: "res_rsv_deel_van", typ: "datetime", filter: "exact" },
"to" : { dbs: "res_rsv_deel_tot", typ: "datetime" },
"price" : { dbs: "res_rsv_deel_prijs", typ: "float" },
"price" : { dbs: "res_rsv_deel_prijs", typ: "float", "iscurrency": true},
"processed" : { dbs: "res_rsv_deel_verwerkt", typ: "datetime" },
"closed" : { dbs: "res_rsv_deel_afgemeld", typ: "datetime" },
"changed" : { dbs: "res_rsv_deel_mutatie", typ: "datetime" },