Index: BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml =================================================================== diff -u -r52719 -r53003 --- BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 52719) +++ BL/Flow/Proxy/impl/LeverbonHoofdingBepaler.cls.xml (.../LeverbonHoofdingBepaler.cls.xml) (revision 53003) @@ -149,7 +149,35 @@ HeinPersonality:DOM.common.HeinPersonality - + Index: vhUnitTest/BL/Flow/Proxy/pxLevering.cls.xml =================================================================== diff -u -r51122 -r53003 --- vhUnitTest/BL/Flow/Proxy/pxLevering.cls.xml (.../pxLevering.cls.xml) (revision 51122) +++ vhUnitTest/BL/Flow/Proxy/pxLevering.cls.xml (.../pxLevering.cls.xml) (revision 53003) @@ -94,6 +94,9 @@ If KLNr = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).HaefeleNederland()) { Set $Piece(x1,"\",59) = "((12, ""HFNL_NL1234"", 255024), (1, ""K||2671"", 255025))" } + If KLNr = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(##class(DOM.VKP.enu.Klant).Hein()) { + Set $Piece(x1,"\",59) = "((11, ""HEIN_1234"", 255024), (1, ""K||2671"", 255025))" + } #dim x2 As %String = "\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\" #dim x3 As %String = "1\VAN DER MEIJDEN\BETIMMERINGEN\B.V.\KROMME GAT 23\NL-3372-DH\HARDINXVELD-GIESSENDAM\1147\N\\\\"_..#KlantTelefoon_"\\\\\\.\\\\\FAX : 0031-184/67.55.54\\\\\\\" Index: vhTest/Mock/DOM/common/ProjectSettingsAPI.cls.xml =================================================================== diff -u -r52878 -r53003 --- vhTest/Mock/DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 52878) +++ vhTest/Mock/DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53003) @@ -29,6 +29,18 @@ ]]> + +%Boolean + + + + +%Boolean + + + %Boolean TECH.Enumeration + Enkel VHEPN of HALUX en anders altijd EXTERN, dus NIET aanvullen met verdere enumeraties, enkel ClassMethods bijvoegen voor extra externen]]> %String ;VHEPN;HALUX;EXTERN @@ -48,6 +50,13 @@ + + +1 +BL.FOP.Proxy.enu.HoofdingType + + Index: BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml =================================================================== diff -u -r51121 -r53003 --- BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 51121) +++ BL/FOP/Proxy/enu/HoofdingType/Verwerker.cls.xml (.../Verwerker.cls.xml) (revision 53003) @@ -18,6 +18,8 @@ Do ..VerwerkHaefeleNL() } ElseIf HoofdingType = "HALUX" { Do ..VerwerkHalux() + } ElseIf HoofdingType = "HEIN" { + Do ..VerwerkHein() } ElseIf HoofdingType = "NOTEBORN" { Do ..VerwerkNoteborn() } ElseIf HoofdingType = "VHEPN" { @@ -47,6 +49,12 @@ + +1 +1 + + + 1 1 Index: vhDeploy/D20180918xProjectSettingsxHeinNaarEindklant.cls.xml =================================================================== diff -u --- vhDeploy/D20180918xProjectSettingsxHeinNaarEindklant.cls.xml (revision 0) +++ vhDeploy/D20180918xProjectSettingsxHeinNaarEindklant.cls.xml (revision 53003) @@ -0,0 +1,19 @@ + + + +vhDeploy.Deploy + + +%String +Projectsettings voor Hein Naar Eindklant + + + +1 + + + + + + Index: DOM/common/ProjectSettingsAPI.cls.xml =================================================================== diff -u -r52878 -r53003 --- DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 52878) +++ DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53003) @@ -133,10 +133,20 @@ %Boolean + +1 +%Boolean + + 1 %Boolean + + +1 +%Boolean + Index: DOM/common/impl/ProjectSettingsAPI.cls.xml =================================================================== diff -u -r52878 -r53003 --- DOM/common/impl/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 52878) +++ DOM/common/impl/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53003) @@ -162,6 +162,12 @@ + + +%Boolean + + Index: BL/Flow/Proxy/pxLevering.cls.xml =================================================================== diff -u -r51878 -r53003 --- BL/Flow/Proxy/pxLevering.cls.xml (.../pxLevering.cls.xml) (revision 51878) +++ BL/Flow/Proxy/pxLevering.cls.xml (.../pxLevering.cls.xml) (revision 53003) @@ -329,7 +329,15 @@ Set LeverbonHoofdingBepaler = ##class(BL.Flow.Proxy.impl.LeverbonHoofdingBepaler).%New() #dim AfzenderHoofdingDto As BL.Flow.Proxy.dto.AfzenderHoofdingDto = LeverbonHoofdingBepaler.BepaalLeverbonHoofding(##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(..GeefPersonalityId(Bon))) - #dim HeeftEigenHoofding As %Boolean = (AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL())||(AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Noteborn()) + #dim HeeftEigenHoofding As %Boolean = $$$False + If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHeinNaarEindklant()) { + Set HeeftEigenHoofding = ((AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL()) || + (AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Noteborn()) || + (AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Hein())) + } Else { + Set HeeftEigenHoofding = ((AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).HaefeleNL()) || + (AfzenderHoofdingDto.HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Noteborn())) + } #dim IsOrgalux As %Boolean = ..DocIsOrgalux(BONNr) @@ -486,6 +494,10 @@ Set ..KlantTelefoon = "" Set ..BTWNR = "" Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Custom() + } ElseIf ((##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefHeinNaarEindklant()) && (..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Hein())) { + Set ..KlantTelefoon = "" + Set ..BTWNR = "" + Set ..HeaderType = ##class(BL.FOP.Proxy.enu.HoofdingType).Custom() } Else { Set ..KlantTelefoon=$P($$$KLRec(0),"\",13) Set ..CheckSumBon= "" ;CheckSumBon Index: BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml =================================================================== diff -u -r51121 -r53003 --- BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 51121) +++ BL/FOP/Proxy/enu/HoofdingType/AutoComplete.cls.xml (.../AutoComplete.cls.xml) (revision 53003) @@ -30,6 +30,13 @@ 1 + +%String +"HEIN" +1 +1 + + %String "NOTEBORN" Index: vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml =================================================================== diff -u -r51128 -r53003 --- vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml (.../TestAfzenderHoofding.cls.xml) (revision 51128) +++ vhUnitTest/BL/Flow/Proxy/pxLevering/TestAfzenderHoofding.cls.xml (.../TestAfzenderHoofding.cls.xml) (revision 53003) @@ -103,6 +103,48 @@ ]]> + + + + AfzenderHoofding:BL.FOP.Derde.pxAfzenderHoofding 1