Skip to content

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

Added changes to save gstr3b custom records 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106559 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 14f74d2f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 34 deletions
webitm-gst/ibase/webitm/ejb/gst/GstrCustomTranEJBLocal.java
View file @ d83cc1a7
......@@ -16,9 +16,9 @@ import javax.ejb.Local;
@Local
public interface GstrCustomTranEJBLocal extends ValidatorLocal
{
public String saveRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException,ITMException;
public String saveRecord(String objName, String tranXml,String gstType, UserInfoBean userInfo) throws RemoteException,ITMException;
String updateRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException, ITMException;
String updateRecord(String objName, String tranXml,String gstType, 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 @ d83cc1a7
......@@ -14,9 +14,9 @@ import javax.ejb.Remote;
@Remote
public interface GstrCustomTranEJBRemote extends ValidatorRemote
{
public String saveRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException,ITMException;
public String saveRecord(String objName, String tranXml, String gstType, UserInfoBean userInfo) throws RemoteException,ITMException;
String updateRecord(String objName, String tranXml, UserInfoBean userInfo) throws RemoteException, ITMException;
String updateRecord(String objName, String tranXml,String gstType, UserInfoBean userInfo) throws RemoteException, ITMException;
String getRecords(String objName, String prdCode, String gstType, UserInfoBean userInfo) throws RemoteException, ITMException;
}
webitm-gst/module-resource/web/js/GstCustomTransaction.js
View file @ d83cc1a7
......@@ -58,6 +58,13 @@ function onLoad()
openExtraContainer("V");
}
}
else if(global_obj_name == "gstr3b")
{
if( gstType.value == "O" || (global_edit_mode == "V" && ($(gstType).text() == "Outward and Inward Supplay Details") ) )
{
openExtraContainer("O");
}
}
// }
......@@ -104,6 +111,13 @@ function openExtraContainer(gstType)
iframe.src = "/ibase/webitm/jsp/GSTITCReversalSupplies.jsp";
}
}
else if(global_obj_name == "gstr3b")
{
if( gstType == "O" )
{
iframe.src = "/ibase/webitm/jsp/GST3OutInlSupplies.jsp";
}
}
global_gst_type = gstType;
extraCont.appendChild(iframe);
saveData = saveDataCustom;
......@@ -115,6 +129,8 @@ function openExtraContainer(gstType)
}
window.parent.document.getElementById("E12TransEditorContainer-layoutBtn").style.display = "none";
// alert(saveData);
// $('#gstExtraFrame').contents().find(':input[type="number"]').click(function () { alert('hello'); });
}
function hideItemDefaultEdit()
......@@ -282,6 +298,10 @@ function getRecordsCallBackFn(retVal)
domNum = +tranTypeAttr - 25;
}
}
else
{
domNum = +tranTypeAttr;
}
//alert(domNum);
for(dNodeCntr = 0; dNodeCntr < detailParentNode.childNodes.length; dNodeCntr++) //Errors Node
{
......@@ -339,6 +359,7 @@ function getRecordsCallBackFn(retVal)
var cgstAmt = "";
var sgstAmt = "";
var cessAmt = "";
var taxableAmt = "";
for(ctr = 0 ; ctr < colCount; ctr++)
{
var colNode = colNodeList.item(ctr);
......@@ -369,19 +390,27 @@ function getRecordsCallBackFn(retVal)
{
cessAmt = colNode.firstChild.nodeValue;
}
else if(colNode.nodeName == "taxable_amt")
{
taxableAmt = colNode.firstChild.nodeValue;
}
}
else
{
}
}
// alert('Detail2.'+domNum+'.tran_id'+domNum+'');
//alert('Detail2.'+domNum+'.tran_id'+domNum+'');
innerDoc.getElementById('Detail2.'+domNum+'.tran_id'+domNum+'').value = tranId;
innerDoc.getElementById('Detail2.'+domNum+'.line_no'+domNum+'').value = lineNo;
innerDoc.getElementById('Detail2.'+domNum+'.igst_amt'+domNum+'').value = igstAmt;
innerDoc.getElementById('Detail2.'+domNum+'.cgst_amt'+domNum+'').value = cgstAmt;
innerDoc.getElementById('Detail2.'+domNum+'.sgst_amt'+domNum+'').value = sgstAmt;
innerDoc.getElementById('Detail2.'+domNum+'.cess_amt'+domNum+'').value = cessAmt;
if(innerDoc.getElementById('Detail2.'+domNum+'.taxable_amt'+domNum+'') != null)
{
innerDoc.getElementById('Detail2.'+domNum+'.taxable_amt'+domNum+'').value = taxableAmt;
}
if(global_edit_mode == "V")
{
innerDoc.getElementById('Detail2.'+domNum+'.igst_amt'+domNum+'').setAttribute("readonly","true");
......@@ -392,6 +421,11 @@ function getRecordsCallBackFn(retVal)
innerDoc.getElementById('Detail2.'+domNum+'.cgst_amt'+domNum+'').style.color = "blue";
innerDoc.getElementById('Detail2.'+domNum+'.sgst_amt'+domNum+'').style.color = "blue";
innerDoc.getElementById('Detail2.'+domNum+'.cess_amt'+domNum+'').style.color = "blue";
if(innerDoc.getElementById('Detail2.'+domNum+'.taxable_amt'+domNum+'') != null)
{
innerDoc.getElementById('Detail2.'+domNum+'.taxable_amt'+domNum+'').setAttribute("readonly","true");
innerDoc.getElementById('Detail2.'+domNum+'.taxable_amt'+domNum+'').style.color = "blue";
}
}
}
}
......@@ -440,11 +474,11 @@ function save2DBCustom(pkValues)
var url = "";
if( getUserLang() == "en" )
{
url = "/ibase/GstrCustomTranServlet?action="+action+"&EDITOR_ID="+coreMdlId+"&OBJ_NAME="+global_obj_name+"&pkValues="+pkValues+"&XML_STR="+escape(saveString)+"&"+allElements;
url = "/ibase/GstrCustomTranServlet?action="+action+"&EDITOR_ID="+coreMdlId+"&OBJ_NAME="+global_obj_name+"&pkValues="+pkValues+"&XML_STR="+escape(saveString)+"&"+allElements+"&GST_TYPE="+global_gst_type;
}
else
{
url = encodeURI( "/ibase/GstrCustomTranServlet?action="+action+"&EDITOR_ID="+coreMdlId+"&OBJ_NAME="+global_obj_name+"&pkValues="+pkValues+"&XML_STR="+saveString+"&"+allElements );
url = encodeURI( "/ibase/GstrCustomTranServlet?action="+action+"&EDITOR_ID="+coreMdlId+"&OBJ_NAME="+global_obj_name+"&pkValues="+pkValues+"&XML_STR="+saveString+"&"+allElements+"&GST_TYPE="+global_gst_type );
}
var argArr = new Array();
argArr[0] = "save2DBCustom";
......@@ -531,6 +565,14 @@ function getqueryStringCustom(formname)
onlyHeader = false;
}
}
else if(global_obj_name == "gstr3b")
{
if(global_gst_type == "O")
{
noOfRec = 5;
onlyHeader = false;
}
}
for ( var i = 1; i <= noOfRec; i++)
......@@ -558,6 +600,10 @@ function getqueryStringCustom(formname)
qstr = qstr + " <amount><![CDATA["+innerDoc.getElementById('Detail1.'+i+'.amount'+i+'').value+"]]></amount>";
qstr = qstr + " <tran_type><![CDATA["+innerDoc.getElementById('Detail1.'+i+'.tran_type'+i+'').value+"]]></tran_type>";
qstr = qstr + " <tran_id><![CDATA["+innerDoc.getElementById('Detail1.'+i+'.tran_id'+i+'').value+"]]></tran_id>";
if(innerDoc.getElementById('Detail1.'+i+'.doc_type'+i+'') != null || innerDoc.getElementById('Detail1.'+i+'.doc_type'+i+'') != undefined)
{
qstr = qstr + " <doc_type><![CDATA["+innerDoc.getElementById('Detail1.'+i+'.doc_type'+i+'').value+"]]></doc_type>";
}
}
else
{
......@@ -572,6 +618,11 @@ function getqueryStringCustom(formname)
tempQstr = tempQstr + " <sgst_amt><![CDATA["+innerDoc.getElementById('Detail2.'+i+'.sgst_amt'+i+'').value+"]]></sgst_amt>";
tempQstr = tempQstr + " <cgst_amt><![CDATA["+innerDoc.getElementById('Detail2.'+i+'.cgst_amt'+i+'').value+"]]></cgst_amt>";
tempQstr = tempQstr + " <cess_amt><![CDATA["+innerDoc.getElementById('Detail2.'+i+'.cess_amt'+i+'').value+"]]></cess_amt>";
// alert(innerDoc.getElementById('Detail2.'+i+'.taxable_amt'+i+''));
if(innerDoc.getElementById('Detail2.'+i+'.taxable_amt'+i+'') != null || innerDoc.getElementById('Detail2.'+i+'.taxable_amt'+i+'') != undefined)
{
tempQstr = tempQstr + " <taxable_amt><![CDATA["+innerDoc.getElementById('Detail2.'+i+'.taxable_amt'+i+'').value+"]]></taxable_amt>";
}
}
qstr += "</Detail1> ";
......@@ -634,4 +685,17 @@ function custValidateFld(obj)
validateFld(obj);
}
}
else if(global_obj_name == "gstr3b")
{
if( obj.value == "O" )
{
validateFld(obj);
openExtraContainer(obj.value);
}
else
{
hideExtraContainer();
validateFld(obj);
}
}
}
\ No newline at end of file
webitm-gst/module-resource/web/jsp/GST3OutInlSupplies.jsp 0 → 100644
View file @ d83cc1a7
<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" >Taxable Amount</th>
<th align="right" valign="top" >IGST Amount</th>
<th align="right" valign="bottom" >SGST Amount</th>
<th align="right" valign="top">CGST Amount</th>
<th align="right" valign="top">CESS Amount</th>
</tr>
</thead>
<tbody class="table-body">
<tr>
<td align="left" valign="bottom">GSTR3B Outward taxable supplies (other than zero)</td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.1.taxable_amt1" name="Detail2.1.taxable_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.1.igst_amt1" name="Detail2.1.igst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.1.sgst_amt1" name="Detail2.1.sgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.1.cgst_amt1" name="Detail2.1.cgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.1.cess_amt1" name="Detail2.1.cess_amt" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.1.tran_type1" name="Detail1.1.tran_type" type="text" value="1" >
<input type="hidden" id="Detail1.1.tran_id1" name="Detail1.1.tran_id" type="text" >
<input type="hidden" id="Detail1.1.amount1" name="Detail1.1.amount" type="text" >
<input type="hidden" id="Detail1.1.doc_type1" name="Detail1.1.doc_type" type="text" value="T" >
<input type="hidden" id="Detail2.1.tran_id1" name="Detail2.1.tran_id" type="text" >
<input type="hidden" id="Detail2.1.line_no1" name="Detail2.1.line_no" type="text" >
</tr>
<tr>
<td align="left" valign="bottom">Outward taxable supplies (zero rated )</td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.2.taxable_amt2" name="Detail2.2.taxable_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.2.igst_amt2" name="Detail2.2.igst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.2.sgst_amt2" name="Detail2.2.sgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.2.cgst_amt2" name="Detail2.2.cgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.2.cess_amt2" name="Detail2.2.cess_amt" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.2.tran_type2" name="Detail1.2.tran_type" type="text" value="2" >
<input type="hidden" id="Detail1.2.tran_id2" name="Detail1.2.tran_id" type="text" >
<input type="hidden" id="Detail1.2.amount2" name="Detail1.2.amount" type="text" >
<input type="hidden" id="Detail1.2.doc_type2" name="Detail1.2.doc_type" type="text" value="Z">
<input type="hidden" id="Detail2.2.tran_id2" name="Detail2.2.tran_id" type="text" >
<input type="hidden" id="Detail2.2.line_no2" name="Detail2.2.line_no" type="text" >
</tr>
<tr>
<td align="left" valign="bottom">Other outward supplies (Nil rated, exempted)</td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.3.taxable_amt3" name="Detail2.3.taxable_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.3.igst_amt3" name="Detail2.3.igst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.3.sgst_amt3" name="Detail2.3.sgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.3.cgst_amt3" name="Detail2.3.cgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.3.cess_amt3" name="Detail2.3.cess_amt" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.3.tran_type3" name="Detail1.3.tran_type" type="text" value="3" >
<input type="hidden" id="Detail1.3.tran_id3" name="Detail1.3.tran_id" type="text" >
<input type="hidden" id="Detail1.3.amount3" name="Detail1.3.amount" type="text" >
<input type="hidden" id="Detail1.3.doc_type3" name="Detail1.3.doc_type" type="text" value="N" >
<input type="hidden" id="Detail2.3.tran_id3" name="Detail2.3.tran_id" type="text" >
<input type="hidden" id="Detail2.3.line_no3" name="Detail2.3.line_no" type="text" >
</tr>
<tr>
<td align="left" valign="bottom">Inward supplies (liable to reverse charge)</td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.4.taxable_amt4" name="Detail2.4.taxable_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.4.igst_amt4" name="Detail2.4.igst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.4.sgst_amt4" name="Detail2.4.sgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.4.cgst_amt4" name="Detail2.4.cgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.4.cess_amt4" name="Detail2.4.cess_amt" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.4.tran_type4" name="Detail1.4.tran_type" type="text" value="4" >
<input type="hidden" id="Detail1.4.tran_id4" name="Detail1.4.tran_id" type="text" >
<input type="hidden" id="Detail1.4.amount4" name="Detail1.4.amount" type="text" >
<input type="hidden" id="Detail1.4.doc_type4" name="Detail1.4.doc_type" type="text" value="R">
<input type="hidden" id="Detail2.4.tran_id4" name="Detail2.4.tran_id" type="text" >
<input type="hidden" id="Detail2.4.line_no4" name="Detail2.4.line_no" type="text" >
</tr>
<tr>
<td align="left" valign="bottom">Non-GST outward supplies </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.taxable_amt5" name="Detail2.5.taxable_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.igst_amt5" name="Detail2.5.igst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.sgst_amt5" name="Detail2.5.sgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.cgst_amt5" name="Detail2.5.cgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.cess_amt5" name="Detail2.5.cess_amt" type="text" value="0.00" > </td>
<input type="hidden" id="Detail1.5.tran_type5" name="Detail1.5.tran_type" type="text" value="5" >
<input type="hidden" id="Detail1.5.tran_id5" name="Detail1.5.tran_id" type="text" >
<input type="hidden" id="Detail1.5.amount5" name="Detail1.5.amount" type="text" >
<input type="hidden" id="Detail1.5.doc_type5" name="Detail1.5.doc_type" type="text" value="G">
<input type="hidden" id="Detail2.5.tran_id5" name="Detail2.5.tran_id" type="text" >
<input type="hidden" id="Detail2.5.line_no5" name="Detail2.5.line_no" type="text" >
</tr>
</tbody>
</table>
</body>
</html>
webitm-gst/module-resource/web/jsp/GSTITCReversalSupplies.jsp
View file @ d83cc1a7
......@@ -13,10 +13,10 @@
<thead class="table-head">
<tr>
<th align="left" valign="top" >Description</th>
<th align="right" valign="top" >IGST Rate</th>
<th align="right" valign="bottom" >SGST Rate</th>
<th align="right" valign="top">CGST Rate</th>
<th align="right" valign="top">CESS Rate</th>
<th align="right" valign="top" >IGST Amount</th>
<th align="right" valign="bottom" >SGST Amount</th>
<th align="right" valign="top">CGST Amount</th>
<th align="right" valign="top">CESS Amount</th>
</tr>
</thead>
<tbody class="table-body">
......@@ -69,7 +69,7 @@
<input type="hidden" id="Detail2.4.line_no4" name="Detail2.4.line_no" type="text" >
</tr>
<tr>
<td align="left" valign="bottom">ITC Rule 7 (2) (b))</td>
<td align="left" valign="bottom">ITC Rule 7 (2) (b)</td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.igst_amt5" name="Detail2.5.igst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.sgst_amt5" name="Detail2.5.sgst_amt" type="text" value="0.00" > </td>
<td> <input type="number" style="position:relative;;TYPE:number;text-align:RIGHT" class="tableInputField" required="" id="Detail2.5.cgst_amt5" name="Detail2.5.cgst_amt" type="text" value="0.00" > </td>
......
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