--- dao/DelphiScanner/Main.pas	2016/10/20 06:03:56	3129
+++ dao/DelphiScanner/Main.pas	2016/10/20 06:56:45	3130
@@ -1574,7 +1574,7 @@
 
             exit;
           end;
-          if (menuNatXpress1.Checked or menuDaoDirekte1.Checked or menuPakkeshop1.Checked) then
+          if (menuNatXpress1.Checked or menuDaoDirekte1.Checked or menuPakkeshop1.Checked or menuPakkeshopRetur1.Checked) then
           begin
             PrintLabel(RuteNummer, Kommentar, BoghandlerNavn, Koreliste, SmsKode, DBKbane, Leveringssted, PrintNyLabel);
             pakkeErScannet := pos('PAKKEN ER SCANNET', BoghandlerNavn);
@@ -2059,18 +2059,16 @@
       BoghandlerNavn := BoghandlerNavn + ' ' + XMLDocument1.ChildNodes.FindNode('PakkeKontrol').ChildNodes.FindNode('PakkeshopNavn').Text;
       PrintNyLabel := False;
 
-      if menuPakkeshop1.Checked then
+      try
+        PrintNyLabelInteger := StrToInt(XMLDocument1.ChildNodes.FindNode('PakkeKontrol').ChildNodes.FindNode('PakkeshopPrintPakkeLabel').Text);
+      except on e:exception do
+          PrintNyLabelInteger := 0;
+      end;
+      if (PrintNyLabelInteger = 1) then
       begin
-        try
-          PrintNyLabelInteger := StrToInt(XMLDocument1.ChildNodes.FindNode('PakkeKontrol').ChildNodes.FindNode('PakkeshopPrintPakkeLabel').Text);
-        except on e:exception do
-            PrintNyLabelInteger := 0;
-        end;
-        if (PrintNyLabelInteger = 1) then
-        begin
-          PrintNyLabel := True;
-        end;
+        PrintNyLabel := True;
       end;
+
      end
     else if menuIndlevering.Checked or chkForstorTilDirekte.Checked then
     begin
@@ -2403,8 +2401,6 @@
                 LabelPrint.PrintLabel( Stregkode );
               end;
             end;
-      else
-       ShowMessage('Ukendt Bladhus sted: ' + IntToStr(BladhusSted));
     end;
   end;
 
@@ -2443,6 +2439,15 @@
     end;
   end;
 
+  // tilføjet 20161020
+  if (menuPakkeshop1.Checked OR menuPakkeshopRetur1.Checked) then
+    begin
+    if (PrintNyLabel = True OR chkAltidPrintLabel.Checked = True) then
+    begin
+      LabelPrint.PrintLabel( Stregkode );
+    end;
+  end;
+
 end;