Index: ProScan/UI/DnaCodeScherm.pas =================================================================== diff -u -r416 -r420 --- ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 416) +++ ProScan/UI/DnaCodeScherm.pas (.../DnaCodeScherm.pas) (revision 420) @@ -118,8 +118,15 @@ inherited; fAantalLadesOpHuidigePallet := BepaalAantalLadesOpHuidigePallet; if fAantalLadesOpHuidigePallet > 0 then begin - if (UiContext.Modus = modusKAD) or - ((UiContext.Modus = modusDefault) and (ToonPopupScherm(lblHuidigePalletData.Caption+' volledig?'+#13#10+inttostr(fAantalLadesOpHuidigePallet)+' lades','Ja','Annuleren',14,6,7) = mrYes)) then begin + if (UiContext.Modus = modusKAD) then begin + PalletBijwerken(DnaCodeStatus.InBuffer,false); + UiContext.Pallet := ''; + Self.ModalResult := mrPallet; + end else if (UiContext.Modus = modusVHOSS) then begin + PalletBijwerken(DnaCodeStatus.InBuffer,false); + UiContext.Pallet := ''; + Self.ModalResult := mrPallet; + end else if ((UiContext.Modus = modusDefault) and (ToonPopupScherm(lblHuidigePalletData.Caption+' volledig?'+#13#10+inttostr(fAantalLadesOpHuidigePallet)+' lades','Ja','Annuleren',14,6,7) = mrYes)) then begin fIsDirecteLevering := (UiContext.Modus = modusDefault) and BepaalDirecteLevering; if fIsDirecteLevering then begin ToonPopupScherm('Directe levering', 'OK','',15,-1,-1,clBlue); @@ -131,7 +138,8 @@ end else begin Self.ModalResult := mrDnaCode; end; - end; + end else + Self.ModalResult := mrPallet; PostMessage(Self.Handle,WM_Close,0,0); (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(Self.ModalResult); end;