Index: vhTest/Mock/DOM/common/ProjectSettingsAPI.cls.xml =================================================================== diff -u -r53072 -r53151 --- vhTest/Mock/DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53072) +++ vhTest/Mock/DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53151) @@ -150,6 +150,12 @@ ]]> + +%Boolean + + + %Boolean AXLeveradresId MessageId OorsprongKetting - EmailAdresBesteller@vanhoecke.be OrderReferentie EDINummer - EmailAdresBevestiging@vanhoecke.be AXSalesId \ No newline at end of file Index: vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml =================================================================== diff -u -r53123 -r53151 --- vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml (.../Test.cls.xml) (revision 53123) +++ vhUnitTest/AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder/Test.cls.xml (.../Test.cls.xml) (revision 53151) @@ -29,8 +29,10 @@ do $$$AssertEquals(OrderHeader.SalesIdAX,"AXSalesId") do $$$AssertEquals(OrderHeader.class,"entity") do $$$AssertEquals(OrderHeader.MessageId,"MessageId") - do $$$AssertEquals(OrderHeader.OrderedByEmail,"EmailAdresBesteller@vanhoecke.be") - do $$$AssertEquals(OrderHeader.SalesConfirmEmail,"EmailAdresBevestiging@vanhoecke.be") + If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefVhisieEmailadressenNaarAx()) { + do $$$AssertEquals(OrderHeader.OrderedByEmail,"EmailAdresBesteller@vanhoecke.be") + do $$$AssertEquals(OrderHeader.SalesConfirmEmail,"EmailAdresBevestiging@vanhoecke.be") + } Do $$$AssertEquals(OrderHeader.SalesOriginId,"") Do $$$AssertEquals(OrderHeader.RefSalesOriginId,"EDINummer") Index: AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml =================================================================== diff -u -r53123 -r53151 --- AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml (.../OrderHoofdingConverteerder.cls.xml) (revision 53123) +++ AXimpl/Dynamics/SalesOrderOut/Converter/OrderHoofdingConverteerder.cls.xml (.../OrderHoofdingConverteerder.cls.xml) (revision 53151) @@ -39,9 +39,12 @@ Set OrderHeader.InvoiceAccount = OrderHeader.CustAccount Set OrderHeader.ReceiptDateRequested = ..GeefLeverDatumVanOrder(Order) Set OrderHeader.SalesIdAX = Order.GeefAxSalesId() - Set OrderHeader.OrderedByEmail = $$$If(##class(TECH.MailUtils).Check(Order.GeefEmailAdresBesteller()),Order.GeefEmailAdresBesteller(),"") - Set OrderHeader.SalesConfirmEmail = $$$If(##class(TECH.MailUtils).Check(Order.GeefEmailAdresBevestiging()),Order.GeefEmailAdresBevestiging(),"") + If (##class(DOM.common.impl.ProjectSettingsAPI).%New().IsActiefVhisieEmailadressenNaarAx()) { + Set OrderHeader.OrderedByEmail = $$$If(##class(TECH.MailUtils).Check(Order.GeefEmailAdresBesteller()),Order.GeefEmailAdresBesteller(),"") + Set OrderHeader.SalesConfirmEmail = $$$If(##class(TECH.MailUtils).Check(Order.GeefEmailAdresBevestiging()),Order.GeefEmailAdresBevestiging(),"") + } + Set OrderHeader.SalesOriginId = ##class(AXimpl.AdminToAxUtils).ConvertOrigin(Order.GeefOorsprong()) Set OrderHeader.RefSalesOriginId = Order.GeefEDINummer() Index: DOM/common/impl/ProjectSettingsAPI.cls.xml =================================================================== diff -u -r53072 -r53151 --- DOM/common/impl/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53072) +++ DOM/common/impl/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53151) @@ -174,6 +174,12 @@ + + +%Boolean + + Index: DOM/common/ProjectSettingsAPI.cls.xml =================================================================== diff -u -r53072 -r53151 --- DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53072) +++ DOM/common/ProjectSettingsAPI.cls.xml (.../ProjectSettingsAPI.cls.xml) (revision 53151) @@ -152,6 +152,11 @@ 1 %Boolean + + +1 +%Boolean + Index: vhDeploy/D20180926xProjectSettingsxEmailAdresBevestigingEnBestellerVanVhisieNaarAx.cls.xml =================================================================== diff -u --- vhDeploy/D20180926xProjectSettingsxEmailAdresBevestigingEnBestellerVanVhisieNaarAx.cls.xml (revision 0) +++ vhDeploy/D20180926xProjectSettingsxEmailAdresBevestigingEnBestellerVanVhisieNaarAx.cls.xml (revision 53151) @@ -0,0 +1,19 @@ + + + +vhDeploy.Deploy + + +%String +Projectsettings voor het doorsturen van de via Vhisie4 verkregen emailadressen bij BestelWinkelkar door te sturen naar AX via VHIP504 Order2Ax + + + +1 + + + + + +