Index: AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml =================================================================== diff -u -r73914 -r73979 --- AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml (.../VergelijkLijn.cls.xml) (revision 73914) +++ AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml (.../VergelijkLijn.cls.xml) (revision 73979) @@ -120,7 +120,8 @@ #dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = Product.GeefIngegevenKenmerken() If (..OmleidingNaarEncowayBepaler.IsMaatwerkCalculatieInEncoway(IngegevenKenmerken.GeefVariant(), IngegevenKenmerken.GeefVersieNr())) { - Set ..Diff.Product = (..Diff.Product && (..OrderLijn.AX.CID'=..OrderLijn.Admin.CID) && (..OrderLijn.AX.ProductHash'=..OrderLijn.Admin.ProductHash)) + #dim CPConfigDataVerschillend As %Boolean = (..OrderLijn.AX.CID'=..OrderLijn.Admin.CID) && (..OrderLijn.AX.ProductHash'=..OrderLijn.Admin.ProductHash) + Set ..Diff.Product = (..Diff.Product && CPConfigDataVerschillend) Set IsEncowayProduct = $$$True } } Index: AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml =================================================================== diff -u -r73176 -r73979 --- AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml (.../AxOrderLijnIterator.cls.xml) (revision 73176) +++ AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml (.../AxOrderLijnIterator.cls.xml) (revision 73979) @@ -48,6 +48,8 @@ _" ,isnull(LogisticsPostalAddress.City,'') as CITY " _" ,isnull(LogisticsPostalAddress.Street,'') as STREET " _" ,isnull(LogisticsPostalAddress.Zipcode,'') as ZIPCODE " + _" ,isnull(LogisticsPostalAddress.ProductHash,'') as PRODUCTHASH " + _" ,isnull(LogisticsPostalAddress.CID,'') as CID " _" ,(select top 1 r.LOG from VHVALENTITYRUN r where r.PARTITION = SALESTABLE.PARTITION and r.DATAAREAID = SALESTABLE.DATAAREAID and r.ENTITY = 2 and r.REFRECID = SALESTABLE.recid and r.STATUS in (2,3) and SALESTABLE.DOCUMENTSTATUS=0 ) as VALIDATIECODE " _" from SALESLINE " _" join inventdim on inventdim.INVENTDIMID = salesline.INVENTDIMID and inventdim.DATAAREAID = SALESLINE.DATAAREAID and inventdim.PARTITION = salesline.PARTITION " @@ -66,6 +68,10 @@ _" left outer join ECORESPRODUCTTRANSLATION transNL " _" on transNL.PRODUCT = Resproduct.RECID and transNL.LANGUAGEID='nl-be' and inventdim.partition=transNL.PARTITION " _" left outer join LOGISTICSPOSTALADDRESS on LOGISTICSPOSTALADDRESS.RECID = salesline.DELIVERYPOSTALADDRESS and LOGISTICSPOSTALADDRESS.PARTITION = salesline.PARTITION " + + _" left outer join ADUCONFIGUREDPRODUCTLOG ADUConfiguredProductLog " + _" on idc.DISTINCTPRODUCTVARIANT= ADUConfiguredProductLog.EcoResDistinctProductVariant and ADUConfiguredProductLog.PARTITION = SALESLINE.PARTITION and ADUConfiguredProductLog.DATAAREAID = salesline.DATAAREAID where ADUConfiguredProductLog.Active = 1" + _" join INVENTTRANSORIGIN on INVENTTRANSORIGIN.INVENTTRANSID = salesline.INVENTTRANSID and INVENTTRANSORIGIN.DATAAREAID = salesline.DATAAREAID and " _" INVENTTRANSORIGIN.PARTITION = salesline.PARTITION " _" Left outer join (select ito.INVENTTRANSID, -sum(qty) as QtyOpBon " Index: AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml =================================================================== diff -u -r73898 -r73979 --- AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml (.../DataBouwer.cls.xml) (revision 73898) +++ AXimpl/Controle/OrdDiff/Admin/DataBouwer.cls.xml (.../DataBouwer.cls.xml) (revision 73979) @@ -70,11 +70,15 @@ If (..ProductTypeAPI.IsMaatwerkProduct(AdminOrderLijn.GeefProductID())) { #dim Product As DOM.PM.MaatwerkProduct = ..ProductTypeAPI.GeefMaatwerkProduct(AdminOrderLijn.GeefProductID()) - #dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = Product.GeefIngegevenKenmerken() + Try { + #dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = Product.GeefIngegevenKenmerken() - If (..OmleidingNaarEncowayBepaler.IsMaatwerkCalculatieInEncoway(IngegevenKenmerken.GeefVariant(), IngegevenKenmerken.GeefVersieNr())) { - Set CID = Product.GeefCID() - Set ProductHash = Product.GeefProductHash() + If (..OmleidingNaarEncowayBepaler.IsMaatwerkCalculatieInEncoway(IngegevenKenmerken.GeefVariant(), IngegevenKenmerken.GeefVersieNr())) { + Set CID = Product.GeefCID() + Set ProductHash = Product.GeefProductHash() + } + } Catch { + } }