Index: BL/Flow/Levering/Label.cls.xml =================================================================== diff -u -r62325 -r62326 --- BL/Flow/Levering/Label.cls.xml (.../Label.cls.xml) (revision 62325) +++ BL/Flow/Levering/Label.cls.xml (.../Label.cls.xml) (revision 62326) @@ -163,20 +163,7 @@ If KLNr="" Quit $$$ERROR($$$GeneralError,"Verkeerd bonnummer "_..BONNr_": geen data in de global.") Set ..pxLabelKlant=##class(BL.Flow.Levering.sub.pxKlantPallet).Create() If $L($TR(xAdres,"\",""))<5 Set xAdres=^KKL(^KK1(KLNr),0) - - If ((KLNr=$$$KlantSchachermayerAU)||(KLNr=$$$KlantSchachermayerNL)){ - Set ..pxLabelKlant.Logo=..pxLabelKlant.GetClientLogo(KLNr) - }ElseIf(KLNr = KlantOptimaPack.GeefNummer()){ - Set ..pxLabelKlant.Logo = "" - } ElseIf ((KLNr = $$$KlantHaefeleB) || (KLNr = $$$KlantHaefeleNL) || (KLNr = $$$KlantHaefeleDE)) { - Set ..pxLabelKlant.Logo="logo\"_^IPCom("CS","LOGO"_KLNr,0) - } ElseIf (KLNr = $$$KlantDupont) { - Set ..pxLabelKlant.Logo="logo\"_^IPCom("CS","LOGO"_KLNr,0) - } ElseIf (KLNr = $$$KlantHein) && $Data(^IPCom("CS","LOGO"_KLNr,0)) { - Set ..pxLabelKlant.Logo="logo\"_^IPCom("CS","LOGO"_KLNr,0) - } Else{ - Set ..pxLabelKlant.Logo="logo\Logo VHZwart.svg" - } + Set ..pxLabelKlant.Logo = ..LabelLogoBepaler(KLNr) Set ..pxLabelKlant.KlantNaam=$Piece(xAdres,"\",2) Set ..pxLabelKlant.Toenaam=$Piece(xAdres,"\",3) Set ..pxLabelKlant.StraatNaamNr=$Piece(xAdres,"\",5) @@ -236,9 +223,7 @@ If Taal="" Set Taal="N" Set xPR0=^KPR(..PRNr,0),xPR1=^KPR(..PRNr,1),xPR2=^KPR(..PRNr,2),xPR3=^KPR(..PRNr,3) Set ..pxLabelProduct.Product=$S(Taal="N":"Product",Taal="F":"Produit",Taal="D":"Product",1:"Product") - If ((KLNr=$$$KlantSchachermayerAU)||(KLNr=$$$KlantSchachermayerNL)) Do - . Set ..pxLabelProduct.Logo=..pxLabelProduct.GetClientLogo(KLNr) - Else Set ..pxLabelProduct.Logo="logo\Logo VHZwart.svg" + Set ..pxLabelKlant.Logo = ..LabelLogoBepaler(KLNr) Set ..pxLabelProduct.Korttekst=$Piece(xPR0,"\") Set ..pxLabelProduct.AantalTitel=$S(Taal="N":"Aantal",Taal="F":"Quantité",Taal="D":"Menge",1:"Quantity") Set ..pxLabelProduct.AantalStuks=AantalStuks