Merge remote-tracking branch 'origin/master'

svc/queries/orderproduction_items.go

@@ -28,7 +28,7 @@ SELECT
     ISNULL(l.ColorCode,'')     AS OldColor,
     ISNULL((
         SELECT TOP 1 LTRIM(RTRIM(cd.ColorDescription))
-        FROM dbo.cdColorDesc cd WITH (NOLOCK)
+        FROM dbo.cdColorDesc cd
         WHERE cd.ColorCode = l.ColorCode
           AND cd.LangCode = N'TR'
     ), '') AS OldColorDescription,
@@ -68,7 +68,7 @@ SELECT
 FROM dbo.trOrderLine l
 JOIN dbo.trOrderHeader h
   ON h.OrderHeaderID = l.OrderHeaderID
-LEFT JOIN dbo.trOrderLineCurrency c WITH (NOLOCK)
+LEFT JOIN dbo.trOrderLineCurrency c
   ON c.OrderLineID  = l.OrderLineID
  AND c.CurrencyCode = ISNULL(h.DocCurrencyCode,'TRY')