Commit ed4a313d authored by pchavan's avatar pchavan

change remark condition.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@198240 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 70c7dcbf
...@@ -24828,8 +24828,19 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -24828,8 +24828,19 @@ dtlSql = " select '' as TRAN_ID, "
+"fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,"; +"fn_gst_rate_amt('MDRCRC',i.tran_id, it.line_no, 'J', 'A') as CESS_AMT,";
} }
dtlSql = dtlSql
+" '' as REMARKS ,"; //PriyankaC on 08MArch2019.[START]
//dtlSql = dtlSql
//+" '' as REMARKS ,"
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
dtlSql = dtlSql +"(SELECT count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and cast(ti.line_no as integer) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
}
else
{
dtlSql = dtlSql +"(SELECT count(1) from taxtran ti, tax tm where tm.tax_code = ti.tax_code and ti.tran_id = i.tran_id and to_number(trim(ti.line_no)) = it.line_no and tm.tax_group in ('ITC','RCM') ) as REMARKS, ";
}
//PriyankaC on 08MArch2019.[END]
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{ {
dtlSql = dtlSql +" fn_get_gst_rate('MDRCRC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate "; dtlSql = dtlSql +" fn_get_gst_rate('MDRCRC',i.tran_id,CAST(it.line_no as char(3))) as gst_rate ";
...@@ -24874,7 +24885,7 @@ dtlSql = " select '' as TRAN_ID, " ...@@ -24874,7 +24885,7 @@ dtlSql = " select '' as TRAN_ID, "
+"i.tran_date AS PRD_CODE ," +"i.tran_date AS PRD_CODE ,"
+"'2' AS REC_TYPE," +"'2' AS REC_TYPE,"
+"'C' AS GST_TYPE," +"'C' AS GST_TYPE,"
+"'6' AS TRAN_TYPE," +"'06' AS TRAN_TYPE,"
+"i.sundry_code AS CUST_CODE," +"i.sundry_code AS CUST_CODE,"
+"c.cust_name AS CUST_NAME," +"c.cust_name AS CUST_NAME,"
+"case when length(trim(state.GST_CODE)) is NULL then '00' else state.gst_code end as GST_CODE, " +"case when length(trim(state.GST_CODE)) is NULL then '00' else state.gst_code end as GST_CODE, "
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