Index: DOM/PM/Maatwerk/Calc/Common/ProductSpecificatie.cls.xml =================================================================== diff -u -r73903 -r74995 --- DOM/PM/Maatwerk/Calc/Common/ProductSpecificatie.cls.xml (.../ProductSpecificatie.cls.xml) (revision 73903) +++ DOM/PM/Maatwerk/Calc/Common/ProductSpecificatie.cls.xml (.../ProductSpecificatie.cls.xml) (revision 74995) @@ -42,8 +42,9 @@ -TECH.String +%String 1 + Index: AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml =================================================================== diff -u -r74224 -r74995 --- AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml (.../AxOrderLijnIterator.cls.xml) (revision 74224) +++ AXimpl/Controle/OrdDiff/AX/AxOrderLijnIterator.cls.xml (.../AxOrderLijnIterator.cls.xml) (revision 74995) @@ -48,9 +48,9 @@ _" ,isnull(LogisticsPostalAddress.City,'') as CITY " _" ,isnull(LogisticsPostalAddress.Street,'') as STREET " _" ,isnull(LogisticsPostalAddress.Zipcode,'') as ZIPCODE " - _" ,salestable.DOCUMENTSTATUS as DOCUMENTSTATUS " - _" ,ADUConfiguredProductLog.ProductHash as PRODUCTHASH " + _" ,isnull(ADUConfiguredProductLog.ProductHash,'') as PRODUCTHASH " _" ,ADUConfiguredProductLog.CID as CID " + _" ,salestable.DOCUMENTSTATUS as DOCUMENTSTATUS " _" ,(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 " @@ -69,8 +69,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 and ADUConfiguredProductLog.Active = 1 " + _" on idc.DISTINCTPRODUCTVARIANT= ADUConfiguredProductLog.EcoResDistinctProductVariant and ADUConfiguredProductLog.PARTITION = SALESLINE.PARTITION and ADUConfiguredProductLog.DATAAREAID = salesline.DATAAREAID and 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/VergelijkLijn.cls.xml =================================================================== diff -u -r74096 -r74995 --- AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml (.../VergelijkLijn.cls.xml) (revision 74096) +++ AXimpl/Controle/OrdDiff/VergelijkLijn.cls.xml (.../VergelijkLijn.cls.xml) (revision 74995) @@ -115,8 +115,8 @@ #dim IsEncowayProduct As %Boolean = $$$False Set ..Diff.Product=(($TRANSLATE(..OrderLijn.AX.ItemId," ") '= $TRANSLATE(..OrderLijn.Admin.ItemId," "))) || ($TRANSLATE(..OrderLijn.AX.KortTekst," ")'= $TRANSLATE(..OrderLijn.Admin.Product.KortTekst," ")) - If (..ProductTypeAPI.IsMaatwerkProduct(..OrderLijn.Admin.ProductNr)) { - Try { + Try { + If (..ProductTypeAPI.IsMaatwerkProduct(..OrderLijn.Admin.ProductNr)) { #dim Product As DOM.PM.MaatwerkProduct = ..ProductTypeAPI.GeefMaatwerkProduct(..OrderLijn.Admin.ProductNr) #dim IngegevenKenmerken As DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken = Product.GeefIngegevenKenmerken() @@ -125,9 +125,9 @@ Set ..Diff.Product = (..Diff.Product && CPConfigDataVerschillend) Set IsEncowayProduct = $$$True } - } Catch { - #dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch() } + } Catch { + } If $$$Not(IsEncowayProduct) { Index: AXif/Dynamics/SalesOrderIn/MessageParts/AxdEntityOrderLine.cls.xml =================================================================== diff -u -r74049 -r74995 --- AXif/Dynamics/SalesOrderIn/MessageParts/AxdEntityOrderLine.cls.xml (.../AxdEntityOrderLine.cls.xml) (revision 74049) +++ AXif/Dynamics/SalesOrderIn/MessageParts/AxdEntityOrderLine.cls.xml (.../AxdEntityOrderLine.cls.xml) (revision 74995) @@ -118,7 +118,7 @@ %String - + Index: AXimpl/Controle/OrdDiff/Admin/OrderData.cls.xml =================================================================== diff -u -r74096 -r74995 --- AXimpl/Controle/OrdDiff/Admin/OrderData.cls.xml (.../OrderData.cls.xml) (revision 74096) +++ AXimpl/Controle/OrdDiff/Admin/OrderData.cls.xml (.../OrderData.cls.xml) (revision 74995) @@ -50,7 +50,7 @@ %String - + Index: AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml =================================================================== diff -u -r74049 -r74995 --- AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml (.../OrderData.cls.xml) (revision 74049) +++ AXimpl/Controle/OrdDiff/AX/OrderData.cls.xml (.../OrderData.cls.xml) (revision 74995) @@ -62,7 +62,7 @@ %String - + Index: DOM/PM/dto/ProductData.cls.xml =================================================================== diff -u -r73898 -r74995 --- DOM/PM/dto/ProductData.cls.xml (.../ProductData.cls.xml) (revision 73898) +++ DOM/PM/dto/ProductData.cls.xml (.../ProductData.cls.xml) (revision 74995) @@ -20,7 +20,8 @@ -TECH.String +%String +