Commit 5c28b57e authored by Hakan Uygun's avatar Hakan Uygun

refs #4696, #3868 satıcı performans raporu güncellendi

parent df59ba63
......@@ -36,7 +36,7 @@
<defaultValueExpression><![CDATA[null]]></defaultValueExpression>
</parameter>
<queryString>
<![CDATA[(
<![CDATA[
(select 2 as DOCTYPE
,txn.SERIAL
,txn.REFERENCE,txn.CODE
......@@ -76,8 +76,7 @@ inner join WAREHOUSE w on w.ID = txn.WAREHOUSE_ID
left outer join USERS usr on usr.ID = txn.CLERK_ID
left outer join ORGANIZATION org on org.ID = w.ORGANIZATION_ID
where txn.TRADE_ACTION = 1
and txn.ID not in ( select ol.INVOICE_ID from INVOICE_ORDER_LINK ol )
and ( txn.TXNDATE >= '2012-10-10' and txn.TXNDATE <= '2012-10-23' )
and txn.ID not in ( select ol.INVOICE_ID from INVOICE_ORDER_LINK ol ) and
( ( $P{pWare} = 0 ) or ( w.ID = $P{pWare} ) ) and
( ( $P{pClerk} = 0 ) or ( txn.CLERK_ID = $P{pClerk} ) ) and
( ( $P{pUser} is null ) or ( txn.UPDATE_USER = $P{pUser} ) ) and
......@@ -131,10 +130,10 @@ left outer join ORGANIZATION org on org.ID = w.ORGANIZATION_ID
where (txm.TRADE_ACTION = 1 )
and (txm.STATUS not in ( 1,2 ))
and (txn.PRODUCT_TYPE = 1 or txn.PRODUCT_TYPE = 2)
and ( txm.TXNDATE >= '2012-10-10' and txm.TXNDATE <= '2012-10-23' )
and ( ( $P{pWare} = 0 ) or ( w.ID = $P{pWare} ) )
and ( ( $P{pOrgLevel} = 0 ) or ( org.ID = $P{pOrgLevel} ) )
and ( ( $P{pAccount} = 0 ) or ( txm.ACCOUNT_ID = $P{pAccount} ) )
and ( ( $P{pClerk} = 0 ) or ( txm.CLERK_ID = $P{pClerk} ) )
and ( ( $P{pUser} is null ) or ( txm.UPDATE_USER = $P{pUser} ) )
and ( txm.TXNDATE >= $P{pBDate} and txm.TXNDATE <= $P{pEDate} )
and ( ( $P{pWorkBunchId} is null ) or ( txm.WORKBUNCH_ID = $P{pWorkBunchId} ) )
......@@ -613,7 +612,7 @@ order by ORGID, Depoadi,Tezgahtar, DOCTYPE, TXNDATE, TXNTIME ]]>
<textElement>
<font size="8" pdfEncoding="Cp1254"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{UPDATE_USER}]]></textFieldExpression>
<textFieldExpression class="java.lang.String"><![CDATA[$F{Tezgahtar}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement key="textField-7" x="470" y="0" width="66" height="16"/>
......
......@@ -538,7 +538,7 @@ order by org.ID, txn.WAREHOUSE_ID,usr.FULL_NAME, txn.TXNDATE, txn.TXNTIME]]>
<textElement>
<font size="8" pdfEncoding="Cp1254"/>
</textElement>
<textFieldExpression class="java.lang.String"><![CDATA[$F{UPDATE_USER}]]></textFieldExpression>
<textFieldExpression class="java.lang.String"><![CDATA[$F{Tezgahtar}]]></textFieldExpression>
</textField>
<textField pattern="#,##0.00" isBlankWhenNull="true">
<reportElement key="textField-7" x="470" y="0" width="66" height="16"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment