Skip to content

B
business-java
Commit 6ebfb27f authored by kdabholkar's avatar kdabholkar
Browse files
Options

commit the changes of gs_desc and credit/debit note 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@157290 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ddf3e474
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 90 deletions
webitm-gst-client/ibase/webitm/ejb/gstclient/GstDataPrc.java
View file @ 6ebfb27f
......@@ -927,7 +927,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19 july 2017*/
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT," changed on 7 sep 2017
......@@ -1159,7 +1160,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('D-ISS',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
// +"item.UNIT as UNIT," changed on 7 sep 2017
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
/* +" u.descr as UNIT,"*/
......@@ -1387,8 +1389,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('P-RET',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*chnaged by Kaustubh*/
/* +" u.descr as UNIT,"*/
// +"item.UNIT as UNIT," chnaged on 7 sep 2017
......@@ -1625,7 +1627,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/* +" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
......@@ -1899,7 +1902,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" accounts.descr as GS_DESCR,"
// +" accounts.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/* +" u.descr as UNIT,"*/
+" '1' as UNIT,"
......@@ -2139,8 +2143,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*chnaged by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +" item.UNIT as UNIT," changed on 7 sep 2017
......@@ -2362,7 +2366,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('P-RET',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +" item.UNIT as UNIT,"
......@@ -2594,7 +2599,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
......@@ -2817,7 +2823,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
......@@ -3039,7 +3046,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('S-INV',i.invoice_id, it.line_no, 'G', 'A') as SGST_AMT,"*/
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +"item.UNIT as UNIT," changed by 7 sep 2017
......@@ -3259,7 +3267,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT," changed on 7 sep
......@@ -3476,7 +3485,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commetned by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT,"
......@@ -3694,7 +3704,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
......@@ -3909,7 +3920,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
......@@ -4124,7 +4136,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+" item.UNIT as UNIT,"
......@@ -4337,7 +4350,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+" item.UNIT as UNIT,"
......@@ -4555,7 +4569,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +" item.UNIT as UNIT," changed on 7 sep
......@@ -4749,7 +4764,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
// +"item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
/* +" u.descr as UNIT,"*/
......@@ -4966,7 +4982,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+" item.UNIT as UNIT,"
......@@ -5180,7 +5197,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+" item.UNIT as UNIT,"
......@@ -5393,7 +5411,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +" item.UNIT as UNIT,"
......@@ -5607,7 +5626,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +" item.UNIT as UNIT,"
......@@ -5824,7 +5844,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+" item.UNIT as UNIT,"
......@@ -6041,7 +6062,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
......@@ -6257,7 +6279,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+" item.UNIT as UNIT,"
......@@ -6472,7 +6495,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
+" u.descr as UNIT,"
/*changed by kaustubh on 19-07-2017*/
// +" item.UNIT as UNIT,"
......@@ -6687,7 +6711,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT,"
......@@ -6905,7 +6930,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 19-07-2017*/
/*+" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
......@@ -7153,11 +7179,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 20-07-2017*/
/*+" u.descr as UNIT,"*/
+" item.UNIT as UNIT,"
// +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -7389,10 +7416,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2107
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 20-07-2017*/
/*+" u.descr as UNIT,"*/
+" item.UNIT as UNIT,"
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY,"
......@@ -7703,11 +7732,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
// +" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2017
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 20-07-2017*/
/*+" u.descr as UNIT,"*/
+" item.UNIT as UNIT,"
// +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -7938,10 +7968,12 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
//+" item.sh_descr GS_DESCR," commented by kaustubh on 28 july 2107
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*changed by kaustubh on 20-07-2017*/
/*+" u.descr as UNIT,"*/
+" item.UNIT as UNIT,"
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=item.unit) as UNIT, "
// +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
// +" (it.quantity__stduom) as QUANTITY,"
+" (it.quantity) as QUANTITY,"
......@@ -9272,7 +9304,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.sh_descr as GS_DESCR,"
//+" item.sh_descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
//+" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" it.rcp_qty as QUANTITY,"
......@@ -9447,7 +9480,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
dtlSql = dtlSql
// +" item.descr as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
// +" item.UNIT as UNIT,"
+" 'NA' as UNIT, "
+" (it.quantity) as QUANTITY, "
......@@ -9617,7 +9651,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
......@@ -9795,7 +9830,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
+"item.UNIT as UNIT,"
// +"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
......@@ -9967,7 +10003,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
......@@ -10143,7 +10180,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
+"item.UNIT as UNIT,"
+" (it.quantity) as QUANTITY,"
......@@ -10314,7 +10352,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
......@@ -10494,7 +10533,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
+"item.UNIT as UNIT,"
+" (it.quantity) as QUANTITY,"
......@@ -10672,7 +10712,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 0 as CGST_AMT "
+" 0 as SGST_PERC "
+" 0 as SGST_AMT "
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
//+"item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
......@@ -10852,7 +10893,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+" 0 as CGST_AMT "
+" 0 as SGST_PERC "
+" 0 as SGST_AMT "
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/*+" u.descr as UNIT,"*/
+"item.UNIT as UNIT,"
+" (it.quantity) as QUANTITY,"
......@@ -11029,7 +11071,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/* +" u.descr as UNIT,"*/
// +"item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
......@@ -11203,7 +11246,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
/* +" u.descr as UNIT,"*/
+" item.UNIT as UNIT,"
+" (it.quantity) as QUANTITY,"
......@@ -11372,7 +11416,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.sh_descr as GS_DESCR,"
//+" item.sh_descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
+" item.UNIT as UNIT,"
+" it.rcp_qty as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -11547,7 +11592,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
+" item.UNIT as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;// -- E/OE (Ecom/Other than Ecom)
......@@ -11721,7 +11767,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.sh_descr as GS_DESCR,"
//+" item.sh_descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
//+" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" it.rcp_qty as QUANTITY,"
......@@ -11894,7 +11941,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
+" item.sh_descr as GS_DESCR,"
// +" item.sh_descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" it.rcp_qty as QUANTITY,"
......@@ -12046,7 +12094,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('CRNPAY',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
+" item.UNIT as UNIT,"
// +" (it.quantity__stduom) as QUANTITY,"
+" 0 as QUANTITY,"
......@@ -12202,7 +12251,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('CRNPAY',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
+" item.UNIT as UNIT,"
// +" (it.quantity__stduom) as QUANTITY,"
+" 0 as QUANTITY,"
......@@ -12354,7 +12404,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('DRNPAY',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
+" item.UNIT as UNIT,"
// +" (it.quantity__stduom) as QUANTITY,"
+" 0 as QUANTITY,"
......@@ -12508,7 +12559,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('DRNPAY',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
+" item.UNIT as UNIT,"
// +" (it.quantity__stduom) as QUANTITY,"
+" 0 as QUANTITY,"
......@@ -12691,7 +12743,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -12854,7 +12907,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -13019,7 +13073,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
// +" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
// +" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -13183,7 +13238,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
//+" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -13346,7 +13402,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
//+" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -13508,7 +13565,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
//+" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -13670,7 +13728,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
//+" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -13833,7 +13892,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
+ "fn_gst_rate_amt('VOUCH',i.tran_id, it.line_no, 'G', 'A') as SGST_AMT,";
}
dtlSql = dtlSql
+" item.descr as GS_DESCR,"
//+" item.descr as GS_DESCR,"
+" ' ' as GS_DESCR, "
//+" item.UNIT as UNIT,"
+"(select case when udf_str2 is null then descr else udf_str2 end as Unit from uom where unit=it.unit) as UNIT, "
+" (it.rcp_qty) as QUANTITY,"
......@@ -15114,7 +15174,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -15273,7 +15334,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -15422,7 +15484,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
//+" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -15569,7 +15632,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
//+" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -15722,7 +15786,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -15876,7 +15941,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -16027,7 +16093,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -16180,7 +16247,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -16333,7 +16401,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -16485,7 +16554,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -16653,7 +16723,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
//+" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -16808,7 +16879,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
//+" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -16961,7 +17033,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -17117,7 +17190,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -17270,7 +17344,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -17426,7 +17501,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -17580,7 +17656,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -17731,7 +17808,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -17886,7 +17964,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -18040,7 +18119,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -18193,7 +18273,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
//+" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......@@ -18347,7 +18428,8 @@ public class GstDataPrc extends ProcessEJB implements GstDataPrcLocal,GstDataPrc
}
dtlSql = dtlSql
//+" accounts.sac_no as GS_DESCR,"
+" accounts.sac_no as GS_DESCR, "
// +" accounts.sac_no as GS_DESCR, "
+" ' ' as GS_DESCR, "
+" 'NA' as UNIT,"
+" (it.quantity) as QUANTITY,"
+" 'OE' as SUPPLY_TYPE," ;
......
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