--- dao/DelphiScanner/Main.pas	2015/08/20 20:16:16	2647
+++ dao/DelphiScanner/Main.pas	2015/08/23 10:44:23	2653
@@ -20,7 +20,7 @@
     IdHTTP1: TIdHTTP;
     XMLDocument1: TXMLDocument;
     ApplicationEvents1: TApplicationEvents;
-    CheckBox1: TCheckBox;
+    chkSporgEfterKunde: TCheckBox;
     KommentarST: TStaticText;
     MainMenu1: TMainMenu;
     N1: TMenuItem;
@@ -59,7 +59,7 @@
     PakkeshopNulstil: TButton;
     Returpakkerfrapakkeshop1: TMenuItem;
     Altidprintepakkelabel1: TMenuItem;
-    CheckBox2: TCheckBox;
+    chkAltidPrintLabel: TCheckBox;
     EKLoverforsel: TButton;
     N5: TMenuItem;
     Uploadlogfil1: TMenuItem;
@@ -85,6 +85,7 @@
     PanelManglendePakker4: TPanel;
     PanelManglendePakker5: TPanel;
     PanelManglendePakker6: TPanel;
+    PanelValg7: TPanel;
 
   function Explode(var a: TStrArray; Border, S: string): Integer;
   function BarCodeValid (ACode: string): boolean;
@@ -114,7 +115,7 @@
   procedure ApplicationEvents1Idle(Sender: TObject; var Done: Boolean);
   procedure RadioButton1Click(Sender: TObject);
   procedure RadioButton2Click(Sender: TObject);
-  procedure CheckBox1Click(Sender: TObject);
+  procedure chkSporgEfterKundeClick(Sender: TObject);
   procedure Pakkernormal1Click(Sender: TObject);
   procedure Testforbindelsen1Click(Sender: TObject);
   procedure Testprinter1Click(Sender: TObject);
@@ -150,8 +151,10 @@
   procedure InitDirektelevering();
   procedure InitPakkeshoplevering();
   procedure InitReturFraPakkeshop();
+  procedure InitIndleveringskode();
+
   procedure Altidprintepakkelabel1Click(Sender: TObject);
-  procedure CheckBox2Click(Sender: TObject);
+  procedure chkAltidPrintLabelClick(Sender: TObject);
   procedure EKLoverforselClick(Sender: TObject);
   procedure Uploadlogfil1Click(Sender: TObject);
   procedure Manual1Click(Sender: TObject);
@@ -175,6 +178,8 @@
   procedure TjekkerUrls();
 // 20150310: start
   procedure RoundCornerOf(Control: TWinControl);
+
+    procedure PanelValg7Click(Sender: TObject);
 // 20150310: slut
 
   private
@@ -329,6 +334,12 @@
       PanelValg6.Font.Color := clWindowText;
     end;
 
+    PanelValg7.Color := clBtnFace;
+    if PanelValg7.Enabled = true then
+    begin
+      PanelValg7.Font.Color := clWindowText;
+    end;
+
     OpdaterListenButton01.Enabled := false;
 
     if (BladhusSted > 00) and (BladhusSted < Length(BladhusStedNavn)) then
@@ -461,11 +472,11 @@
 
   if Altidprintepakkelabel1.Checked then
   begin
-     CheckBox2.Checked := true;
+     chkAltidPrintLabel.Checked := true;
   end
   else
   begin
-     CheckBox2.Checked := false;
+     chkAltidPrintLabel.Checked := false;
   end;
 
 end;
@@ -552,7 +563,7 @@
 
 // Sætter lige en default panel størrelse
   MainForm.ClientWidth := 1000;
-  MainForm.ClientHeight := 700;
+  MainForm.ClientHeight := 750;
 
   // Læser parametre fra ini filen
   with TIniFile.Create(ChangeFileExt(Application.ExeName,'.ini')) do
@@ -700,12 +711,12 @@
 
     if SporgEfterBoghandler = '1' then
     begin
-      CheckBox1.Checked := true;
+      chkSporgEfterKunde.Checked := true;
       Sprgefterboghandlernummer1.Checked := true;
     end
     else
     begin
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
     end;
 
@@ -1283,15 +1294,15 @@
 
     if StregKode = 'Indtast kundenummer' then
     begin
-       if CheckBox1.Enabled = true then
+       if chkSporgEfterKunde.Enabled = true then
        begin
-         if (CheckBox1.State = cbChecked) then
+         if (chkSporgEfterKunde.State = cbChecked) then
          begin
-          CheckBox1.State := cbUnchecked;
+          chkSporgEfterKunde.State := cbUnchecked;
          end
          else
          begin
-          CheckBox1.State := cbChecked;
+          chkSporgEfterKunde.State := cbChecked;
          end;
        end
        else
@@ -2592,7 +2603,7 @@
 
 // 20150306: start
 //  if Sprgefterboghandlernummer1.Enabled and CheckBox1.Checked and (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) or (pakkeForkertSted > 0) then
-  if Sprgefterboghandlernummer1.Enabled and CheckBox1.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) or (pakkeForkertSted > 0) ) then
+  if Sprgefterboghandlernummer1.Enabled and chkSporgEfterKunde.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) or (pakkeForkertSted > 0) ) then
 // 20150306: slut
   begin
       if (RuteNummer = 'Ukendt') then
@@ -2746,15 +2757,15 @@
     exit;
   end;
 
-  if Budlevering1.Checked or ( Sprgefterboghandlernummer1.Enabled and CheckBox1.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) ) and (printNyLabel = false) ) then
+  if Budlevering1.Checked or ( Sprgefterboghandlernummer1.Enabled and chkSporgEfterKunde.Checked and ( (RuteNummer = 'Ukendt') or (RuteNummer = 'Ukendt tur') or (RuteNummer = 'Retur ukendt') or (pakkeErScannet > 0) ) and (printNyLabel = false) ) then
   begin
   end
   else
   begin
-    if ( (PrinterNavn <> 'Ingen') and (PrintNyLabel or CheckBox2.Checked) and (RuteNummer <> 'Ukendt') or (RuteNummer = 'Rutenr')) then
+    if ( (PrinterNavn <> 'Ingen') and (PrintNyLabel or chkAltidPrintLabel.Checked) and (RuteNummer <> 'Ukendt') or (RuteNummer = 'Rutenr')) then
     begin
       logTekst := 'Printer label type ';
-      if (CheckBox2.Checked) then
+      if (chkAltidPrintLabel.Checked) then
       begin
         logTekst := logTekst + 'Alle ';
       end
@@ -2851,9 +2862,9 @@
 end;
 
 
-procedure TMainForm.CheckBox1Click(Sender: TObject);
+procedure TMainForm.chkSporgEfterKundeClick(Sender: TObject);
 begin
-  if CheckBox1.Checked then
+  if chkSporgEfterKunde.Checked then
   begin
      Sprgefterboghandlernummer1.Checked := true;
   end
@@ -2864,9 +2875,9 @@
 end;
 
 
-procedure TMainForm.CheckBox2Click(Sender: TObject);
+procedure TMainForm.chkAltidPrintLabelClick(Sender: TObject);
 begin
-  if CheckBox2.Checked then
+  if chkAltidPrintLabel.Checked then
   begin
      Altidprintepakkelabel1.Checked := true;
   end
@@ -3412,6 +3423,7 @@
   PrinterstatusStaticText1.Color := MainForm.Color;
 end;
 
+
 procedure TMainForm.PanelValg1Click(Sender: TObject);
 begin
       Scanningtype := '1';
@@ -3454,6 +3466,15 @@
       NulstilAutomatiskValg();
 end;
 
+
+procedure TMainForm.PanelValg7Click(Sender: TObject);
+begin
+      Scanningtype := '7';
+      InitIndleveringskode();
+      NulstilAutomatiskValg();
+
+end;
+
 procedure TMainForm.PanelValgAClick(Sender: TObject);
 begin
 // 20150311: start
@@ -3762,11 +3783,11 @@
 
   if Sprgefterboghandlernummer1.Checked then
   begin
-     CheckBox1.Checked := true;
+     chkSporgEfterKunde.Checked := true;
   end
   else
   begin
-     CheckBox1.Checked := false;
+     chkSporgEfterKunde.Checked := false;
   end;
 
 
@@ -3794,13 +3815,13 @@
       InitForm(FarveNormal,TitelNormal,UrlNormal);
       PanelValg1.Color := clGreen;
       PanelValg1.Font.Color := clWhite;
-      CheckBox1.Enabled := true;
-      CheckBox2.Enabled := true;
+
+      chkAltidPrintLabel.Enabled := true;
       Altidprintepakkelabel1.Enabled := true;
       Altidprintepakkelabel1.Checked := false;
-      CheckBox2.Checked := false;
+      chkAltidPrintLabel.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Enabled := true;
       Smpakker1.Enabled := false;
       Storepakker1.Enabled := false;
@@ -3826,13 +3847,13 @@
       InitForm(FarveReturDAO,TitelReturDAO,UrlReturDAO);
       PanelValg2.Color := clGreen;
       PanelValg2.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Enabled := false;
       Smpakker1.Enabled := true;
       Storepakker1.Enabled := true;
@@ -3853,13 +3874,12 @@
       InitForm(FarveReturBoghandler,TitelReturBoghandler,UrlReturBoghandler);
       PanelValg3.Color := clGreen;
       PanelValg3.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Enabled := false;
       Smpakker1.Enabled := true;
       Storepakker1.Enabled := true;
@@ -3880,13 +3900,13 @@
       InitForm(FarveBudlevering,TitelBudlevering,UrlBudlevering);
       PanelValg4.Color := clGreen;
       PanelValg4.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Enabled := false;
       Smpakker1.Enabled := true;
       Storepakker1.Enabled := true;
@@ -3916,13 +3936,13 @@
       InitForm(FarvePakkeshoplevering,TitelPakkeshoplevering,UrlPakkeshoplevering);
       PanelValg5.Color := clGreen;
       PanelValg5.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Enabled := false;
       Smpakker1.Enabled := false;
       Storepakker1.Enabled := false;
@@ -3954,13 +3974,13 @@
       InitForm(FarveReturPakkeshop,TitelReturPakkeshop,UrlReturPakkeshop);
       PanelValg6.Color := clGreen;
       PanelValg6.Font.Color := clWhite;
-      CheckBox1.Enabled := false;
-      CheckBox2.Enabled := false;
+
+      chkAltidPrintLabel.Enabled := false;
       Altidprintepakkelabel1.Enabled := false;
-      CheckBox2.Checked := false;
+
       Altidprintepakkelabel1.Checked := false;
       Sprgefterboghandlernummer1.Checked := false;
-      CheckBox1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
       Sprgefterboghandlernummer1.Enabled := false;
       Smpakker1.Enabled := false;
       Storepakker1.Enabled := false;
@@ -3988,6 +4008,42 @@
       InitReturFraKunde();
 end;
 
+procedure TMainForm.InitIndleveringskode();
+begin
+      AutomatiskTjekkodeStyring1.Enabled := false;
+      Returpakkerfrapakkeshop1.Checked := true;
+      PakkeshopNulstil.Visible := false;
+      InitForm(FarveReturPakkeshop,TitelReturPakkeshop,UrlReturPakkeshop);
+      PanelValg7.Color := clGreen;
+      PanelValg7.Font.Color := clWhite;
+
+      chkAltidPrintLabel.Enabled := false;
+      Altidprintepakkelabel1.Enabled := false;
+
+      Altidprintepakkelabel1.Checked := false;
+      Sprgefterboghandlernummer1.Checked := false;
+      chkSporgEfterKunde.Checked := false;
+      Sprgefterboghandlernummer1.Enabled := false;
+      Smpakker1.Enabled := false;
+      Storepakker1.Enabled := false;
+      RadioButton1.Enabled := false;
+      RadioButton2.Enabled := false;
+      ListBox1.Visible := true;
+      ListBox1.Items.Clear;
+      DownloadButton01.Enabled := false;
+      OpdaterListenButton01.Enabled := true;
+      EKLoverforsel.Enabled := false;
+      InitLillePakke();
+      IndlesScanningLogFil();
+      if BladhusSted = 0 then
+      begin
+        IndlesManglendeScanninger();
+      end;
+      IdFTP1.Passive := true;
+      IdFTP1.PassiveUseControlHost := true;
+end;
+
+
 procedure TMainForm.Storepakker1Click(Sender: TObject);
 begin
   InitStorPakke();
@@ -5504,7 +5560,7 @@
 function TMainForm.getProddag() : String;
 begin
 //  ShowMessage(LongDayNames[DayOfWeek(getProddato())]);
-  result := LongDayNames[DayOfWeek(getProddato())];
+  result := FormatSettings.LongDayNames[DayOfWeek(getProddato())];
   //result := 'lørdag';     // MENS VI TESTER  kan vi fremtvinge lørdag situation her
 end;