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

STPH#36546: [BES] Status bestelopdrachten.

Browse Source 
svn path=/Website/trunk/; revision=30565
This commit is contained in:
Maykel Geerdink
2016-09-06 07:24:19 +00:00
parent fa8d5ba355
commit 1ffc6a44f9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
APPL/BES/opdr_list.inc
View File

@@ -139,6 +139,8 @@ function opdr_list (pautfunction, params)
+ ", bes_bestelling_parentkey"
+ ", bes_bestelopdr_opmerking"
+ ", bes_bestelopdr_delivery_opmerk"
+ ", boi.bes_bestelopdr_item_aantal"
+ ", boi.bes_bestelopdr_item_aantalontv"
+ " FROM bes_bestelopdr b"
+ ", prs_bedrijf be"
+ ", mld_adres ma"
@@ -282,10 +284,15 @@ function opdr_list (pautfunction, params)
function fncolStatusText(oRs)
{
var opdrStatus = oRs("bes_bestelopdr_status").Value;
if(opdrStatus == 6 && oRs("bes_bestelling_retourvan_key").Value > 0)
return L("lcl_bes_collected");
else
return bes.getbesopdrstatustext(opdrStatus);
var retourvanKey = oRs("bes_bestelling_retourvan_key").Value;
if (opdrStatus == 6 && retourvanKey > 0)
return L("lcl_bes_collected");
var itemAantal = oRs("bes_bestelopdr_item_aantal").Value;
var itemAantalOntv = oRs("bes_bestelopdr_item_aantalontv").Value;
if (opdrStatus == 4 && itemAantalOntv > 0 && itemAantalOntv < itemAantal)
return L("lcl_bes_deels_geleverd");
else
return bes.getbesopdrstatustext(opdrStatus);
}
function fncolOrderVoor(oRs)