Index: ProScan/UI/BestaandePalletScherm.pas =================================================================== diff -u -r396 -r423 --- ProScan/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 396) +++ ProScan/UI/BestaandePalletScherm.pas (.../BestaandePalletScherm.pas) (revision 423) @@ -10,14 +10,12 @@ type TfmBestaandePalletScherm = class(TfmDrieKnoppenScherm) lblBestaandePallet: TLabel; - btnHuidigeToelevering: TButton; btnRework: TButton; btnExtraToelevering: TButton; btnTerug: TButton; procedure FormShow(Sender: TObject); procedure btnExtraToeleveringClick(Sender: TObject); procedure btnReworkClick(Sender: TObject); - procedure btnHuidigeToeleveringClick(Sender: TObject); procedure btnTerugClick(Sender: TObject); private function BepaalAantalToeleveringenOpPallet(PalletCode: string): integer; @@ -43,16 +41,6 @@ (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); end; -procedure TfmBestaandePalletScherm.btnHuidigeToeleveringClick(Sender: TObject); -begin - inherited; - if (BepaalAantalToeleveringenOpPallet(UiContext.Pallet) > 1) then begin - UiContext.Toelevering := ''; - end; - PostMessage(Self.Handle,WM_Close,0,0); - (Self.Parent.Parent As TfmProScanHoofdscherm).NavigeerNaar(mrDnaCode); -end; - procedure TfmBestaandePalletScherm.btnReworkClick(Sender: TObject); begin inherited; Index: ProScan/UI/BestaandePalletScherm.dfm =================================================================== diff -u -r396 -r423 --- ProScan/UI/BestaandePalletScherm.dfm (.../BestaandePalletScherm.dfm) (revision 396) +++ ProScan/UI/BestaandePalletScherm.dfm (.../BestaandePalletScherm.dfm) (revision 423) @@ -7,7 +7,7 @@ TextHeight = 19 object lblBestaandePallet: TLabel [0] Left = 0 - Top = 57 + Top = 65 Width = 480 Height = 39 Align = alTop @@ -26,28 +26,8 @@ inherited pnlDrieKnoppen: TPanel Visible = False end - object btnHuidigeToelevering: TButton [3] + object btnRework: TButton [3] Left = 56 - Top = 120 - Width = 369 - Height = 81 - Caption = 'Huidige toelevering' - Font.Charset = DEFAULT_CHARSET - Font.Color = clWindowText - Font.Height = -32 - Font.Name = 'Tahoma' - Font.Style = [] - ImageIndex = 7 - ImageMargins.Left = 10 - Images = ImagesScherm.ilAlgemeen48 - ModalResult = 6 - ParentFont = False - TabOrder = 2 - WordWrap = True - OnClick = btnHuidigeToeleveringClick - end - object btnRework: TButton [4] - Left = 56 Top = 221 Width = 369 Height = 81 @@ -62,11 +42,11 @@ Images = ImagesScherm.ilAlgemeen48 ModalResult = 7 ParentFont = False - TabOrder = 3 + TabOrder = 2 WordWrap = True OnClick = btnReworkClick end - object btnExtraToelevering: TButton [5] + object btnExtraToelevering: TButton [4] Left = 56 Top = 322 Width = 369 @@ -82,11 +62,11 @@ Images = ImagesScherm.ilAlgemeen48 ModalResult = 7 ParentFont = False - TabOrder = 4 + TabOrder = 3 WordWrap = True OnClick = btnExtraToeleveringClick end - object btnTerug: TButton [6] + object btnTerug: TButton [5] Left = 56 Top = 423 Width = 369 @@ -102,7 +82,7 @@ Images = ImagesScherm.ilAlgemeen48 ModalResult = 7 ParentFont = False - TabOrder = 5 + TabOrder = 4 WordWrap = True OnClick = btnTerugClick end