Skip to content

B
business-java
Commit dcdac321 authored by spawar's avatar spawar
Browse files
Options

Added changes to save gstr2 custom transactions (nil rated and itc reversal) 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106533 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cabf3ffa
Expand all Show whitespace changes
Inline Side-by-side
Showing with 789 additions and 298 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrCustomTranEJBLocal.java
View file @ dcdac321
......@@ -20,5 +20,5 @@ public interface GstrCustomTranEJBLocal extends ValidatorLocal
String updateRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException, ITMException;
String getRecords(String objName, String prdCode, UserInfoBean userInfo) throws RemoteException, ITMException;
String getRecords(String objName, String prdCode,String gstType, UserInfoBean userInfo) throws RemoteException, ITMException;
}
webitm-gst/ibase/webitm/ejb/gst/GstrCustomTranEJBRemote.java
View file @ dcdac321
......@@ -18,5 +18,5 @@ public interface GstrCustomTranEJBRemote extends ValidatorRemote
String updateRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException, ITMException;
String getRecords(String objName, String prdCode, UserInfoBean userInfo) throws RemoteException, ITMException;
String getRecords(String objName, String prdCode, String gstType, UserInfoBean userInfo) throws RemoteException, ITMException;
}
webitm-gst/ibase/webitm/servlet/gst/GstrCustomTranServlet.java
View file @ dcdac321
......@@ -98,12 +98,13 @@ public class GstrCustomTranServlet extends HttpServlet
{
String objName = request.getParameter("OBJ_NAME");
String prdCode = request.getParameter("PRD_CODE");
String gstType = request.getParameter("GST_TYPE");
System.out.println("OBJ_NAME["+objName+"]");
ctx=getInitialContext();
GstrCustomTranEJBRemote GstrCustomTranEJBRemote = (ibase.webitm.ejb.gst.GstrCustomTranEJBRemote) ctx.lookup("ibase/GstrCustomTranEJB/remote");
responseXML = GstrCustomTranEJBRemote.getRecords(objName, prdCode, userInfo);
responseXML = GstrCustomTranEJBRemote.getRecords(objName, prdCode,gstType, userInfo);
//responseXML = gstRegNoRemote.handleRequest(requestParamMap);
}
......
webitm-gst/module-resource/web/css/GstCustomTransaction.css
View file @ dcdac321
......@@ -26,8 +26,7 @@ input[type=number]::-webkit-outer-spin-button {
width: 99%;
border: 1px solid lightgray;
margin: 5px;
border-right: none;
border-bottom: none;
border:none;
margin-bottom: 0px;
}
body
......@@ -41,10 +40,12 @@ body
text-align: left;
border-collapse: separate;
border-spacing: 0;
border-radius: 2px;
background-color: white;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.06);
border-left: 1px solid lightgray;
border-top: 1px solid lightgrey;
margin-top: 15px;
}
.table-head>tr>th {
border: none !important;
......
webitm-gst/module-resource/web/jsp/GSTITCReversalSupplies.jsp 0 → 100644
View file @ dcdac321
This diff is collapsed.
webitm-gst/module-resource/web/jsp/GSTPurcNilRatedSupplies.jsp 0 → 100644
View file @ dcdac321
<html>
<head>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/GstCustomTransaction.css"/>
<script>
</script>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<table class="gstTableClass">
<thead class="table-head">
<tr>
<th align="left" valign="top" >Description</th>
<th align="right" valign="top" >Compounding Dealer</th>
<th align="right" valign="bottom" >Exempted supplies</th>
<th align="right" valign="top">Non-GST supplies</th>
<th align="right" valign="top">Nil Rated</th>
</tr>
</thead>
<tbody class="table-body">
<tr>
<td align="left" valign="bottom">Inter-State supplies</td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.1.amount1" name="Detail1.1.amount" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.2.amount2" name="Detail1.2.amount" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.3.amount3" name="Detail1.3.amount" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.4.amount4" name="Detail1.4.amount" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.1.tran_type1" name="Detail1.1.tran_type" type="text" value="18" >
<input type="hidden" id="Detail1.2.tran_type2" name="Detail1.2.tran_type" type="text" value="19" >
<input type="hidden" id="Detail1.3.tran_type3" name="Detail1.3.tran_type" type="text" value="20" >
<input type="hidden" id="Detail1.4.tran_type4" name="Detail1.4.tran_type" type="text" value="21" >
<input type="hidden" id="Detail1.1.tran_id1" name="Detail1.1.tran_id" type="text" >
<input type="hidden" id="Detail1.2.tran_id2" name="Detail1.2.tran_id" type="text" >
<input type="hidden" id="Detail1.3.tran_id3" name="Detail1.3.tran_id" type="text" >
<input type="hidden" id="Detail1.4.tran_id4" name="Detail1.4.tran_id" type="text" >
</tr>
<tr>
<td align="left" valign="bottom">Intra-State supplies</td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.5.amount5" name="Detail1.5.amount" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.6.amount6" name="Detail1.6.amount" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.7.amount7" name="Detail1.7.amount" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail1.8.amount8" name="Detail1.8.amount" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.5.tran_type5" name="Detail1.5.tran_type" type="text" value="22" >
<input type="hidden" id="Detail1.6.tran_type6" name="Detail1.6.tran_type" type="text" value="23" >
<input type="hidden" id="Detail1.7.tran_type7" name="Detail1.7.tran_type" type="text" value="24" >
<input type="hidden" id="Detail1.8.tran_type8" name="Detail1.8.tran_type" type="text" value="25" >
<input type="hidden" id="Detail1.5.tran_id5" name="Detail1.5.tran_id" type="text" >
<input type="hidden" id="Detail1.6.tran_id6" name="Detail1.6.tran_id" type="text" >
<input type="hidden" id="Detail1.7.tran_id7" name="Detail1.7.tran_id" type="text" >
<input type="hidden" id="Detail1.8.tran_id8" name="Detail1.8.tran_id" type="text" >
</tr>
</tbody>
</table>
</body>
</html>
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