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

YKPN#41337 Imoplementatie mld_typeopdr_fvs (FiatteringVrijStelling)

Browse Source 
svn path=/Website/trunk/; revision=34847
This commit is contained in:
Jos Groot Lipman
2017-08-07 15:39:51 +00:00
parent d84cded707
commit 0022cbfa15
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
APPL/API2/model_mld_typeopdr.inc
View File

@@ -86,7 +86,8 @@ function model_mld_typeopdr()
"dbs": "mld_typeopdr_afmeldmarge",
"label": L("mld_typeopdr_afmeldmarge"),
"typ": "number",
"defaultvalue": "0"
"defaultvalue": "0",
"multiedit": true
},
"visiblefe": {
"dbs": "mld_typeopdr_zichtbaarfe",
@@ -102,13 +103,22 @@ function model_mld_typeopdr()
"dbs": "mld_typeopdr_offertelimiet",
"label": L("mld_typeopdr_offertelimiet"),
"iscurrency": true,
"typ": "float"
"typ": "float",
"multiedit": true
},
"approval": {
"dbs": "mld_typeopdr_gvs",
"label": L("mld_typeopdr_gvs"),
"iscurrency": true,
"typ": "float"
"typ": "float",
"multiedit": true
},
"approvalfiat": {
"dbs": "mld_typeopdr_fvs",
"label": L("mld_typeopdr_fvs"),
"iscurrency": true,
"typ": "float",
"multiedit": true
},
"nextissueordertype": {
"dbs": "mld_typeopdr_typeopdr_key",
@@ -139,7 +149,8 @@ function model_mld_typeopdr()
"label": L("mld_typeopdr_kosten_verplicht"),
"typ": "number",
"LOV": L("mld_typeopdr_kosten_verplichtLOV"),
"emptyoption": null
"emptyoption": null,
"multiedit": true
},
"slamode": {
"dbs": "mld_typeopdr_slamode",
@@ -147,7 +158,8 @@ function model_mld_typeopdr()
"typ": "number",
"defaultvalue": "1",
"LOV": L("mld_typeopdr_slamodeLOV"),
"emptyoption": null
"emptyoption": null,
"multiedit": true
},
"sequential": {
"dbs": "mld_typeopdr_sequential",
@@ -155,7 +167,8 @@ function model_mld_typeopdr()
"typ": "number",
"defaultvalue": "0",
"LOV": L("mld_typeopdr_seqmodeLOV"),
"emptyoption": null
"emptyoption": null,
"multiedit": true
}
};

9
APPL/MLD/mld_edit_opdr_save.asp
View File

@@ -85,6 +85,7 @@ lcl.set_dialect(t_opdr, "mld_typeopdr_key");
var sql = "SELECT mld_typeopdr_matchtype"
+ " , mld_typeopdr_slamode"
+ " , mld_typeopdr_isofferte"
+ " , mld_typeopdr_fvs"
+ " , mld_typeopdr_gvs"
+ " , mld_typeopdr_kosten"
+ " FROM mld_typeopdr"
@@ -94,6 +95,7 @@ var mld_typeopdr_matchtype = oRs("mld_typeopdr_matchtype").Value;
var sla_mode = sla_mode = oRs("mld_typeopdr_slamode").Value;
var mld_typeopdr_isofferte = oRs("mld_typeopdr_isofferte").Value;
var mld_typeopdr_gvs = oRs("mld_typeopdr_gvs").Value || 0;
var mld_typeopdr_fvs = oRs("mld_typeopdr_fvs").Value || 0;
var needKostenplaats = oRs("mld_typeopdr_kosten").Value == 1;
if (isNew && uitvoerende < 0 && copyorder_key < 0)
@@ -438,7 +440,12 @@ for (var u = 0; u < uitvkeyArray.length; u++)
requestApproval = true;
}
else if (requestApproval)
status = 3; // Ter fiattering.
{
if (tot_kosten < mld_typeopdr_fvs)
requestApproval = false; // Hoge fiat vrijstelling, toch niet nodig
else
status = 3; // Ter fiattering.
}
// requestApproval heeft nu zijn definitieve waarde, en approver_key is geldig gedefinieerd.
// Status en tracking altijd met de functie setopdrachtstatus