Index: UI/MB/UGLYPicking/dlgOpslagPalSel.cls.xml
===================================================================
diff -u -r7716 -r7960
--- UI/MB/UGLYPicking/dlgOpslagPalSel.cls.xml	(.../dlgOpslagPalSel.cls.xml)	(revision 7716)
+++ UI/MB/UGLYPicking/dlgOpslagPalSel.cls.xml	(.../dlgOpslagPalSel.cls.xml)	(revision 7960)
@@ -770,7 +770,7 @@
  New OBForm,FormCanceled
  Set OBForm=##class(UI.MB.UGLYPicking.dlgOpslagBijladen).%New($LB(%this.Form.Address,0))
  Set OBForm.InRCPMode=..InRCPMode
- If OBForm.LoadBron(..txtBronLocatie.Text,..txtBronPalletID.Text,SelectedProduct) Do
+ If OBForm.LoadBron(..txtBronLocatie.Text,..GeefBronPalletID(),SelectedProduct) Do
  . Quit:(OBForm.Form.ShowModal()=$$$mrCancel)
  . If OBForm.PerformCycleCount Do      ; --- BACKWARD TRIGGER 1: CYCLE COUNT ---
  ..  New CCForm
@@ -792,7 +792,7 @@
 
  ;Check of er nog producten op de pallet staan
  If ..lvProdsOnPallet.Items.Count=0 Do  Quit
- . Do pdaMsgBox^vhVisual(..Form.Caption,"Er staan geen producten meer op pallet '"_..txtBronPalletID.Text_"'.",$$$MBICONINFORMATION)
+ . Do pdaMsgBox^vhVisual(..Form.Caption,"Er staan geen producten meer op pallet '"_..GeefBronPalletID()_"'.",$$$MBICONINFORMATION)
  . Set ..Form.ModalResult=$$$mrOk
 
  ;Product dat daarnet geselecteerd was opnieuw selecteren, indien mogelijk...
@@ -814,6 +814,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefBronPalletID">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	 Set BronPalletID = ..txtBronPalletID.Text
+	 Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
+	 If (ProductionHelper.IsFrameID(BronPalletID))
+	 {
+		Set BronPalletID = ProductionHelper.GeefPalletIDVanVHossID(BronPalletID)
+	 }	
+	 Quit BronPalletID
+]]></Implementation>
+</Method>
+
 <Method name="EXEVerplaatsPallet">
 <Language>cache</Language>
 <ProcedureBlock>0</ProcedureBlock>
@@ -822,12 +835,7 @@
 <Implementation><![CDATA[
  Quit:(..dCurrentInterfaceMode'=$$$imVerplaatsPallet)
 
- Set BronPalletID = ..txtBronPalletID.Text
- Set ProductionHelper = ##class(APPS.VisiDot.impl.VHossProductionHelper).%New()
- If (ProductionHelper.IsFrameID(BronPalletID))
- {
-	Set BronPalletID = ProductionHelper.GeefPalletIDVanVHossID(BronPalletID)
- }
+ Set BronPalletID = ..GeefBronPalletID()
 
  If ..InRCPMode Do
  . Do evpRCP
@@ -905,8 +913,8 @@
  Do ..dCOMPWRITEProdsOnPallet()
 
  New Status,HistoryRemark
- Set HistoryRemark="Wijzig "_..txtBronPalletID.Text_"->"_..txtDoelPalletID.Text
- Set Status=$$$cmOpslag.ChangePalletID(..txtBronPalletID.Text,..txtDoelPalletID.Text,HistoryRemark)
+ Set HistoryRemark="Wijzig "_..GeefBronPalletID()_"->"_..txtDoelPalletID.Text
+ Set Status=$$$cmOpslag.ChangePalletID(..GeefBronPalletID(),..txtDoelPalletID.Text,HistoryRemark)
 
  If $LI(Status)<0 Do
  . Do pdaMsgBox^vhVisual(..Form.Caption,$LI(Status,2),$$$MBICONERROR)
@@ -1335,7 +1343,7 @@
  Set dlgOpslagReceptieDetail=##class(UI.MB.UGLYPicking.dlgOpslagReceptieDetail).%New($LB(%this.Form.Address,0))
 
  New Result
- Set Result=dlgOpslagReceptieDetail.LoadProduct(..txtBronPalletID.Text,Product)
+ Set Result=dlgOpslagReceptieDetail.LoadProduct(..GeefBronPalletID(),Product)
  If Result="" Do
  . Do dlgOpslagReceptieDetail.Form.ShowModal()
  Else  Do
@@ -1424,16 +1432,16 @@
  If ..txtBronLocatie.Text="" Do  Quit 0
  . Do pdaMsgBox^vhVisual(..Form.Caption,"Er is geen locatie ingescand!",$$$MBICONINFORMATION)
 
- If ..txtBronPalletID.Text="" Do  Quit 0
+ If ..GeefBronPalletID()="" Do  Quit 0
  . Do pdaMsgBox^vhVisual(..Form.Caption,"Er is geen pallet ingescand!",$$$MBICONINFORMATION)
 
  ;Leading Zero's voor PalletID
- Set ..txtBronPalletID.Text=$$AddLeadingChar^vhLib(..txtBronPalletID.Text,"0",8)
+ Set ..txtBronPalletID.Text=$$AddLeadingChar^vhLib(..GeefBronPalletID(),"0",8)
 
  New ErrStr
- If ..InRCPMode && '##class(EWMS.ToReceive).PalletIsInToReceive(..txtBronPalletID.Text,.ErrStr) Do  Quit 0
+ If ..InRCPMode && '##class(EWMS.ToReceive).PalletIsInToReceive(..GeefBronPalletID(),.ErrStr) Do  Quit 0
  . If ErrStr="" Do
- ..  Do pdaMsgBox^vhVisual(..Form.Caption,"Pallet '"_..txtBronPalletID.Text_"' komt niet voor in de receptie-tabel.",$$$MBICONINFORMATION)
+ ..  Do pdaMsgBox^vhVisual(..Form.Caption,"Pallet '"_..GeefBronPalletID()_"' komt niet voor in de receptie-tabel.",$$$MBICONINFORMATION)
  . Else  Do
  ..  Do pdaMsgBox^vhVisual(..Form.Caption,ErrStr,$$$MBICONINFORMATION)
 
@@ -1442,7 +1450,7 @@
 
  New Location
  If ..InTransMode || ..InRCPMode Do
- . Set Location=$$$cmGeneral.GetLocationViaLocID(..txtBronPalletID.Text)
+ . Set Location=$$$cmGeneral.GetLocationViaLocID(..GeefBronPalletID())
  Else  Do
  . Set Location=$$$cmGeneral.GetLocationFromScan(..txtBronLocatie.Text)
 
@@ -1458,13 +1466,13 @@
  Set:(..InTransMode || ..InRCPMode) ..txtBronLocatie.Text=$$$cmGeneral.GetScannedLocStrViaLocation(Location)   ; GetTransLocStrViaLocation(Location)   ; GetScannedLocStrViaLocation(..)
 
  New Result
- Set Result=$$$cmGeneral.CompleteLocationViaPalletID(.Location,..txtBronPalletID.Text)
+ Set Result=$$$cmGeneral.CompleteLocationViaPalletID(.Location,..GeefBronPalletID())
 
  If Result'="" Do  Quit 0
- . Do pdaMsgBox^vhVisual(..Form.Caption,"Pallet '"_..txtBronPalletID.Text_"' is onbekend!",$$$MBICONINFORMATION)
+ . Do pdaMsgBox^vhVisual(..Form.Caption,"Pallet '"_..GeefBronPalletID()_"' is onbekend! "_$C(13,10)_$C(13,10)_$G(Result),$$$MBICONINFORMATION)
 
  New Status
- Set Status=##class(Flow.OrderWMS.PalletReservatie).IsPalletReservedByOthers(..txtBronPalletID.Text)
+ Set Status=##class(Flow.OrderWMS.PalletReservatie).IsPalletReservedByOthers(..GeefBronPalletID())
  If $LI(Status)<0 Do  Quit 0
  . Do pdaMsgBox^vhVisual(..Form.Caption,$LI(Status,2),$$$MBICONERROR)
  Else  If $LI(Status)=1 Do  Quit 0
@@ -1560,7 +1568,7 @@
  . Do ListItem.SubItems.Add($$DottedInt^vhLib(RS.Get("QtyPcs")))
  . Do ListItem.SubItems.Add(RS.Get("SectieCnt"))
  . Do ListItem.SubItems.Add(ReadForSendToAuto)
- . Set:(RS.Get("LocID")=..txtBronPalletID.Text) ThisPalletIndex=ListItem.Index
+ . Set:(RS.Get("LocID")=..GeefBronPalletID()) ThisPalletIndex=ListItem.Index
 
  Do RS.%Close()
 
@@ -1613,7 +1621,7 @@
  Set RS=##class(%ResultSet).%New("EWMS.Inventory:GetPalletsWithSameProds")
 
  New tmpStatus
- Set tmpStatus=RS.Execute(..txtBronPalletID.Text)
+ Set tmpStatus=RS.Execute(..GeefBronPalletID())
  If $$$ISERR(tmpStatus) Do  Quit
  . Do pdaMsgBox^vhVisual(..Form.Caption,$$ParseStatus^vhLib(tmpStatus),$$$MBICONERROR)
  . Do RS.%Close()
@@ -1622,7 +1630,7 @@
  For  Quit:('RS.Next())  Do
  . Set ProdNr=+RS.Get("ProductNr")
  . Set LocM=RS.Get("LocM")
- . If RS.Get("LocID")=..txtBronPalletID.Text Do   ;We tonen enkel de Qty van de huidige pallet
+ . If RS.Get("LocID")=..GeefBronPalletID() Do   ;We tonen enkel de Qty van de huidige pallet
  ..  Set Prods(ProdNr)=+RS.Get("QtyPcs")
  . Set Prods(ProdNr,LocM)=$G(Prods(ProdNr,LocM),0)+1   ;Aantal bijhouden van hoeveel maal een prod. voorkomt ie magazijn
 
@@ -1658,7 +1666,7 @@
  Set RS=##class(%ResultSet).%New("EWMS.ToReceive:QGetProdsViaPallet")
 
  New tmpStatus
- Set tmpStatus=RS.Execute(..txtBronPalletID.Text)
+ Set tmpStatus=RS.Execute(..GeefBronPalletID())
  If $$$ISERR(tmpStatus) Do  Quit
  . Do pdaMsgBox^vhVisual(..Form.Caption,$$ParseStatus^vhLib(tmpStatus),$$$MBICONERROR)
  . Do RS.%Close()
@@ -1909,7 +1917,7 @@
  ..  Do ..dCOMPWRITEProdsOnPallet()
  ..  ;Check of er nog producten op de pallet staan
  ..  If ..lvProdsOnPallet.Items.Count=0 Do  Quit
- ...   Do pdaMsgBox^vhVisual(..Form.Caption,"Er staan geen producten meer op pallet '"_..txtBronPalletID.Text_"'.",$$$MBICONINFORMATION)
+ ...   Do pdaMsgBox^vhVisual(..Form.Caption,"Er staan geen producten meer op pallet '"_..GeefBronPalletID()_"'.",$$$MBICONINFORMATION)
  ...   Set ..Form.ModalResult=$$$mrOk
  . Else  Do
  ..  Do ..txtBronPalletID.SelectAll()
@@ -1995,12 +2003,12 @@
 
  If (Key=$$$keyEnter) Do       ;&& ..dCOMPVALDoelLocAndPal() Do  ;eigenlijk gn validatie nodig van doel
  . Set:(..txtDoelLocatie.Text="") ..txtDoelLocatie.Text=..txtBronLocatie.Text
- . Set:(..txtDoelPalletID.Text="") ..txtDoelPalletID.Text=..txtBronPalletID.Text
+ . Set:(..txtDoelPalletID.Text="") ..txtDoelPalletID.Text=..GeefBronPalletID()
  . Set ..txtDoelLocatie.Text=$$AddLeadingChar^vhLib(..txtDoelLocatie.Text,"0",8)
  . Set ..txtDoelPalletID.Text=$$AddLeadingChar^vhLib(..txtDoelPalletID.Text,"0",8)
  . New EqualLocations,EqualPalletIDs
  . Set EqualLocations=(..txtBronLocatie.Text=..txtDoelLocatie.Text)
- . Set EqualPalletIDs=(..txtBronPalletID.Text=..txtDoelPalletID.Text)
+ . Set EqualPalletIDs=(..GeefBronPalletID()=..txtDoelPalletID.Text)
  . If EqualLocations Do
  ..  If EqualPalletIDs Do   ;(1)
  ...   Do pdaMsgBox^vhVisual(..Form.Caption,"Hoef pallet niet te verplaatsen: bron- en doelgegevens zijn identiek!",$$$MBICONINFORMATION)