Index: vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml =================================================================== diff -u -r55961 -r56002 --- vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml (.../TestAfzenderHoofding.cls.xml) (revision 55961) +++ vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml (.../TestAfzenderHoofding.cls.xml) (revision 56002) @@ -154,20 +154,20 @@ #dim pxLevering As BL.Flow.Proxy.pxLevering = ##class(BL.Flow.Proxy.pxLevering).Create(BONNr,0,"F") #dim afzender As BL.FOP.Derde.pxAfzenderHoofding =pxLevering.AfzenderHoofding If $$$AssertTrue($IsObject(afzender)){ - Do $$$AssertEquals(afzender.NAAM,"Du Pont bvba","Klantnaam") + Do $$$AssertEquals(afzender.NAAM,"DU PONT BVBA","Klantnaam") Do $$$AssertEquals(afzender.STRAATNRBUS,"Kleinheide 24G","Straat") - Do $$$AssertEquals(afzender.POSTCODE,"2242","Postcode") - Do $$$AssertEquals(afzender.WOONPLAATS,"Pulderbos (Zandhoven)","Woonplaats") + Do $$$AssertEquals(afzender.POSTCODE,"BE 2242","Postcode") + Do $$$AssertEquals(afzender.WOONPLAATS,"Pulderbos","Woonplaats") Do $$$AssertEquals(afzender.EMAIL,"info@du-pont.be") - Do $$$AssertEquals(afzender.TELEFOON,"+32(0)3 464 00 91") - Do $$$AssertEquals(afzender.FAX,"") - Do $$$AssertEquals(afzender.LOGO.Content,"\\fop\Resources\Media\KlantLogos\Logo\Logo Du Pont 1736.jpg") + Do $$$AssertEquals(afzender.TELEFOON,"Tel.: +32 3 464 00 91") + Do $$$AssertEquals(afzender.FAX,"Fax.: +32 3 464 00 92") + Do $$$AssertEquals(afzender.LOGO.Content,"\\fop\Resources\Media\KlantLogos\Logo\Logo Du Pont 1736 levbon.jpg") Do $$$AssertEquals(afzender.LOGO.Type,"JPG") - Do $$$AssertEquals(afzender.T1,"BTW BE0430.459.769") - Do $$$AssertEquals(afzender.T2,"0430.459.769") - Do $$$AssertEquals(afzender.T3,"RPR Antwerpen") - Do $$$AssertEquals(afzender.T4,"") + Do $$$AssertEquals(afzender.T1,"BTW-nr.: BE 0430.459.769") + Do $$$AssertEquals(afzender.T2,"RPR Antwerpen") + Do $$$AssertEquals(afzender.T3,"KBC: IBAN BE60 4138 2531 6170") + Do $$$AssertEquals(afzender.T4," BIC KREDBEBB") Do $$$AssertEquals(afzender.T5,"") Do $$$AssertEquals(afzender.T6,"") Do $$$AssertEquals(afzender.T7,"") Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml =================================================================== diff -u -r55950 -r56002 --- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 55950) +++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 56002) @@ -62,22 +62,23 @@ #dim Klant As DOM.VKP.VanHoeckeKlant = ##class(DOM.DomeinContext).Instance().GeefVerkoopAPI().GeefKlant(DupontPersonality.GeefKlantID()) If Klant.HeeftEigenLogo(){ - Set URL = "\\fop\Resources\Media\KlantLogos\" - #dim Bestand As %String = Klant.GeefLogo() + Set URL = "\\fop\Resources\Media\KlantLogos\Logo\" + #dim Bestand As %String = "Logo Du Pont 1736 levbon.jpg" #dim Extensie As %String = ##class(TECH.StringUtils).GetLastPart(Bestand,".") Set URL = ##class(TECH.Files).AppendFile(URL,Bestand) Set ..LeverbonHoofding.LOGO = ##class(BL.FOP.Basis.pxAttribType).Create(URL,##class(TECH.StringUtils).ToUpper(Extensie),,) } - Set ..LeverbonHoofding.NAAM = "Du Pont bvba" + Set ..LeverbonHoofding.NAAM = "DU PONT BVBA" Set ..LeverbonHoofding.STRAATNRBUS = "Kleinheide 24G" - Set ..LeverbonHoofding.WOONPLAATS = "Pulderbos (Zandhoven)" - Set ..LeverbonHoofding.POSTCODE = "2242" - Set ..LeverbonHoofding.TELEFOON = "+32(0)3 464 00 91" + Set ..LeverbonHoofding.WOONPLAATS = "Pulderbos" + Set ..LeverbonHoofding.POSTCODE = "BE 2242" + Set ..LeverbonHoofding.TELEFOON = "Tel.: +32 3 464 00 91" + Set ..LeverbonHoofding.FAX = "Fax.: +32 3 464 00 92" Set ..LeverbonHoofding.EMAIL = "info@du-pont.be" - Set ..LeverbonHoofding.T1 = "BTW BE0430.459.769" - Set ..LeverbonHoofding.T2 = "0430.459.769" - Set ..LeverbonHoofding.T3 = "RPR Antwerpen" - Set ..LeverbonHoofding.T4 = "" + Set ..LeverbonHoofding.T1 = "BTW-nr.: BE 0430.459.769" + Set ..LeverbonHoofding.T2 = "RPR Antwerpen" + Set ..LeverbonHoofding.T3 = "KBC: IBAN BE60 4138 2531 6170" + Set ..LeverbonHoofding.T4 = " BIC KREDBEBB" ]]>