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

FSN#34440 Expliciet contracttermijn voor het termijnbedrag

Browse Source 
svn path=/Website/trunk/; revision=27877
This commit is contained in:
Peter Feij
2016-01-22 17:06:09 +00:00
parent d8c21909ae
commit 0a7e9f9b33
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APPL/CNT/cnt.inc
View File

@@ -324,6 +324,11 @@ cnt = { setcontractstatus:
+ " , cc.cnt_contract_versie"
+ " , cc.cnt_contract_kosten"
+ " , cc.cnt_contract_termijnkosten"
+ " , cc.cnt_contract_termijntermijn"
+ " , (SELECT " + lcl.xsqla('cnt_termijn_omschrijving', 'cnt_termijn_key')
+ " FROM cnt_termijn"
+ " WHERE cnt_termijn_key = cc.cnt_contract_termijntermijn) termijntermijn_oms"
+ " , cnt.termijnjaarfactor(cc.cnt_contract_termijntermijn) termijnjaarfactor"
+ " , cc.cnt_contract_approved"
+ " , COALESCE(cc.cnt_contract_verlenging, -1) cnt_contract_verlenging"
+ " , cc.cnt_contract_nummer"
@@ -410,6 +415,9 @@ cnt = { setcontractstatus:
versie: oRs("cnt_contract_versie").Value,
kosten: oRs("cnt_contract_kosten").Value? oRs("cnt_contract_kosten").Value : 0,
termijnkosten: oRs("cnt_contract_termijnkosten").Value,
termijntermijn: oRs("cnt_contract_termijntermijn").Value,
termijntermijn_oms: oRs("termijntermijn_oms").Value,
termijnjaarfactor: oRs("termijnjaarfactor").Value,
approved: oRs("cnt_contract_approved").Value? oRs("cnt_contract_approved").Value : 0,
verlenging: oRs("cnt_contract_verlenging").Value,
nummer: oRs("cnt_contract_nummer").Value,

20
APPL/CNT/cnt_edit_contract.asp
View File

@@ -264,22 +264,18 @@ else // nieuw contract
required: true,
readonly: cnt_info.isAbonnement || !this_cnt.canChangeAlg
});
sql_opzegtermijnen = "SELECT t.cnt_termijn_key"
sql_termijnen = "SELECT t.cnt_termijn_key"
+ ", "+lcl.xsqla('t.cnt_termijn_omschrijving', 't.cnt_termijn_key')
+ " FROM cnt_termijn t"
+ " ORDER BY t.cnt_termijn_volgnummer";
FCLTselector("cnt_cancel_period", sql_opzegtermijnen,
FCLTselector("cnt_cancel_period", sql_termijnen,
{ label: L("lcl_cnt_cancel_period"),
initKey: cnt_info.opzegtermijn,
required: true,
emptyOption: "",
readonly: cnt_info.isAbonnement || !this_cnt.canChangeAlg
});
sql_rappeltermijnen = "SELECT t.cnt_termijn_key"
+ ", "+lcl.xsqla('t.cnt_termijn_omschrijving', 't.cnt_termijn_key')
+ " FROM cnt_termijn t"
+ " ORDER BY t.cnt_termijn_volgnummer";
FCLTselector("cnt_rappel_period", sql_rappeltermijnen,
FCLTselector("cnt_rappel_period", sql_termijnen,
{ label: L("lcl_cnt_rappel_period"),
initKey: cnt_info.rappeltermijn,
required: true,
@@ -405,10 +401,18 @@ else // nieuw contract
});
}
RWFIELDTR("cnt_termkstn", "fldshort float", L("lcl_cnt_period_sum") + " " + L("lcl_valutasign"), safe.curreditable(cnt_info.termijnkosten), {readonly: cnt_info.isAbonnement || !this_cnt.canChangeAlg, suppressEmpty: true});
FCLTselector("cnt_term_period", sql_termijnen,
{ label: L("lcl_cnt_period_period"),
initKey: cnt_info.termijntermijn,
required: false,
emptyOption: "",
readonly: cnt_info.isAbonnement || !this_cnt.canChangeAlg
});
// TODO: berekend jaarbedrag hiertussen??
RWFIELDTR("cnt_cntkstn", "fldshort float", L("lcl_cnt_contract_sum") + " " + L("lcl_valutasign"),
safe.curreditable(cnt_info.kosten),
{ readonly: !this_cnt.canChangeKosten || !this_cnt.canChangeAlg, suppressEmpty: true} );
RWFIELDTR("cnt_termkstn", "fldshort float", L("lcl_cnt_period_sum") + " " + L("lcl_valutasign"), safe.curreditable(cnt_info.termijnkosten), {readonly: cnt_info.isAbonnement || !this_cnt.canChangeAlg, suppressEmpty: true});
RWFIELDTR("cnt_uurloon", "fldshort float", L("lcl_hour_rate") + " " + L("lcl_valutasign"), safe.curreditable(cnt_info.uurloon), {readonly: cnt_info.isAbonnement || !this_cnt.canChangeAlg, suppressEmpty: true});
RWFIELDTR("cnt_korting", "fldshort float", L("lcl_cnt_discount"), cnt_info.korting, {datatype:"float", readonly: cnt_info.isAbonnement || !this_cnt.canChangeAlg, suppressEmpty: true});
BLOCK_END();

1
APPL/CNT/cnt_edit_contract_save.asp
View File

@@ -85,6 +85,7 @@ var fields = [ { dbs: "cnt_contract_nummer_intern", typ: "varchar", frm: "cnt_
{ dbs: "prs_dienst_key", typ: "key", frm: "dienst", track: L("lcl_prs_companies_dienst"),foreign: "prs_dienst" },
{ dbs: "prs_contactpersoon_key", typ: "key", frm: "cnt_contprs", track: L("lcl_cnt_contact_prs"), foreign: "prs_contactpersoon" },
{ dbs: "cnt_contract_termijnkosten", typ: "float", frm: "cnt_termkstn", track: L("lcl_cnt_period_sum") },
{ dbs: "cnt_contract_termijntermijn", typ: "key", frm: "cnt_term_period", track: L("lcl_cnt_period_period"), foreign: "cnt_termijn" },
{ dbs: "cnt_contract_kosten", typ: "float", frm: "cnt_cntkstn", track: L("lcl_cnt_contract_sum") },
{ dbs: "cnt_contract_uurloon", typ: "float", frm: "cnt_uurloon", track: L("lcl_hour_rate") },
{ dbs: "cnt_contract_korting", typ: "float", frm: "cnt_korting", track: L("lcl_cnt_discount") },

8
APPL/CNT/cnt_show_contract.asp
View File

@@ -367,8 +367,14 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke
BLOCK_START("cntFindata" , L("lcl_cnt_fin_data"));
ROFIELDTR ("fldkp", L("lcl_cnt_kostenplaats"), cnt_info.kostenplaats_naam, {suppressEmpty: true});
ROFIELDTR ("fldkp", L("lcl_cnt_kostensoort"), cnt_info.kostensoort_naam, {suppressEmpty: true});
// Kies er hier voor in 1 regel te combineren, is logischer
//ROFIELDTR ("fld", L("lcl_cnt_period_sum")+ " " + L("lcl_valutasign"), hasFactuurschema ? L("lcl_cnt_see_factuurschema") : safe.curr(cnt_info.termijnkosten), {suppressEmpty: true, datatype:"currency"});
//ROFIELDTR ("fld", L("lcl_cnt_period_period"), cnt_info.termijntermijn_oms, {suppressEmpty: true});
ROFIELDTR ("fld", L("lcl_cnt_period_sum")+ " " + L("lcl_valutasign"), hasFactuurschema ? L("lcl_cnt_see_factuurschema") : safe.curr(cnt_info.termijnkosten)+(cnt_info.termijntermijn_oms ? " / " + cnt_info.termijntermijn_oms : ""), {suppressEmpty: true, datatype:"currency"});
if (cnt_info.termijnjaarfactor != -1 && cnt_info.termijnjaarfactor != 1) { // -1 is ongedefinieer/ongeldig, 1 is triviaal, staat hierboven al
ROFIELDTR ("fld", L("lcl_cnt_contract_year")+ " " + L("lcl_valutasign"), safe.curr(cnt_info.termijnjaarfactor * cnt_info.termijnkosten), {datatype:"currency", suppressEmpty: true});
}
ROFIELDTR ("fld", L("lcl_cnt_contract_sum")+ " " + L("lcl_valutasign"), safe.curr(cnt_info.kosten), {datatype:"currency", suppressEmpty: true});
ROFIELDTR ("fld", L("lcl_cnt_period_sum")+ " " + L("lcl_valutasign"), hasFactuurschema ? L("lcl_cnt_see_factuurschema") : safe.curr(cnt_info.termijnkosten), {suppressEmpty: true, datatype:"currency"});
ROFIELDTR ("fldshort", L("lcl_hour_rate")+ " " + L("lcl_valutasign"), safe.curr(cnt_info.uurloon), {suppressEmpty: true, datatype:"currency"});
ROFIELDTR ("fldshort", L("lcl_cnt_discount"), cnt_info.korting, {suppressEmpty: true, datatype:"float"});
BLOCK_END();