Commit d663a972 authored by kdabholkar's avatar kdabholkar

Commited new Changes of Sales Order Wizard suggested by danish Sir

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174856 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d1be8eaf
......@@ -25,6 +25,24 @@
<script language="Javascript" src="/ibase/webitm/js/jquery.datetimepicker.full.js"></script>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/jquery.datetimepicker.css"/>
<script>
<![CDATA[
$(function()
{
var isResetFromOther = localStorage.getItem('isResetFromOther');
console.log("isresetValue"+isResetFromOther);
if(isResetFromOther == 'true')
{
resetHeader();
localStorage.removeItem('isResetFromOther');
}
});
]]>
</script>
<style type="text/css">
.editDisplayClass{
......@@ -37,9 +55,9 @@ border:none;
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/htmlWizard.css"/>
<link type="text/css" rel="stylesheet" href="/ibase/webitm/css/sorderWiz.css"/>
<body onload="pageLoadHeader();">
<form name="sorderWizFormI" id = "sorderWizFormI" onkeypress="return event.keyCode != 13" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" style="background-color: #f7f8fa;">
<body onload="pageLoadHeader();">
<!-- <form name="sorderWizFormI" id = "sorderWizFormI" onkeypress="return event.keyCode != 13" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" style="background-color: #f7f8fa;"> -->
<form name="sorderWizFormI" id = "sorderWizFormI" onkeypress="myFunction(event)" onload="myFunction(event)" METHOD="post" ACTION="/ibase/ITMWizardHandlerServlet" style="background-color: #f7f8fa;">
<TABLE border="0" width="99%" height="2%" class="header_td" cellpadding="0" cellspacing="0" style="background-color: #f7f8fa;">
<TR>
<div class='contentHeaderLbl'><img src="/ibase/images/menuImages/web/salesorder.png" onerror=" this.src= '/ibase/images/menuImages/errMenu.png' " style="position: absolute; margin-left: -20px;margin-top:9px; height: 20px; width: 20px;"/>
......@@ -730,7 +748,7 @@ border:none;
</div>
<div style = "margin-top:5px">
<div style = "margin-top:5px" >
<table cellSpacing="1" cellPadding="1" width="100%" border="0">
<tr>
<td >
......@@ -738,9 +756,11 @@ border:none;
<input type="hidden" value="sorderWiz" name="OBJ_NAME" id="OBJ_NAME"/>
<input type="hidden" value="next" name="action" id="action" />
<input type="button" style="cursor:hand" value="Reset" class="button" title='Reset' id="reset" onclick ="javascript:return resetHeader()"/>
<input type="button" style="cursor:hand" value="Reset" class="button" title='Reset' id="reset1" onclick ="javascript:return resetHeader()"/>
<input type="submit" style="cursor:hand" value="Next" class="button" title='Next' id="next" onclick ="javascript:return checkNullvalidation()"/>
<!-- <input type="text" size="50" onkeypress="myFunction1(event)"/> -->
<div id="buttonreplacement" align="center" style="display:none;">
<img src="/ibase/images/preload.gif" alt="Please wait work in progress" >
Please wait......
......
......@@ -34,7 +34,7 @@
$('#itemParentImage').draggable().resizable();
pageLoad();
getFom2Tables();
setImagesMain();
$('body').click(function(event)
......@@ -99,7 +99,7 @@
</style>
<body>
<form name="sorderWizFormII" id="sorderWizFormII" METHOD="post" onkeypress="return event.keyCode != 13;" ACTION="/ibase/ITMWizardHandlerServlet">
<form name="sorderWizFormII" id="sorderWizFormII" METHOD="post" onkeypress="return event.keyCode != 13;" >
<!-- <input type="text" value="1" name="TAB" ID="tabs" />
<input type="text" value="1" name="active" ID="active" /> -->
......@@ -263,13 +263,13 @@
<img src="" id = "cloths1" height="40" width="40" style="float: left;border-radius: 90%;margin-left: -20px;visibility:hidden" onmouseover="openImage(event,'1')" ></img>
</td>
<td style="width:98%;">
<table style = "font-size:14px">
<table style = "font-size:14px; width:95%;">
<tr>
<td><label id='main1' style='background-color: transparent;'></label></td>
<td><label id='main1' style='background-color: transparent;'></label></td> <td align="right"><label align="right" id = "pieces1"></label><label id = "rate1"></label></td>
<input type='hidden' id='display' value='0' />
</tr>
<tr>
<td><label id = "pieces1"></label><label id = "rate1"></label></td>
<!-- <td align="right" style="width:95%;"><label align="right" id = "pieces1"></label><label id = "rate1"></label></td> -->
</tr>
</table>
</td>
......@@ -316,26 +316,37 @@
</div>
</div>
</td>
<td align="right" width = "10%">
<td style="visibility:hidden" align="right" width = "10%" >
In Stock :
</td>
<td width = "10%">
<label id = "item_parent_totalQuantity1"></label>
<label style="visibility:hidden" id = "item_parent_totalQuantity1"></label>
<input type="hidden" id="totalquantity1" value="{item_code}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 400px" />
</td>
<td align="right" width = "10%">
<!-- <td align="right" width = "10%">
Rate:
</td>
<td width = "10%">
<label id = "item_parent_rate1"></label>
<label id = "Ind_rate1"></label>
<input type="hidden" id="indrate1" value="{item_code}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 400px" />
</td> -->
<!-- <td align="right" width = "10%">
Rate:
</td> -->
<td width = "10%">
<label style="visibility:hidden" id = "item_parent_rate1"></label>
<input type="hidden" id="itmdescription1" value="{item_code}" class="editDisplayClass" maxlength="0" ISCHANGED="false" readOnly = "1" style="width: 400px" />
</td>
</td>
<td align = 'right' width = "20%">
<!-- <strong>Due Date: <span id="dlv_date_span1"> <xsl:value-of select="due_date"/> </span></strong>
<input type="hidden" name="dlv_date1" readOnly = "1" id="dlv_date1" value="{$ord_date_m}" style="width:28%;font-size:12px" />
-->
Despatch Date: <input type="hidden" name="dlv_date1" readOnly = "1" id="dlv_date1" value="{$ord_date_m}" style="width:28%;font-size:12px" />
<input type="text" class="input_editable" size="8" value="{$ord_date_m}" name="dspdate1" id="dspdate1" onkeydown = 'return false;' maxlength="8" placeholder = "DD/MM/YY" onchange="javascript:setDespDate('1');"/>
<!-- <input type="text" class="input_editable" size="8" value="{$ord_date_m}" name="dspdate1" id="dspdate1" onkeydown = 'return false;' maxlength="8" placeholder = "DD/MM/YY" onchange="javascript:setDespDate('1');"/>-->
<input type="text" class="input_editable" size="8" value="{$ord_date_m}" name="dspdate1" id="dspdate1" maxlength="8" placeholder = "DD/MM/YY" onkeydown="javascript:setDate('dspdate1');"/>
<img border="0" src="/ibase/webitm/images/calender.png" style = "margin-bottom:-5px;margin-left:3px;cursor: hand;" id="dspdate1" name="dspdate1" onClick="javascript:setDate('dspdate1');"/>
</td>
......@@ -344,9 +355,12 @@
</table>
</div>
<input type ="hidden" id="deleteAccordian1"></input>
<div class = 'totalQuantity' align = "right">
<b>Total Quantity: </b><span id= "sum1"></span>
<!-- <b>Total Quantity: </b> -->
<span style="visibility:hidden" id= "sum1"></span>
</div>
</div>
</div>
</div>
......@@ -422,8 +436,15 @@
<div style="width=20%;height:6px;margin-left=-12px;margin-top:3px;margin-bottom:0px;">
<table cellSpacing="1" cellPadding="1" width="50%" border="0">
<tr>
<!-- <input type="button" style="cursor:hand" value="Reset" class="button" title='Reset' id="reset" onclick ="event.stopPropagation();javascript:closeAccordian('1')"/> -->
<input type="submit" style="cursor:hand" class="button" value="Previous" title='Previous' id="previous" onclick="javascript:createXMLString()"/>
<input type="submit" style="cursor:hand" class="button" value="Next" title='Next' id="next" onclick="javascript:return setCheckedTrue();"/>
<input type="button" style="cursor:hand" value="Reset" class="button" title='Reset' id="reset" onclick ="javascript:createXMLString1('sorderWiz');"/>
<span title="Add New" class="addNewDetailBtn" id="AddButton" name="AddButton" onclick="createAccordian()" >
<p class="plus">+</p>
</span>
......
......@@ -277,9 +277,12 @@
</th>
<!-- Added by Sneha on 20-01-2017, to add discount field [Start] -->
<th class="tHeader" nowrap="true" valign="bottom">
Discount(%)
</th>
</th>
<!-- Added by Sneha on 20-01-2017, to add discount field [End] -->
<!-- <th class="thClass" nowrap="true" >
......@@ -394,12 +397,18 @@
</td>
<!-- Added by Sneha 20-01-2017, to add discount field [End] -->
<td class="td_rightAlign editTdClass" style="width:75px;" onclick='gotoChildTextbox(this);' nowrap="true">
<td class="td_rightAlign editTdClass" style="width:75px;" onclick='gotoChildTextbox(this);' nowrap="true">
<input type="text" class="editInputClass editInputCur" value="{$discount}" name="Detail3.{normalize-space($dbIDs)}.discount" id="Detail3.{normalize-space($dbIDs)}.discount"
style="width:100%;border:none;text-align: right; outline:none" maxlength="10"
onchange='sendInfo("Detail3.{normalize-space($dbIDs)}.quantity");'
onkeypress='return isQuantity(event);' onfocus='setActiveTD(this);'/>
</td>
</td>
<!-- <td style="width:75px">
<xsl:value-of select="item_parnt"/>
</td> -->
......@@ -461,6 +470,10 @@
<input type="hidden" value="{$line_no__contr}" name="Detail3.{normalize-space($dbIDs)}.line_no__contr" id="Detail3.{normalize-space($dbIDs)}.line_no__contr" />
<input type="hidden" value="{$item_ser}" name="Detail3.{normalize-space($dbIDs)}.item_ser" id="Detail3.{normalize-space($dbIDs)}.item_ser" />
<input type="hidden" value="{$rate__clg}" name="Detail3.{normalize-space($dbIDs)}.rate__clg" id="Detail3.{normalize-space($dbIDs)}.rate__clg" />
<!-- <input type="hidden" class="editInputClass editInputCur" value="{$discount}" name="Detail3.{normalize-space($dbIDs)}.discount" id="Detail3.{normalize-space($dbIDs)}.discount"
style="width:100%;border:none;text-align: right; outline:none" maxlength="10"
onchange='sendInfo("Detail3.{normalize-space($dbIDs)}.quantity");'
onkeypress='return isQuantity(event);' onfocus='setActiveTD(this);'/> -->
</tr>
</xsl:if>
......@@ -478,8 +491,15 @@
<input type="hidden" name="PRE_FORM_VAL" ID="PRE_FORM_VAL" />
<input type="hidden" name="PRE_FORM_VAL2" ID="PRE_FORM_VAL2" />
<!-- <input type="button" style="cursor:hand" value="Reset" class="button" title='Reset' id="reset" onclick ="createXMLString1('sorderWiz');"/> -->
<input type="submit" id="previous" style="cursor:hand" class="button" value="Previous" title='Previous' onclick="return form3Pre();"/>
<input type="submit" id="finish" style="cursor:hand" class="button" value="Finish" title='Finish' onclick="return checkRate();"/>
<input type="button" style="cursor:hand" value="Reset" class="button" title='Reset' id="reset" onclick ="javascript:createXMLString1('sorderWiz');"/>
<div id="buttonreplacement" align="center" style="display:none;">
<img src="/ibase/images/preload.gif" alt="Please wait work in progress" >
Please wait......
......
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