Merge remote-tracking branch 'origin/master'

This commit is contained in:
M_Kececi
2026-06-24 19:05:26 +03:00
parent aca2cf5d02
commit 62bf272f17
22 changed files with 88 additions and 88 deletions

View File

@@ -691,7 +691,7 @@ func getOrderHeaderFromDB(db *sql.DB, orderID string) (*OrderHeader, error) {
h.CreatedUserName,
ISNULL((
SELECT TOP (1) ca.AttributeDescription
FROM BAGGI_V3.dbo.cdCurrAccAttributeDesc AS ca WITH (NOLOCK)
FROM BAGGI_V3.dbo.cdCurrAccAttributeDesc AS ca
WHERE ca.CurrAccTypeCode IN (1,3)
AND ca.AttributeTypeCode = 2 -- 🟡 Müşteri Temsilcisi
AND ca.AttributeCode = f.CustomerAtt02
@@ -764,7 +764,7 @@ func getOrderLinesFromDB(db *sql.DB, orderID string) ([]OrderLineRaw, error) {
WHEN ISNULL(L.IsClosed, 0) = 1
OR EXISTS (
SELECT 1
FROM BAGGI_V3.dbo.trInvoiceLine il WITH (NOLOCK)
FROM BAGGI_V3.dbo.trInvoiceLine il
WHERE il.OrderLineID = L.OrderLineID
)
THEN CAST(1 AS bit)
@@ -777,7 +777,7 @@ func getOrderLinesFromDB(db *sql.DB, orderID string) ([]OrderLineRaw, error) {
L.VatCode,
L.VatRate
FROM BAGGI_V3.dbo.trOrderLine AS L
LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD WITH (NOLOCK)
LEFT JOIN BAGGI_V3.dbo.trOrderLineCurrency AS CD
ON CD.OrderLineID = L.OrderLineID
AND CD.CurrencyCode = ISNULL(NULLIF(LTRIM(RTRIM(L.DocCurrencyCode)), ''), 'TRY')
LEFT JOIN ProductFilterWithDescription('TR') AS P